Skip to content

Commit a5b3de0

Browse files
neo-clonclaudejuliusmarminge
authored
fix(acp): Antigravity html_render pages show in the thread (#19796)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 23b550d commit a5b3de0

8 files changed

Lines changed: 540 additions & 38 deletions

File tree

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

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// @effect-diagnostics nodeBuiltinImport:off - plain local servers stand in for LAN services.
22
import * as NodeServices from "@effect/platform-node/NodeServices";
33
import { describe, expect, it } from "@effect/vitest";
4-
import { ThreadId } from "@t3tools/contracts";
4+
import { EnvironmentId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
5+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
56
import * as HostProcess from "@t3tools/shared/HostProcess";
67
import {
78
HTML_RENDER_MEASURE_FONTS,
@@ -47,6 +48,7 @@ const layerHtmlRender = (
4748
}),
4849
),
4950
),
51+
Layer.provideMerge(McpProviderSessions.layer),
5052
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-html-render-" })),
5153
Layer.provideMerge(NodeServices.layer),
5254
);
@@ -196,10 +198,22 @@ describe("HtmlRender", () => {
196198
const fileSystem = yield* FileSystem.FileSystem;
197199
const config = yield* ServerConfig.ServerConfig;
198200
const htmlRender = yield* HtmlRender.HtmlRender;
201+
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
202+
const threadId = ThreadId.make("thread-html-render");
203+
const session = {
204+
environmentId: EnvironmentId.make("html-render-environment"),
205+
threadId,
206+
providerSessionId: "first-credential",
207+
providerInstanceId: ProviderInstanceId.make("claude"),
208+
endpoint: "http://localhost:8311/mcp",
209+
authorizationHeader: "Bearer first-token",
210+
browserToolsAvailable: false,
211+
};
212+
yield* mcpSessions.set(session);
199213

200214
const reference = yield* htmlRender.publish({
201-
threadId: ThreadId.make("thread-html-render"),
202-
html: "<p>Quarterly revenue</p>",
215+
threadId,
216+
html: `<p>Quarterly revenue</p>${" ".repeat(8_000)}`,
203217
title: " Revenue ",
204218
height: 9_000,
205219
});
@@ -217,32 +231,62 @@ describe("HtmlRender", () => {
217231
const html = yield* fileSystem.readFileString(stored ?? "");
218232
expect(html).toContain('<style id="t3-theme">');
219233
expect(html).toContain("<p>Quarterly revenue</p>");
234+
// Antigravity reports the call without its result, so the thread's
235+
// provider session keeps the page for one call with these arguments.
236+
const page = {
237+
html: `<p>Quarterly revenue</p>${" ".repeat(8_000)}`,
238+
title: " Revenue ",
239+
height: 9_000,
240+
};
241+
expect(
242+
yield* mcpSessions.takeHtmlRender(threadId, {
243+
...page,
244+
html: page.html.replace("revenue", "expense"),
245+
}),
246+
).toBe(undefined);
247+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toEqual(reference);
248+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toBe(undefined);
249+
const reused = yield* htmlRender.publish({ threadId, ...page });
250+
yield* mcpSessions.set({ ...session, browserToolsAvailable: true });
251+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toEqual(reused);
252+
253+
yield* htmlRender.publish({ threadId, ...page });
254+
yield* mcpSessions.set({
255+
...session,
256+
providerSessionId: "replacement-credential",
257+
providerInstanceId: ProviderInstanceId.make("antigravity"),
258+
authorizationHeader: "Bearer replacement-token",
259+
});
260+
const replacement = yield* htmlRender.publish({ threadId, ...page });
261+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toEqual(replacement);
262+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toBe(undefined);
263+
// Clearing the thread's MCP session drops the pages it kept.
264+
yield* htmlRender.publish({ threadId, ...page });
265+
yield* mcpSessions.clear(threadId);
266+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toBe(undefined);
220267
}).pipe(Effect.provide(layerTest)),
221268
);
222269

223270
it.effect("removes the page when publishing is interrupted", () =>
224271
Effect.gen(function* () {
272+
const threadId = ThreadId.make("thread-html-cancel");
273+
const page = { html: "<p>x</p>", title: "X", height: 200 };
225274
const measuring = yield* Deferred.make<void>();
226275
yield* Effect.gen(function* () {
227276
const fileSystem = yield* FileSystem.FileSystem;
228277
const config = yield* ServerConfig.ServerConfig;
229278
const htmlRender = yield* HtmlRender.HtmlRender;
279+
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
230280
const storedPages = fileSystem
231281
.readDirectory(config.attachmentsDir, { recursive: true })
232282
.pipe(Effect.map((names) => names.filter((name) => name.endsWith(".html"))));
233283

234-
const publishing = yield* htmlRender
235-
.publish({
236-
threadId: ThreadId.make("thread-html-cancel"),
237-
html: "<p>x</p>",
238-
title: "X",
239-
height: 200,
240-
})
241-
.pipe(Effect.forkChild);
284+
const publishing = yield* htmlRender.publish({ threadId, ...page }).pipe(Effect.forkChild);
242285
yield* Deferred.await(measuring);
243286
expect(yield* storedPages).toHaveLength(1);
244287
yield* Fiber.interrupt(publishing);
245288
expect(yield* storedPages).toEqual([]);
289+
expect(yield* mcpSessions.takeHtmlRender(threadId, page)).toBe(undefined);
246290
}).pipe(
247291
Effect.provide(
248292
layerHtmlRender(

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

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { ThreadId } from "@t3tools/contracts";
2+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
23
import * as HostProcess from "@t3tools/shared/HostProcess";
34
import {
45
clampHtmlRenderHeight,
@@ -310,6 +311,7 @@ const make = Effect.gen(function* () {
310311
const fileSystem = yield* FileSystem.FileSystem;
311312
const config = yield* ServerConfig.ServerConfig;
312313
const previewBrowser = yield* PreviewBrowser.PreviewBrowser;
314+
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
313315
const services = yield* Effect.context<
314316
FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner
315317
>();
@@ -404,19 +406,35 @@ const make = Effect.gen(function* () {
404406
if (attachmentId === null || filePath === null) {
405407
return yield* new HtmlRenderStoreError({ cause: new Error("Invalid thread id.") });
406408
}
407-
const heights = yield* fileSystem.writeFileString(filePath, html).pipe(
408-
Effect.mapError((cause) => new HtmlRenderStoreError({ cause })),
409-
Effect.andThen(measure(html)),
410-
// Only the returned reference lets thread deletion find the page, so a
411-
// publish that fails or is interrupted before returning removes it.
412-
Effect.onError(() => fileSystem.remove(filePath, { force: true }).pipe(Effect.ignore)),
413-
);
414-
return {
409+
const baseReference: HtmlRenderReference = {
415410
attachmentId,
416411
title: input.title.trim().slice(0, HTML_RENDER_MAX_TITLE_LENGTH) || "HTML",
417412
height: clampHtmlRenderHeight(input.height),
418-
...(heights === undefined ? {} : { heights }),
419-
} satisfies HtmlRenderReference;
413+
};
414+
return yield* fileSystem.writeFileString(filePath, html).pipe(
415+
Effect.mapError((cause) => new HtmlRenderStoreError({ cause })),
416+
Effect.uninterruptible,
417+
Effect.andThen(measure(html)),
418+
Effect.andThen((heights) => {
419+
const reference: HtmlRenderReference = {
420+
...baseReference,
421+
...(heights === undefined ? {} : { heights }),
422+
};
423+
return mcpSessions
424+
.recordHtmlRender(input.threadId, input, reference)
425+
.pipe(Effect.as(reference));
426+
}),
427+
// An interrupted publish must leave neither an attachment nor a recoverable reference.
428+
Effect.onError(() =>
429+
Effect.all(
430+
[
431+
fileSystem.remove(filePath, { force: true }).pipe(Effect.ignore),
432+
mcpSessions.takeHtmlRender(input.threadId, input, baseReference).pipe(Effect.ignore),
433+
],
434+
{ discard: true },
435+
),
436+
),
437+
);
420438
});
421439

422440
const preview = Effect.fn("HtmlRender.preview")(function* (input: {

‎apps/server/src/mcp/toolkits/core.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
type OrchestrationV2ProjectedTurnItem,
1919
type OrchestrationV2ThreadShell,
2020
} from "@t3tools/contracts";
21+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
2122
import * as Deferred from "effect/Deferred";
2223
import * as Effect from "effect/Effect";
2324
import * as TestClock from "effect/testing/TestClock";
@@ -292,6 +293,7 @@ it.effect("returns an HTML render reference that Codex and Claude tool rows both
292293
Effect.provide(
293294
McpHttpServer.layerHtmlToolkit.pipe(
294295
Layer.provideMerge(McpServer.McpServer.layer),
296+
Layer.provide(McpProviderSessions.layer),
295297
Layer.provide(PreviewBrowser.layer),
296298
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-html-render-" })),
297299
Layer.provide(NodeServices.layer),

‎apps/server/src/mcp/toolkits/worktree/registration.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { expect, it } from "@effect/vitest";
66
import { NodeHttpServer } from "@effect/platform-node";
77
import * as NodeServices from "@effect/platform-node/NodeServices";
88
import { ProviderInstanceId, ThreadId } from "@t3tools/contracts";
9+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
910
import * as Effect from "effect/Effect";
1011
import * as Layer from "effect/Layer";
1112
import * as Schema from "effect/Schema";
@@ -57,6 +58,7 @@ const layerStubServices = Layer.mergeAll(
5758
Layer.mock(SourceControlRepositoryService.SourceControlRepositoryService)({}),
5859
Layer.mock(ThreadLaunchService.ThreadLaunchService)({}),
5960
Layer.mock(ThreadSearch.ThreadSearch)({}),
61+
McpProviderSessions.layer,
6062
);
6163

6264
const ToolsListPayload = Schema.fromJsonString(

0 commit comments

Comments
 (0)