Fix: import ADK symbols from source in core/test and pin the convention (281 -> 139 type errors)

core/test/a2a/a2a_agent_test.ts

@@ -13,6 +13,9 @@ import {
 } from '@a2a-js/sdk';
 import {ClientFactory} from '@a2a-js/sdk/client';
 import {ExecutionEventBus, RequestContext} from '@a2a-js/sdk/server';
+import {Language, Outcome} from '@google/genai';
+import {beforeEach, describe, expect, it, Mock, vi} from 'vitest';
+import {A2AEvent} from '../../src/a2a/a2a_event.js';
 import {
   A2AAgentExecutor,
   Event as AdkEvent,
@@ -27,10 +30,7 @@ import {
   Runner,
   RunnerConfig,
   Session,
-} from '@google/adk';
-import {Language, Outcome} from '@google/genai';
-import {beforeEach, describe, expect, it, Mock, vi} from 'vitest';
-import {A2AEvent} from '../../src/a2a/a2a_event.js';
+} from '../../src/index.js';
 
 vi.mock('@a2a-js/sdk/client', () => {
   const Client = vi.fn().mockImplementation(() => ({

core/test/a2a/agent_card_test.ts

@@ -17,7 +17,7 @@ import {
   LoopAgent,
   ParallelAgent,
   SequentialAgent,
-} from '@google/adk';
+} from '../../src/index.js';
 
 // Minimal CustomAgent for testing BaseAgent path
 class CustomAgent extends BaseAgent {

core/test/a2a/agent_executor_test.ts

@@ -6,6 +6,7 @@
 
 import {TaskStatusUpdateEvent, TextPart} from '@a2a-js/sdk';
 import {ExecutionEventBus, RequestContext} from '@a2a-js/sdk/server';
+import {beforeEach, describe, expect, it, Mocked, vi} from 'vitest';
 import {
   A2AAgentExecutor,
   Event as AdkEvent,
@@ -15,8 +16,7 @@ import {
   Runner,
   RunnerConfig,
   Session,
-} from '@google/adk';
-import {beforeEach, describe, expect, it, Mocked, vi} from 'vitest';
+} from '../../src/index.js';
 
 // Mock the Runner to control its async generator
 vi.mock('../../src/runner/runner.js', async (importOriginal) => {

core/test/a2a/event_converter_utils_test.ts

@@ -10,10 +10,10 @@ import {
   TaskArtifactUpdateEvent,
   TaskStatusUpdateEvent,
 } from '@a2a-js/sdk';
-import {createEvent, createEventActions} from '@google/adk';
 import {describe, expect, it, vi} from 'vitest';
 import {A2AEvent} from '../../src/a2a/a2a_event.js';
 import {toA2AMessage, toAdkEvent} from '../../src/a2a/event_converter_utils.js';
+import {createEvent, createEventActions} from '../../src/index.js';
 import * as envAwareUtils from '../../src/utils/env_aware_utils.js';
 
 vi.mock('../../src/utils/env_aware_utils.js', async (importOriginal) => {

core/test/a2a/event_processor_utils_test.ts

@@ -5,18 +5,18 @@
  */
 
 import {DataPart, Task, TextPart} from '@a2a-js/sdk';
-import {
-  Event as AdkEvent,
-  ExecutorContext,
-  createEvent,
-  createEventActions,
-} from '@google/adk';
 import {Content as GenAIContent} from '@google/genai';
 import {describe, expect, it, vi} from 'vitest';
 import {
   getFinalTaskStatusUpdate,
   getTaskInputRequiredEvent,
 } from '../../src/a2a/event_processor_utils.js';
+import {
+  Event as AdkEvent,
+  ExecutorContext,
+  createEvent,
+  createEventActions,
+} from '../../src/index.js';
 
 import {toA2AParts} from '../../src/a2a/part_converter_utils.js';
 

core/test/a2a/executor_context_test.ts

@@ -5,10 +5,10 @@
  */
 
 import {RequestContext} from '@a2a-js/sdk/server';
-import {Session} from '@google/adk';
 import {Content} from '@google/genai';
 import {describe, expect, it} from 'vitest';
 import {createExecutorContext} from '../../src/a2a/executor_context.js';
+import {Session} from '../../src/index.js';
 
 describe('createExecutorContext', () => {
   const mockUserContent: Content = {role: 'user', parts: [{text: 'hello'}]};

core/test/a2a/metadata_converter_utils_test.ts

@@ -5,7 +5,6 @@
  */
 
 import {Message, Task} from '@a2a-js/sdk';
-import {Event as AdkEvent, createEventActions} from '@google/adk';
 import {describe, expect, it} from 'vitest';
 import {toAdkEvent} from '../../src/a2a/event_converter_utils.js';
 import {
@@ -14,6 +13,7 @@ import {
   getA2AEventMetadata,
   getAdkEventMetadata,
 } from '../../src/a2a/metadata_converter_utils.js';
+import {Event as AdkEvent, createEventActions} from '../../src/index.js';
 
 describe('metadata_converter_utils', () => {
   describe('getAdkEventMetadata', () => {

core/test/a2a/remote_agent_test.ts

@@ -16,15 +16,15 @@ import {
   ClientFactory,
   DefaultAgentCardResolver,
 } from '@a2a-js/sdk/client';
+import {beforeEach, describe, expect, it, vi} from 'vitest';
 import {
   Event as AdkEvent,
   createEvent,
   InvocationContext,
   RemoteA2AAgent,
   RemoteA2AAgentConfig,
   Session,
-} from '@google/adk';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
+} from '../../src/index.js';
 
 type A2AStreamEventData =
   | Message

core/test/agents/active_streaming_tool_test.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {ActiveStreamingTool, Task} from '@google/adk';
 import {describe, expect, it} from 'vitest';
+import {ActiveStreamingTool, Task} from '../../src/index.js';
 
 describe('ActiveStreamingTool', () => {
   it('should construct with default parameters', () => {

core/test/agents/base_agent_test.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {describe, expect, it} from 'vitest';
 import {
   AgentTransferLlmRequestProcessor,
   BaseAgent,
@@ -15,8 +16,7 @@ import {
   PluginManager,
   Session,
   createEvent,
-} from '@google/adk';
-import {describe, expect, it} from 'vitest';
+} from '../../src/index.js';
 
 class MockAgent extends BaseAgent {
   constructor(config: BaseAgentConfig) {

core/test/agents/functions_test.ts

@@ -3,6 +3,16 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import {FunctionCall} from '@google/genai';
+import {beforeEach, describe, expect, it, vi} from 'vitest';
+import {z} from 'zod';
+import {
+  findEventByFunctionCallId,
+  findMatchingFunctionCall,
+  generateClientFunctionCallId,
+  getLongRunningFunctionCalls,
+  mergeParallelFunctionResponseEvents,
+} from '../../src/agents/functions.js';
 import {
   BasePlugin,
   BaseTool,
@@ -18,17 +28,7 @@ import {
   SingleAfterToolCallback,
   SingleBeforeToolCallback,
   ToolConfirmation,
-} from '@google/adk';
-import {FunctionCall} from '@google/genai';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-import {z} from 'zod';
-import {
-  findEventByFunctionCallId,
-  findMatchingFunctionCall,
-  generateClientFunctionCallId,
-  getLongRunningFunctionCalls,
-  mergeParallelFunctionResponseEvents,
-} from '../../src/agents/functions.js';
+} from '../../src/index.js';
 
 // Get the test target function
 const {
@@ -709,7 +709,6 @@ describe('getLongRunningFunctionCalls', () => {
         isLongRunning: false,
       }),
     };
-    // @ts-expect-error ts will argue about toolsDict because getLongRunningFunctionCalls is improted from the source and BaseTool is imported from '@google/adk'.
     const result = getLongRunningFunctionCalls(functionCalls, toolsDict);
     expect(result.has('call-1')).toBe(true);
     expect(result.has('call-2')).toBe(false);

core/test/agents/instructions_test.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {InvocationContext, ReadonlyContext} from '@google/adk';
 import {describe, expect, it, vi} from 'vitest';
 import {injectSessionState} from '../../src/agents/instructions.js';
+import {InvocationContext, ReadonlyContext} from '../../src/index.js';
 
 /**
  * Builds a minimal ReadonlyContext backed by a plain-object invocation context.

core/test/agents/invocation_context_test.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {describe, expect, it} from 'vitest';
 import {
   BaseAgent,
   BaseAgentConfig,
@@ -13,8 +14,7 @@ import {
   PluginManager,
   Session,
   createEvent,
-} from '@google/adk';
-import {describe, expect, it} from 'vitest';
+} from '../../src/index.js';
 
 function makeSession(): Session {
   return {

core/test/agents/live_request_queue_test.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {LiveRequest, LiveRequestQueue} from '@google/adk';
 import {createUserContent} from '@google/genai';
 import {describe, expect, it} from 'vitest';
+import {LiveRequest, LiveRequestQueue} from '../../src/index.js';
 
 describe('LiveRequestQueue', () => {
   it('should handle sendContent', async () => {

core/test/agents/llm_agent_auth_integration_test.ts

@@ -4,19 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  BaseLlm,
-  BaseLlmConnection,
-  Event,
-  getFunctionCalls,
-  getFunctionResponses,
-  InMemorySessionService,
-  LlmAgent,
-  LlmRequest,
-  LlmResponse,
-  RestApiTool,
-  Runner,
-} from '@google/adk';
 import * as http from 'http';
 import {OpenAPIV3} from 'openapi-types';
 import {
@@ -29,6 +16,19 @@ import {
   it,
   vi,
 } from 'vitest';
+import {
+  BaseLlm,
+  BaseLlmConnection,
+  Event,
+  getFunctionCalls,
+  getFunctionResponses,
+  InMemorySessionService,
+  LlmAgent,
+  LlmRequest,
+  LlmResponse,
+  RestApiTool,
+  Runner,
+} from '../../src/index.js';
 
 class MockLlm extends BaseLlm {
   responses: LlmResponse[] = [];

core/test/agents/llm_agent_test.ts

@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {Content, Schema, Type} from '@google/genai';
+import {beforeEach, describe, expect, it} from 'vitest';
+import {z as z3} from 'zod/v3';
+import {z as z4} from 'zod/v4';
 import {
   AUTH_PREPROCESSOR,
   BaseLlm,
@@ -25,11 +29,7 @@ import {
   RunAsyncToolRequest,
   Session,
   ToolProcessLlmRequest,
-} from '@google/adk';
-import {Content, Schema, Type} from '@google/genai';
-import {beforeEach, describe, expect, it} from 'vitest';
-import {z as z3} from 'zod/v3';
-import {z as z4} from 'zod/v4';
+} from '../../src/index.js';
 
 class MockLlmConnection implements BaseLlmConnection {
   sendHistory(_history: Content[]): Promise<void> {

core/test/agents/loop_agent_test.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {describe, expect, it} from 'vitest';
 import {
   BaseAgent,
   BaseAgentConfig,
@@ -15,8 +16,7 @@ import {
   createEvent,
   createEventActions,
   isLoopAgent,
-} from '@google/adk';
-import {describe, expect, it} from 'vitest';
+} from '../../src/index.js';
 
 class MockSubAgent extends BaseAgent {
   private eventsToYield: Event[];

core/test/agents/parallel_agent_test.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {describe, expect, it} from 'vitest';
 import {
   BaseAgent,
   BaseAgentConfig,
@@ -14,8 +15,7 @@ import {
   createEvent,
   createSession,
   isParallelAgent,
-} from '@google/adk';
-import {describe, expect, it} from 'vitest';
+} from '../../src/index.js';
 
 class MockSubAgent extends BaseAgent {
   private eventsToYield: Event[];

core/test/agents/processors/agent_transfer_llm_request_processor_test.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {describe, expect, it} from 'vitest';
 import {
   AgentTransferLlmRequestProcessor,
   BaseAgent,
@@ -13,8 +14,7 @@ import {
   LlmAgent,
   LlmRequest,
   PluginManager,
-} from '@google/adk';
-import {describe, expect, it} from 'vitest';
+} from '../../../src/index.js';
 
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR =
   new AgentTransferLlmRequestProcessor();

core/test/agents/processors/basic_llm_request_processor_test.ts

@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {Content, Blob as GenaiBlob, Modality} from '@google/genai';
+import {beforeAll, describe, expect, it} from 'vitest';
+import {BASIC_LLM_REQUEST_PROCESSOR} from '../../../src/agents/processors/basic_llm_request_processor.js';
 import {
   BaseAgent,
   BaseLlm,
@@ -17,10 +20,7 @@ import {
   LlmResponse,
   PluginManager,
   RunConfig,
-} from '@google/adk';
-import {Content, Blob as GenaiBlob, Modality} from '@google/genai';
-import {beforeAll, describe, expect, it} from 'vitest';
-import {BASIC_LLM_REQUEST_PROCESSOR} from '../../../src/agents/processors/basic_llm_request_processor.js';
+} from '../../../src/index.js';
 
 class TestLlmConnection implements BaseLlmConnection {
   async sendHistory(_history: Content[]): Promise<void> {}