Skip to content

feat(acp): Protect against repeated tool execution failures #8469

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
doudouOUC merged 10 commits into from
Aug 9, 2026
Merged

feat(acp): Protect against repeated tool execution failures #8469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
72bc670
feat(acp): protect repeated tool execution failures
doudouOUC Aug 3, 2026
4e9fc52
Merge branch 'main' into feat/acp-repeated-tool-call-protection-v2
wenshao Aug 3, 2026
955a692
fix(acp): harden repeated tool failure guard rollout
doudouOUC Aug 4, 2026
03d6add
Merge branch 'main' into feat/acp-repeated-tool-call-protection-v2
wenshao Aug 4, 2026
ba8fe4e
fix(acp): address repeated failure guard review
doudouOUC Aug 5, 2026
a46c203
Merge branch 'main' into feat/acp-repeated-tool-call-protection-v2
doudouOUC Aug 6, 2026
8cb87ea
fix(acp): improve repeated failure guard recall
doudouOUC Aug 6, 2026
30c50a6
Merge branch 'main' into feat/acp-repeated-tool-call-protection-v2
doudouOUC Aug 8, 2026
9c8ccd3
Merge branch 'main' into feat/acp-repeated-tool-call-protection-v2
doudouOUC Aug 8, 2026
41289f6
docs(acp): clarify review and rollout gates
doudouOUC Aug 9, 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
590 changes: 590 additions & 0 deletions docs/design/acp-repeated-tool-call-protection.md
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 30 additions & 29 deletions docs/users/configuration/settings.md
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion packages/channels/base/src/AcpBridge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import {
AcpBridge,
} from './AcpBridge.js';
import { CHANNEL_LOOP_MCP_SERVER_NAME } from './ChannelLoopTools.js';
import type { ChannelLoopToolHandler } from './ChannelAgentBridge.js';
import {
CHANNEL_PROMPT_META_KEY,
type ChannelLoopToolHandler,
} from './ChannelAgentBridge.js';

const child = vi.hoisted(() => {
class MockEmitter {
Expand Down Expand Up @@ -430,6 +433,11 @@ describe('AcpBridge', () => {
await expect(bridge.prompt('s-1', 'question')).resolves.toBe(
'Final answer.',
);
expect(bridge.connection.prompt).toHaveBeenCalledWith({
sessionId: 's-1',
prompt: [{ type: 'text', text: 'question' }],
_meta: { [CHANNEL_PROMPT_META_KEY]: true },
});
});

it('excludes nested subagent text from the final response', async () => {
Expand Down
14 changes: 8 additions & 6 deletions packages/channels/base/src/AcpBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ import type {
RequestPermissionRequest,
RequestPermissionResponse,
} from '@agentclientprotocol/sdk';
import type {
AvailableCommand,
ChannelAgentBridge,
ChannelAgentBridgeSessionOptions,
ChannelLoopToolHandler,
ToolCallEvent,
import {
CHANNEL_PROMPT_META_KEY,
type AvailableCommand,
type ChannelAgentBridge,
type ChannelAgentBridgeSessionOptions,
type ChannelLoopToolHandler,
type ToolCallEvent,
} from './ChannelAgentBridge.js';
import {
CHANNEL_LOOP_MCP_SERVER_NAME,
Expand Down Expand Up @@ -280,6 +281,7 @@ export class AcpBridge extends EventEmitter implements ChannelAgentBridge {
await conn.prompt({
sessionId,
prompt: prompt as Array<{ type: 'text'; text: string }>,
_meta: { [CHANNEL_PROMPT_META_KEY]: true },
});
} finally {
this.off('textChunk', onChunk);
Expand Down
3 changes: 3 additions & 0 deletions packages/channels/base/src/ChannelAgentBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import type {
RequestPermissionResponse,
} from '@agentclientprotocol/sdk';

// Client-supplied routing hint only; never use it as an authorization boundary.
export const CHANNEL_PROMPT_META_KEY = 'qwen.channel.prompt';
Comment thread
doudouOUC marked this conversation as resolved.
Comment thread
doudouOUC marked this conversation as resolved.

export interface AvailableCommand {
name: string;
description: string;
Expand Down
3 changes: 3 additions & 0 deletions packages/channels/base/src/DaemonChannelBridge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
type DaemonChannelLoopMcpHost,
type DaemonChannelSessionClient,
} from './DaemonChannelBridge.js';
import { CHANNEL_PROMPT_META_KEY } from './ChannelAgentBridge.js';

class EventQueue implements AsyncGenerator<DaemonChannelEvent> {
private events: DaemonChannelEvent[] = [];
Expand Down Expand Up @@ -243,6 +244,7 @@ describe('DaemonChannelBridge', () => {
expect(session.prompt).toHaveBeenCalledWith(
{
prompt: [{ type: 'text', text: 'summarize' }],
_meta: { [CHANNEL_PROMPT_META_KEY]: true },
},
expect.any(AbortSignal),
);
Expand Down Expand Up @@ -1849,6 +1851,7 @@ describe('DaemonChannelBridge', () => {
{ type: 'image', data: 'base64-image', mimeType: 'image/png' },
{ type: 'text', text: 'describe' },
],
_meta: { [CHANNEL_PROMPT_META_KEY]: true },
},
expect.any(AbortSignal),
);
Expand Down
24 changes: 16 additions & 8 deletions packages/channels/base/src/DaemonChannelBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import type {
RequestPermissionRequest,
RequestPermissionResponse,
} from '@agentclientprotocol/sdk';
import type {
AvailableCommand,
BridgeSessionInfo,
ChannelAgentBridge,
ChannelAgentBridgeSessionOptions,
ChannelLoopToolHandler,
ToolCallEvent,
import {
CHANNEL_PROMPT_META_KEY,
type AvailableCommand,
type BridgeSessionInfo,
type ChannelAgentBridge,
type ChannelAgentBridgeSessionOptions,
type ChannelLoopToolHandler,
type ToolCallEvent,
} from './ChannelAgentBridge.js';
import { readAvailableCommandAltNames } from './AcpBridge.js';
import {
Expand All @@ -35,6 +36,7 @@ export interface DaemonChannelSessionClient {
prompt(
req: {
prompt: Array<Record<string, unknown>>;
_meta?: Record<string, unknown>;
},
Comment thread
doudouOUC marked this conversation as resolved.
signal?: AbortSignal,
): Promise<{ stopReason?: string; [key: string]: unknown }>;
Expand Down Expand Up @@ -404,7 +406,13 @@ export class DaemonChannelBridge
prompt.push({ type: 'text', text });

try {
const result = await session.prompt({ prompt }, controller.signal);
const result = await session.prompt(
{
prompt,
_meta: { [CHANNEL_PROMPT_META_KEY]: true },
},
controller.signal,
);
// Prefer turn_complete for deterministic chunk collection (SSE path).
// Fall back to one event-loop tick for non-SSE prompt paths (blocking
// HTTP, non-202 responses) where turn_complete never arrives.
Expand Down
1 change: 1 addition & 0 deletions packages/channels/base/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export type {
SessionDiedEvent,
ToolCallEvent,
} from './ChannelAgentBridge.js';
export { CHANNEL_PROMPT_META_KEY } from './ChannelAgentBridge.js';
export type { AcpBridgeOptions } from './AcpBridge.js';
export { DaemonChannelBridge } from './DaemonChannelBridge.js';
export type {
Expand Down
Loading
Loading