Skip to content

fix(acp-bridge): keep event attribution through turn compaction #7499

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

Closed
he-yufeng wants to merge 2 commits into from
Closed

fix(acp-bridge): keep event attribution through turn compaction #7499

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
223963b
fix(acp-bridge): keep event attribution through turn compaction
he-yufeng Jul 22, 2026
ee89861
chore: resolve merge conflicts with origin/main
qwen-code-dev-bot Jul 23, 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
49 changes: 49 additions & 0 deletions packages/acp-bridge/src/compactionEngine.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,36 @@ describe('TurnBoundaryCompactionEngine', () => {
expect(data.update.content.text).toBe('How are you?');
expect(snap.compactedTurns[0]!.id).toBe(1);
});

it('keeps promptId and originatorClientId on merged text chunks', () => {
const engine = new TurnBoundaryCompactionEngine();
engine.ingest({
...makeTextChunk(1, 'Hello'),
promptId: 'prompt-1',
originatorClientId: 'client-a',
});
engine.ingest({
...makeTextChunk(2, ' world'),
promptId: 'prompt-1',
originatorClientId: 'client-a',
});
engine.ingest(makeTurnComplete(3));

const textEvent = engine.snapshot().compactedTurns[0]!;
expect(textEvent.promptId).toBe('prompt-1');
expect(textEvent.originatorClientId).toBe('client-a');
});

it('omits attribution on merged chunks whose sources carried none', () => {
const engine = new TurnBoundaryCompactionEngine();
engine.ingest(makeTextChunk(1, 'Hello'));
engine.ingest(makeTextChunk(2, ' world'));
engine.ingest(makeTurnComplete(3));

const textEvent = engine.snapshot().compactedTurns[0]!;
expect(textEvent.promptId).toBeUndefined();
expect(textEvent.originatorClientId).toBeUndefined();
});
});

describe('tool call folding', () => {
Expand Down Expand Up @@ -365,6 +395,25 @@ describe('TurnBoundaryCompactionEngine', () => {
(toolEvents[1]!.data as { update: { title: string } }).update.title,
).toBe('Tool B');
});

it('keeps promptId and originatorClientId on folded tool calls', () => {
const engine = new TurnBoundaryCompactionEngine();
engine.ingest({
...makeToolCall(1, 'tc1', 'running', { title: 'Read file' }),
promptId: 'prompt-1',
originatorClientId: 'client-a',
});
engine.ingest({
...makeToolCallUpdate(2, 'tc1', 'done', { rawOutput: 'contents' }),
promptId: 'prompt-1',
originatorClientId: 'client-a',
});
engine.ingest(makeTurnComplete(3));

const toolEvent = engine.snapshot().compactedTurns[0]!;
expect(toolEvent.promptId).toBe('prompt-1');
expect(toolEvent.originatorClientId).toBe('client-a');
});
});

describe('text segmentation across tool calls', () => {
Expand Down
Loading