fix: type errors

packages/core/src/core/coreToolScheduler.test.ts

@@ -794,11 +794,11 @@ describe('CoreToolScheduler cancellation during executing with live output', ()
         model: 'test-model',
         authType: 'oauth-personal',
       }),
+      getToolRegistry: () => mockToolRegistry,
     } as unknown as Config;
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
-      toolRegistry: mockToolRegistry,
       onAllToolCallsComplete,
       onToolCallsUpdate,
       getPreferredEditor: () => 'vscode',

packages/core/src/core/prompts.ts

@@ -19,7 +19,7 @@ import { isGitRepository } from '../utils/gitUtils.js';
 import { MemoryTool, GEMINI_CONFIG_DIR } from '../tools/memoryTool.js';
 import { TodoWriteTool } from '../tools/todoWrite.js';
 import { TaskTool } from '../tools/task.js';
-import { GenerateContentConfig } from '@google/genai';
+import type { GenerateContentConfig } from '@google/genai';
 
 export interface ModelTemplateMapping {
   baseUrls?: string[];

packages/core/src/subagents/builtin-agents.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SubagentConfig } from './types.js';
+import type { SubagentConfig } from './types.js';
 
 /**
  * Registry of built-in subagents that are always available to all users.

packages/core/src/subagents/subagent-events.ts

@@ -6,7 +6,7 @@
 
 import { EventEmitter } from 'events';
 import {
-  ToolCallConfirmationDetails,
+  type ToolCallConfirmationDetails,
   ToolConfirmationOutcome,
 } from '../tools/tools.js';
 

packages/core/src/subagents/subagent-manager.test.ts

@@ -9,7 +9,7 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
 import { SubagentManager } from './subagent-manager.js';
-import { SubagentConfig, SubagentError } from './types.js';
+import { type SubagentConfig, SubagentError } from './types.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { Config } from '../config/config.js';
 import { makeFakeConfig } from '../test-utils/config.js';

packages/core/src/subagents/subagent-manager.ts

@@ -13,19 +13,18 @@ import {
   parse as parseYaml,
   stringify as stringifyYaml,
 } from '../utils/yaml-parser.js';
-import {
+import type {
   SubagentConfig,
   SubagentRuntimeConfig,
   SubagentLevel,
   ListSubagentsOptions,
   CreateSubagentOptions,
-  SubagentError,
-  SubagentErrorCode,
   PromptConfig,
   ModelConfig,
   RunConfig,
   ToolConfig,
 } from './types.js';
+import { SubagentError, SubagentErrorCode } from './types.js';
 import { SubagentValidator } from './validation.js';
 import { SubAgentScope } from './subagent.js';
 import { Config } from '../config/config.js';

packages/core/src/subagents/subagent.test.ts

@@ -165,7 +165,7 @@ describe('subagent.ts', () => {
       // Default mock for executeToolCall
       vi.mocked(executeToolCall).mockResolvedValue({
         callId: 'default-call',
-        responseParts: 'default response',
+        responseParts: [{ text: 'default response' }],
         resultDisplay: 'Default tool result',
         error: undefined,
         errorType: undefined,

packages/core/src/subagents/subagent.ts

@@ -6,11 +6,11 @@
 
 import { reportError } from '../utils/errorReporting.js';
 import { Config } from '../config/config.js';
-import { ToolCallRequestInfo } from '../core/turn.js';
+import { type ToolCallRequestInfo } from '../core/turn.js';
 import {
   CoreToolScheduler,
-  ToolCall,
-  WaitingToolCall,
+  type ToolCall,
+  type WaitingToolCall,
 } from '../core/coreToolScheduler.js';
 import type {
   ToolConfirmationOutcome,
@@ -18,7 +18,7 @@ import type {
 } from '../tools/tools.js';
 import { createContentGenerator } from '../core/contentGenerator.js';
 import { getEnvironmentContext } from '../utils/environmentContext.js';
-import {
+import type {
   Content,
   Part,
   FunctionCall,
@@ -27,16 +27,14 @@ import {
   GenerateContentResponseUsageMetadata,
 } from '@google/genai';
 import { GeminiChat } from '../core/geminiChat.js';
-import {
-  SubagentTerminateMode,
+import type {
   PromptConfig,
   ModelConfig,
   RunConfig,
   ToolConfig,
 } from './types.js';
-import {
-  SubAgentEventEmitter,
-  SubAgentEventType,
+import { SubagentTerminateMode } from './types.js';
+import type {
   SubAgentFinishEvent,
   SubAgentRoundEvent,
   SubAgentStartEvent,
@@ -45,11 +43,12 @@ import {
   SubAgentStreamTextEvent,
   SubAgentErrorEvent,
 } from './subagent-events.js';
+import { SubAgentEventEmitter, SubAgentEventType } from './subagent-events.js';
 import {
   SubagentStatistics,
-  SubagentStatsSummary,
+  type SubagentStatsSummary,
 } from './subagent-statistics.js';
-import { SubagentHooks } from './subagent-hooks.js';
+import type { SubagentHooks } from './subagent-hooks.js';
 import { logSubagentExecution } from '../telemetry/loggers.js';
 import { SubagentExecutionEvent } from '../telemetry/types.js';
 import { TaskTool } from '../tools/task.js';
@@ -379,26 +378,36 @@ export class SubAgentScope {
         let roundText = '';
         let lastUsage: GenerateContentResponseUsageMetadata | undefined =
           undefined;
-        for await (const resp of responseStream) {
+        for await (const streamEvent of responseStream) {
           if (abortController.signal.aborted) {
             this.terminateMode = SubagentTerminateMode.CANCELLED;
             return;
           }
-          if (resp.functionCalls) functionCalls.push(...resp.functionCalls);
-          const content = resp.candidates?.[0]?.content;
-          const parts = content?.parts || [];
-          for (const p of parts) {
-            const txt = (p as Part & { text?: string }).text;
-            if (txt) roundText += txt;
-            if (txt)
-              this.eventEmitter?.emit(SubAgentEventType.STREAM_TEXT, {
-                subagentId: this.subagentId,
-                round: turnCounter,
-                text: txt,
-                timestamp: Date.now(),
-              } as SubAgentStreamTextEvent);
+
+          // Handle retry events
+          if (streamEvent.type === 'retry') {
+            continue;
+          }
+
+          // Handle chunk events
+          if (streamEvent.type === 'chunk') {
+            const resp = streamEvent.value;
+            if (resp.functionCalls) functionCalls.push(...resp.functionCalls);
+            const content = resp.candidates?.[0]?.content;
+            const parts = content?.parts || [];
+            for (const p of parts) {
+              const txt = (p as Part & { text?: string }).text;
+              if (txt) roundText += txt;
+              if (txt)
+                this.eventEmitter?.emit(SubAgentEventType.STREAM_TEXT, {
+                  subagentId: this.subagentId,
+                  round: turnCounter,
+                  text: txt,
+                  timestamp: Date.now(),
+                } as SubAgentStreamTextEvent);
+            }
+            if (resp.usageMetadata) lastUsage = resp.usageMetadata;
           }
-          if (resp.usageMetadata) lastUsage = resp.usageMetadata;
         }
         this.executionStats.rounds = turnCounter;
         this.stats.setRounds(turnCounter);
@@ -546,7 +555,6 @@ export class SubAgentScope {
     const responded = new Set<string>();
     let resolveBatch: (() => void) | null = null;
     const scheduler = new CoreToolScheduler({
-      toolRegistry: this.runtimeContext.getToolRegistry(),
       outputUpdateHandler: undefined,
       onAllToolCallsComplete: async (completedCalls) => {
         for (const call of completedCalls) {

packages/core/src/subagents/types.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Content, FunctionDeclaration } from '@google/genai';
+import type { Content, FunctionDeclaration } from '@google/genai';
 
 /**
  * Represents the storage level for a subagent configuration.

packages/core/src/subagents/validation.test.ts

@@ -6,7 +6,7 @@
 
 import { describe, it, expect, beforeEach } from 'vitest';
 import { SubagentValidator } from './validation.js';
-import { SubagentConfig, SubagentError } from './types.js';
+import { type SubagentConfig, SubagentError } from './types.js';
 
 describe('SubagentValidator', () => {
   let validator: SubagentValidator;

packages/core/src/subagents/validation.ts

@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  SubagentConfig,
-  ValidationResult,
-  SubagentError,
-  SubagentErrorCode,
+import { SubagentError, SubagentErrorCode } from './types.js';
+import type {
   ModelConfig,
   RunConfig,
+  SubagentConfig,
+  ValidationResult,
 } from './types.js';
 
 /**

packages/core/src/tools/task.test.ts

@@ -5,12 +5,15 @@
  */
 
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { TaskTool, TaskParams } from './task.js';
+import { TaskTool, type TaskParams } from './task.js';
 import type { PartListUnion } from '@google/genai';
 import type { ToolResultDisplay, TaskResultDisplay } from './tools.js';
 import { Config } from '../config/config.js';
 import { SubagentManager } from '../subagents/subagent-manager.js';
