The best way to control Claude Code, Codex and more from any computer or phone
fix(server): ACP streamed chunks compare message ids exactly (#35836)
Julius Marminge committed
Nov 12, 2026 at 19:28 UTC
edd6fc3489353a768ea76b6d5b228ecbcb593f49
2 files changed
+14
-1
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+13
@@ -2878,6 +2878,19 @@ describe("AcpAdapterV2", () => {
2878
["reasoning", "Thinking more"],
2879
],
2880
},
2881
+ {
2882
+ label: "opaque ids differ only in surrounding whitespace",
2883
+ steps: [answer("answer", "A"), answer(" answer ", "B")],
2884
+ expected: [
2885
+ ["assistant_message", "A"],
2886
+ ["assistant_message", "B"],
2887
+ ],
2888
+ },
2889
+ {
2890
+ label: "a chunk continues a full update with the same whitespace-padded id",
2891
+ steps: [agentMessage(" answer ", "A"), answer(" answer ", "B")],
2892
+ expected: [["assistant_message", "AB"]],
2893
+ },
2894
] satisfies ReadonlyArray<{
2895
readonly label: string;
2896
readonly steps: ReadonlyArray<ScriptedTextStep>;
packages/provider-acp/src/server/adapter.ts
+1
-1
@@ -3002,7 +3002,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
3002
if (other !== kind) yield* closeTextStream(context, other);
3003
}
3004
const stream = textStreamFor(context, kind);
3005
- const sourceMessageId = messageId?.trim() || null;
3005
+ const sourceMessageId = messageId || null;
3006
if (
3007
stream.current !== null &&
3008
sourceMessageId !== null &&