fix(preview): render website favicons for browser tool activity (#11032)

maria committed 2 months ago

Commit 6c695341 parent 02297e39 files · +320 −78Browse files

Unified · Split

9 files

apps/server/src/mcp/McpHttpServer.test.ts +33 −14
apps/server/src/mcp/McpHttpServer.ts +7 −0
apps/server/src/mcp/PreviewAutomationBroker.test.ts +61 −41
apps/server/src/mcp/PreviewAutomationBroker.ts +6 −0
apps/server/src/mcp/toolkits/preview/handlers.ts +52 −17
apps/server/src/mcp/toolkits/preview/tools.test.ts +1 −0
apps/server/src/mcp/toolkits/preview/tools.ts +12 −5
apps/server/src/orchestration/ActivityPayloadProjection.test.ts +78 −0
apps/server/src/orchestration/ActivityPayloadProjection.ts +70 −1

apps/server/src/mcp/McpHttpServer.test.ts+33−14

         const { accessibilityTree: _tree, ...boundedMetadata } = metadata;
         expect(snapshot.isError).toBe(false);
         expect(snapshot.structuredContent).toEqual(metadata);
-        const [text, ...rest] = snapshot.content;
+        const [identity, text, ...rest] = snapshot.content;
+        expect(identity?.type === "text" ? decodeJsonText(identity.text) : null).toEqual({
+          url: page.url,
+        });
         expect(text?.type === "text" ? decodeJsonText(text.text) : null).toEqual(boundedMetadata);
         expect(rest).toEqual([
           {
           Effect.provideService(McpInvocationContext.McpInvocationContext, invocation),
           Effect.provideService(McpSchema.McpServerClient, client),
         );
-      expect(nextDefault.content.map((content) => content.type)).toEqual(["text", "text", "image"]);
+      expect(nextDefault.content.map((content) => content.type)).toEqual([
+        "text",
+        "text",
+        "text",
+        "image",
+      ]);
       expect(nextDefault.structuredContent).toEqual({ ...page, title: "Snapshot 7", screenshot });
       expect(requests).toBe(7);
     }),
         /^browser-screenshot-example-test-[0-9a-z]+-[0-9a-f]{8}\.png$/,
       );
       expect(Buffer.from(yield* fileSystem.readFile(screenshotPath!)).toString()).toBe("png");
-      const text = snapshot.content.find((content) => content.type === "text");
+      const [, text] = snapshot.content;
       expect(text?.type === "text" ? text.text : "").toContain(screenshotPath);
       const unsaved = yield* callSnapshot({});
       const snapshot = yield* callSnapshot({ includeImage: false });
       expect(snapshot.isError).toBe(false);
