Skip to content

refactor: migrate app containter hook calls to hook system #16161

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 app containter hook calls to hook system #16161

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a0e4f5
refactor: migrate app containter hook calls to hook system
ishaanxgupta Jan 8, 2026
ad59f55
Merge branch 'main' into ishaan/hook
ishaanxgupta Jan 8, 2026
3dff8b7
Merge branch 'main' into ishaan/hook
ishaanxgupta 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
63 changes: 25 additions & 38 deletions packages/cli/src/ui/AppContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ import {
startupProfiler,
SessionStartSource,
SessionEndReason,
fireSessionStartHook,
fireSessionEndHook,
generateSummary,
} from '@google/gemini-cli-core';
import { validateAuthMethod } from '../config/auth.js';
Expand Down Expand Up @@ -294,38 +292,31 @@ export const AppContainer = (props: AppContainerProps) => {
setConfigInitialized(true);
startupProfiler.flush(config);

// Fire SessionStart hook through MessageBus (only if hooks are enabled)
// Must be called AFTER config.initialize() to ensure HookRegistry is loaded
const hooksEnabled = config.getEnableHooks();
const hookMessageBus = config.getMessageBus();
if (hooksEnabled && hookMessageBus) {
const sessionStartSource = resumedSessionData
? SessionStartSource.Resume
: SessionStartSource.Startup;
const result = await fireSessionStartHook(
hookMessageBus,
sessionStartSource,
);
const sessionStartSource = resumedSessionData
? SessionStartSource.Resume
: SessionStartSource.Startup;
const result = await config
.getHookSystem()
?.fireSessionStartEvent(sessionStartSource);

if (result?.finalOutput) {
if (result.finalOutput?.systemMessage) {
historyManager.addItem(
{
type: MessageType.INFO,
text: result.finalOutput.systemMessage,
},
Date.now(),
);
}

if (result) {
if (result.systemMessage) {
historyManager.addItem(
{
type: MessageType.INFO,
text: result.systemMessage,
},
Date.now(),
);
}

const additionalContext = result.getAdditionalContext();
const geminiClient = config.getGeminiClient();
if (additionalContext && geminiClient) {
await geminiClient.addHistory({
role: 'user',
parts: [{ text: additionalContext }],
});
}
const additionalContext = result.finalOutput.getAdditionalContext();
const geminiClient = config.getGeminiClient();
if (additionalContext && geminiClient) {
await geminiClient.addHistory({
role: 'user',
parts: [{ text: additionalContext }],
});
}
}

Expand All @@ -341,11 +332,7 @@ export const AppContainer = (props: AppContainerProps) => {
await ideClient.disconnect();

// Fire SessionEnd hook on cleanup (only if hooks are enabled)
const hooksEnabled = config.getEnableHooks();
const hookMessageBus = config.getMessageBus();
if (hooksEnabled && hookMessageBus) {
await fireSessionEndHook(hookMessageBus, SessionEndReason.Exit);
}
await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
});
// Disable the dependencies check here. historyManager gets flagged
// but we don't want to react to changes to it because each new history
Expand Down
Loading