Skip to content

Commit 1fa593a

Browse files
committed
fix(acp): replace child reply when full result arrives
1 parent 3ca3a2a commit 1fa593a

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6315,6 +6315,18 @@ describe("AcpAdapterV2", () => {
63156315
results,
63166316
);
63176317
assert.equal(childUpdates[1]?.completedAt, childUpdates[0]?.completedAt);
6318+
const replies = observed.flatMap((event) =>
6319+
event.type === "message.updated" &&
6320+
event.message.threadId === childUpdates[0]?.childThreadId &&
6321+
event.message.role === "assistant"
6322+
? [event.message]
6323+
: [],
6324+
);
6325+
assert.deepEqual(
6326+
replies.map(({ text }) => text),
6327+
results,
6328+
);
6329+
assert.equal(replies[1]?.id, replies[0]?.id);
63186330
assert.isFalse(
63196331
yield* hasPendingBackgroundWork,
63206332
"finalize-window terminal must clear the carryover pin",

‎packages/provider-acp/src/server/adapter.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3049,12 +3049,16 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
30493049
);
30503050
}
30513051

3052+
const previousResultMessage = subagent.assistantMessages.get(
3053+
`${nativeTaskId}:message:result`,
3054+
);
30523055
if (
30533056
taskStatus !== "running" &&
3054-
subagent.assistantText.length === 0 &&
3055-
update.result !== null
3057+
update.result !== null &&
3058+
(subagent.assistantText.length === 0 ||
3059+
(previousResultMessage !== undefined && previousResultMessage !== update.result))
30563060
) {
3057-
yield* emitSubagentAssistant(subagent, update.result);
3061+
yield* emitSubagentAssistant(subagent, update.result, "replace");
30583062
}
30593063
const result = update.result ?? subagent.task.result ?? (subagent.assistantText || null);
30603064
subagent.task = {

0 commit comments

Comments
 (0)