-      const [text, notice] = snapshot.content;
+      const [identity, text, notice] = snapshot.content;
+      expect(identity?.type === "text" ? decodeJsonText(identity.text) : null).toEqual({
+        url: oversized.url,
+      });
       expect(text?.type).toBe("text");
       const body = text?.type === "text" ? text.text : "";
       expect(Buffer.byteLength(body, "utf8")).toBeLessThanOrEqual(
       const snapshot = yield* callSnapshot({ includeImage: false });
-      const [text] = snapshot.content;
+      const [, text] = snapshot.content;
       const body = text?.type === "text" ? text.text : "";
       expect(Buffer.byteLength(body, "utf8")).toBeLessThanOrEqual(
         McpHttpServer.MAX_SNAPSHOT_TEXT_BYTES,
       };
       expect(parsed.title.length).toBe(2_049);
       expect(parsed.consoleEntries[0]?.text.length).toBe(501);
-      const notice = snapshot.content[1];
+      const notice = snapshot.content[2];
       const noticeText = notice?.type === "text" ? notice.text : "";
       expect(noticeText).toContain("url or title after 2048 characters");
       expect(noticeText).toContain("console entries text after 500 characters");
       const snapshot = yield* callSnapshot({ includeImage: false });
-      const [text, notice] = snapshot.content;
+      const [, text, notice] = snapshot.content;
       const body = text?.type === "text" ? text.text : "";
       expect(Buffer.byteLength(body, "utf8")).toBeLessThanOrEqual(
         McpHttpServer.MAX_SNAPSHOT_TEXT_BYTES,
     Effect.gen(function* () {
       const server = yield* McpServer.McpServer;
       const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
+      const toolIcon = {
+        _tag: "website" as const,
+        pageUrl: "http://example.test/",
+      };
       const routedRequests: Array<{
         readonly operation: string;
         readonly tabId?: string | undefined;
       expect(clickTool?.tool.annotations?.readOnlyHint).toBe(false);
       expect(clickTool?.tool.annotations?.destructiveHint).toBe(true);
       expect(clickTool?.tool.annotations?.openWorldHint).toBe(true);
-      expect(clickTool?.tool.outputSchema).toEqual({
+      expect(clickTool?.tool.outputSchema).toMatchObject({
         type: "object",
         additionalProperties: false,
         description: "The preview action completed successfully.",
           Effect.provideService(McpSchema.McpServerClient, client),
         );
       expect(evaluated.isError).toBe(false);
-      expect(evaluated.structuredContent).toEqual({ value: ["Connect", "Continue"] });
+      expect(evaluated.structuredContent).toEqual({ value: ["Connect", "Continue"], toolIcon });
-      expect(evaluated.content).toEqual([
+      const evaluatedText = evaluated.content[0];
-        { type: "text", text: '{"value":["Connect","Continue"]}' },
+      expect(evaluatedText?.type === "text" ? decodeJsonText(evaluatedText.text) : null).toEqual({
-      ]);
+        toolIcon,
+        value: ["Connect", "Continue"],
+      });
       const actionRequests = [
         { name: "preview_click", arguments: { x: 10, y: 10 } },
             Effect.provideService(McpSchema.McpServerClient, client),
           );
         expect(result.isError).toBe(false);
-        expect(result.structuredContent).toEqual({});
+        expect(result.structuredContent).toEqual({ toolIcon });
-        expect(result.content).toEqual([{ type: "text", text: "{}" }]);
+        expect(routedRequests.at(-1)?.operation).toBe("status");
+        const text = result.content[0];
+        expect(text?.type === "text" ? decodeJsonText(text.text) : null).toEqual({ toolIcon });
       }
     }),
   ).pipe(Effect.provide(TestLayer)),

apps/server/src/mcp/McpHttpServer.ts+7−0

@@ -410,6 +410,13 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot · 409 unmodified lines
410	isError: false,	410	isError: false,
411	structuredContent: metadata,	411	structuredContent: metadata,
412	content: [	412	content: [
		413	// Keep the page identity readable even if a provider truncates the snapshot.
		414	{
		415	type: "text",
		416	text: encodeJsonText({
		417	url: cutText(snapshot.url, MAX_SNAPSHOT_IDENTIFIER_CHARS),
		418	}),
		419	},
413	{ type: "text", text: bounded.text },	420	{ type: "text", text: bounded.text },
414	...(bounded.omitted.length === 0	421	...(bounded.omitted.length === 0
415	? []	422	? []

apps/server/src/mcp/PreviewAutomationBroker.test.ts+61−41

   ),
 );
-it.effect("does not let an older response replace a newer explicit tab target", () =>
+it.effect.each([true, false])(
-  Effect.scoped(
+  "keeps an older target stable while a newer explicit tab responds (implicit: %s)",
-    Effect.gen(function* () {
+  (implicit) =>
-      const broker = yield* makeBroker;
+    Effect.scoped(
-      const olderTabId = PreviewTabId.make("tab-older-request");
+      Effect.gen(function* () {
-      const newerTabId = PreviewTabId.make("tab-newer-request");
+        const broker = yield* makeBroker;
-      const releaseOlderResponse = yield* Deferred.make<void>();
+        const olderTabId = PreviewTabId.make("tab-older-request");
-      const routedRequests: RoutedRequest[] = [];
+        const newerTabId = PreviewTabId.make("tab-newer-request");
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
+        const releaseOlderResponse = yield* Deferred.make<void>();
-      yield* Stream.runForEach(requests, (request) => {
+        const routedRequests: RoutedRequest[] = [];
-        routedRequests.push(request);
+        const requests = requestsFrom(yield* broker.connect(makeHost()));
-        const response = Effect.gen(function* () {
+        yield* Stream.runForEach(requests, (request) => {
-          if (request.tabId === olderTabId) {
+          routedRequests.push(request);
-            yield* Deferred.await(releaseOlderResponse);
+          const response = Effect.gen(function* () {
-          }
+            if (request.tabId === olderTabId && request.operation === "snapshot") {
-          yield* broker.respond({
+              yield* Deferred.await(releaseOlderResponse);
-            clientId: "client-1",
+            }
-            connectionId: request.connectionId,
+            yield* broker.respond({
-            requestId: request.requestId,
+              clientId: "client-1",
-            ok: true,
+              connectionId: request.connectionId,
-            result: { url: "http://localhost:3200" },
+              requestId: request.requestId,
+              ok: true,
+              result: { url: "http://localhost:3200" },
+            });
+            if (request.tabId === newerTabId) {
+              yield* Deferred.succeed(releaseOlderResponse, undefined);
+            }
           });
-          if (request.tabId === newerTabId) {
+          return response.pipe(Effect.forkScoped, Effect.asVoid);
-            yield* Deferred.succeed(releaseOlderResponse, undefined);
+        }).pipe(Effect.forkScoped);
-          }
+        yield* Effect.yieldNow;
+        yield* broker.invoke({ scope, operation: "status", input: {}, tabId: olderTabId });
+        let capturedTabId: PreviewTabId | undefined;
+        const older = yield* broker
+          .invoke({
+            scope,
+            operation: "snapshot",
+            input: {},
+            ...(implicit ? {} : { tabId: olderTabId }),
+            onTargetTab: (tabId) => {
+              capturedTabId = tabId;
+            },
+          })
+          .pipe(Effect.forkScoped);
+        yield* Effect.yieldNow;
+        const newer = yield* broker
+          .invoke({ scope, operation: "snapshot", input: {}, tabId: newerTabId })
+          .pipe(Effect.forkScoped);
+        yield* Fiber.join(newer);
+        yield* Fiber.join(older);
+        yield* broker.invoke({
+          scope,
+          operation: "status",
+          input: {},
+          tabId: olderTabId,
+          updateCurrentTab: false,
         });
-        return response.pipe(Effect.forkScoped, Effect.asVoid);
+        yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-      const older = yield* broker
-        .invoke({ scope, operation: "snapshot", input: {}, tabId: olderTabId })
-        .pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-      const newer = yield* broker
-        .invoke({ scope, operation: "snapshot", input: {}, tabId: newerTabId })
-        .pipe(Effect.forkScoped);
-      yield* Fiber.join(newer);
-      yield* Fiber.join(older);
-      yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-      expect(routedRequests.at(-1)?.tabId).toBe(newerTabId);
+        expect(routedRequests.at(-1)?.tabId).toBe(newerTabId);
-    }),
+        expect(capturedTabId).toBe(olderTabId);
-  ),
+      }),
+    ),
 );
 it.effect("tracks the tab returned by a targeted recording stop", () =>

apps/server/src/mcp/PreviewAutomationBroker.ts+6−0

   readonly input: unknown;
   readonly tabId?: PreviewTabId;
   readonly timeoutMs?: number;
+  /** Background metadata reads must not change the agent's current tab. */
+  readonly updateCurrentTab?: boolean;
+  /** Capture the routed tab before another request changes the current assignment. */
+  readonly onTargetTab?: (tabId: PreviewTabId | undefined) => void;
 }
 export class PreviewAutomationBroker extends Context.Service<
       });
     }
     const { connection, requestId, requestContext, requestSequence } = route;
+    input.onTargetTab?.(requestContext.tabId);
     const removePending = SynchronizedRef.update(state, (next) => {
       if (!next.pending.has(requestId)) return next;
       const pending = new Map(next.pending);
       });
     });
     const result = yield* awaitResponse().pipe(Effect.ensuring(removePending));
+    if (input.updateCurrentTab === false) return result;
     const responseTabId = readResultTabId(result);
     const resultTabId = responseTabId === undefined ? input.tabId : responseTabId;
     if (resultTabId === undefined) return result;

apps/server/src/mcp/toolkits/preview/handlers.ts+52−17

   PreviewAutomationRecordingTransferError,
   PreviewAutomationRecordingDesktopUpdateRequiredError,
   PreviewAutomationRecordingArtifact,
+  type ToolActivityIcon,
   type ThreadId,
   type PreviewAutomationOperation,
   type PreviewAutomationOpenInput,
   timeoutMs?: number,
   tabId?: PreviewTabId,
 ): Effect.fn.Return<
-  A,
+  { result: A; toolIcon?: ToolActivityIcon },
   import("@t3tools/contracts").PreviewAutomationError,
   McpInvocationContext.McpInvocationContext | PreviewAutomationBroker.PreviewAutomationBroker
 > {
   const scope = yield* McpInvocationContext.requireMcpCapability("preview");
   const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
-  return yield* broker.invoke<A>({
+  let targetTabId = tabId;
+  const result = yield* broker.invoke<A>({
+    onTargetTab: (resolvedTabId) => {
+      targetTabId = resolvedTabId;
+    },
     scope,
     operation,
     input,
     ...(timeoutMs === undefined ? {} : { timeoutMs }),
     ...(tabId === undefined ? {} : { tabId }),
   });
+  if (["status", "open", "navigate", "snapshot"].includes(operation)) return { result };
+  const statusTabId =
+    (operation !== "evaluate" && typeof result === "object" && result !== null
+      ? (result as { tabId?: PreviewTabId }).tabId
+      : undefined) ?? targetTabId;
+  const page = yield* broker
+    .invoke<PreviewAutomationStatus>({
+      scope,
+      operation: "status",
+      input: {},
+      timeoutMs: 500,
+      updateCurrentTab: false,
+      ...(statusTabId === undefined ? {} : { tabId: statusTabId }),
+    })
+    .pipe(Effect.catch(() => Effect.succeed(null)));
+  return {
+    result,
+    ...(page?.url && /^https?:\/\//i.test(page.url) && page.url.length <= 4096
+      ? { toolIcon: { _tag: "website" as const, pageUrl: page.url } }
+      : {}),
+  };
 });
-const invokeTargeted = <A>(
+const invokeTargeted = <A extends object>(
   operation: PreviewAutomationOperation,
   input: {
     readonly tabId?: PreviewTabId | undefined;
   timeoutMs?: number,
 ) => {
   const { tabId, ...operationInput } = input;
-  return invoke<A>(operation, operationInput, timeoutMs, tabId);
+  return invoke<A>(operation, operationInput, timeoutMs, tabId).pipe(
+    Effect.map(({ result, toolIcon }) => ({
+      ...result,
+      ...(toolIcon ? { toolIcon } : {}),
+    })),
+  );
 };
 const UploadedRecordingArtifact = Schema.Struct({
     const { includeImage: _includeImage, save: _save, ...operationInput } = input ?? {};
     return invokeTargeted<PreviewAutomationSnapshot>("snapshot", operationInput);
   },
-  preview_click: (input) =>
+  preview_click: (input) => invokeTargeted<object>("click", input, input.timeoutMs),
-    invokeTargeted<void>("click", input, input.timeoutMs).pipe(Effect.as({})),
+  preview_type: (input) => invokeTargeted<object>("type", input, input.timeoutMs),
-  preview_type: (input) => invokeTargeted<void>("type", input, input.timeoutMs).pipe(Effect.as({})),
+  preview_press: (input) => invokeTargeted<object>("press", input),
-  preview_press: (input) => invokeTargeted<void>("press", input).pipe(Effect.as({})),
+  preview_scroll: (input) => invokeTargeted<object>("scroll", input),
-  preview_scroll: (input) => invokeTargeted<void>("scroll", input).pipe(Effect.as({})),
+  preview_evaluate: ({ tabId, ...input }) =>
-  preview_evaluate: (input) =>
+    invoke<unknown>("evaluate", input, undefined, tabId).pipe(
-    invokeTargeted<unknown>("evaluate", input).pipe(
+      Effect.map(({ result, toolIcon }) => ({
-      Effect.map((result) => ({ value: result ?? null })),
+        value: result ?? null,
+        ...(toolIcon ? { toolIcon } : {}),
+      })),
     ),
-  preview_wait_for: (input) =>
+  preview_wait_for: (input) => invokeTargeted<object>("waitFor", input, input.timeoutMs),
-    invokeTargeted<void>("waitFor", input, input.timeoutMs).pipe(Effect.as({})),
   preview_recording_start: (input) =>
     invokeTargeted<PreviewAutomationRecordingStatus>("recordingStart", input ?? {}),
   preview_recording_stop: (input) =>
     Effect.gen(function* () {
       const scope = yield* McpInvocationContext.requireMcpCapability("preview");
-      const response = yield* invokeTargeted<unknown>(
+      const { tabId, ...operationInput } = input;
+      const response = yield* invoke<unknown>(
         "recordingStop",
-        { ...input, transferToEnvironment: true },
+        { ...operationInput, transferToEnvironment: true },
         PREVIEW_RECORDING_STOP_TIMEOUT_MS,
+        tabId,
       );
-      return yield* claimPreviewRecording(scope.threadId, response);
+      const artifact = yield* claimPreviewRecording(scope.threadId, response.result);
+      return { ...artifact, ...(response.toolIcon ? { toolIcon: response.toolIcon } : {}) };
     }),
 } satisfies Parameters<typeof PreviewToolkit.toLayer>[0];

apps/server/src/mcp/toolkits/preview/tools.test.ts+1−0

@@ -67,6 +67,7 @@ it("exports exact object result schemas for preview actions", () => { · 66 unmodified lines
67	for (const name of actionNames) {	67	for (const name of actionNames) {
68	expect(Tool.getJsonSchemaFromSchema(PreviewToolkit.tools[name].successSchema)).toEqual({	68	expect(Tool.getJsonSchemaFromSchema(PreviewToolkit.tools[name].successSchema)).toEqual({
69	type: "object",	69	type: "object",
		70	properties: { toolIcon: expect.any(Object) },
70	additionalProperties: false,	71	additionalProperties: false,
71	description: "The preview action completed successfully.",	72	description: "The preview action completed successfully.",
72	});	73	});

apps/server/src/mcp/toolkits/preview/tools.ts+12−5

 import {
+  ToolActivityIcon,
   PreviewAutomationClickInput,
   PreviewAutomationError,
   PreviewAutomationEvaluateInput,
   PreviewAutomationBroker.PreviewAutomationBroker,
 ];
-const PreviewActionResult = Schema.Record(Schema.String, Schema.Never).annotate({
+const presentationFields = { toolIcon: Schema.optional(ToolActivityIcon) };
+const PreviewActionResult = Schema.Struct(presentationFields).annotate({
   description: "The preview action completed successfully.",
 });
     description:
       "Resize a collaborative browser tab, optionally selected by tabId. Use {mode:'fill'}, {mode:'freeform',width:1024,height:768}, or {mode:'preset',preset:'iphone-12-pro',orientation:'portrait'}. This changes CSS layout breakpoints without changing the desktop browser user agent.",
     parameters: PreviewAutomationResizeInput,
-    success: PreviewAutomationResizeResult,
+    success: Schema.Struct({ ...PreviewAutomationResizeResult.fields, ...presentationFields }),
     failure: PreviewAutomationError,
     dependencies,
   })
     description:
       "Emulate prefers-color-scheme in a collaborative browser tab, optionally selected by tabId. Use {colorScheme:'dark'} or {colorScheme:'light'} to preview the page in that appearance, and {colorScheme:'system'} to clear the override and follow the OS appearance.",
     parameters: PreviewAutomationSetColorSchemeInput,
-    success: PreviewAutomationSetColorSchemeResult,
+    success: Schema.Struct({
+      ...PreviewAutomationSetColorSchemeResult.fields,
+      ...presentationFields,
+    }),
     failure: PreviewAutomationError,
     dependencies,
   })
  * null valid instead of failing only for non-object expressions.
  */
 export const PreviewEvaluateResult = Schema.Struct({
+  ...presentationFields,
   value: Schema.Unknown.annotate({
     description: "The JSON-serializable value the expression produced, or null.",
   }),
     description:
       "Start recording the collaborative browser tab selected by tabId, or this agent session's current tab when omitted.",
     parameters: PreviewAutomationTabTargetInput,
-    success: PreviewAutomationRecordingStatus,
+    success: Schema.Struct({ ...PreviewAutomationRecordingStatus.fields, ...presentationFields }),
     failure: PreviewAutomationError,
     dependencies,
   }).annotate(Tool.Title, "Start browser recording"),
     description:
       "Stop recording the collaborative browser tab selected by tabId, or this agent session's current tab when omitted, and transfer the compressed recording once (up to 50 MiB) to an evidence file readable in this agent's environment. Returns its environment-local path after transfer succeeds.",
     parameters: PreviewAutomationTabTargetInput,
-    success: PreviewAutomationRecordingArtifact,
+    success: Schema.Struct({ ...PreviewAutomationRecordingArtifact.fields, ...presentationFields }),
     failure: PreviewAutomationError,
     dependencies: [...dependencies, FileSystem.FileSystem, ServerConfig.ServerConfig],
   }).annotate(Tool.Title, "Stop browser recording"),

apps/server/src/orchestration/ActivityPayloadProjection.test.ts+78−0

@@ -249,6 +249,84 @@ describe("projectActivityPayload", () => { · 248 unmodified lines
249	expect(JSON.stringify(projected.payload).length).toBeLessThan(500);	249	expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
250	});	250	});
251		251
		252	it.each([
		253	{
		254	item: {
		255	server: "t3-code",
		256	tool: "preview_open",
		257	result: { structuredContent: { url: "https://example.com/" } },
		258	},
		259	},
		260	{
		261	toolName: "mcp__t3-code__preview_navigate",
		262	result: { content: '{"url":"https://example.com/"}' },
		263	},
		264	{ tool: "t3-code_preview_status", state: { output: '{"url":"https://example.com/"}' } },
		265	{
		266	toolName: "mcp__t3_code__preview_snapshot",
		267	result: {
		268	content: [
		269	{ type: "text", text: '{"url":"https://example.com/"}' },
		270	{ type: "text", text: "Snapshot text was bounded. Omitted: accessibilityTree." },
		271	],
		272	},
		273	},
		274	{
		275	toolName: "mcp__t3-code__preview_click",
		276	result: { content: '{"toolIcon":{"_tag":"website","pageUrl":"https://example.com/"}}' },
		277	},
		278	{
		279	toolName: "mcp__t3_code__preview_snapshot",
		280	result: { content: '{"url":"https://example.com/"}\n{"accessibilityTree":"truncated' },
		281	},
		282	...[false, true].map((truncated) => ({
		283	toolName: "mcp__t3_code__preview_snapshot",
		284	result: {
		285	content: JSON.stringify({
		286	content: [{ type: "text", text: '{"url":"https://example.com/"}' }],
		287	structuredContent: { url: "https://example.com/", visibleText: "page" },
		288	}).slice(0, truncated ? -5 : undefined),
		289	},
		290	})),
		291	...[
		292	"type",
		293	"press",
		294	"scroll",
		295	"resize",
		296	"set_appearance",
		297	"evaluate",
		298	"wait_for",
		299	"recording_start",
		300	"recording_stop",
		301	].map((action) => ({
		302	toolName: `mcp__t3_code__preview_${action}`,
		303	result: { content: '{"toolIcon":{"_tag":"website","pageUrl":"https://example.com/"}}' },
		304	})),
		305	])("preserves the preview page favicon through result slimming", (data) => {
		306	const projected = projectActivityPayload(activity({ itemType: "mcp_tool_call", data }));
		307	const icon = { _tag: "website", pageUrl: "https://example.com/" };
		308	expect(projected.payload).toMatchObject({ toolIcon: icon });
		309	expect(projectActivityPayload(projected).payload).toMatchObject({ toolIcon: icon });
		310	});
		311
		312	it.each([
		313	{ toolName: "mcp__other__preview_open", result: { content: '{"url":"https://example.com/"}' } },
		314	{
		315	toolName: "mcp__t3-code__preview_evaluate",
		316	result: { content: '{"url":"https://example.com/"}' },
		317	},
		318	{
		319	toolName: "mcp__t3-code__preview_open",
		320	result: { isError: true, content: '{"url":"https://example.com/"}' },
		321	},
		322	{ toolName: "mcp__t3-code__preview_open", result: { content: "malformed JSON" } },
		323	{ toolName: "mcp__t3-code__preview_open", result: { content: '{"url":"about:blank"}' } },
		324	])("keeps the fallback for unrelated tools, failed navigation, and missing page URLs", (data) => {
		325	expect(
		326	projectActivityPayload(activity({ itemType: "mcp_tool_call", data })).payload,
		327	).not.toHaveProperty("toolIcon");
		328	});
		329
252	it("passes task lifecycle payloads (no data field) through untouched", () => {	330	it("passes task lifecycle payloads (no data field) through untouched", () => {
253	const source = activity({	331	const source = activity({
254	taskId: "task-9",	332	taskId: "task-9",

apps/server/src/orchestration/ActivityPayloadProjection.ts+70−1

@@ -5,6 +5,7 @@ import type { · 4 unmodified lines
5	OrchestrationThreadDetailSnapshot,	5	OrchestrationThreadDetailSnapshot,
6	} from "@t3tools/contracts";	6	} from "@t3tools/contracts";
7	import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";	7	import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
		8	import { extractJsonObject } from "@t3tools/shared/schemaJson";
8		9
9	function asRecord(value: unknown): Record<string, unknown> \| null {	10	function asRecord(value: unknown): Record<string, unknown> \| null {
10	return value !== null && typeof value === "object" && !Array.isArray(value)	11	return value !== null && typeof value === "object" && !Array.isArray(value)
@@ -241,6 +242,70 @@ function summarizeMcpResult(result: unknown): Record<string, unknown> \| undefine · 230 unmodified lines
241	return summary ? { content: summary } : undefined;	242	return summary ? { content: summary } : undefined;
242	}	243	}
243		244
		245	/** Reuse the page URL already returned by preview tools before slimming their output. */
		246	function projectPreviewToolMetadata(data: Record<string, unknown>, status: unknown) {
		247	const item = asRecord(data.item);
		248	const name = item ? `mcp__${item.server}__${item.tool}` : (data.toolName ?? data.tool);
		249	if (
		250	typeof name !== "string" \|\|
		251	!/^(?:mcp__)?(?:t3-code\|t3_code\|t3code)_{1,2}preview_(?:open\|navigate\|status\|snapshot\|click\|type\|press\|scroll\|resize\|set_appearance\|evaluate\|wait_for\|recording_start\|recording_stop)$/.test(
		252	name,
		253	)
		254	)
		255	return {};
		256	const state = asRecord(data.state);
		257	const result = item?.result ?? data.result ?? state?.output;
		258	const record = asRecord(result);
		259	if (
		260	status === "failed" \|\|
		261	status === "declined" \|\|
		262	state?.status === "error" \|\|
		263	item?.error != null \|\|
		264	record?.isError === true \|\|
		265	record?.is_error === true
		266	)
		267	return {};
		268
		269	let page = record;
		270	let output: unknown = result;
		271	for (let depth = 0; depth < 3; depth += 1) {
		272	if (page?.isError === true \|\| page?.is_error === true) return {};
		273	const structured = asRecord(page?.structuredContent);
		274	if (structured) {
		275	page = structured;
		276	break;
		277	}
		278	const text = extractMcpResultText(output)?.slice(0, 2 * 1024 * 1024);
		279	if (!text) break;
		280	try {
		281	page = asRecord(JSON.parse(extractJsonObject(text)));
		282	} catch {
		283	// A truncated MCP envelope can still contain a complete first text block.
		284	const firstBlock = /^\s\{\s"content"\s:\s\[\s*/.exec(text);
		285	if (!firstBlock) return {};
		286	try {
		287	const block = asRecord(JSON.parse(extractJsonObject(text.slice(firstBlock[0].length))));
		288	page = block?.type === "text" ? { content: [block] } : null;
		289	} catch {
		290	return {};
		291	}
		292	}
		293	output = page;
		294	}
		295	const rawUrl = asTrimmedString(
		296	asRecord(page?.toolIcon)?.pageUrl ??
		297	(/preview_(?:open\|navigate\|status\|snapshot)$/.test(name) ? page?.url : undefined),
		298	);
		299	if (!rawUrl \|\| rawUrl.length > 4096) return {};
		300	try {
		301	const url = new URL(rawUrl);
		302	if (url.protocol !== "http:" && url.protocol !== "https:") return {};
		303	return { toolIcon: { _tag: "website", pageUrl: url.href } };
		304	} catch {
		305	return {};
		306	}
		307	}
		308
244	/**	309	/**
245	* MCP tool calls carry full tool results (`data.item.result` on Codex,	310	* MCP tool calls carry full tool results (`data.item.result` on Codex,
246	* `data.result` on Claude/OpenCode) that used to bypass slimming entirely to	311	* `data.result` on Claude/OpenCode) that used to bypass slimming entirely to
@@ -367,10 +432,14 @@ export function projectActivityPayload( · 120 unmodified lines
367	}	432	}
368		433
369	const itemStatus = asRecord(data.item)?.status;	434	const itemStatus = asRecord(data.item)?.status;
370	const projectedPayload =	435	const statusPayload =
371	payload.status === "completed" && (itemStatus === "failed" \|\| itemStatus === "declined")	436	payload.status === "completed" && (itemStatus === "failed" \|\| itemStatus === "declined")
372	? { ...payload, status: itemStatus }	437	? { ...payload, status: itemStatus }
373	: payload;	438	: payload;
		439	const projectedPayload = {
		440	...projectPreviewToolMetadata(data, statusPayload.status),
		441	...statusPayload,
		442	};
374	const questionInput = projectQuestionToolInput(data, payload.title);	443	const questionInput = projectQuestionToolInput(data, payload.title);
375		444
376	if (payload.itemType === "mcp_tool_call") {	445	if (payload.itemType === "mcp_tool_call") {

fix(preview): render website favicons for browser tool activity (#11032)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code