From 15826637d2d12a773f7e16104654053ecd94d121 Mon Sep 17 00:00:00 2001
From: Christian Gunderman <gundermanc@google.com>
Date: Wed, 8 Apr 2026 11:04:30 -0700
Subject: [PATCH] Fix errors.

---
 evals/component-test-helper.ts | 19 +++++++++++--------
 evals/test-helper.ts           |  8 ++++----
 evals/vitest.config.ts         |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/evals/component-test-helper.ts b/evals/component-test-helper.ts
index 9e5c9aa567..23f3cb8b6a 100644
--- a/evals/component-test-helper.ts
+++ b/evals/component-test-helper.ts
@@ -25,17 +25,21 @@ import {
   ExtensionLoader,
   IntegrityDataStatus,
   makeFakeConfig,
+  type GeminiCLIExtension,
 } from '@google/gemini-cli-core';
 import { createMockSettings } from '../packages/cli/src/test-utils/settings.js';
 
 // A minimal mock ExtensionManager to bypass integrity checks
 class MockExtensionManager extends ExtensionLoader {
-  getExtensions = () => [];
-  setRequestConsent = () => {};
-  setRequestSetting = () => {};
+  override getExtensions(): GeminiCLIExtension[] {
+    return [];
+  }
+  setRequestConsent = (): void => {};
+  setRequestSetting = (): void => {};
   integrityManager = {
-    verifyExtensionIntegrity: async () => IntegrityDataStatus.VERIFIED,
-    storeExtensionIntegrity: async () => undefined,
+    verifyExtensionIntegrity: async (): Promise<IntegrityDataStatus> =>
+      IntegrityDataStatus.VERIFIED,
+    storeExtensionIntegrity: async (): Promise<void> => undefined,
   };
 }
 
@@ -77,7 +81,7 @@ export class ComponentRig {
       approvalMode: ApprovalMode.DEFAULT,
       policyEngineConfig,
       enableEventDrivenScheduler: false, // Don't need scheduler for direct component tests
-      extensionLoader: new MockExtensionManager() as any,
+      extensionLoader: new MockExtensionManager(),
       useAlternateBuffer: false,
       ...this.options.configOverrides,
     };
@@ -108,8 +112,7 @@ export function componentEvalTest(
         configOverrides: evalCase.configOverrides,
       });
 
-      const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
-      const logFile = path.join(logDir, `${sanitizedName}-component.log`);
+      await prepareLogDir(evalCase.name);
 
       try {
         await rig.initialize();
diff --git a/evals/test-helper.ts b/evals/test-helper.ts
index 0a7c5c4dd7..7baab8326f 100644
--- a/evals/test-helper.ts
+++ b/evals/test-helper.ts
@@ -17,6 +17,7 @@ import {
   getProjectHash,
   SESSION_FILE_PREFIX,
   PREVIEW_GEMINI_FLASH_MODEL,
+  getErrorMessage,
 } from '@google/gemini-cli-core';
 
 export * from '@google/gemini-cli-test-utils';
@@ -26,7 +27,7 @@ export * from '@google/gemini-cli-test-utils';
  * Can be overridden by setting the GEMINI_MODEL environment variable.
  */
 export const EVAL_MODEL =
-  process.env.GEMINI_MODEL || PREVIEW_GEMINI_FLASH_MODEL;
+  process.env['GEMINI_MODEL'] || PREVIEW_GEMINI_FLASH_MODEL;
 
 // Indicates the consistency expectation for this test.
 // - ALWAYS_PASSES - Means that the test is expected to pass 100% of the time. These
@@ -67,8 +68,7 @@ export async function withEvalRetries(
       await attemptFn(attempt);
       return; // Success! Exit the retry loop.
     } catch (error: unknown) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = getErrorMessage(error);
       const errorCode = getApiErrorCode(errorMessage);
 
       if (errorCode) {
@@ -246,7 +246,7 @@ function logReliabilityEvent(
   const reliabilityLog = {
     timestamp: new Date().toISOString(),
     testName,
-    model: process.env.GEMINI_MODEL || 'unknown',
+    model: process.env['GEMINI_MODEL'] || 'unknown',
     attempt,
     status,
     errorCode,
diff --git a/evals/vitest.config.ts b/evals/vitest.config.ts
index ee397c17b5..b0ad05c9e9 100644
--- a/evals/vitest.config.ts
+++ b/evals/vitest.config.ts
@@ -15,7 +15,7 @@ export default defineConfig({
     conditions: ['test'],
   },
   test: {
-    testTimeout: 600000, // 5 minutes
+    testTimeout: 300000, // 5 minutes
     reporters: ['default', 'json'],
     outputFile: {
       json: 'evals/logs/report.json',