revert(web-integration): remove MCP session changes and createExportSessionReportTool (#2151)

Revert all MCP-related session persistence modifications across platforms
(android, computer, harmony, ios, web, web-puppeteer) and shared MCP
infrastructure. Remove createExportSessionReportTool and its export.
These will be submitted in a separate PR.

https://claude.ai/code/session_01S1H1TfbYsvLbgCm95qHgRN

Co-authored-by: Claude <noreply@anthropic.com>

Author: ottomao

packages/android/src/mcp-tools.ts

@@ -1,8 +1,4 @@
-import {
-  createExportSessionReportTool,
-  createSessionAgentOptions,
-  z,
-} from '@midscene/core';
+import { z } from '@midscene/core';
 import { getDebug } from '@midscene/shared/logger';
 import { BaseMidsceneTools, type ToolDefinition } from '@midscene/shared/mcp';
 import { type AndroidAgent, agentFromAdbDevice } from './agent';
@@ -21,15 +17,8 @@ export class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
     return new AndroidDevice('temp-for-action-space', {});
   }
 
-  protected async ensureAgent(
-    deviceId?: string,
-    options?: { sessionId?: string },
-  ): Promise<AndroidAgent> {
-    const sessionId = options?.sessionId;
-    if (
-      this.agent &&
-      (deviceId || this.shouldResetAgentForSession(sessionId))
-    ) {
+  protected async ensureAgent(deviceId?: string): Promise<AndroidAgent> {
+    if (this.agent && deviceId) {
       // If a specific deviceId is requested and we have an agent,
       // destroy it to create a new one with the new device
       try {
@@ -45,13 +34,8 @@ export class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
     }
 
     debug('Creating Android agent with deviceId:', deviceId || 'auto-detect');
-    const sessionOptions = createSessionAgentOptions({
-      sessionId,
-      platform: 'android',
-    });
     const agent = await agentFromAdbDevice(deviceId, {
       autoDismissKeyboard: false,
-      ...sessionOptions,
     });
     this.agent = agent;
     return agent;
@@ -72,18 +56,15 @@ export class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
             .optional()
             .describe('Android device ID (from adb devices)'),
         },
-        handler: async (args: { deviceId?: string; sessionId?: string }) => {
-          const agent = await this.ensureAgent(
-            args.deviceId,
-            this.getAgentOptions(args as Record<string, unknown>),
-          );
+        handler: async ({ deviceId }: { deviceId?: string }) => {
+          const agent = await this.ensureAgent(deviceId);
           const screenshot = await agent.page.screenshotBase64();
 
           return {
             content: [
               {
                 type: 'text',
-                text: `Connected to Android device${args.deviceId ? `: ${args.deviceId}` : ' (auto-detected)'}`,
+                text: `Connected to Android device${deviceId ? `: ${deviceId}` : ' (auto-detected)'}`,
               },
               ...this.buildScreenshotContent(screenshot),
             ],
@@ -98,7 +79,6 @@ export class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
         schema: {},
         handler: this.createDisconnectHandler('Android device'),
       },
-      createExportSessionReportTool(),
     ];
   }
 }

packages/computer/src/mcp-tools.ts

@@ -1,8 +1,4 @@
-import {
-  createExportSessionReportTool,
-  createSessionAgentOptions,
-  z,
-} from '@midscene/core';
+import { z } from '@midscene/core';
 import { getDebug } from '@midscene/shared/logger';
 import { BaseMidsceneTools, type ToolDefinition } from '@midscene/shared/mcp';
 import { type ComputerAgent, agentFromComputer } from './agent';
@@ -22,14 +18,9 @@ export class ComputerMidsceneTools extends BaseMidsceneTools<ComputerAgent> {
 
   protected async ensureAgent(
     displayId?: string,
-    options?: { sessionId?: string; headless?: boolean },
+    headless?: boolean,
   ): Promise<ComputerAgent> {
-    const sessionId = options?.sessionId;
-    const headless = options?.headless;
-    if (
-      this.agent &&
-      (displayId || this.shouldResetAgentForSession(sessionId))
-    ) {
+    if (this.agent && displayId) {
       // If a specific displayId is requested and we have an agent,
       // destroy it to create a new one with the new display
       try {
@@ -45,14 +36,9 @@ export class ComputerMidsceneTools extends BaseMidsceneTools<ComputerAgent> {
     }
 
     debug('Creating Computer agent with displayId:', displayId || 'primary');
-    const sessionOptions = createSessionAgentOptions({
-      sessionId,
-      platform: 'computer',
-    });
     const opts = {
       ...(displayId ? { displayId } : {}),
       ...(headless !== undefined ? { headless } : {}),
-      ...sessionOptions,
     };
     const agent = await agentFromComputer(
       Object.keys(opts).length > 0 ? opts : undefined,
@@ -80,22 +66,18 @@ export class ComputerMidsceneTools extends BaseMidsceneTools<ComputerAgent> {
             .optional()
             .describe('Start virtual display via Xvfb (Linux only)'),
         },
-        handler: async (args: {
-          displayId?: string;
-          headless?: boolean;
-          sessionId?: string;
-        }) => {
-          const agent = await this.ensureAgent(args.displayId, {
-            ...this.getAgentOptions(args as Record<string, unknown>),
-            headless: args.headless,
-          });
+        handler: async ({
+          displayId,
+          headless,
+        }: { displayId?: string; headless?: boolean }) => {
+          const agent = await this.ensureAgent(displayId, headless);
           const screenshot = await agent.interface.screenshotBase64();
 
           return {
             content: [
               {
                 type: 'text',
-                text: `Connected to computer${args.displayId ? ` (Display: ${args.displayId})` : ' (Primary display)'}`,
+                text: `Connected to computer${displayId ? ` (Display: ${displayId})` : ' (Primary display)'}`,
               },
               ...this.buildScreenshotContent(screenshot),
             ],
@@ -108,7 +90,6 @@ export class ComputerMidsceneTools extends BaseMidsceneTools<ComputerAgent> {
         schema: {},
         handler: this.createDisconnectHandler('computer'),
       },
-      createExportSessionReportTool(),
       {
         name: 'computer_list_displays',
         description: 'List all available displays/monitors',

packages/core/src/execution-report.ts

@@ -4,7 +4,6 @@ import {
   globalConfigManager,
 } from '@midscene/shared/env';
 import { logMsg } from '@midscene/shared/utils';
-import { z } from 'zod';
 import { ExecutionStore } from './execution-store';
 import { reportHTMLContent } from './utils';
 
@@ -24,40 +23,3 @@ export function exportSessionReport(
 
   return reportPath;
 }
-
-/**
- * Create a platform-agnostic MCP tool definition for exporting session reports.
- * Eliminates the need for each platform to duplicate the same handler.
- */
-export function createExportSessionReportTool() {
-  return {
-    name: 'export_session_report',
-    description: 'Generate a merged HTML report from a persisted session',
-    schema: {
-      sessionId: z.string().describe('Persistent session ID to export'),
-    },
-    handler: async (args: { sessionId?: string }) => {
-      const { sessionId } = args;
-      if (typeof sessionId !== 'string' || !sessionId) {
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: 'sessionId is required to export a session report',
-            },
-          ],
-          isError: true,
-        };
-      }
-      const reportPath = exportSessionReport(sessionId);
-      return {
-        content: [
-          {
-            type: 'text' as const,
-            text: `Session report generated: ${reportPath}`,
-          },
-        ],
-      };
-    },
-  };
-}

packages/core/src/index.ts

@@ -64,15 +64,12 @@ export {
 } from './dump';
 
 // Execution persistence & report
-export { ExecutionStore, createSessionAgentOptions } from './execution-store';
+export { ExecutionStore } from './execution-store';
 export type {
   SessionRecord,
   EnsureSessionRecordInput,
 } from './execution-store';
-export {
-  exportSessionReport,
-  createExportSessionReportTool,
-} from './execution-report';
+export { exportSessionReport } from './execution-report';
 
 // ScreenshotItem
 export { ScreenshotItem } from './screenshot-item';

packages/harmony/src/mcp-tools.ts

@@ -1,8 +1,4 @@
-import {
-  createExportSessionReportTool,
-  createSessionAgentOptions,
-  z,
-} from '@midscene/core';
+import { z } from '@midscene/core';
 import { getDebug } from '@midscene/shared/logger';
 import { BaseMidsceneTools, type ToolDefinition } from '@midscene/shared/mcp';
 import { type HarmonyAgent, agentFromHdcDevice } from './agent';
@@ -15,15 +11,8 @@ export class HarmonyMidsceneTools extends BaseMidsceneTools<HarmonyAgent> {
     return new HarmonyDevice('temp-for-action-space', {});
   }
 
-  protected async ensureAgent(
-    deviceId?: string,
-    options?: { sessionId?: string },
-  ): Promise<HarmonyAgent> {
-    const sessionId = options?.sessionId;
-    if (
-      this.agent &&
-      (deviceId || this.shouldResetAgentForSession(sessionId))
-    ) {
+  protected async ensureAgent(deviceId?: string): Promise<HarmonyAgent> {
+    if (this.agent && deviceId) {
       try {
         await this.agent.destroy?.();
       } catch (error) {
@@ -37,13 +26,8 @@ export class HarmonyMidsceneTools extends BaseMidsceneTools<HarmonyAgent> {
     }
 
     debug('Creating Harmony agent with deviceId:', deviceId || 'auto-detect');
-    const sessionOptions = createSessionAgentOptions({
-      sessionId,
-      platform: 'harmony',
-    });
     const agent = await agentFromHdcDevice(deviceId, {
       autoDismissKeyboard: false,
-      ...sessionOptions,
     });
     this.agent = agent;
     return agent;
@@ -61,18 +45,15 @@ export class HarmonyMidsceneTools extends BaseMidsceneTools<HarmonyAgent> {
             .optional()
             .describe('HarmonyOS device ID (from hdc list targets)'),
         },
-        handler: async (args: { deviceId?: string; sessionId?: string }) => {
-          const agent = await this.ensureAgent(
-            args.deviceId,
-            this.getAgentOptions(args as Record<string, unknown>),
-          );
+        handler: async ({ deviceId }: { deviceId?: string }) => {
+          const agent = await this.ensureAgent(deviceId);
           const screenshot = await agent.page.screenshotBase64();
 
           return {
             content: [
               {
                 type: 'text',
-                text: `Connected to HarmonyOS device${args.deviceId ? `: ${args.deviceId}` : ' (auto-detected)'}`,
+                text: `Connected to HarmonyOS device${deviceId ? `: ${deviceId}` : ' (auto-detected)'}`,
               },
               ...this.buildScreenshotContent(screenshot),
             ],
@@ -87,7 +68,6 @@ export class HarmonyMidsceneTools extends BaseMidsceneTools<HarmonyAgent> {
         schema: {},
         handler: this.createDisconnectHandler('HarmonyOS device'),
       },
-      createExportSessionReportTool(),
     ];
   }
 }

packages/ios/src/mcp-tools.ts

@@ -1,7 +1,3 @@
-import {
-  createExportSessionReportTool,
-  createSessionAgentOptions,
-} from '@midscene/core';
 import { getDebug } from '@midscene/shared/logger';
 import { BaseMidsceneTools, type ToolDefinition } from '@midscene/shared/mcp';
 import { type IOSAgent, agentFromWebDriverAgent } from './agent';
@@ -20,33 +16,14 @@ export class IOSMidsceneTools extends BaseMidsceneTools<IOSAgent> {
     return new IOSDevice({});
   }
 
-  protected async ensureAgent(
-    _unused?: string,
-    options?: { sessionId?: string },
-  ): Promise<IOSAgent> {
-    const sessionId = options?.sessionId;
-
-    if (this.agent && this.shouldResetAgentForSession(sessionId)) {
-      try {
-        await this.agent.destroy?.();
-      } catch (error) {
-        debug('Failed to destroy agent during cleanup:', error);
-      }
-      this.agent = undefined;
-    }
-
+  protected async ensureAgent(): Promise<IOSAgent> {
     if (this.agent) {
       return this.agent;
     }
 
     debug('Creating iOS agent with WebDriverAgent');
-    const sessionOptions = createSessionAgentOptions({
-      sessionId,
-      platform: 'ios',
-    });
     this.agent = await agentFromWebDriverAgent({
       autoDismissKeyboard: false,
-      ...sessionOptions,
     });
     return this.agent;
   }
@@ -60,11 +37,8 @@ export class IOSMidsceneTools extends BaseMidsceneTools<IOSAgent> {
         name: 'ios_connect',
         description: 'Connect to iOS device or simulator via WebDriverAgent',
         schema: {},
-        handler: async (args: { sessionId?: string }) => {
-          const agent = await this.ensureAgent(
-            undefined,
-            this.getAgentOptions(args as Record<string, unknown>),
-          );
+        handler: async () => {
+          const agent = await this.ensureAgent();
           const screenshot = await agent.page.screenshotBase64();
 
           return {
@@ -86,7 +60,6 @@ export class IOSMidsceneTools extends BaseMidsceneTools<IOSAgent> {
         schema: {},
         handler: this.createDisconnectHandler('iOS device'),
       },
-      createExportSessionReportTool(),
     ];
   }
 }