TOONify test response, not structuredContent.

Author: Piotr Paulski

src/McpResponse.ts

@@ -17,7 +17,7 @@ import type {McpContext} from './McpContext.js';
 import type {McpPage} from './McpPage.js';
 import {UncaughtError} from './PageCollector.js';
 import {TextSnapshot} from './TextSnapshot.js';
-import {DevTools, type Protocol} from './third_party/index.js';
+import {DevTools, toonEncode, type Protocol} from './third_party/index.js';
 import type {
   ConsoleMessage,
   ImageContent,
@@ -456,6 +456,7 @@ export class McpResponse implements Response {
   async handle(
     toolName: string,
     context: McpContext,
+    useToon: boolean = false,
   ): Promise<{
     content: Array<TextContent | ImageContent>;
     structuredContent: object;
@@ -687,7 +688,7 @@ export class McpResponse implements Response {
       thirdPartyDeveloperTools,
       webmcpTools,
       errorMessage: this.#error?.message,
-    });
+    }, useToon);
   }
 
   format(
@@ -707,6 +708,7 @@ export class McpResponse implements Response {
       webmcpTools?: WebMCPTool[];
       errorMessage?: string;
     },
+    useToon: boolean,
   ): {content: Array<TextContent | ImageContent>; structuredContent: object} {
     const structuredContent: {
       snapshot?: object;
@@ -953,9 +955,9 @@ Call ${handleDialog.name} to handle it before continuing.`);
         response.push(`Saved snapshot to ${data.snapshot}.`);
         structuredContent.snapshotFilePath = data.snapshot;
       } else {
-        response.push('## Latest page snapshot');
-        response.push(data.snapshot.toString());
         structuredContent.snapshot = data.snapshot.toJSON();
+        response.push('## Latest page snapshot');
+        response.push(useToon ? toonEncode(structuredContent.snapshot) : data.snapshot.toString());
       }
     }
 
@@ -988,8 +990,8 @@ Call ${handleDialog.name} to handle it before continuing.`);
         const paginatedRecord = Object.fromEntries(paginationData.items);
         const formatter = new HeapSnapshotFormatter(paginatedRecord);
 
-        response.push(formatter.toString());
         structuredContent.heapSnapshotData = formatter.toJSON();
+        response.push(useToon ? toonEncode(structuredContent.heapSnapshotData) : formatter.toString());
       }
       const nodes = this.#heapSnapshotOptions.nodes;
       if (nodes) {
@@ -1111,9 +1113,10 @@ Call ${handleDialog.name} to handle it before continuing.`);
         if (data.networkRequests) {
           structuredContent.networkRequests = [];
           for (const formatter of paginationData.items) {
-            response.push(formatter.toString());
             structuredContent.networkRequests.push(formatter.toJSON());
+            if (!useToon) response.push(formatter.toString());
           }
+          if (useToon) response.push(toonEncode(structuredContent.networkRequests));
         }
       } else {
         response.push('No requests found.');
@@ -1131,11 +1134,15 @@ Call ${handleDialog.name} to handle it before continuing.`);
           this.#consoleDataOptions.pagination,
         );
         structuredContent.pagination = paginationData.pagination;
-        response.push(...paginationData.info);
-        response.push(...paginationData.items.map(item => item.toString()));
         structuredContent.consoleMessages = paginationData.items.map(item =>
           item.toJSON(),
         );
+        response.push(...paginationData.info);
+        if (useToon) {
+          response.push(toonEncode(structuredContent.consoleMessages));
+        } else {
+          response.push(...paginationData.items.map(item => item.toString()));
+        }
       } else {
         response.push('<no console messages found>');
       }

src/ToolHandler.ts

@@ -256,6 +256,7 @@ export class ToolHandler {
       const {content, structuredContent} = await response.handle(
         this.tool.name,
         context,
+        this.serverArgs.experimentalToonFormat ?? false,
       );
       const result: CallToolResult & {
         structuredContent?: Record<string, unknown>;
@@ -267,11 +268,7 @@ export class ToolHandler {
       }
       success = true;
       if (this.serverArgs.experimentalStructuredContent) {
-        if (this.serverArgs.experimentalStructuredContentFormat === 'toon') {
-          result.structuredContent = { format: 'toon', data: toonEncode(structuredContent)};
-        } else {
-          result.structuredContent = structuredContent as Record<string, unknown>;
-        }
+        result.structuredContent = structuredContent as Record<string, unknown>;
       }
       return result;
     } catch (err) {

src/bin/chrome-devtools-mcp-cli-options.ts

@@ -169,10 +169,9 @@ export const cliOptions = {
     type: 'boolean',
     describe: 'Whether to output structured formatted content.',
   },
-  experimentalStructuredContentFormat: {
-    type: 'string',
-    describe: 'The format of the structured content. Defaults to "json".',
-    choices: ['toon', 'json'] as const,
+  experimentalToonFormat: {
+    type: 'boolean',
+    describe: 'Whether to format structured data in text response using Token-Oriented Object Notation. Defaults to false which represents the embedded content as formatted JSON instead.',
     hidden: true,
   },
   experimentalIncludeAllPages: {
@@ -316,20 +315,6 @@ export function parseArguments(
         );
         args.usageStatistics = false;
       }
-      if (args.experimentalStructuredContentFormat && args.experimentalStructuredContent === undefined) {
-        args.experimentalStructuredContent = true;
-      }
-      if (args.experimentalStructuredContentFormat === undefined && args.experimentalStructuredContent) {
-        args.experimentalStructuredContentFormat = 'json';
-      }
-    })
-    .check(args => {
-      if (args.experimentalStructuredContentFormat && !args.experimentalStructuredContent) {
-        throw new Error(
-          'The --experimentalStructuredContentFormat option can only be used when --experimentalStructuredContent is enabled.'
-        );
-      }
-      return true;
     })
     .example([
       [