-import { SubagentConfig, SubagentTerminateMode } from '../subagents/types.js';
+import {
+  type SubagentConfig,
+  SubagentTerminateMode,
+} from '../subagents/types.js';
 import { SubAgentScope, ContextState } from '../subagents/subagent.js';
 import { partToString } from '../utils/partUtils.js';
 

packages/core/src/tools/task.ts

@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
+import type {
   ToolResult,
   ToolResultDisplay,
   TaskResultDisplay,
@@ -19,14 +17,19 @@ import type {
 } from './tools.js';
 import { Config } from '../config/config.js';
 import { SubagentManager } from '../subagents/subagent-manager.js';
-import { SubagentConfig, SubagentTerminateMode } from '../subagents/types.js';
+import {
+  type SubagentConfig,
+  SubagentTerminateMode,
+} from '../subagents/types.js';
 import { ContextState } from '../subagents/subagent.js';
 import {
   SubAgentEventEmitter,
+  SubAgentEventType,
+} from '../subagents/subagent-events.js';
+import type {
   SubAgentToolCallEvent,
   SubAgentToolResultEvent,
   SubAgentFinishEvent,
-  SubAgentEventType,
   SubAgentErrorEvent,
   SubAgentApprovalRequestEvent,
 } from '../subagents/subagent-events.js';

packages/core/src/tools/tools.ts

@@ -8,7 +8,7 @@ import type { FunctionDeclaration, PartListUnion } from '@google/genai';
 import { ToolErrorType } from './tool-error.js';
 import type { DiffUpdateResult } from '../ide/ideContext.js';
 import { SchemaValidator } from '../utils/schemaValidator.js';
-import { SubagentStatsSummary } from '../subagents/subagent-statistics.js';
+import { type SubagentStatsSummary } from '../subagents/subagent-statistics.js';
 
 /**
  * Represents a validated and ready-to-execute tool call.

packages/core/src/utils/subagentGenerator.test.ts

@@ -4,14 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, Mock, afterEach } from 'vitest';
-import { Content, GoogleGenAI, Models } from '@google/genai';
+import {
+  describe,
+  it,
+  expect,
+  vi,
+  beforeEach,
+  type Mock,
+  afterEach,
+} from 'vitest';
+import { type Content, GoogleGenAI, Models } from '@google/genai';
 import { DEFAULT_QWEN_MODEL } from '../config/models.js';
 import { GeminiClient } from '../core/client.js';
 import { Config } from '../config/config.js';
 import {
   subagentGenerator,
-  SubagentGeneratedContent,
+  type SubagentGeneratedContent,
 } from './subagentGenerator.js';
 
 // Mock GeminiClient and Config constructor

packages/core/src/utils/subagentGenerator.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Content } from '@google/genai';
+import { type Content } from '@google/genai';
 import { DEFAULT_QWEN_MODEL } from '../config/models.js';
 import { GeminiClient } from '../core/client.js';