@xcanwin/manyoyo 5.11.10 → 5.11.11

package/lib/plugin/index.js

@@ -31,7 +31,9 @@ function createPlugin(pluginName, options = {}) {
         stdout: options.stdout,
         stderr: options.stderr,
         globalConfig: cfg.globalPluginConfig,
-        runConfig: cfg.runPluginConfig
+        runConfig: cfg.runPluginConfig,
+        rootGlobalConfig: asObject(options.globalConfig),
+        rootRunConfig: asObject(options.runConfig)
     });
 }
 

package/lib/plugin/playwright.js

@@ -312,6 +312,8 @@ class PlaywrightPlugin {
         this.stderr = options.stderr || process.stderr;
         this.globalConfig = asObject(options.globalConfig);
         this.runConfig = asObject(options.runConfig);
+        this.rootGlobalConfig = asObject(options.rootGlobalConfig);
+        this.rootRunConfig = asObject(options.rootRunConfig);
         this.config = this.resolveConfig();
     }
 
@@ -421,7 +423,7 @@ class PlaywrightPlugin {
         if (sceneName !== 'cli-host-headed') {
             return;
         }
-        if (this.config.cliSessionScene === sceneName) {
+        if (this.cliHostContainerAttachConfigReady()) {
             return;
         }
         this.writeStdout('[tip] 如果希望容器内 manyoyo run 自动附着到当前 CLI 宿主场景，请在 ~/.manyoyo/manyoyo.json 中设置:');
@@ -473,20 +475,17 @@ class PlaywrightPlugin {
         return false;
     }
 
-    remindDevHostCliSessionScene() {
-        this.writeStdout(`[tip] 已尝试用 Chrome 打开 ${this.remoteDebuggingPageUrl()}，请在页面中确认 remote debugging 相关勾选项已启用。`);
-        this.writeStdout('[tip] 如果希望容器内 manyoyo run 自动附着到宿主机正在运行的 Chrome，请在 ~/.manyoyo/manyoyo.json 中设置:');
-        this.writeStdout('{');
-        this.writeStdout('    "volumes": [');
-        this.writeStdout('        "~/.manyoyo/.cache/ms-playwright:/root/.cache/ms-playwright",');
-        this.writeStdout('        "~/Library/Application Support/Google/Chrome/DevToolsActivePort:/root/Library/Application Support/Google/Chrome/DevToolsActivePort"');
-        this.writeStdout('    ],');
-        this.writeStdout('    "plugins": {');
-        this.writeStdout('        "playwright": {');
-        this.writeStdout('            "cliSessionScene": "dev-host-headed"');
-        this.writeStdout('        }');
-        this.writeStdout('    }');
-        this.writeStdout('}');
+    writeDevHostUsage(configPath) {
+        this.writeStdout('');
+        this.writeStdout('若用容器 Agent 操作宿主机浏览器，在宿主机执行:');
+        ['claude', 'codex', 'gemini'].forEach(runName => {
+            this.writeStdout(`my run -r ${runName}`);
+        });
+        this.writeStdout('');
+        this.writeStdout('若用宿主机 Agent 操作宿主机浏览器，在宿主机执行:');
+        ['claude', 'codex', 'gemini'].forEach(command => {
+            this.writeStdout(this.devHostAttachCommand(configPath, command));
+        });
     }
 
     randomAlnum(length = 16) {
@@ -594,6 +593,109 @@ class PlaywrightPlugin {
         fs.rmSync(this.sceneCliAttachConfigPath(sceneName), { force: true });
     }
 
+    buildDevHostAttachConfig(endpoint, cdpHost) {
+        return {
+            outputDir: '/tmp/.playwright-cli',
+            browser: {
+                cdpEndpoint: `ws://${cdpHost}:${endpoint.port}${endpoint.wsPath}`,
+                cdpHeaders: {
+                    Host: `127.0.0.1:${endpoint.port}`
+                },
+                cdpTimeout: this.config.devtoolsCdpTimeout
+            }
+        };
+    }
+
+    writeDevHostAttachConfig(sceneName, endpoint) {
+        fs.mkdirSync(this.config.configDir, { recursive: true });
+        const filePath = this.sceneConfigPath(sceneName);
+        fs.writeFileSync(filePath, `${JSON.stringify(this.buildDevHostAttachConfig(endpoint, '127.0.0.1'), null, 4)}\n`, 'utf8');
+        return filePath;
+    }
+
+    removeDevHostAttachConfig(sceneName) {
+        fs.rmSync(this.sceneConfigPath(sceneName), { force: true });
+    }
+
+    userDisplayPath(filePath) {
+        const normalizedPath = path.resolve(filePath);
+        const normalizedHome = path.resolve(this.config.homeDir);
+        if (normalizedPath === normalizedHome) {
+            return '~';
+        }
+        if (normalizedPath.startsWith(`${normalizedHome}${path.sep}`)) {
+            return `~${normalizedPath.slice(normalizedHome.length)}`;
+        }
+        return filePath;
+    }
+
+    shellValue(value) {
+        const text = String(value);
+        if (/^[A-Za-z0-9_@%+=:,./~-]+$/.test(text)) {
+            return text;
+        }
+        return `'${text.replace(/'/g, "'\\''")}'`;
+    }
+
+    devHostAttachEnvEntries(configPath) {
+        return [
+            `PLAYWRIGHT_MCP_CONFIG=${this.shellValue(this.userDisplayPath(configPath))}`
+        ];
+    }
+
+    devHostAttachCommand(configPath, command) {
+        return `${this.devHostAttachEnvEntries(configPath).join(' ')} ${command}`;
+    }
+
+    expandHomePath(value) {
+        const text = String(value || '').trim();
+        if (text === '~') {
+            return this.config.homeDir;
+        }
+        if (text.startsWith('~/')) {
+            return path.join(this.config.homeDir, text.slice(2));
+        }
+        return text;
+    }
+
+    parseVolumeEntry(value) {
+        const parts = String(value || '').split(':');
+        if (parts.length < 2) {
+            return null;
+        }
+        return {
+            hostPath: path.resolve(this.expandHomePath(parts[0])),
+            containerPath: parts[1]
+        };
+    }
+
+    mergedRootVolumes() {
+        return [
+            ...asStringArray(this.rootGlobalConfig.volumes, []),
+            ...asStringArray(this.rootRunConfig.volumes, []),
+            ...asStringArray(this.globalConfig.volumes, []),
+            ...asStringArray(this.runConfig.volumes, [])
+        ];
+    }
+
+    hasRootVolume(required) {
+        const parsedRequired = this.parseVolumeEntry(required);
+        if (!parsedRequired) {
+            return false;
+        }
+        return this.mergedRootVolumes().some(item => {
+            const parsed = this.parseVolumeEntry(item);
+            return parsed
+                && parsed.hostPath === parsedRequired.hostPath
+                && parsed.containerPath === parsedRequired.containerPath;
+        });
+    }
+
+    cliHostContainerAttachConfigReady() {
+        return this.config.cliSessionScene === 'cli-host-headed'
+            && this.hasRootVolume('~/.manyoyo/.cache/ms-playwright:/root/.cache/ms-playwright');
+    }
+
     devtoolsActivePortCandidates() {
         const homeDir = this.config.homeDir;
         const configured = this.config.devtoolsActivePortPath;
@@ -1168,24 +1270,13 @@ class PlaywrightPlugin {
         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
-            }
-        });
+        this.writeSceneCliAttachConfig(sceneName, this.buildDevHostAttachConfig(endpoint, connectHost));
 
         const envEntries = [
-            `PLAYWRIGHT_MCP_CONFIG=${containerConfigPath}`,
-            'PW_CHROMIUM_ATTACH_TO_OTHER=1'
+            `PLAYWRIGHT_MCP_CONFIG=${containerConfigPath}`
         ];
         const extraArgs = normalizedDockerCmd === 'docker'
             ? ['--add-host', 'host.docker.internal:host-gateway']
@@ -1506,12 +1597,13 @@ class PlaywrightPlugin {
             if (!(await this.portReady(endpoint.port))) {
                 throw new Error(`DevToolsActivePort 指向 127.0.0.1:${endpoint.port}，但该端口不可连接；请确认 Chrome remote debugging 已启用，或重新打开 Chrome 后再试。`);
             }
+            const cfgPath = this.writeDevHostAttachConfig(sceneName, endpoint);
             this.writeStdout(`[up] ${sceneName} ready via DevToolsActivePort (${endpoint.filePath}, 127.0.0.1:${endpoint.port})`);
-            this.remindDevHostCliSessionScene();
+            this.writeStdout(`[tip] 已尝试打开 ${this.remoteDebuggingPageUrl()}，请确认 remote debugging 已启用。`);
+            this.writeDevHostUsage(cfgPath);
             return 0;
         } catch (error) {
             this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
-            this.remindDevHostCliSessionScene();
             return 1;
         }
     }
@@ -1559,6 +1651,7 @@ class PlaywrightPlugin {
     stopDevHost(sceneName) {
         this.removeSceneEndpoint(sceneName);
         this.removeSceneCliAttachConfig(sceneName);
+        this.removeDevHostAttachConfig(sceneName);
         this.writeStdout(`[down] ${sceneName} no managed process`);
         return 0;
     }

package/package.json

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