Skip to content

Commit bf626c0

Browse files
fix(acp): keep text tool output shape and image order without message ids
Unwrap only image ToolCallContent blocks, so text tool output keeps the shape main uses. Start new segments for every closed message id at an image boundary, so text after an id-less image cannot reopen a pre-image segment, and give image segments their own item id namespace. Ported by Claude Opus 5.5 in Amp. Amp-Thread-ID: https://ampcode.com/threads/T-01a1d49f-af4b-77bf-b0f4-ad0d620d8ca0 Co-authored-by: Amp <[email protected]>
1 parent dad96e5 commit bf626c0

2 files changed

Lines changed: 46 additions & 27 deletions

File tree

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

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3153,12 +3153,13 @@ describe("AcpAdapterV2", () => {
31533153
);
31543154

31553155
it.effect.each([
3156-
{ protocolVersion: 1, messageId: undefined },
3157-
{ protocolVersion: 1, messageId: "source-message" },
3158-
{ protocolVersion: 2, messageId: "source-message" },
3156+
{ protocolVersion: 1, messageId: undefined, imagesWithoutId: false },
3157+
{ protocolVersion: 1, messageId: "source-message", imagesWithoutId: false },
3158+
{ protocolVersion: 1, messageId: "source-message", imagesWithoutId: true },
3159+
{ protocolVersion: 2, messageId: "source-message", imagesWithoutId: false },
31593160
] as const)(
3160-
"handles inline images under protocol $protocolVersion with messageId $messageId",
3161-
({ protocolVersion, messageId }) =>
3161+
"handles inline images under protocol $protocolVersion with messageId $messageId (images without id: $imagesWithoutId)",
3162+
({ protocolVersion, messageId, imagesWithoutId }) =>
31623163
Effect.gen(function* () {
31633164
const path = yield* Path.Path;
31643165
const config = yield* ServerConfig.ServerConfig;
@@ -3180,11 +3181,24 @@ describe("AcpAdapterV2", () => {
31803181
{ ...image, data: "", uri: `data:image/png;base64,${png}` },
31813182
{ type: "text", text: "after" },
31823183
] satisfies Array<EffectAcpSchema.ContentBlock>
3183-
).map((content) => ({
3184-
sessionUpdate: "agent_message_chunk" as const,
3185-
...(messageId === undefined ? {} : { messageId }),
3186-
content,
3187-
})),
3184+
).flatMap((content) => [
3185+
// A reasoning chunk closes the assistant stream, so an id-less image has no source id.
3186+
...(imagesWithoutId && content.type === "image"
3187+
? [
3188+
{
3189+
sessionUpdate: "agent_thought_chunk" as const,
3190+
content: { type: "text" as const, text: "thinking" },
3191+
},
3192+
]
3193+
: []),
3194+
{
3195+
sessionUpdate: "agent_message_chunk" as const,
3196+
...(messageId === undefined || (imagesWithoutId && content.type === "image")
3197+
? {}
3198+
: { messageId }),
3199+
content,
3200+
},
3201+
]),
31883202
{
31893203
sessionUpdate: "tool_call",
31903204
toolCallId: "image-tool",
@@ -3307,7 +3321,10 @@ describe("AcpAdapterV2", () => {
33073321
const tool = [...items.values()].find((item) => item.type === "dynamic_tool");
33083322
assert.isTrue(tool?.type === "dynamic_tool");
33093323
if (tool?.type === "dynamic_tool")
3310-
assert.deepEqual(tool.output, [{ type: "text", text: "tool caption" }, image]);
3324+
assert.deepEqual(tool.output, [
3325+
{ type: "content", content: { type: "text", text: "tool caption" } },
3326+
image,
3327+
]);
33113328
}).pipe(
33123329
Effect.provide(
33133330
Layer.mergeAll(

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,11 +1041,14 @@ function appendToolContentText(content: unknown, text: string): unknown[] {
10411041
return next;
10421042
}
10431043

1044+
// Only image blocks are unwrapped, for the tool-image reader; text keeps its shape.
10441045
function acpToolCallContentOutput(content: unknown): unknown {
10451046
return Array.isArray(content)
10461047
? content.map((entry: unknown) => {
10471048
const record = unknownRecord(entry);
1048-
return record?.type === "content" ? record.content : entry;
1049+
return record?.type === "content" && unknownRecord(record.content)?.type === "image"
1050+
? record.content
1051+
: entry;
10491052
})
10501053
: content;
10511054
}
@@ -3026,7 +3029,6 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
30263029
kind === "assistant" && sourceMessageId !== null
30273030
? (context.assistantImageSegments.get(sourceMessageId) ?? 0)
30283031
: 0;
3029-
const messageItemId = `${context.nativeTurnId}:${kind}:message:${sourceMessageId}`;
30303032
// A new object, so a flush scheduled before the close stays a no-op.
30313033
const segment: ActiveTextSegment =
30323034
closed === undefined
@@ -3035,8 +3037,8 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
30353037
sourceMessageId === null
30363038
? `${context.nativeTurnId}:${kind}:${stream.nextSegment}`
30373039
: imageSegment > 0
3038-
? `${messageItemId}:${imageSegment}`
3039-
: messageItemId,
3040+
? `${context.nativeTurnId}:${kind}:message-segment:${encodeURIComponent(sourceMessageId)}:${imageSegment}`
3041+
: `${context.nativeTurnId}:${kind}:message:${sourceMessageId}`,
30403042
startedAt: yield* DateTime.now,
30413043
sourceMessageId,
30423044
text: "",
@@ -3132,21 +3134,21 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
31323134
if (Result.isSuccess(stored)) {
31333135
const sourceMessageId =
31343136
messageId?.trim() || context.assistant.current?.sourceMessageId;
3135-
const imageSegment = sourceMessageId
3136-
? (context.assistantImageSegments.get(sourceMessageId) ?? 0) + 1
3137-
: 0;
3137+
// Text after an image starts a new segment instead of reopening one from before it.
3138+
const startSegmentsAfterImage = () => {
3139+
for (const closedId of context.assistant.closedNamedSegments.keys()) {
3140+
context.assistantImageSegments.set(
3141+
closedId,
3142+
(context.assistantImageSegments.get(closedId) ?? 0) + 1,
3143+
);
3144+
}
3145+
context.assistant.closedNamedSegments.clear();
3146+
};
31383147
yield* closeTextStreams(context);
3139-
// Text around an image gets its own segment instead of reopening the closed one.
3140-
if (sourceMessageId) {
3141-
context.assistant.closedNamedSegments.delete(sourceMessageId);
3142-
context.assistantImageSegments.set(sourceMessageId, imageSegment);
3143-
}
3148+
startSegmentsAfterImage();
31443149
yield* appendText(context, "assistant", "", sourceMessageId, stored.success);
31453150
yield* closeTextStream(context, "assistant");
3146-
if (sourceMessageId) {
3147-
context.assistant.closedNamedSegments.delete(sourceMessageId);
3148-
context.assistantImageSegments.set(sourceMessageId, imageSegment + 1);
3149-
}
3151+
startSegmentsAfterImage();
31503152
return;
31513153
}
31523154
yield* appendText(

0 commit comments

Comments
 (0)