Skip to content

refactor: migrate clearCommand hook calls to HookSystem #16157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scidomino merged 3 commits into from
Jan 9, 2026
Merged

refactor: migrate clearCommand hook calls to HookSystem #16157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85a02e2
refactor hookrunner
ved015 Jan 8, 2026
50dab81
Merge branch 'main' into refactor/hooks
ved015 Jan 8, 2026
3f38da6
Merge branch 'main' into refactor/hooks
ved015 Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/cli/src/ui/commands/clearCommand.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}),
},
},
});
Expand Down
19 changes: 6 additions & 13 deletions packages/cli/src/ui/commands/clearCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

import type { DefaultHookOutput } from '@google/gemini-cli-core';
import {
uiTelemetryService,
fireSessionEndHook,
fireSessionStartHook,
SessionEndReason,
SessionStartSource,
flushTelemetry,
Expand All @@ -30,12 +27,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.');
Expand All @@ -54,10 +48,9 @@ export const clearCommand: SlashCommand = {
}

// 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
Expand All @@ -72,11 +65,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(),
);
Expand Down
Loading