Skip to content

Commit 59e737b

Browse files
neo-clonclaude
andcommitted
fix(acp): an html_render call takes the page published with its html
Pages kept for agents that report a call without its result were matched by title and height alone, so two calls with the same title and height that completed out of order took each other's pages. A kept page now holds its length and its last 8,000 characters, and a call matches it by its html as well: whole, or bounded to its end the way Antigravity bounds long input strings before the adapter sees them. A call without html, or whose arguments match several kept pages, takes none and keeps the output it reported. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d935233 commit 59e737b

4 files changed

Lines changed: 263 additions & 37 deletions

File tree

‎apps/server/src/htmlRender/HtmlRender.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,14 @@ describe("HtmlRender", () => {
203203
expect(html).toContain("<p>Quarterly revenue</p>");
204204
// The thread's provider session can attach the page to a call reported
205205
// without its result, matched by the call's own arguments, once.
206-
const page = { title: " Revenue ", height: 9_000 };
206+
const page = { html: "<p>Quarterly revenue</p>", title: " Revenue ", height: 9_000 };
207207
expect(yield* mcpSessions.takeHtmlRender(ThreadId.make("thread-other"), page)).toBe(
208208
undefined,
209209
);
210210
expect(yield* mcpSessions.takeHtmlRender(threadId, { ...page, height: 400 })).toBe(undefined);
211+
expect(
212+
yield* mcpSessions.takeHtmlRender(threadId, { ...page, html: "<p>Quarterly costs</p>" }),
213+
).toBe(undefined);
211214
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toEqual(reference);
212215
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toBe(undefined);
213216
}).pipe(Effect.provide(layerTest)),
@@ -239,6 +242,7 @@ describe("HtmlRender", () => {
239242
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
240243
expect(
241244
yield* mcpSessions.takeHtmlRender(ThreadId.make("thread-html-cancel"), {
245+
html: "<p>x</p>",
242246
title: "X",
243247
height: 200,
244248
}),

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

Lines changed: 100 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderS
2828
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
2929
import type * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
3030
import { makeAntigravityAcpRuntime } from "../../provider/acp/AntigravityAcpSupport.ts";
31+
import { normalizeAntigravitySessionUpdate } from "../../provider/acp/AntigravityProtocol.ts";
3132
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
3233
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
3334
import {
@@ -540,7 +541,13 @@ describe("AntigravityAdapterV2 html_render pages", () => {
540541
height: 240,
541542
});
542543
const revenue = { html: "<p>Revenue</p>", title: "Revenue", height: 240 };
544+
const restated = { ...revenue, html: "<p>Revenue, restated</p>" };
543545
const margin = { ...revenue, html: "<p>Margin</p>", title: "Margin" };
546+
const byRegion = { ...revenue, html: "<p>Revenue by region</p>" };
547+
const byMonth = { ...revenue, html: "<p>Revenue by month</p>" };
548+
// About the size of the page in the session that showed the bug.
549+
const rows = Array.from({ length: 500 }, (_, row) => `<tr><td>Row ${row}</td></tr>`);
550+
const report = { ...revenue, html: `<table>${rows.join("")}</table>` };
544551
const renderError = {
545552
content: [{ type: "text", text: "html_render failed" }],
546553
isError: true,
@@ -568,15 +575,29 @@ describe("AntigravityAdapterV2 html_render pages", () => {
568575
}).pipe(Effect.andThen(runtime.handleSessionUpdate(handler))),
569576
prompt: () =>
570577
Effect.gen(function* () {
578+
// Antigravity's runtime bounds each update before the
579+
// adapter sees it, html_render's html included.
571580
const send = (update: EffectAcpSchema.SessionUpdate) =>
572581
sessionUpdate === undefined
573582
? Effect.die("the adapter must handle session updates")
574-
: sessionUpdate({ sessionId: "mock-session-1", update });
583+
: sessionUpdate(
584+
normalizeAntigravitySessionUpdate({
585+
sessionId: "mock-session-1",
586+
update,
587+
}),
588+
);
575589
// agy_acp_server 1.3.0 and 1.4.0 without a permission prompt:
576590
// the title is "Running <tool>", rawInput holds only the
577591
// tool's arguments, and the completion reports the step's
578592
// own summary as rawOutput instead of the MCP result.
579-
const start = (toolCallId: string, rawInput: typeof revenue) =>
593+
const start = (
594+
toolCallId: string,
595+
rawInput: {
596+
readonly html?: string;
597+
readonly title: string;
598+
readonly height: number;
599+
},
600+
) =>
580601
send({
581602
sessionUpdate: "tool_call",
582603
toolCallId,
@@ -587,16 +608,23 @@ describe("AntigravityAdapterV2 html_render pages", () => {
587608
});
588609
yield* start("trajectory:1", revenue);
589610
yield* start("trajectory:2", { ...revenue, title: "Costs" });
590-
yield* start("trajectory:3", revenue);
611+
yield* start("trajectory:3", restated);
591612
yield* start("trajectory:4", revenue);
592613
yield* start("trajectory:5", revenue);
593614
yield* start("trajectory:6", margin);
594615
yield* start("trajectory:7", margin);
616+
yield* start("trajectory:8", byRegion);
617+
yield* start("trajectory:9", byMonth);
618+
yield* start("trajectory:10", report);
619+
yield* start("trajectory:11", { title: "Revenue", height: 240 });
595620
// T3's MCP server publishes while each call runs.
596621
yield* mcpSessions.recordHtmlRender(threadId, revenue, page("first"));
597-
yield* mcpSessions.recordHtmlRender(threadId, revenue, page("second"));
622+
yield* mcpSessions.recordHtmlRender(threadId, restated, page("second"));
598623
yield* mcpSessions.recordHtmlRender(threadId, margin, page("seventh", "Margin"));
599624
yield* mcpSessions.recordHtmlRender(threadId, margin, page("sixth", "Margin"));
625+
yield* mcpSessions.recordHtmlRender(threadId, byRegion, page("eighth"));
626+
yield* mcpSessions.recordHtmlRender(threadId, byMonth, page("ninth"));
627+
yield* mcpSessions.recordHtmlRender(threadId, report, page("tenth"));
600628
yield* send({
601629
sessionUpdate: "tool_call_update",
602630
toolCallId: "trajectory:1",
@@ -664,6 +692,34 @@ describe("AntigravityAdapterV2 html_render pages", () => {
664692
status: "completed",
665693
rawOutput: "Render margin chart",
666694
});
695+
// Calls with the same title and height that complete out of
696+
// order each take the page published with their html.
697+
yield* send({
698+
sessionUpdate: "tool_call_update",
699+
toolCallId: "trajectory:9",
700+
status: "completed",
701+
rawOutput: "Render revenue by month",
702+
});
703+
yield* send({
704+
sessionUpdate: "tool_call_update",
705+
toolCallId: "trajectory:8",
706+
status: "completed",
707+
rawOutput: "Render revenue by region",
708+
});
709+
// The adapter sees only the end of a long page.
710+
yield* send({
711+
sessionUpdate: "tool_call_update",
712+
toolCallId: "trajectory:10",
713+
status: "completed",
714+
rawOutput: "Render revenue report",
715+
});
716+
// A call without its html cannot tell which page is its own.
717+
yield* send({
718+
sessionUpdate: "tool_call_update",
719+
toolCallId: "trajectory:11",
720+
status: "completed",
721+
rawOutput: "Render revenue chart",
722+
});
667723
return { stopReason: "end_turn" as const };
668724
}),
669725
})),
@@ -740,10 +796,15 @@ describe("AntigravityAdapterV2 html_render pages", () => {
740796
event.type === "turn_item.updated" &&
741797
event.turnItem.nativeItemRef?.nativeId === nativeId,
742798
);
743-
const tool = (nativeId: string) => {
799+
const toolItem = (nativeId: string) => {
744800
const event = finalItem(nativeId);
745-
const item = event?.type === "turn_item.updated" ? event.turnItem : undefined;
746-
return item?.type === "dynamic_tool"
801+
return event?.type === "turn_item.updated" && event.turnItem.type === "dynamic_tool"
802+
? event.turnItem
803+
: undefined;
804+
};
805+
const tool = (nativeId: string) => {
806+
const item = toolItem(nativeId);
807+
return item !== undefined
747808
? {
748809
status: item.status,
749810
toolName: item.toolName,
@@ -795,8 +856,39 @@ describe("AntigravityAdapterV2 html_render pages", () => {
795856
page: page("seventh", "Margin"),
796857
output: { htmlRender: page("seventh", "Margin") },
797858
});
859+
assert.deepEqual(tool("trajectory:8"), {
860+
status: "completed",
861+
toolName: "t3-code.html_render",
862+
page: page("eighth"),
863+
output: { htmlRender: page("eighth") },
864+
});
865+
assert.deepEqual(tool("trajectory:9"), {
866+
status: "completed",
867+
toolName: "t3-code.html_render",
868+
page: page("ninth"),
869+
output: { htmlRender: page("ninth") },
870+
});
871+
// The adapter saw only the end of the long page.
872+
assert.isAbove(report.html.length, 8_000);
873+
assert.propertyVal(
874+
toolItem("trajectory:10")?.input,
875+
"html",
876+
`[Earlier output truncated]\n\n${report.html.slice(-8_000)}`,
877+
);
878+
assert.deepEqual(tool("trajectory:10"), {
879+
status: "completed",
880+
toolName: "t3-code.html_render",
881+
page: page("tenth"),
882+
output: { htmlRender: page("tenth") },
883+
});
884+
assert.deepEqual(tool("trajectory:11"), {
885+
status: "completed",
886+
toolName: "t3-code.html_render",
887+
page: undefined,
888+
output: "Render revenue chart",
889+
});
798890
// Each page goes to one call; the unclaimed one stays for a later call.
799-
assert.deepEqual(yield* mcpSessions.takeHtmlRender(threadId, revenue), page("second"));
891+
assert.deepEqual(yield* mcpSessions.takeHtmlRender(threadId, restated), page("second"));
800892
assert.strictEqual(yield* mcpSessions.takeHtmlRender(threadId, margin), undefined);
801893
}).pipe(Effect.provide(layerSession), Effect.scoped),
802894
);

‎packages/provider-core/src/server/McpProviderSessions.test.ts‎

Lines changed: 81 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,34 @@ const page = (name: string) => ({
1010
title: "Revenue",
1111
height: 240,
1212
});
13+
const revenue = { html: "<p>Revenue</p>", title: "Revenue", height: 240 };
1314

1415
describe("McpProviderSessions html_render pages", () => {
1516
it.effect("matches a height the agent reports as a numeric string", () =>
1617
Effect.gen(function* () {
1718
const sessions = yield* McpProviderSessions.McpProviderSessions;
18-
yield* sessions.recordHtmlRender(threadId, { title: "Revenue", height: 240 }, page("first"));
19+
yield* sessions.recordHtmlRender(threadId, revenue, page("first"));
1920

2021
assert.strictEqual(
21-
yield* sessions.takeHtmlRender(threadId, { title: "Revenue", height: "240px" }),
22+
yield* sessions.takeHtmlRender(threadId, { ...revenue, height: "240px" }),
2223
undefined,
2324
);
2425
assert.strictEqual(
25-
yield* sessions.takeHtmlRender(threadId, { title: "Revenue", height: "" }),
26+
yield* sessions.takeHtmlRender(threadId, { ...revenue, height: "" }),
2627
undefined,
2728
);
2829
assert.deepStrictEqual(
29-
yield* sessions.takeHtmlRender(threadId, { title: "Revenue", height: " 240 " }),
30+
yield* sessions.takeHtmlRender(threadId, { ...revenue, height: " 240 " }),
3031
page("first"),
3132
);
3233
// Each page goes to one call.
33-
assert.strictEqual(
34-
yield* sessions.takeHtmlRender(threadId, { title: "Revenue", height: 240 }),
35-
undefined,
36-
);
34+
assert.strictEqual(yield* sessions.takeHtmlRender(threadId, revenue), undefined);
3735
}).pipe(Effect.provide(McpProviderSessions.layer)),
3836
);
3937

4038
it.effect("takes the very page a call reported", () =>
4139
Effect.gen(function* () {
4240
const sessions = yield* McpProviderSessions.McpProviderSessions;
43-
const revenue = { title: "Revenue", height: 240 };
4441
yield* sessions.recordHtmlRender(threadId, revenue, page("first"));
4542
yield* sessions.recordHtmlRender(threadId, revenue, page("second"));
4643

@@ -57,4 +54,79 @@ describe("McpProviderSessions html_render pages", () => {
5754
assert.strictEqual(yield* sessions.takeHtmlRender(threadId, revenue), undefined);
5855
}).pipe(Effect.provide(McpProviderSessions.layer)),
5956
);
57+
58+
it.effect("tells pages with the same title and height apart by their html", () =>
59+
Effect.gen(function* () {
60+
const sessions = yield* McpProviderSessions.McpProviderSessions;
61+
const byRegion = { ...revenue, html: "<p>Revenue by region</p>" };
62+
const byMonth = { ...revenue, html: "<p>Revenue by month</p>" };
63+
yield* sessions.recordHtmlRender(threadId, byRegion, page("region"));
64+
yield* sessions.recordHtmlRender(threadId, byMonth, page("month"));
65+
66+
// The calls complete in the reverse order of their pages.
67+
assert.deepStrictEqual(yield* sessions.takeHtmlRender(threadId, byMonth), page("month"));
68+
assert.deepStrictEqual(yield* sessions.takeHtmlRender(threadId, byRegion), page("region"));
69+
}).pipe(Effect.provide(McpProviderSessions.layer)),
70+
);
71+
72+
it.effect("matches a page whose html the agent bounded to its last 8,000 characters", () =>
73+
Effect.gen(function* () {
74+
const sessions = yield* McpProviderSessions.McpProviderSessions;
75+
const rows = (label: string) =>
76+
Array.from({ length: 500 }, (_, row) => `<tr><td>${label} ${row}</td></tr>`).join("");
77+
const byRegion = { ...revenue, html: `<table>${rows("Region")}</table>` };
78+
const byMonth = { ...revenue, html: `<table>${rows("Month")}</table>` };
79+
const bounded = (html: string) => `[Earlier output truncated]\n\n${html.slice(-8_000)}`;
80+
assert.isAbove(byRegion.html.length, 8_000);
81+
yield* sessions.recordHtmlRender(threadId, byRegion, page("region"));
82+
yield* sessions.recordHtmlRender(threadId, byMonth, page("month"));
83+
84+
// An end the page does not have, or more of it than a kept page holds,
85+
// matches no page.
86+
assert.strictEqual(
87+
yield* sessions.takeHtmlRender(threadId, {
88+
...revenue,
89+
html: bounded(`${byMonth.html}<p>Notes</p>`),
90+
}),
91+
undefined,
92+
);
93+
assert.strictEqual(
94+
yield* sessions.takeHtmlRender(threadId, {
95+
...revenue,
96+
html: `[Earlier output truncated]\n\n${byMonth.html.slice(-8_001)}`,
97+
}),
98+
undefined,
99+
);
100+
assert.deepStrictEqual(
101+
yield* sessions.takeHtmlRender(threadId, { ...byMonth, html: bounded(byMonth.html) }),
102+
page("month"),
103+
);
104+
// The whole page still matches.
105+
assert.deepStrictEqual(yield* sessions.takeHtmlRender(threadId, byRegion), page("region"));
106+
}).pipe(Effect.provide(McpProviderSessions.layer)),
107+
);
108+
109+
it.effect("takes no page for a call without html or with pages it cannot tell apart", () =>
110+
Effect.gen(function* () {
111+
const sessions = yield* McpProviderSessions.McpProviderSessions;
112+
yield* sessions.recordHtmlRender(threadId, revenue, page("first"));
113+
114+
assert.strictEqual(
115+
yield* sessions.takeHtmlRender(threadId, { title: "Revenue", height: 240 }),
116+
undefined,
117+
);
118+
assert.strictEqual(
119+
yield* sessions.takeHtmlRender(threadId, { ...revenue, html: "" }),
120+
undefined,
121+
);
122+
yield* sessions.recordHtmlRender(threadId, revenue, page("second"));
123+
assert.strictEqual(yield* sessions.takeHtmlRender(threadId, revenue), undefined);
124+
// Both pages stay kept for calls that tell them apart.
125+
assert.deepStrictEqual(
126+
yield* sessions.takeHtmlRender(threadId, revenue, page("first")),
127+
page("first"),
128+
);
129+
assert.deepStrictEqual(yield* sessions.takeHtmlRender(threadId, revenue), page("second"));
130+
}).pipe(Effect.provide(McpProviderSessions.layer)),
131+
);
60132
});

0 commit comments

Comments
 (0)