From b2a323f8ef8bb48ebf98186c97e4b865d165f41c Mon Sep 17 00:00:00 2001
From: Christian Gunderman <gundermanc@google.com>
Date: Fri, 13 Mar 2026 12:21:17 -0700
Subject: [PATCH] Linter rules.

---
 packages/core/src/core/coreToolScheduler.ts   |  2 +-
 .../src/core/coreToolSchedulerHooks.test.ts   | 20 +++++++++++++++----
 packages/core/src/scheduler/scheduler.ts      |  1 -
 packages/core/src/tools/web-fetch.ts          |  8 +-------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/core/coreToolScheduler.ts b/packages/core/src/core/coreToolScheduler.ts
index 9aea547164..8aabd709c2 100644
--- a/packages/core/src/core/coreToolScheduler.ts
+++ b/packages/core/src/core/coreToolScheduler.ts
@@ -134,7 +134,7 @@ export class CoreToolScheduler {
     this.onAllToolCallsComplete = options.onAllToolCallsComplete;
     this.onToolCallsUpdate = options.onToolCallsUpdate;
     this.getPreferredEditor = options.getPreferredEditor;
-    this.toolExecutor = new ToolExecutor(this.context.config);
+    this.toolExecutor = new ToolExecutor(this.context);
     this.toolModifier = new ToolModificationHandler();
 
     // Subscribe to message bus for ASK_USER policy decisions
diff --git a/packages/core/src/core/coreToolSchedulerHooks.test.ts b/packages/core/src/core/coreToolSchedulerHooks.test.ts
index d0872ad64d..63c22e0b11 100644
--- a/packages/core/src/core/coreToolSchedulerHooks.test.ts
+++ b/packages/core/src/core/coreToolSchedulerHooks.test.ts
@@ -7,7 +7,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import { CoreToolScheduler } from './coreToolScheduler.js';
 import type { ToolCall, ErroredToolCall } from '../scheduler/types.js';
-import type { Config, ToolRegistry } from '../index.js';
+import type { Config, ToolRegistry, AgentLoopContext } from '../index.js';
 import {
   ApprovalMode,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
@@ -118,7 +118,11 @@ describe('CoreToolScheduler Hooks', () => {
 
     const onAllToolCallsComplete = vi.fn();
     const scheduler = new CoreToolScheduler({
-      config: mockConfig,
+      context: {
+        config: mockConfig,
+        messageBus: mockMessageBus,
+        toolRegistry,
+      } as unknown as AgentLoopContext,
       onAllToolCallsComplete,
       getPreferredEditor: () => 'vscode',
     });
@@ -188,7 +192,11 @@ describe('CoreToolScheduler Hooks', () => {
 
     const onAllToolCallsComplete = vi.fn();
     const scheduler = new CoreToolScheduler({
-      config: mockConfig,
+      context: {
+        config: mockConfig,
+        messageBus: mockMessageBus,
+        toolRegistry,
+      } as unknown as AgentLoopContext,
       onAllToolCallsComplete,
       getPreferredEditor: () => 'vscode',
     });
@@ -261,7 +269,11 @@ describe('CoreToolScheduler Hooks', () => {
 
     const onAllToolCallsComplete = vi.fn();
     const scheduler = new CoreToolScheduler({
-      config: mockConfig,
+      context: {
+        config: mockConfig,
+        messageBus: mockMessageBus,
+        toolRegistry,
+      } as unknown as AgentLoopContext,
       onAllToolCallsComplete,
       getPreferredEditor: () => 'vscode',
     });
diff --git a/packages/core/src/scheduler/scheduler.ts b/packages/core/src/scheduler/scheduler.ts
index b9d9d3c1c5..281df0674d 100644
--- a/packages/core/src/scheduler/scheduler.ts
+++ b/packages/core/src/scheduler/scheduler.ts
@@ -584,7 +584,6 @@ export class Scheduler {
       this.state.updateStatus(
         callId,
         CoreToolCallStatus.Error,
-        signal,
         createErrorResponse(
           toolCall.request,
           hookResult.error,
diff --git a/packages/core/src/tools/web-fetch.ts b/packages/core/src/tools/web-fetch.ts
index 8884698fea..514f808f8c 100644
--- a/packages/core/src/tools/web-fetch.ts
+++ b/packages/core/src/tools/web-fetch.ts
@@ -18,7 +18,6 @@ import { buildParamArgsPattern } from '../policy/utils.js';
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
 import { ToolErrorType } from './tool-error.js';
 import { getErrorMessage } from '../utils/errors.js';
-import { ApprovalMode } from '../policy/types.js';
 import { getResponseText } from '../utils/partUtils.js';
 import { fetchWithTimeout, isPrivateIp } from '../utils/fetch.js';
 import { truncateString } from '../utils/textUtils.js';
@@ -465,11 +464,6 @@ ${aggregatedContent}
   protected override async getConfirmationDetails(
     _abortSignal: AbortSignal,
   ): Promise<ToolCallConfirmationDetails | false> {
-    // Check for AUTO_EDIT approval mode. This tool has a specific behavior
-    // where ProceedAlways switches the entire session to AUTO_EDIT.
-    if (this.context.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
-      return false;
-    }
     let urls: string[] = [];
     let prompt = this.params.prompt || '';
 
@@ -878,7 +872,7 @@ export class WebFetchTool extends BaseDeclarativeTool<
     _toolDisplayName?: string,
   ): ToolInvocation<WebFetchToolParams, ToolResult> {
     return new WebFetchToolInvocation(
-      this.context.config,
+      this.context,
       params,
       messageBus,
       _toolName,