Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
37 changes: 22 additions & 15 deletions packages/cli/src/acp-integration/session/Session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ import {
evaluatePermissionFlow,
needsConfirmation,
isPlanModeBlocked,
abortGoalForStopHookCap,
formatStopHookBlockingCapWarning,
} from '@qwen-code/qwen-code-core';
import { getCommandSubcommandNames } from '../../services/commandMetadata.js';
import { getEffectiveSupportedModes } from '../../services/commandUtils.js';
Expand Down Expand Up @@ -693,11 +695,11 @@ export class Session implements SessionContext {
hooksEnabled: boolean,
messageBus: MessageBus | undefined,
): Promise<{ stopReason: PromptResponse['stopReason'] }> {
const MAX_STOP_HOOK_ITERATIONS = 100;
const stopHookBlockingCap = this.config.getStopHookBlockingCap();
let stopHookIterationCount = 0;
let stopHookReasons: string[] = [];

while (stopHookIterationCount < MAX_STOP_HOOK_ITERATIONS) {
while (stopHookIterationCount < stopHookBlockingCap) {
if (
!hooksEnabled ||
!messageBus ||
Expand Down Expand Up @@ -761,13 +763,25 @@ export class Session implements SessionContext {
stopHookIterationCount++;
stopHookReasons = [...stopHookReasons, continueReason];

// Emit StopHookLoop event for iterations after the first one
if (stopHookIterationCount > 1) {
await this.messageEmitter.emitStopHookLoop(
stopHookIterationCount,
stopHookReasons,
response.stopHookCount ?? 1,
await this.messageEmitter.emitStopHookLoop(
stopHookIterationCount,
stopHookReasons,
response.stopHookCount ?? 1,
);

if (stopHookIterationCount >= stopHookBlockingCap) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Critical] #handleStopHookLoop 的 cap-enforcement 路径未测试。config mock 已添加 getStopHookBlockingCap: vi.fn().mockReturnValue(8),但没有测试将 cap 设为低值(如 1 或 2)来触发 stopHookIterationCount >= stopHookBlockingCap 分支。当前的两个 Stop hook 测试在 cap=8 下分别仅运行 1-2 次迭代,远未达到上限。

Session.ts 的 cap 逻辑独立处理 ACP 会话(VSCode companion)的 stop hook 循环。此路径的 bug 仅会在 ACP 会话中暴露,现有测试无法捕获。

Suggested change
if (stopHookIterationCount >= stopHookBlockingCap) {
// Add a test that sets up a blocking Stop hook and getStopHookBlockingCap.mockReturnValue(1),
// then asserts the prompt completes with stopReason: 'end_turn' on cap hit
// and that the warning message is emitted via messageEmitter.emitAgentMessage.

— DeepSeek/deepseek-v4-pro via Qwen Code /review

const warning = formatStopHookBlockingCapWarning(
'Stop',
stopHookBlockingCap,
);
abortGoalForStopHookCap(
this.config,
this.config.getSessionId(),
warning,
);
await this.messageEmitter.emitAgentMessage(warning);
debugLogger.warn(warning);
return { stopReason: 'end_turn' };
}

// Continue the conversation with the hook's reason
Expand Down Expand Up @@ -904,13 +918,6 @@ export class Session implements SessionContext {
break;
}

// If we exceeded max iterations, log a warning but still end gracefully
if (stopHookIterationCount >= MAX_STOP_HOOK_ITERATIONS) {
debugLogger.warn(
`Stop hook loop reached maximum iterations (${MAX_STOP_HOOK_ITERATIONS}), forcing stop`,
);
}

return { stopReason: 'end_turn' };
}

Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,7 @@ export async function loadCliConfig(
projectHooks: bareMode ? undefined : hooksConfig?.projectHooks,
hooks: bareMode ? undefined : settings.hooks, // Keep for backward compatibility
disableAllHooks: bareMode ? true : (settings.disableAllHooks ?? false),
stopHookBlockingCap: bareMode ? undefined : settings.stopHookBlockingCap,
channel: argv.channel,
// CLI flag wins over settings.json. `--json-fd` is fd-only (no settings
// equivalent — fd passing is a spawn-time concern). `--json-file` and
Expand Down
12 changes: 12 additions & 0 deletions packages/cli/src/config/settingsSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type {
} from '@qwen-code/qwen-code-core';
import {
ApprovalMode,
DEFAULT_STOP_HOOK_BLOCK_CAP,
DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
} from '@qwen-code/qwen-code-core';
Expand Down Expand Up @@ -1950,6 +1951,17 @@ const SETTINGS_SCHEMA = {
showInDialog: false,
},

stopHookBlockingCap: {
type: 'number',
label: 'Stop Hook Blocking Cap',
category: 'Advanced',
requiresRestart: true,
default: DEFAULT_STOP_HOOK_BLOCK_CAP,
description:
'Maximum consecutive blocking Stop/SubagentStop hook decisions before Qwen Code overrides the hook loop and ends the turn. Can be overridden by QWEN_CODE_STOP_HOOK_BLOCK_CAP.',
showInDialog: false,
},

hooks: {
type: 'object',
label: 'Hooks',
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/agents/background-agent-resume.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ describe('BackgroundAgentResumeService', () => {
getMonitorRegistry: () => monitorRegistry,
getSubagentManager: () => subagentManager,
getHookSystem: () => hookSystem,
getStopHookBlockingCap: () => 8,
getApprovalMode: () => 'default',
isTrustedFolder: () => true,
getProjectRoot: () => tempDir,
Expand Down
8 changes: 6 additions & 2 deletions packages/core/src/agents/background-agent-resume.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import type { ChatRecord } from '../services/chatRecordingService.js';
import { getInitialChatHistory } from '../utils/environmentContext.js';
import { getGitBranch } from '../utils/gitUtils.js';
import { PermissionMode, type StopHookOutput } from '../hooks/types.js';
import { formatStopHookBlockingCapWarning } from '../hooks/stopHookCap.js';
import { runWithAgentContext } from './runtime/agent-context.js';
import { createApprovalModeOverride } from '../tools/agent/agent.js';
import type { ApprovalMode } from '../config/config.js';
Expand Down Expand Up @@ -982,7 +983,7 @@ export class BackgroundAgentResumeService {
const hookSystem = this.config.getHookSystem();
if (!hookSystem) return;
let stopHookActive = false;
const maxIterations = 5;
const maxIterations = this.config.getStopHookBlockingCap();

for (let i = 0; i < maxIterations; i++) {
try {
Expand Down Expand Up @@ -1022,7 +1023,10 @@ export class BackgroundAgentResumeService {
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Suggestion] Same dead-code pattern as agent.ts: the debugLogger.warn after the for-loop is unreachable because the in-loop cap check always returns on the final iteration.

Suggested change
}
// (remove the post-loop debugLogger.warn block — it is unreachable)
}

— DeepSeek/deepseek-v4-pro via Qwen Code /review


debugLogger.warn(
`[BackgroundAgentResume] SubagentStop hook reached maximum iterations (${maxIterations}), forcing stop`,
`[BackgroundAgentResume] ${formatStopHookBlockingCapWarning(
'SubagentStop',
maxIterations,
)}`,
);
}
}
14 changes: 14 additions & 0 deletions packages/core/src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import { MonitorRegistry } from '../services/monitorRegistry.js';
import { BackgroundAgentResumeService } from '../agents/background-agent-resume.js';
import { BackgroundShellRegistry } from '../services/backgroundShellRegistry.js';
import { FileReadCache } from '../services/fileReadCache.js';
import { resolveStopHookBlockingCap } from '../hooks/stopHookCap.js';
import {
DEFAULT_OTLP_ENDPOINT,
DEFAULT_TELEMETRY_TARGET,
Expand Down Expand Up @@ -592,6 +593,11 @@ export interface ConfigParameters {
* to use disableAllHooks instead (note: inverted logic - enabled:true → disableAllHooks:false).
*/
disableAllHooks?: boolean;
/**
* Maximum consecutive blocking Stop/SubagentStop hook decisions before the
* runtime overrides the hook loop and allows the turn to end.
*/
stopHookBlockingCap?: number;
/**
* User-level hooks configuration (from user settings).
* These hooks are always loaded regardless of folder trust status.
Expand Down Expand Up @@ -818,6 +824,7 @@ export class Config {
private readonly enableAutoSkill: boolean;
private fastModel?: string;
private readonly disableAllHooks: boolean;
private readonly stopHookBlockingCap: number;
/** User-level hooks (always loaded regardless of trust) */
private readonly userHooks?: Record<string, unknown>;
/** Project-level hooks (only loaded in trusted folders) */
Expand Down Expand Up @@ -1020,6 +1027,9 @@ export class Config {
this.enableAutoSkill = params.enableAutoSkill ?? false;
this.fastModel = params.fastModel || undefined;
this.disableAllHooks = params.disableAllHooks ?? false;
this.stopHookBlockingCap = resolveStopHookBlockingCap(
params.stopHookBlockingCap,
);
// Store user and project hooks separately for proper source attribution
this.userHooks = params.userHooks;
this.projectHooks = params.projectHooks;
Expand Down Expand Up @@ -2653,6 +2663,10 @@ export class Config {
return this.disableAllHooks || this.getBareMode();
}

getStopHookBlockingCap(): number {
return this.stopHookBlockingCap;
}

getManagedAutoMemoryEnabled(): boolean {
return this.enableManagedAutoMemory && !this.getBareMode();
}
Expand Down
60 changes: 60 additions & 0 deletions packages/core/src/core/client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ describe('Gemini Client (client.ts)', () => {
getResolvedModel: vi.fn().mockReturnValue(undefined),
}),
getDisableAllHooks: vi.fn().mockReturnValue(true),
getStopHookBlockingCap: vi.fn().mockReturnValue(8),
getArenaManager: vi.fn().mockReturnValue(null),
getMessageBus: vi.fn().mockReturnValue(undefined),
hasHooksForEvent: vi.fn().mockReturnValue(false),
Expand Down Expand Up @@ -4332,6 +4333,65 @@ Other open files:
expect(mockMessageBus.request).not.toHaveBeenCalled();
});

it('ends the Stop hook loop when the blocking cap is reached', async () => {
const mockMessageBus = {
request: vi.fn().mockResolvedValue({
output: {
decision: 'block',
reason: 'Keep working',
},
stopHookCount: 1,
}),
response: vi.fn(),
};
vi.mocked(mockConfig.getDisableAllHooks).mockReturnValue(false);
vi.mocked(mockConfig.getMessageBus).mockReturnValue(
mockMessageBus as unknown as ReturnType<Config['getMessageBus']>,
);
vi.mocked(mockConfig.hasHooksForEvent).mockImplementation(
(event: string) => event === 'Stop',
);
vi.mocked(mockConfig.getStopHookBlockingCap).mockReturnValue(1);

client['chat'] = {
addHistory: vi.fn(),
getHistory: vi.fn().mockReturnValue([
{
role: 'model',
parts: [{ text: 'not done' }],
},
]),
} as unknown as GeminiChat;
mockTurnRunFn.mockReturnValue(
(async function* () {
yield { type: GeminiEventType.Content, value: 'not done' };
})(),
);

const events = await fromAsync(
client.sendMessageStream(
[{ text: 'Hi' }],
new AbortController().signal,
'prompt-stop-cap',
),
);

expect(mockTurnRunFn).toHaveBeenCalledTimes(1);
expect(events).toContainEqual({
type: GeminiEventType.StopHookLoop,
value: {
iterationCount: 1,
reasons: ['Keep working'],
stopHookCount: 1,
},
});
expect(events).toContainEqual({
type: GeminiEventType.HookSystemMessage,
value:
'Stop hook blocked continuation 1 consecutive times; overriding and ending the turn.',
});
});

it('should not skip hooks when hasHooksForEvent returns true', async () => {
const mockMessageBus = {
request: vi.fn().mockResolvedValue({ modifiedPrompt: undefined }),
Expand Down
22 changes: 22 additions & 0 deletions packages/core/src/core/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import { createDebugLogger } from '../utils/debugLogger.js';
import { recordStartupEvent } from '../utils/startupEventSink.js';
import { microcompactHistory } from '../services/microcompaction/microcompact.js';
import { getActiveGoal } from '../goals/activeGoalStore.js';
import { abortGoalForStopHookCap } from '../goals/goalHook.js';
import { formatStopHookBlockingCapWarning } from '../hooks/stopHookCap.js';

const debugLogger = createDebugLogger('CLIENT');

Expand Down Expand Up @@ -1577,6 +1579,26 @@ export class GeminiClient {
},
};

const stopHookBlockingCap = this.config.getStopHookBlockingCap();
if (currentIterationCount >= stopHookBlockingCap) {
const warning = formatStopHookBlockingCapWarning(
'Stop',
stopHookBlockingCap,
);
abortGoalForStopHookCap(
this.config,
this.config.getSessionId(),
warning,
);
yield {
type: GeminiEventType.HookSystemMessage,
value: warning,
};
debugLogger.warn(warning);
if (isTopLevelInteraction) endInteractionSpan('ok');
return turn;
}

const continueRequest = [{ text: continueReason }];
const activeGoal = getActiveGoal(this.config.getSessionId());
const hookTurnBudget = activeGoal ? boundedTurns : boundedTurns - 1;
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/goals/goalHook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,25 @@ function finishGoal(
clearGoalTerminalObserver(sessionId);
}

export function abortGoalForStopHookCap(
config: Config,
sessionId: string,
systemMessage: string,
): boolean {
const goal = getActiveGoal(sessionId);
if (!goal) return false;

finishGoal(config, sessionId, goal, {
kind: 'aborted',
condition: goal.condition,
iterations: goal.iterations,
durationMs: Date.now() - goal.setAt,
lastReason: goal.lastReason,
systemMessage,
});
return true;
}

/**
* Builds the Function hook callback that, on every Stop event, asks a fast
* model whether the goal condition holds.
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/goals/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export {
GOAL_HOOK_TIMEOUT_MS,
GOAL_HOOK_TIMEOUT_SECONDS,
createGoalStopHookCallback,
abortGoalForStopHookCap,
registerGoalHook,
unregisterGoalHook,
} from './goalHook.js';
Expand Down
45 changes: 45 additions & 0 deletions packages/core/src/hooks/stopHookCap.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/**
* @license
* Copyright 2026 Qwen Team
* SPDX-License-Identifier: Apache-2.0
*/

import { afterEach, describe, expect, it } from 'vitest';
import {
DEFAULT_STOP_HOOK_BLOCK_CAP,
STOP_HOOK_BLOCK_CAP_ENV,
formatStopHookBlockingCapWarning,
normalizeStopHookBlockingCap,
resolveStopHookBlockingCap,
} from './stopHookCap.js';

describe('stop hook blocking cap', () => {
afterEach(() => {
delete process.env[STOP_HOOK_BLOCK_CAP_ENV];
});

it('normalizes invalid values to the default cap', () => {
expect(normalizeStopHookBlockingCap(undefined)).toBe(
DEFAULT_STOP_HOOK_BLOCK_CAP,
);
expect(normalizeStopHookBlockingCap(0)).toBe(DEFAULT_STOP_HOOK_BLOCK_CAP);
expect(normalizeStopHookBlockingCap(Number.NaN)).toBe(
DEFAULT_STOP_HOOK_BLOCK_CAP,
);
});

it('prefers the environment override over config', () => {
process.env[STOP_HOOK_BLOCK_CAP_ENV] = '3';

expect(resolveStopHookBlockingCap(12)).toBe(3);
});

it('formats warnings for the relevant hook event', () => {
expect(formatStopHookBlockingCapWarning('Stop', 8)).toBe(
'Stop hook blocked continuation 8 consecutive times; overriding and ending the turn.',
);
expect(formatStopHookBlockingCapWarning('SubagentStop', 2)).toContain(
'SubagentStop hook blocked continuation 2 consecutive times',
);
});
});
Loading
Loading