refactor(cli): finalize event-driven transition and remove interaction bridge (#18569)

packages/cli/src/ui/hooks/useToolScheduler.ts

@@ -6,21 +6,18 @@
 
 import {
   type Config,
-  type MessageBus,
   type ToolCallRequestInfo,
   type ToolCall,
   type CompletedToolCall,
-  type ToolConfirmationPayload,
   MessageBusType,
-  ToolConfirmationOutcome,
+  ROOT_SCHEDULER_ID,
   Scheduler,
   type EditorType,
   type ToolCallsUpdateMessage,
-  ROOT_SCHEDULER_ID,
 } from '@google/gemini-cli-core';
 import { useCallback, useState, useMemo, useEffect, useRef } from 'react';
 
-// Re-exporting types compatible with legacy hook expectations
+// Re-exporting types compatible with hook expectations
 export type ScheduleFn = (
   request: ToolCallRequestInfo | ToolCallRequestInfo[],
   signal: AbortSignal,
@@ -109,8 +106,8 @@ export function useToolScheduler(
 
   const internalAdaptToolCalls = useCallback(
     (coreCalls: ToolCall[], prevTracked: TrackedToolCall[]) =>
-      adaptToolCalls(coreCalls, prevTracked, messageBus),
-    [messageBus],
+      adaptToolCalls(coreCalls, prevTracked),
+    [],
   );
 
   useEffect(() => {
@@ -227,12 +224,11 @@ export function useToolScheduler(
 }
 
 /**
- * ADAPTER: Merges UI metadata (submitted flag) and injects legacy callbacks.
+ * ADAPTER: Merges UI metadata (submitted flag).
  */
 function adaptToolCalls(
   coreCalls: ToolCall[],
   prevTracked: TrackedToolCall[],
-  messageBus: MessageBus,
 ): TrackedToolCall[] {
   const prevMap = new Map(prevTracked.map((t) => [t.request.callId, t]));
 
@@ -240,34 +236,6 @@ function adaptToolCalls(
     const prev = prevMap.get(coreCall.request.callId);
     const responseSubmittedToGemini = prev?.responseSubmittedToGemini ?? false;
 
-    // Inject onConfirm adapter for tools awaiting approval.
-    // The Core provides data-only (serializable) confirmationDetails. We must
-    // inject the legacy callback function that proxies responses back to the
-    // MessageBus.
-    if (coreCall.status === 'awaiting_approval' && coreCall.correlationId) {
-      const correlationId = coreCall.correlationId;
-      return {
-        ...coreCall,
-        confirmationDetails: {
-          ...coreCall.confirmationDetails,
-          onConfirm: async (
-            outcome: ToolConfirmationOutcome,
-            payload?: ToolConfirmationPayload,
-          ) => {
-            await messageBus.publish({
-              type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-              correlationId,
-              confirmed: outcome !== ToolConfirmationOutcome.Cancel,
-              requiresUserConfirmation: false,
-              outcome,
-              payload,
-            });
-          },
-        },
-        responseSubmittedToGemini,
-      };
-    }
-
     return {
       ...coreCall,
       responseSubmittedToGemini,