@xcanwin/manyoyo 5.11.7 → 5.11.9

package/lib/plugin/playwright.js

@@ -16,7 +16,7 @@ const EXTENSIONS = [
     ['webgl-fingerprint-defender', 'olnbjpaejebpnokblkepbphhembdicik']
 ];
 
-const SCENE_ORDER = ['mcp-cont-headless', 'mcp-cont-headed', 'mcp-host-headless', 'mcp-host-headed', 'cli-host-headless', 'cli-host-headed'];
+const SCENE_ORDER = ['mcp-cont-headless', 'mcp-cont-headed', 'mcp-host-headless', 'mcp-host-headed', 'cli-host-headless', 'cli-host-headed', 'dev-host-headed'];
 
 const SCENE_DEFS = {
     'mcp-cont-headless': {
@@ -72,6 +72,12 @@ const SCENE_DEFS = {
         portKey: 'cliHostHeaded',
         headless: false,
         listenHost: '0.0.0.0'
+    },
+    'dev-host-headed': {
+        type: 'host',
+        engine: 'dev',
+        configFile: 'dev-host-headed.json',
+        headless: false
     }
 };
 
@@ -96,6 +102,14 @@ function isCliScene(sceneName) {
     return Boolean(SCENE_DEFS[sceneName] && SCENE_DEFS[sceneName].engine === 'cli');
 }
 
+function isDevScene(sceneName) {
+    return Boolean(SCENE_DEFS[sceneName] && SCENE_DEFS[sceneName].engine === 'dev');
+}
+
+function isCliSessionScene(sceneName) {
+    return isCliScene(sceneName) || isDevScene(sceneName);
+}
+
 function platformFromUserAgent(userAgent) {
     const ua = String(userAgent || '').toLowerCase();
     if (ua.includes('macintosh') || ua.includes('mac os x')) {
@@ -154,6 +168,20 @@ function asBoolean(value, fallback = false) {
     return fallback;
 }
 
+function uniqueStrings(values) {
+    const out = [];
+    const seen = new Set();
+    for (const value of values) {
+        const text = String(value || '').trim();
+        if (!text || seen.has(text)) {
+            continue;
+        }
+        seen.add(text);
+        out.push(text);
+    }
+    return out;
+}
+
 function isHostPermission(value) {
     if (value === '<all_urls>') {
         return true;
@@ -305,6 +333,8 @@ class PlaywrightPlugin {
             extensionProdversion: '132.0.0.0',
             navigatorPlatform: platformFromUserAgent(DEFAULT_FINGERPRINT_PROFILE.userAgent),
             disableWebRTC: false,
+            devtoolsActivePortPath: '',
+            devtoolsCdpTimeout: 60000,
             composeDir: path.join(__dirname, 'playwright-assets'),
             ports: {
                 mcpContHeadless: 8931,
@@ -350,7 +380,10 @@ class PlaywrightPlugin {
         if (invalidScene) {
             throw new Error(`playwright.enabledScenes 包含未知场景: ${invalidScene}`);
         }
-        if (merged.cliSessionScene && !isCliScene(merged.cliSessionScene)) {
+        merged.devtoolsActivePortPath = String(merged.devtoolsActivePortPath || '').trim();
+        merged.devtoolsCdpTimeout = Number(merged.devtoolsCdpTimeout) || defaultConfig.devtoolsCdpTimeout;
+
+        if (merged.cliSessionScene && !isCliSessionScene(merged.cliSessionScene)) {
             throw new Error(`playwright.cliSessionScene 无效: ${merged.cliSessionScene}`);
         }
 
@@ -509,6 +542,62 @@ class PlaywrightPlugin {
         fs.rmSync(this.sceneCliAttachConfigPath(sceneName), { force: true });
     }
 
+    devtoolsActivePortCandidates() {
+        const homeDir = this.config.homeDir;
+        const configured = this.config.devtoolsActivePortPath;
+        return uniqueStrings([
+            configured,
+            path.join(homeDir, 'Library', 'Application Support', 'Google', 'Chrome', 'DevToolsActivePort'),
+            path.join(homeDir, 'Library', 'Application Support', 'Google', 'Chrome Canary', 'DevToolsActivePort'),
+            path.join(homeDir, 'Library', 'Application Support', 'Chromium', 'DevToolsActivePort'),
+            path.join(homeDir, 'Library', 'Application Support', 'BraveSoftware', 'Brave-Browser', 'DevToolsActivePort'),
+            path.join(homeDir, '.config', 'google-chrome', 'DevToolsActivePort'),
+            path.join(homeDir, '.config', 'chromium', 'DevToolsActivePort'),
+            path.join(homeDir, '.config', 'google-chrome-beta', 'DevToolsActivePort'),
+            path.join(homeDir, '.config', 'google-chrome-unstable', 'DevToolsActivePort'),
+            path.join(homeDir, '.config', 'BraveSoftware', 'Brave-Browser', 'DevToolsActivePort'),
+            path.join(homeDir, 'AppData', 'Local', 'Google', 'Chrome', 'User Data', 'DevToolsActivePort'),
+            path.join(homeDir, 'AppData', 'Local', 'Google', 'Chrome Beta', 'User Data', 'DevToolsActivePort'),
+            path.join(homeDir, 'AppData', 'Local', 'Google', 'Chrome SxS', 'User Data', 'DevToolsActivePort'),
+            path.join(homeDir, 'AppData', 'Local', 'Chromium', 'User Data', 'DevToolsActivePort'),
+            path.join(homeDir, 'AppData', 'Local', 'BraveSoftware', 'Brave-Browser', 'User Data', 'DevToolsActivePort')
+        ]);
+    }
+
+    parseDevToolsActivePort(content, filePath = 'DevToolsActivePort') {
+        const lines = String(content || '')
+            .split(/\r?\n/)
+            .map(line => line.trim())
+            .filter(Boolean);
+        const port = Number(lines[0]);
+        const wsPath = lines[1] || '';
+
+        if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+            throw new Error(`${filePath} 内容无效: 第一行必须是端口号`);
+        }
+        if (!wsPath.startsWith('/devtools/browser/')) {
+            throw new Error(`${filePath} 内容无效: 第二行必须是 /devtools/browser/...`);
+        }
+
+        return { port, wsPath };
+    }
+
+    readDevToolsActivePort() {
+        const candidates = this.devtoolsActivePortCandidates();
+        for (const candidate of candidates) {
+            if (!fs.existsSync(candidate)) {
+                continue;
+            }
+            const content = fs.readFileSync(candidate, 'utf8');
+            return {
+                ...this.parseDevToolsActivePort(content, candidate),
+                filePath: candidate
+            };
+        }
+
+        throw new Error(`未找到 DevToolsActivePort，请先在 Chrome 启用 remote debugging，并挂载或配置 devtoolsActivePortPath。已检查: ${candidates.join(', ')}`);
+    }
+
     sceneInitScriptPath(sceneName) {
         const configFile = path.basename(this.sceneConfigPath(sceneName), '.json');
         return path.join(this.config.configDir, `${configFile}.init.js`);
@@ -988,6 +1077,10 @@ class PlaywrightPlugin {
             return { envEntries: [], extraArgs: [], volumeEntries: [] };
         }
 
+        if (isDevScene(sceneName)) {
+            return this.buildDevHostCliSessionIntegration(dockerCmd, sceneName);
+        }
+
         const endpoint = this.readSceneEndpoint(sceneName);
         if (!endpoint || !Number.isInteger(endpoint.port) || endpoint.port <= 0 || typeof endpoint.wsPath !== 'string' || !endpoint.wsPath) {
             return { envEntries: [], extraArgs: [], volumeEntries: [] };
@@ -999,6 +1092,7 @@ class PlaywrightPlugin {
         const hostConfigPath = this.sceneCliAttachConfigPath(sceneName);
         const containerConfigPath = `/tmp/manyoyo-playwright/${sceneName}.cli-attach.json`;
         this.writeSceneCliAttachConfig(sceneName, {
+            outputDir: '/tmp/.playwright-cli',
             browser: {
                 // launch-server（非 shared）不预创建 context；remoteEndpoint 存在时
                 // playwright-cli 默认 isolated=false 会走 contexts()[0] 并报
@@ -1018,6 +1112,36 @@ class PlaywrightPlugin {
         return { envEntries, extraArgs, volumeEntries };
     }
 
+    buildDevHostCliSessionIntegration(dockerCmd, sceneName) {
+        const endpoint = this.readDevToolsActivePort();
+        const normalizedDockerCmd = String(dockerCmd || '').trim().toLowerCase();
+        const connectHost = normalizedDockerCmd === 'podman' ? 'host.containers.internal' : 'host.docker.internal';
+        const cdpEndpoint = `ws://${connectHost}:${endpoint.port}${endpoint.wsPath}`;
+        const hostConfigPath = this.sceneCliAttachConfigPath(sceneName);
+        const containerConfigPath = `/tmp/manyoyo-playwright/${sceneName}.cli-attach.json`;
+
+        this.writeSceneCliAttachConfig(sceneName, {
+            outputDir: '/tmp/.playwright-cli',
+            browser: {
+                cdpEndpoint,
+                cdpHeaders: {
+                    Host: `127.0.0.1:${endpoint.port}`
+                },
+                cdpTimeout: this.config.devtoolsCdpTimeout
+            }
+        });
+
+        const envEntries = [
+            `PLAYWRIGHT_MCP_CONFIG=${containerConfigPath}`,
+            'PW_CHROMIUM_ATTACH_TO_OTHER=1'
+        ];
+        const extraArgs = normalizedDockerCmd === 'docker'
+            ? ['--add-host', 'host.docker.internal:host-gateway']
+            : [];
+        const volumeEntries = ['--volume', `${hostConfigPath}:${containerConfigPath}:ro`];
+        return { envEntries, extraArgs, volumeEntries };
+    }
+
     async startContainer(sceneName, options = {}) {
         const runtime = this.config.containerRuntime;
         if (!this.ensureCommandAvailable(runtime)) {
@@ -1323,6 +1447,17 @@ class PlaywrightPlugin {
         return 1;
     }
 
+    startDevHost(sceneName) {
+        try {
+            const endpoint = this.readDevToolsActivePort();
+            this.writeStdout(`[up] ${sceneName} ready via DevToolsActivePort (${endpoint.filePath}, 127.0.0.1:${endpoint.port})`);
+            return 0;
+        } catch (error) {
+            this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
+            return 1;
+        }
+    }
+
     async stopHost(sceneName) {
         const pidFile = this.scenePidFile(sceneName);
         const port = this.scenePort(sceneName);
@@ -1363,6 +1498,13 @@ class PlaywrightPlugin {
         return 0;
     }
 
+    stopDevHost(sceneName) {
+        this.removeSceneEndpoint(sceneName);
+        this.removeSceneCliAttachConfig(sceneName);
+        this.writeStdout(`[down] ${sceneName} no managed process`);
+        return 0;
+    }
+
     async statusHost(sceneName) {
         const pidFile = this.scenePidFile(sceneName);
         const port = this.scenePort(sceneName);
@@ -1392,7 +1534,28 @@ class PlaywrightPlugin {
         return 0;
     }
 
+    statusDevHost(sceneName) {
+        try {
+            const endpoint = this.readDevToolsActivePort();
+            this.writeStdout(`[status] ${sceneName} configured (${endpoint.filePath}, 127.0.0.1:${endpoint.port})`);
+        } catch {
+            this.writeStdout(`[status] ${sceneName} not configured`);
+        }
+        return 0;
+    }
+
     async healthScene(sceneName) {
+        if (isDevScene(sceneName)) {
+            try {
+                const endpoint = this.readDevToolsActivePort();
+                this.writeStdout(`[health] ${sceneName} ok (DevToolsActivePort 127.0.0.1:${endpoint.port})`);
+                return 0;
+            } catch (error) {
+                this.writeStdout(`[health] ${sceneName} fail (${error.message || String(error)})`);
+                return 1;
+            }
+        }
+
         const port = this.scenePort(sceneName);
         if (await this.portReady(port)) {
             this.writeStdout(`[health] ${sceneName} ok (127.0.0.1:${port})`);
@@ -1403,6 +1566,11 @@ class PlaywrightPlugin {
     }
 
     logsHost(sceneName) {
+        if (isDevScene(sceneName)) {
+            this.writeStdout(`[logs] ${sceneName} no managed process`);
+            return 0;
+        }
+
         const logFile = this.sceneLogFile(sceneName);
         if (!fs.existsSync(logFile)) {
             this.writeStdout(`[logs] ${sceneName} no log file: ${logFile}`);
@@ -1613,6 +1781,23 @@ class PlaywrightPlugin {
 
     async runOnScene(action, sceneName, options = {}) {
         const def = SCENE_DEFS[sceneName];
+        if (isDevScene(sceneName)) {
+            if (action === 'up') {
+                return this.startDevHost(sceneName);
+            }
+            if (action === 'down') {
+                return this.stopDevHost(sceneName);
+            }
+            if (action === 'status') {
+                return this.statusDevHost(sceneName);
+            }
+            if (action === 'health') {
+                return await this.healthScene(sceneName);
+            }
+            if (action === 'logs') {
+                return this.logsHost(sceneName);
+            }
+        }
         if (action === 'up') {
             return def.type === 'container'
                 ? await this.startContainer(sceneName, options)

package/manyoyo.example.json

@@ -50,7 +50,7 @@
             // mixed: 支持容器+宿主机；container: 仅容器；host: 仅宿主机
             "runtime": "mixed",
             // 启用场景（可按需裁剪）
-            "enabledScenes": ["mcp-cont-headless", "mcp-cont-headed", "mcp-host-headless", "mcp-host-headed", "cli-host-headless", "cli-host-headed"],
+            "enabledScenes": ["mcp-cont-headless", "mcp-cont-headed", "mcp-host-headless", "mcp-host-headed", "cli-host-headless", "cli-host-headed", "dev-host-headed"],
             // my run 默认注入的 playwright-cli 宿主场景
             "cliSessionScene": "cli-host-headless",
             // mcp-add 默认 host（可改为 localhost / 127.0.0.1）
@@ -63,6 +63,10 @@
             "navigatorPlatform": "MacIntel",
             // 是否禁用 WebRTC（默认 false）
             "disableWebRTC": false,
+            // dev-host-headed 读取的 Chrome DevToolsActivePort 文件；留空时自动探测常见路径
+            "devtoolsActivePortPath": "",
+            // dev-host-headed 连接 Chrome CDP 的超时时间（毫秒）
+            "devtoolsCdpTimeout": 60000,
             "ports": {
                 "mcpContHeadless": 8931,
                 "mcpContHeaded": 8932,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.11.7",
+    "version": "5.11.9",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.14",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",