MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-12 15:10:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): fix BeforeAgent/AfterAgent inconsistencies (#18514) (#21383)

Browse Source 
Co-authored-by: Spencer <spencertang@google.com>
This commit is contained in:
krishdef7
2026-03-12 03:10:11 +05:30
committed by GitHub
parent 352bbc36c0
commit 926dddf0bf
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/core/src/core/client.ts
View File

@@ -30,12 +30,6 @@ import { getCoreSystemPrompt } from './prompts.js';
import { checkNextSpeaker } from '../utils/nextSpeakerChecker.js';
import { reportError } from '../utils/errorReporting.js';
import { GeminiChat } from './geminiChat.js';
import { coreEvents, CoreEvent } from '../utils/events.js';
import {
getDisplayString,
resolveModel,
isGemini2Model,
} from '../config/models.js';
import {
retryWithBackoff,
type RetryAvailabilityContext,
@@ -76,7 +70,13 @@ import {
applyModelSelection,
createAvailabilityContextProvider,
} from '../availability/policyHelpers.js';
import {
getDisplayString,
resolveModel,
isGemini2Model,
} from '../config/models.js';
import { partToString } from '../utils/partUtils.js';
import { coreEvents, CoreEvent } from '../utils/events.js';
const MAX_TURNS = 100;
@@ -907,6 +907,7 @@ export class GeminiClient {
const boundedTurns = Math.min(turns, MAX_TURNS);
let turn = new Turn(this.getChat(), prompt_id);
let continuationHandled = false;
try {
turn = yield* this.processTurn(
@@ -963,7 +964,15 @@ export class GeminiClient {
await this.resetChat();
}
const continueRequest = [{ text: continueReason }];
yield* this.sendMessageStream(
// Reset hook state so the continuation fires BeforeAgent fresh
// and fireAfterAgentHookSafe sees activeCalls=1, not 2.
const contHookState = this.hookStateMap.get(prompt_id);
if (contHookState) {
contHookState.hasFiredBeforeAgent = false;
contHookState.activeCalls--;
}
continuationHandled = true;
turn = yield* this.sendMessageStream(
continueRequest,
signal,
prompt_id,
@@ -981,16 +990,18 @@ export class GeminiClient {
}
throw error;
} finally {
const hookState = this.hookStateMap.get(prompt_id);
if (hookState) {
hookState.activeCalls--;
const isPendingTools =
turn?.pendingToolCalls && turn.pendingToolCalls.length > 0;
const isAborted = signal?.aborted;
if (!continuationHandled) {
const hookState = this.hookStateMap.get(prompt_id);
if (hookState) {
hookState.activeCalls--;
const isPendingTools =
turn?.pendingToolCalls && turn.pendingToolCalls.length > 0;
const isAborted = signal?.aborted;
if (hookState.activeCalls <= 0) {
if (!isPendingTools || isAborted) {
this.hookStateMap.delete(prompt_id);
if (hookState.activeCalls <= 0) {
if (!isPendingTools || isAborted) {
this.hookStateMap.delete(prompt_id);
}
}
}
}