Skip to content

fix(cli/acp): prevent infinite thought loop in ACP mode by disablig nextSpeakerCheck #26874

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
sripasg merged 1 commit into from
May 11, 2026
Merged

fix(cli/acp): prevent infinite thought loop in ACP mode by disablig nextSpeakerCheck #26874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions packages/cli/src/config/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,28 @@ describe('loadCliConfig', () => {

expect(config.isInteractive()).toBe(false);
});

describe('isAcpMode', () => {
it('should force skipNextSpeakerCheck to true when in ACP mode', async () => {
process.argv = ['node', 'script.js', '--acp'];
const argv = await parseArguments(createTestMergedSettings());
const settings = createTestMergedSettings({
model: { skipNextSpeakerCheck: false },
});
const config = await loadCliConfig(settings, 'test-session', argv);
expect(config.getSkipNextSpeakerCheck()).toBe(true);
});

it('should respect settings.model.skipNextSpeakerCheck when not in ACP mode', async () => {
process.argv = ['node', 'script.js'];
const argv = await parseArguments(createTestMergedSettings());
const settings = createTestMergedSettings({
model: { skipNextSpeakerCheck: false },
});
const config = await loadCliConfig(settings, 'test-session', argv);
expect(config.getSkipNextSpeakerCheck()).toBe(false);
});
});
});

describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
Expand Down
6 changes: 5 additions & 1 deletion packages/cli/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,11 @@ export async function loadCliConfig(
shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
enableShellOutputEfficiency:
settings.tools?.shell?.enableShellOutputEfficiency ?? true,
skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
// In ACP mode, always skip the next-speaker check. This check triggers
// recursive continuation turns inside GeminiClient.processTurn() that
// conflict with ACP's explicit turn management via session/prompt,
// causing infinite agent_thought_chunk loops.
skipNextSpeakerCheck: isAcpMode || settings.model?.skipNextSpeakerCheck,
truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
eventEmitter: coreEvents,
useWriteTodos: argv.useWriteTodos ?? settings.useWriteTodos,
Expand Down
Loading