@xcanwin/manyoyo 5.0.2 → 5.1.3

package/bin/manyoyo.js

@@ -14,6 +14,7 @@ const { buildContainerRunArgs, buildContainerRunCommand } = require('../lib/cont
 const { initAgentConfigs } = require('../lib/init-config');
 const { buildImage } = require('../lib/image-build');
 const { resolveAgentResumeArg, buildAgentResumeCommand } = require('../lib/agent-resume');
+const { runPluginCommand } = require('../lib/plugin');
 const { version: BIN_VERSION, imageVersion: IMAGE_VERSION_DEFAULT } = require('../package.json');
 const IMAGE_VERSION_BASE = String(IMAGE_VERSION_DEFAULT || '1.0.0').split('-')[0];
 const IMAGE_VERSION_HELP_EXAMPLE = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
@@ -236,6 +237,7 @@ function sanitizeSensitiveData(obj) {
  * @property {Object.<string, string|number|boolean>} [env] - 环境变量映射
  * @property {string[]} [envFile] - 环境文件数组
  * @property {string[]} [volumes] - 挂载卷数组
+ * @property {Object.<string, Object>} [plugins] - 可选插件配置映射（如 plugins.playwright）
  * @property {Object.<string, Object>} [runs] - 运行配置映射（-r <name>）
  * @property {string} [yolo] - YOLO 模式
  * @property {string} [containerMode] - 容器模式
@@ -698,11 +700,33 @@ function updateManyoyo() {
 
 function getContList() {
     try {
-        const result = execSync(`${DOCKER_CMD} ps -a --size --filter "ancestor=manyoyo" --filter "ancestor=$(${DOCKER_CMD} images -a --format '{{.Repository}}:{{.Tag}}' | grep manyoyo)" --format "table {{.Names}}\\t{{.Status}}\\t{{.Size}}\\t{{.ID}}\\t{{.Image}}\\t{{.Ports}}\\t{{.Networks}}\\t{{.Mounts}}"`,
-            { encoding: 'utf-8' });
-        console.log(result);
+        const output = dockerExecArgs([
+            'ps', '-a', '--size',
+            '--format', '{{.Names}}\t{{.Status}}\t{{.Size}}\t{{.ID}}\t{{.Image}}\t{{.Ports}}\t{{.Networks}}\t{{.Mounts}}'
+        ], { stdio: 'pipe' });
+
+        const rows = output
+            .split('\n')
+            .map(line => line.trim())
+            .filter(Boolean)
+            .filter(line => {
+                const cols = line.split('\t');
+                const name = cols[0] || '';
+                const image = cols[4] || '';
+                // include manyoyo runtime containers (image match)
+                // and plugin containers (both legacy manyoyo-* and new my-* prefixes)
+                return image.includes('manyoyo') || name.startsWith('manyoyo-') || name.startsWith('my-');
+            });
+
+        console.log('NO.\tNAMES\tSTATUS\tSIZE\tCONTAINER ID\tIMAGE\tPORTS\tNETWORKS\tMOUNTS');
+        if (rows.length > 0) {
+            const numberedRows = rows.map((line, index) => {
+                return `${index + 1}.\t${line}`;
+            });
+            console.log(numberedRows.join('\n'));
+        }
     } catch (e) {
-        console.log(e.stdout || '');
+        console.log((e && e.stdout) || '');
     }
 }
 
@@ -843,6 +867,67 @@ async function setupCommander() {
         selectedAction = action;
         selectedOptions = options;
     };
+    const selectPluginAction = (params = {}, options = {}) => {
+        selectAction('plugin', {
+            ...options,
+            pluginAction: params.action || 'ls',
+            pluginName: params.pluginName || 'playwright',
+            pluginScene: params.scene || 'host-headless',
+            pluginHost: params.host || '',
+            pluginExtensions: Array.isArray(params.extensions) ? params.extensions : [],
+            pluginProdversion: params.prodversion || ''
+        });
+    };
+
+    const registerPlaywrightAliasCommands = (command) => {
+        command.command('ls')
+            .description('列出 playwright 启用场景')
+            .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+            .action(options => selectPluginAction({
+                action: 'ls',
+                pluginName: 'playwright',
+                scene: 'all'
+            }, options));
+
+        const actions = ['up', 'down', 'status', 'health', 'logs'];
+        actions.forEach(action => {
+            const sceneCommand = command.command(`${action} [scene]`)
+                .description(`${action} playwright 场景，scene 默认 host-headless`)
+                .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)');
+
+            if (action === 'up') {
+                appendArrayOption(sceneCommand, '--ext <path>', '追加浏览器扩展目录（可多次传入；目录需包含 manifest.json）');
+            }
+
+            sceneCommand.action((scene, options) => selectPluginAction({
+                action,
+                pluginName: 'playwright',
+                scene: scene || 'host-headless',
+                extensions: action === 'up' ? (options.ext || []) : []
+            }, options));
+        });
+
+        command.command('mcp-add')
+            .description('输出 playwright 的 MCP 接入命令')
+            .option('--host <host>', 'MCP URL 使用的主机名或IP (默认 host.docker.internal)')
+            .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+            .action(options => selectPluginAction({
+                action: 'mcp-add',
+                pluginName: 'playwright',
+                scene: 'all',
+                host: options.host || ''
+            }, options));
+
+        command.command('ext-download')
+            .description('下载并解压 Playwright 扩展到 ~/.manyoyo/plugin/playwright/extensions/')
+            .option('--prodversion <ver>', 'CRX 下载使用的 Chrome 版本号 (默认 132.0.0.0)')
+            .action(options => selectPluginAction({
+                action: 'ext-download',
+                pluginName: 'playwright',
+                scene: 'all',
+                prodversion: options.prodversion || ''
+            }, options));
+    };
 
     program
         .name(MANYOYO_NAME)
@@ -870,6 +955,8 @@ async function setupCommander() {
   ${MANYOYO_NAME} run -x "echo 123"                   指定命令执行
   ${MANYOYO_NAME} serve 3000 -u admin -P 123456       启动带登录认证的网页服务
   ${MANYOYO_NAME} serve 0.0.0.0:3000                  监听全部网卡，便于局域网访问
+  ${MANYOYO_NAME} playwright up host-headless         启动 playwright 默认场景（推荐）
+  ${MANYOYO_NAME} plugin playwright up host-headless  通过 plugin 命名空间启动
   ${MANYOYO_NAME} run -n test -q tip -q cmd           多次使用静默选项
         `);
 
@@ -910,6 +997,21 @@ async function setupCommander() {
         });
     });
 
+    const playwrightCommand = program.command('playwright').description('管理 playwright 插件服务（推荐）');
+    registerPlaywrightAliasCommands(playwrightCommand);
+
+    const pluginCommand = program.command('plugin').description('管理 manyoyo 插件');
+    pluginCommand.command('ls')
+        .description('列出可用插件与启用场景')
+        .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+        .action(options => selectPluginAction({
+            action: 'ls',
+            pluginName: 'playwright',
+            scene: 'all'
+        }, options));
+    const pluginPlaywrightCommand = pluginCommand.command('playwright').description('管理 playwright 插件服务');
+    registerPlaywrightAliasCommands(pluginPlaywrightCommand);
+
     const configCommand = program.command('config').description('查看解析后的配置或命令');
     const configShowCommand = configCommand.command('show').description('显示最终生效配置并退出');
     applyRunStyleOptions(configShowCommand, { includeRmOnExit: false, includeServePreview: true });
@@ -982,7 +1084,7 @@ async function setupCommander() {
     const isShowCommandMode = selectedAction === 'config-command';
     const isServerMode = options.server !== undefined;
 
-    const noDockerActions = new Set(['init', 'update', 'install', 'config-show']);
+    const noDockerActions = new Set(['init', 'update', 'install', 'config-show', 'plugin']);
     if (!noDockerActions.has(selectedAction)) {
         ensureDocker();
     }
@@ -1003,6 +1105,23 @@ async function setupCommander() {
         process.exit(0);
     }
 
+    if (selectedAction === 'plugin') {
+        const runConfig = options.run ? loadRunConfig(options.run, config) : {};
+        return {
+            isPluginMode: true,
+            pluginRequest: {
+                action: options.pluginAction,
+                pluginName: options.pluginName,
+                scene: options.pluginScene || 'host-headless',
+                host: options.pluginHost || '',
+                extensions: Array.isArray(options.pluginExtensions) ? options.pluginExtensions : [],
+                prodversion: options.pluginProdversion || ''
+            },
+            pluginGlobalConfig: config,
+            pluginRunConfig: runConfig
+        };
+    }
+
     // Load run config if specified
     const runConfig = options.run ? loadRunConfig(options.run, config) : {};
 
@@ -1162,7 +1281,8 @@ async function setupCommander() {
         isBuildMode,
         isRemoveMode,
         isShowCommandMode,
-        isServerMode
+        isServerMode,
+        isPluginMode: false
     };
 }
 
@@ -1495,6 +1615,18 @@ async function main() {
     try {
         // 1. Setup commander and parse arguments
         const modeState = await setupCommander();
+
+        if (modeState.isPluginMode) {
+            const exitCode = await runPluginCommand(modeState.pluginRequest, {
+                globalConfig: modeState.pluginGlobalConfig,
+                runConfig: modeState.pluginRunConfig,
+                projectRoot: path.join(__dirname, '..'),
+                stdout: process.stdout,
+                stderr: process.stderr
+            });
+            process.exit(exitCode);
+        }
+
         const runtime = createRuntimeContext(modeState);
 
         // 2. Start web server mode

package/config.example.json

@@ -25,6 +25,29 @@
     "imageBuildArgs": [],
     "quiet": ["tip", "cmd"],
 
+    // 可选插件（manyoyo playwright / manyoyo plugin playwright）
+    "plugins": {
+        "playwright": {
+            // mixed: 支持容器+宿主机；container: 仅容器；host: 仅宿主机
+            "runtime": "mixed",
+            // 启用场景（可按需裁剪）
+            "enabledScenes": ["cont-headless", "cont-headed", "host-headless", "host-headed"],
+            // mcp-add 默认 host（可改为 localhost / 127.0.0.1）
+            "mcpDefaultHost": "host.docker.internal",
+            // cont-headed 场景读取的密码环境变量名（默认 VNC_PASSWORD）
+            "vncPasswordEnvKey": "VNC_PASSWORD",
+            // playwright ext-download 的 CRX prodversion 参数
+            "extensionProdversion": "132.0.0.0",
+            "ports": {
+                "contHeadless": 8931,
+                "contHeaded": 8932,
+                "hostHeadless": 8933,
+                "hostHeaded": 8934,
+                "contHeadedNoVnc": 6080
+            }
+        }
+    },
+
     // 运行配置集合：通过 -r <name> 读取 runs.<name>
     "runs": {
         "claude": {
@@ -33,6 +56,11 @@
             "shell": "claude",
             "env": {
                 "ANTHROPIC_MODEL": "claude-sonnet-4-5"
+            },
+            "plugins": {
+                "playwright": {
+                    "runtime": "container"
+                }
             }
         }
     }

package/lib/plugin/index.js

@@ -0,0 +1,65 @@
+'use strict';
+
+const { PlaywrightPlugin } = require('./playwright');
+
+const AVAILABLE_PLUGINS = ['playwright'];
+
+function asObject(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return {};
+    }
+    return value;
+}
+
+function getPluginConfigs(pluginName, globalConfig, runConfig) {
+    const globalPlugins = asObject(asObject(globalConfig).plugins);
+    const runPlugins = asObject(asObject(runConfig).plugins);
+    return {
+        globalPluginConfig: asObject(globalPlugins[pluginName]),
+        runPluginConfig: asObject(runPlugins[pluginName])
+    };
+}
+
+function createPlugin(pluginName, options = {}) {
+    if (pluginName !== 'playwright') {
+        throw new Error(`未知插件: ${pluginName}`);
+    }
+
+    const cfg = getPluginConfigs(pluginName, options.globalConfig, options.runConfig);
+    return new PlaywrightPlugin({
+        projectRoot: options.projectRoot,
+        stdout: options.stdout,
+        stderr: options.stderr,
+        globalConfig: cfg.globalPluginConfig,
+        runConfig: cfg.runPluginConfig
+    });
+}
+
+async function runPluginCommand(request, options = {}) {
+    const action = String(request && request.action || '').trim();
+
+    if (action === 'ls') {
+        const plugin = createPlugin('playwright', options);
+        return await plugin.run({ action: 'ls' });
+    }
+
+    const pluginName = String(request && request.pluginName || '').trim();
+    if (!pluginName) {
+        throw new Error('plugin 名称不能为空');
+    }
+
+    const plugin = createPlugin(pluginName, options);
+    return await plugin.run({
+        action,
+        scene: request.scene,
+        host: request.host,
+        extensions: request.extensions,
+        prodversion: request.prodversion
+    });
+}
+
+module.exports = {
+    AVAILABLE_PLUGINS,
+    createPlugin,
+    runPluginCommand
+};

package/lib/plugin/playwright-assets/compose-headed.yaml

@@ -0,0 +1,19 @@
+services:
+  playwright:
+    build:
+      context: .
+      dockerfile: headed.Dockerfile
+      args:
+        PLAYWRIGHT_MCP_BASE_IMAGE: mcr.microsoft.com/playwright/mcp:${PLAYWRIGHT_MCP_DOCKER_TAG:-latest}
+    image: ${PLAYWRIGHT_MCP_IMAGE:-localhost/xcanwin/manyoyo-playwright-headed}
+    container_name: ${PLAYWRIGHT_MCP_CONTAINER_NAME:-my-playwright-cont-headed}
+    init: true
+    stdin_open: true
+    ports:
+      - "127.0.0.1:${PLAYWRIGHT_MCP_PORT:-8932}:${PLAYWRIGHT_MCP_PORT:-8932}"
+      - "127.0.0.1:${PLAYWRIGHT_MCP_NOVNC_PORT:-6080}:6080"
+    environment:
+      VNC_PASSWORD: "${VNC_PASSWORD:?VNC_PASSWORD is required}"
+    volumes:
+      - ${PLAYWRIGHT_MCP_CONFIG_PATH:?PLAYWRIGHT_MCP_CONFIG_PATH is required}:/app/config/playwright.json:ro
+    command: ["node", "cli.js", "--config", "/app/config/playwright.json"]

package/lib/plugin/playwright-assets/compose-headless.yaml

@@ -0,0 +1,11 @@
+services:
+  playwright:
+    image: mcr.microsoft.com/playwright/mcp:${PLAYWRIGHT_MCP_DOCKER_TAG:-latest}
+    container_name: ${PLAYWRIGHT_MCP_CONTAINER_NAME:-my-playwright-cont-headless}
+    init: true
+    stdin_open: true
+    ports:
+      - "127.0.0.1:${PLAYWRIGHT_MCP_PORT:-8931}:${PLAYWRIGHT_MCP_PORT:-8931}"
+    volumes:
+      - ${PLAYWRIGHT_MCP_CONFIG_PATH:?PLAYWRIGHT_MCP_CONFIG_PATH is required}:/app/config/playwright.json:ro
+    command: ["--config", "/app/config/playwright.json"]

package/lib/plugin/playwright-assets/headed.Dockerfile

@@ -0,0 +1,15 @@
+ARG PLAYWRIGHT_MCP_BASE_IMAGE=mcr.microsoft.com/playwright/mcp:latest
+FROM ${PLAYWRIGHT_MCP_BASE_IMAGE}
+
+USER root
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates xvfb x11vnc novnc websockify fluxbox && \
+    update-ca-certificates && \
+    apt-get clean && \
+    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/*
+
+COPY init-headed.sh /usr/local/bin/init-headed.sh
+RUN chmod +x /usr/local/bin/init-headed.sh
+
+ENTRYPOINT ["/usr/local/bin/init-headed.sh"]

package/lib/plugin/playwright-assets/init-headed.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export DISPLAY=:99
+
+Xvfb :99 -screen 0 1920x1080x24 -nolisten tcp &
+fluxbox >/tmp/fluxbox.log 2>&1 &
+
+if [[ -z "${VNC_PASSWORD:-}" ]]; then
+    echo "VNC_PASSWORD is required."
+    exit 1
+fi
+
+x11vnc -display :99 -forever -shared -rfbport 5900 -localhost -passwd "$VNC_PASSWORD" >/tmp/x11vnc.log 2>&1 &
+websockify --web=/usr/share/novnc/ 6080 localhost:5900 >/tmp/websockify.log 2>&1 &
+
+exec "$@"