Merge Commit 'b9f8858bf': refactor: migrate clearCommand hook calls to HookSystem (google-gemini#16157)

Author: thacio

packages/cli/src/ui/commands/clearCommand.test.ts

@@ -46,6 +46,10 @@ describe('clearCommand', () => {
           setSessionId: vi.fn(),
           getEnableHooks: vi.fn().mockReturnValue(false),
           getMessageBus: vi.fn().mockReturnValue(undefined),
+          getHookSystem: vi.fn().mockReturnValue({
+            fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
+            fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
+          }),
         },
       },
     });

packages/cli/src/ui/commands/clearCommand.ts

@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { DefaultHookOutput } from '@google/gemini-cli-core';
 import {
   uiTelemetryService,
   clearContextBackups,
   clearCollaborativeWriting,
-  fireSessionEndHook,
-  fireSessionStartHook,
   SessionEndReason,
   SessionStartSource,
   flushTelemetry,
@@ -32,12 +29,9 @@ export const clearCommand: SlashCommand = {
       ?.getGeminiClient()
       ?.getChat()
       .getChatRecordingService();
-    const messageBus = config?.getMessageBus();
 
     // Fire SessionEnd hook before clearing
-    if (config?.getEnableHooks() && messageBus) {
-      await fireSessionEndHook(messageBus, SessionEndReason.Clear);
-    }
+    await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Clear);
 
     if (geminiClient) {
       context.ui.setDebugMessage('Clearing terminal and resetting chat.');
@@ -66,10 +60,9 @@ export const clearCommand: SlashCommand = {
     // AUDITARIA_FEATURE_END
 
     // Fire SessionStart hook after clearing
-    let result: DefaultHookOutput | undefined;
-    if (config?.getEnableHooks() && messageBus) {
-      result = await fireSessionStartHook(messageBus, SessionStartSource.Clear);
-    }
+    const result = await config
+      ?.getHookSystem()
+      ?.fireSessionStartEvent(SessionStartSource.Clear);
 
     // Give the event loop a chance to process any pending telemetry operations
     // This ensures logger.emit() calls have fully propagated to the BatchLogRecordProcessor
@@ -84,11 +77,11 @@ export const clearCommand: SlashCommand = {
     uiTelemetryService.setLastPromptTokenCount(0);
     context.ui.clear();
 
-    if (result?.systemMessage) {
+    if (result?.finalOutput?.systemMessage) {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: result.systemMessage,
+          text: result.finalOutput.systemMessage,
         },
         Date.now(),
       );