Merge branch 'main' into sdk-07-hooks-agent

packages/sdk/src/agent.integration.test.ts

@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { GeminiCliAgent } from './agent.js';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 
 // Set this to true locally when you need to update snapshots
 const RECORD_MODE = process.env['RECORD_NEW_RESPONSES'] === 'true';
@@ -20,6 +19,13 @@ const getGoldenPath = (name: string) =>
   path.resolve(__dirname, '../test-data', `${name}.json`);
 
 describe('GeminiCliAgent Integration', () => {
+  beforeEach(() => {
+    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
   it('handles static instructions', async () => {
     const goldenFile = getGoldenPath('agent-static-instructions');
 

packages/sdk/src/shell.ts

@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config as CoreConfig } from '@google/gemini-cli-core';
-import { ShellExecutionService, ShellTool } from '@google/gemini-cli-core';
+import {
+  ShellExecutionService,
+  ShellTool,
+  type Config as CoreConfig,
+} from '@google/gemini-cli-core';
 import type {
   AgentShell,
   AgentShellResult,

packages/sdk/src/skills.integration.test.ts

@@ -9,10 +9,9 @@ import { GeminiCliAgent } from './agent.js';
 import { skillDir } from './skills.js';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 
 // Set this to true locally when you need to update snapshots
 const RECORD_MODE = process.env['RECORD_NEW_RESPONSES'] === 'true';

packages/sdk/src/tool.integration.test.ts

@@ -10,10 +10,9 @@ import * as path from 'node:path';
 import { z } from 'zod';
 import { tool, ModelVisibleError } from './tool.js';
 import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 
 // Set this to true locally when you need to update snapshots
 const RECORD_MODE = process.env['RECORD_NEW_RESPONSES'] === 'true';