@midscene/shared 1.0.1-beta-20251208070218.0 → 1.0.1-beta-20251208075922.0

package/dist/es/mcp/inject-report-html-plugin.mjs

@@ -12,9 +12,20 @@ function injectReportHtmlFromCore(packageDir) {
                 if (!node_fs.existsSync(coreUtilsPath)) return void console.warn('[inject-report-html] @midscene/core dist not found, skipping');
                 const coreContent = node_fs.readFileSync(coreUtilsPath, 'utf-8');
                 if (!coreContent.includes(REPLACED_MARK)) return void console.warn('[inject-report-html] HTML not found in core dist. Ensure report builds first.');
-                const match = coreContent.match(/\/\*REPORT_HTML_REPLACED\*\/(".*?")/);
-                if (!match?.[1]) return void console.warn('[inject-report-html] Failed to extract HTML from core');
-                const finalContent = `${REPLACED_MARK}${match[1]}`;
+                const markerIndex = coreContent.indexOf(REPLACED_MARK);
+                const jsonStart = markerIndex + REPLACED_MARK.length;
+                let jsonEnd = jsonStart;
+                if ('"' === coreContent[jsonStart]) {
+                    jsonEnd = jsonStart + 1;
+                    while(jsonEnd < coreContent.length)if ('\\' === coreContent[jsonEnd]) jsonEnd += 2;
+                    else if ('"' === coreContent[jsonEnd]) {
+                        jsonEnd += 1;
+                        break;
+                    } else jsonEnd += 1;
+                }
+                const jsonString = coreContent.slice(jsonStart, jsonEnd);
+                if (!jsonString || jsonString.length < 10) return void console.warn('[inject-report-html] Failed to extract HTML from core');
+                const finalContent = `${REPLACED_MARK}${jsonString}`;
                 const distDir = node_path.join(packageDir, 'dist');
                 if (!node_fs.existsSync(distDir)) return;
                 const jsFiles = node_fs.readdirSync(distDir).filter((f)=>f.endsWith('.js'));

package/dist/lib/mcp/inject-report-html-plugin.js

@@ -51,9 +51,20 @@ function injectReportHtmlFromCore(packageDir) {
                 if (!external_node_fs_default().existsSync(coreUtilsPath)) return void console.warn('[inject-report-html] @midscene/core dist not found, skipping');
                 const coreContent = external_node_fs_default().readFileSync(coreUtilsPath, 'utf-8');
                 if (!coreContent.includes(REPLACED_MARK)) return void console.warn('[inject-report-html] HTML not found in core dist. Ensure report builds first.');
-                const match = coreContent.match(/\/\*REPORT_HTML_REPLACED\*\/(".*?")/);
-                if (!match?.[1]) return void console.warn('[inject-report-html] Failed to extract HTML from core');
-                const finalContent = `${REPLACED_MARK}${match[1]}`;
+                const markerIndex = coreContent.indexOf(REPLACED_MARK);
+                const jsonStart = markerIndex + REPLACED_MARK.length;
+                let jsonEnd = jsonStart;
+                if ('"' === coreContent[jsonStart]) {
+                    jsonEnd = jsonStart + 1;
+                    while(jsonEnd < coreContent.length)if ('\\' === coreContent[jsonEnd]) jsonEnd += 2;
+                    else if ('"' === coreContent[jsonEnd]) {
+                        jsonEnd += 1;
+                        break;
+                    } else jsonEnd += 1;
+                }
+                const jsonString = coreContent.slice(jsonStart, jsonEnd);
+                if (!jsonString || jsonString.length < 10) return void console.warn('[inject-report-html] Failed to extract HTML from core');
+                const finalContent = `${REPLACED_MARK}${jsonString}`;
                 const distDir = external_node_path_default().join(packageDir, 'dist');
                 if (!external_node_fs_default().existsSync(distDir)) return;
                 const jsFiles = external_node_fs_default().readdirSync(distDir).filter((f)=>f.endsWith('.js'));

package/dist/types/mcp/base-tools.d.ts

@@ -1,8 +1,12 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { BaseAgent, BaseDevice, IMidsceneTools, ToolDefinition } from './types';
-export declare abstract class BaseMidsceneTools implements IMidsceneTools {
+/**
+ * Base class for platform-specific MCP tools
+ * Generic type TAgent allows subclasses to use their specific agent types
+ */
+export declare abstract class BaseMidsceneTools<TAgent extends BaseAgent = BaseAgent> implements IMidsceneTools {
     protected mcpServer?: McpServer;
-    protected agent?: BaseAgent;
+    protected agent?: TAgent;
     protected toolDefinitions: ToolDefinition[];
     /**
      * Ensure agent is initialized and ready for use.
@@ -11,7 +15,7 @@ export declare abstract class BaseMidsceneTools implements IMidsceneTools {
      * @returns Promise resolving to initialized agent instance
      * @throws Error if agent initialization fails
      */
-    protected abstract ensureAgent(initParam?: string): Promise<BaseAgent>;
+    protected abstract ensureAgent(initParam?: string): Promise<TAgent>;
     /**
      * Optional: prepare platform-specific tools (e.g., device connection)
      */

package/dist/types/mcp/types.d.ts

@@ -72,6 +72,7 @@ export interface ActionSpaceItem {
 /**
  * Base agent interface
  * Represents a platform-specific agent (Android, iOS, Web)
+ * Note: Return types use `unknown` for compatibility with platform-specific implementations
  */
 export interface BaseAgent {
     getActionSpace(): Promise<ActionSpaceItem[]>;
@@ -79,8 +80,8 @@ export interface BaseAgent {
     page?: {
         screenshotBase64(): Promise<string>;
     };
-    aiAction?: (description: string, params?: Record<string, unknown>) => Promise<void>;
-    aiWaitFor?: (assertion: string, options: Record<string, unknown>) => Promise<void>;
+    aiAction?: (description: string, params?: Record<string, unknown>) => Promise<unknown>;
+    aiWaitFor?: (assertion: string, options: Record<string, unknown>) => Promise<unknown>;
 }
 /**
  * Base device interface for temporary device instances

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/shared",
-  "version": "1.0.1-beta-20251208070218.0",
+  "version": "1.0.1-beta-20251208075922.0",
   "repository": "https://github.com/web-infra-dev/midscene",
   "homepage": "https://midscenejs.com/",
   "types": "./dist/types/index.d.ts",

package/src/mcp/base-tools.ts

@@ -15,9 +15,15 @@ import type {
 
 const debug = getDebug('mcp:base-tools');
 
-export abstract class BaseMidsceneTools implements IMidsceneTools {
+/**
+ * Base class for platform-specific MCP tools
+ * Generic type TAgent allows subclasses to use their specific agent types
+ */
+export abstract class BaseMidsceneTools<TAgent extends BaseAgent = BaseAgent>
+  implements IMidsceneTools
+{
   protected mcpServer?: McpServer;
-  protected agent?: BaseAgent;
+  protected agent?: TAgent;
   protected toolDefinitions: ToolDefinition[] = [];
 
   /**
@@ -27,7 +33,7 @@ export abstract class BaseMidsceneTools implements IMidsceneTools {
    * @returns Promise resolving to initialized agent instance
    * @throws Error if agent initialization fails
    */
-  protected abstract ensureAgent(initParam?: string): Promise<BaseAgent>;
+  protected abstract ensureAgent(initParam?: string): Promise<TAgent>;
 
   /**
    * Optional: prepare platform-specific tools (e.g., device connection)

package/src/mcp/inject-report-html-plugin.ts

@@ -48,13 +48,34 @@ export function injectReportHtmlFromCore(packageDir: string) {
           return;
         }
 
-        const match = coreContent.match(/\/\*REPORT_HTML_REPLACED\*\/(".*?")/);
-        if (!match?.[1]) {
+        // Extract the JSON string after the marker
+        // JSON strings can contain escaped quotes, so we need to properly parse it
+        const markerIndex = coreContent.indexOf(REPLACED_MARK);
+        const jsonStart = markerIndex + REPLACED_MARK.length;
+
+        // Find the end of the JSON string by tracking quote escaping
+        let jsonEnd = jsonStart;
+        if (coreContent[jsonStart] === '"') {
+          jsonEnd = jsonStart + 1;
+          while (jsonEnd < coreContent.length) {
+            if (coreContent[jsonEnd] === '\\') {
+              jsonEnd += 2; // Skip escaped character
+            } else if (coreContent[jsonEnd] === '"') {
+              jsonEnd += 1; // Include closing quote
+              break;
+            } else {
+              jsonEnd += 1;
+            }
+          }
+        }
+
+        const jsonString = coreContent.slice(jsonStart, jsonEnd);
+        if (!jsonString || jsonString.length < 10) {
           console.warn('[inject-report-html] Failed to extract HTML from core');
           return;
         }
 
-        const finalContent = `${REPLACED_MARK}${match[1]}`;
+        const finalContent = `${REPLACED_MARK}${jsonString}`;
         const distDir = path.join(packageDir, 'dist');
 
         if (!fs.existsSync(distDir)) return;

package/src/mcp/types.ts

@@ -72,6 +72,7 @@ export interface ActionSpaceItem {
 /**
  * Base agent interface
  * Represents a platform-specific agent (Android, iOS, Web)
+ * Note: Return types use `unknown` for compatibility with platform-specific implementations
  */
 export interface BaseAgent {
   getActionSpace(): Promise<ActionSpaceItem[]>;
@@ -82,11 +83,11 @@ export interface BaseAgent {
   aiAction?: (
     description: string,
     params?: Record<string, unknown>,
-  ) => Promise<void>;
+  ) => Promise<unknown>;
   aiWaitFor?: (
     assertion: string,
     options: Record<string, unknown>,
-  ) => Promise<void>;
+  ) => Promise<unknown>;
 }
 
 /**