@xcanwin/manyoyo 5.3.10 → 5.4.4

package/README.md

@@ -53,7 +53,7 @@ AI Agent CLI 往往需要：
 ```bash
 npm install -g @xcanwin/manyoyo
 podman pull ubuntu:24.04           # 仅 Podman 需要
-manyoyo build --iv 1.8.4-common
+manyoyo build --iv 1.8.8-common
 manyoyo init all
 manyoyo run -r claude
 ```
@@ -137,10 +137,10 @@ manyoyo config command
 
 ```bash
 # common 版本
-manyoyo build --iv 1.8.4-common
+manyoyo build --iv 1.8.8-common
 
 # full 版本
-manyoyo build --iv 1.8.4-full
+manyoyo build --iv 1.8.8-full
 
 # 自定义工具集
 manyoyo build --iba TOOL=go,codex,java,gemini

package/bin/manyoyo.js

@@ -14,7 +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 { runPluginCommand, createPlugin } = require('../lib/plugin');
 const { buildManyoyoLogPath } = require('../lib/log-path');
 const {
     sanitizeSensitiveData,
@@ -71,6 +71,7 @@ let CONTAINER_ENVS = [];
 let FIRST_CONTAINER_ENVS = [];
 let CONTAINER_VOLUMES = [];
 let CONTAINER_PORTS = [];
+let CONTAINER_EXTRA_ARGS = [];
 const MANYOYO_NAME = detectCommandName();
 let CONT_MODE_ARGS = [];
 let QUIET = {};
@@ -559,6 +560,63 @@ function addEnvFile(envFile) {
     return addEnvFileTo(CONTAINER_ENVS, envFile);
 }
 
+function hasEnvKey(targetEnvs, key) {
+    for (let i = 0; i < targetEnvs.length; i += 2) {
+        if (targetEnvs[i] !== '--env') {
+            continue;
+        }
+        const text = String(targetEnvs[i + 1] || '');
+        const idx = text.indexOf('=');
+        if (idx > 0 && text.slice(0, idx) === key) {
+            return true;
+        }
+    }
+    return false;
+}
+
+function appendUniqueArgs(targetArgs, extraArgs) {
+    const joinedExisting = new Set();
+    for (let i = 0; i < targetArgs.length; i += 2) {
+        const head = String(targetArgs[i] || '');
+        const value = String(targetArgs[i + 1] || '');
+        if (head.startsWith('--')) {
+            joinedExisting.add(`${head}\u0000${value}`);
+        }
+    }
+
+    for (let i = 0; i < extraArgs.length; i += 2) {
+        const head = String(extraArgs[i] || '');
+        const value = String(extraArgs[i + 1] || '');
+        const signature = `${head}\u0000${value}`;
+        if (!joinedExisting.has(signature)) {
+            joinedExisting.add(signature);
+            targetArgs.push(head, value);
+        }
+    }
+}
+
+function applyPlaywrightCliSessionIntegration(config, runConfig) {
+    try {
+        const plugin = createPlugin('playwright', {
+            globalConfig: config,
+            runConfig,
+            projectRoot: path.join(__dirname, '..')
+        });
+        const integration = plugin.buildCliSessionIntegration(DOCKER_CMD);
+        for (const entry of integration.envEntries) {
+            const parsed = parseEnvEntry(entry);
+            if (!hasEnvKey(CONTAINER_ENVS, parsed.key)) {
+                addEnv(`${parsed.key}=${parsed.value}`);
+            }
+        }
+        appendUniqueArgs(CONTAINER_EXTRA_ARGS, integration.extraArgs);
+        appendUniqueArgs(CONTAINER_VOLUMES, integration.volumeEntries || []);
+    } catch (error) {
+        console.error(`${RED}⚠️  错误: Playwright CLI 会话注入失败: ${error.message || String(error)}${NC}`);
+        process.exit(1);
+    }
+}
+
 function addVolume(volume) {
     CONTAINER_VOLUMES.push("--volume", volume);
 }
@@ -954,7 +1012,7 @@ async function setupCommander() {
             ...options,
             pluginAction: params.action || 'ls',
             pluginName: params.pluginName || 'playwright',
-            pluginScene: params.scene || 'host-headless',
+            pluginScene: params.scene || 'mcp-host-headless',
             pluginHost: params.host || '',
             pluginExtensionPaths: Array.isArray(params.extensionPaths) ? params.extensionPaths : [],
             pluginExtensionNames: Array.isArray(params.extensionNames) ? params.extensionNames : [],
@@ -975,7 +1033,7 @@ async function setupCommander() {
         const actions = ['up', 'down', 'status', 'health', 'logs'];
         actions.forEach(action => {
             const sceneCommand = command.command(`${action} [scene]`)
-                .description(`执行 playwright ${action} 场景（scene 默认 host-headless）`)
+                .description(`执行 playwright ${action} 场景（scene 默认 mcp-host-headless）`)
                 .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)');
 
             if (action === 'up') {
@@ -986,7 +1044,7 @@ async function setupCommander() {
             sceneCommand.action((scene, options) => selectPluginAction({
                 action,
                 pluginName: 'playwright',
-                scene: scene || 'host-headless',
+                scene: scene || 'mcp-host-headless',
                 extensionPaths: action === 'up' ? (options.extPath || []) : [],
                 extensionNames: action === 'up' ? (options.extName || []) : []
             }, options));
@@ -1041,8 +1099,8 @@ async function setupCommander() {
   ${MANYOYO_NAME} serve 127.0.0.1:3000                启动本机网页服务
   ${MANYOYO_NAME} serve 127.0.0.1:3000 -d             后台启动；未设密码时会打印本次随机密码
   ${MANYOYO_NAME} serve 0.0.0.0:3000 -U admin -P 123 -d  后台启动并监听全部网卡
-  ${MANYOYO_NAME} playwright up host-headless         启动 playwright 默认场景（推荐）
-  ${MANYOYO_NAME} plugin playwright up host-headless  通过 plugin 命名空间启动
+  ${MANYOYO_NAME} playwright up mcp-host-headless         启动 playwright 默认场景（推荐）
+  ${MANYOYO_NAME} plugin playwright up mcp-host-headless  通过 plugin 命名空间启动
   ${MANYOYO_NAME} run -n test -q tip -q cmd           多次使用静默选项
         `);
 
@@ -1208,7 +1266,7 @@ Notes:
             pluginRequest: {
                 action: options.pluginAction,
                 pluginName: options.pluginName,
-                scene: options.pluginScene || 'host-headless',
+                scene: options.pluginScene || 'mcp-host-headless',
                 host: options.pluginHost || '',
                 extensionPaths: Array.isArray(options.pluginExtensionPaths) ? options.pluginExtensionPaths : [],
                 extensionNames: Array.isArray(options.pluginExtensionNames) ? options.pluginExtensionNames : [],
@@ -1302,6 +1360,8 @@ Notes:
     };
     Object.entries(firstEnvMap).forEach(([key, value]) => addEnvTo(FIRST_CONTAINER_ENVS, `${key}=${value}`));
 
+    applyPlaywrightCliSessionIntegration(config, runConfig);
+
     const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume);
     volumeList.forEach(v => addVolume(v));
 
@@ -1438,6 +1498,7 @@ function createRuntimeContext(modeState = {}) {
         firstExecCommandPrefix: FIRST_EXEC_COMMAND_PREFIX,
         firstExecCommandSuffix: FIRST_EXEC_COMMAND_SUFFIX,
         contModeArgs: CONT_MODE_ARGS,
+        containerExtraArgs: CONTAINER_EXTRA_ARGS,
         containerEnvs: CONTAINER_ENVS,
         firstContainerEnvs: FIRST_CONTAINER_ENVS,
         containerVolumes: CONTAINER_VOLUMES,
@@ -1662,6 +1723,7 @@ function buildDockerRunArgs(runtime) {
         imageName: runtime.imageName,
         imageVersion: runtime.imageVersion,
         contModeArgs: runtime.contModeArgs,
+        containerExtraArgs: runtime.containerExtraArgs,
         containerEnvs: runtime.containerEnvs,
         containerVolumes: runtime.containerVolumes,
         containerPorts: runtime.containerPorts,
@@ -1826,6 +1888,7 @@ async function runWebServerMode(runtime) {
         execCommand: runtime.execCommand,
         execCommandSuffix: runtime.execCommandSuffix,
         contModeArgs: runtime.contModeArgs,
+        containerExtraArgs: runtime.containerExtraArgs,
         containerEnvs: runtime.containerEnvs,
         containerVolumes: runtime.containerVolumes,
         containerPorts: runtime.containerPorts,

package/docker/manyoyo.Dockerfile

@@ -64,7 +64,7 @@ FROM ubuntu:24.04
 
 ARG TARGETARCH
 ARG NODE_VERSION=24
-ARG TOOL="full"
+ARG TOOL="common"
 
 # 镜像源参数化（默认使用阿里云，可按需覆盖）
 ARG APT_MIRROR=https://mirrors.aliyun.com
@@ -74,9 +74,11 @@ ARG PIP_INDEX_URL=https://mirrors.tencent.com/pypi/simple
 ARG PY_TEXT_PIP_PACKAGES="PyYAML python-dotenv tomlkit pyjson5 jsonschema"
 ARG PY_TEXT_EXTRA_PIP_PACKAGES=""
 ENV LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8
+    LC_ALL=C.UTF-8 \
+    PIP_ROOT_USER_ACTION=ignore \
+    PLAYWRIGHT_MCP_CONFIG=/app/config/cli-cont-headless.json
 
-# 合并系统依赖安装为单层，减少镜像体积
+# 合并系统依赖与 Python 安装为单层，减少镜像体积
 RUN <<EOX
     # 配置 APT 镜像源
     sed -i "s|http://[^/]*\.ubuntu\.com|${APT_MIRROR}|g" /etc/apt/sources.list.d/ubuntu.sources
@@ -87,12 +89,14 @@ RUN <<EOX
     # 开发与构建
     # 系统管理
     # 通用工具
+    # Python
     apt-get -o Acquire::https::Verify-Peer=false update -y
     apt-get -o Acquire::https::Verify-Peer=false install -y --no-install-recommends \
         ca-certificates openssl curl wget net-tools iputils-ping dnsutils socat ncat ssh \
         git gh g++ make sqlite3 \
-        procps psmisc lsof supervisor man-db \
-        nano jq file tree ripgrep less bc xxd tar zip unzip gzip
+        procps psmisc lsof supervisor \
+        nano jq file tree ripgrep less bc xxd tar zip unzip gzip \
+        python3.12 python3.12-dev python3.12-venv python3-pip
 
     # 更新 CA 证书
     update-ca-certificates
@@ -107,15 +111,7 @@ RUN <<EOX
         apt-get install -y --no-install-recommends docker.io
     ;; esac
 
-    # 清理
-    apt-get clean
-    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.cache ~/.npm ~/go/pkg/mod/cache
-EOX
-
-RUN <<EOX
-    # 安装 python
-    apt-get update -y
-    apt-get install -y --no-install-recommends python3.12 python3.12-dev python3.12-venv python3-pip
+    # 配置 python
     ln -sf /usr/bin/python3 /usr/bin/python
     ln -sf /usr/bin/pip3 /usr/bin/pip
     pip config set global.index-url "${PIP_INDEX_URL}"
@@ -131,6 +127,8 @@ EOX
 
 # 从 cache-stage 复制 Node.js（缓存或下载）
 COPY --from=cache-stage /opt/node /usr/local
+COPY ./docker/res/playwright/cli-cont-headless.init.js /app/config/cli-cont-headless.init.js
+COPY ./docker/res/playwright/cli-cont-headless.json /app/config/cli-cont-headless.json
 COPY ./docker/res/ /tmp/docker-res/
 ARG GIT_SSL_NO_VERIFY=false
 
@@ -203,9 +201,31 @@ RUN <<EOX
         cp /tmp/docker-res/opencode/opencode.json ~/.config/opencode/opencode.json
     ;; esac
 
+    # 安装 Playwright CLI skills（不在镜像构建阶段下载浏览器）
+    npm install -g @playwright/cli@latest
+    PLAYWRIGHT_CLI_INSTALL_DIR=/tmp/playwright-cli-install
+    mkdir -p "${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright"
+    cat > "${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright/cli.config.json" <<'EOF'
+{
+    "browser": {
+        "browserName": "chromium",
+        "launchOptions": {
+            "channel": "chrome"
+        }
+    }
+}
+EOF
+    cd "${PLAYWRIGHT_CLI_INSTALL_DIR}"
+    playwright-cli install --skills
+    mkdir -p "$HOME/.codex/skills/playwright-cli" ~/.gemini/skills/playwright-cli
+    cp -R "${PLAYWRIGHT_CLI_INSTALL_DIR}/.claude/skills/playwright-cli/." "$HOME/.codex/skills/playwright-cli/"
+    cp -R "${PLAYWRIGHT_CLI_INSTALL_DIR}/.claude/skills/playwright-cli/." "$HOME/.gemini/skills/playwright-cli/"
+    cd $OLDPWD
+    rm -rf "${PLAYWRIGHT_CLI_INSTALL_DIR}"
+
     # 清理
     npm cache clean --force
-    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.cache ~/.npm ~/go/pkg/mod/cache
+    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
 EOX
 
 # 从 cache-stage 复制 JDT LSP（缓存或下载）
@@ -224,7 +244,7 @@ RUN <<EOX
 
         # 清理
         apt-get clean
-        rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.cache ~/.npm ~/go/pkg/mod/cache
+        rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
     ;; esac
     rm -rf /tmp/jdtls-cache
 EOX
@@ -236,7 +256,7 @@ RUN <<EOX
     # 安装 go
     case ",$TOOL," in *,full,*|*,go,*)
         apt-get update -y
-        apt-get install -y --no-install-recommends golang golang-src gcc
+        apt-get install -y --no-install-recommends golang gcc
         go env -w GOPROXY=https://mirrors.tencent.com/go
 
         # 安装 LSP服务（go）
@@ -252,7 +272,7 @@ RUN <<EOX
         # 清理
         apt-get clean
         go clean -modcache -cache
-        rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.cache ~/.npm ~/go/pkg/mod/cache
+        rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
     ;; esac
     rm -rf /tmp/gopls-cache
 EOX
@@ -262,7 +282,7 @@ COPY ./docker/res/supervisor/s.conf /etc/supervisor/conf.d/s.conf
 
 RUN <<EOX
     # 清理
-    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.cache ~/.npm ~/go/pkg/mod/cache
+    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
 EOX
 
 WORKDIR /tmp

package/docker/res/playwright/cli-cont-headless.init.js

@@ -0,0 +1,12 @@
+'use strict';
+
+(function () {
+    const platformValue = 'MacIntel';
+    try {
+        const navProto = Object.getPrototypeOf(navigator);
+        Object.defineProperty(navProto, 'platform', {
+            configurable: true,
+            get: () => platformValue
+        });
+    } catch (_) {}
+})();

package/docker/res/playwright/cli-cont-headless.json

@@ -0,0 +1,37 @@
+{
+    "outputDir": "/tmp/.playwright-cli",
+    "browser": {
+        "chromiumSandbox": true,
+        "browserName": "chromium",
+        "initScript": [
+            "/app/config/cli-cont-headless.init.js"
+        ],
+        "launchOptions": {
+            "channel": "chromium",
+            "headless": true,
+            "args": [
+                "--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36",
+                "--lang=zh-CN",
+                "--window-size=1366,768",
+                "--disable-blink-features=AutomationControlled",
+                "--force-webrtc-ip-handling-policy=disable_non_proxied_udp"
+            ]
+        },
+        "contextOptions": {
+            "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36",
+            "locale": "zh-CN",
+            "timezoneId": "Asia/Shanghai",
+            "viewport": {
+                "width": 1366,
+                "height": 768
+            },
+            "screen": {
+                "width": 1366,
+                "height": 768
+            },
+            "extraHTTPHeaders": {
+                "Accept-Language": "zh-CN,zh;q=0.9"
+            }
+        }
+    }
+}

package/lib/container-run.js

@@ -10,6 +10,7 @@ function buildContainerRunArgs(options) {
         '--name', options.containerName,
         '--entrypoint', '',
         ...(options.contModeArgs || []),
+        ...(options.containerExtraArgs || []),
         ...(options.containerEnvs || []),
         ...(options.containerVolumes || []),
         ...(options.containerPorts || []),

package/lib/init-config.js

@@ -193,18 +193,7 @@ function collectCodexInitData(homeDir, ctx) {
 
     if (configToml && typeof configToml === 'object') {
         setInitValue(values, 'OPENAI_MODEL', configToml.model);
-        const providers = configToml.model_providers;
-        let providerConfig = null;
-        if (providers && typeof providers === 'object') {
-            const selectedProviderName =
-                (typeof configToml.model_provider === 'string' && providers[configToml.model_provider])
-                    ? configToml.model_provider
-                    : Object.keys(providers)[0];
-            providerConfig = selectedProviderName ? providers[selectedProviderName] : null;
-        }
-        if (providerConfig && typeof providerConfig === 'object') {
-            setInitValue(values, 'OPENAI_BASE_URL', providerConfig.base_url);
-        }
+        setInitValue(values, 'OPENAI_BASE_URL', configToml.openai_base_url);
     }
 
     if (fs.existsSync(codexDir)) {

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

@@ -6,7 +6,7 @@ services:
       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}
+    container_name: ${PLAYWRIGHT_MCP_CONTAINER_NAME:-my-playwright-mcp-cont-headed}
     init: true
     stdin_open: true
     ports:

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

@@ -1,7 +1,7 @@
 services:
   playwright:
     image: mcr.microsoft.com/playwright/mcp:${PLAYWRIGHT_MCP_DOCKER_TAG:-latest}
-    container_name: ${PLAYWRIGHT_MCP_CONTAINER_NAME:-my-playwright-cont-headless}
+    container_name: ${PLAYWRIGHT_MCP_CONTAINER_NAME:-my-playwright-mcp-cont-headless}
     init: true
     stdin_open: true
     ports:

package/lib/plugin/playwright.js

@@ -15,42 +15,62 @@ const EXTENSIONS = [
     ['webgl-fingerprint-defender', 'olnbjpaejebpnokblkepbphhembdicik']
 ];
 
-const SCENE_ORDER = ['cont-headless', 'cont-headed', 'host-headless', 'host-headed'];
+const SCENE_ORDER = ['mcp-cont-headless', 'mcp-cont-headed', 'mcp-host-headless', 'mcp-host-headed', 'cli-host-headless', 'cli-host-headed'];
 
 const SCENE_DEFS = {
-    'cont-headless': {
+    'mcp-cont-headless': {
         type: 'container',
-        configFile: 'container-headless.json',
+        engine: 'mcp',
+        configFile: 'mcp-cont-headless.json',
         composeFile: 'compose-headless.yaml',
-        projectName: 'my-playwright-cont-headless',
-        containerName: 'my-playwright-cont-headless',
+        projectName: 'my-playwright-mcp-cont-headless',
+        containerName: 'my-playwright-mcp-cont-headless',
         portKey: 'contHeadless',
         headless: true,
         listenHost: '0.0.0.0'
     },
-    'cont-headed': {
+    'mcp-cont-headed': {
         type: 'container',
-        configFile: 'container-headed.json',
+        engine: 'mcp',
+        configFile: 'mcp-cont-headed.json',
         composeFile: 'compose-headed.yaml',
-        projectName: 'my-playwright-cont-headed',
-        containerName: 'my-playwright-cont-headed',
+        projectName: 'my-playwright-mcp-cont-headed',
+        containerName: 'my-playwright-mcp-cont-headed',
         portKey: 'contHeaded',
         headless: false,
         listenHost: '0.0.0.0'
     },
-    'host-headless': {
+    'mcp-host-headless': {
         type: 'host',
-        configFile: 'host-headless.json',
+        engine: 'mcp',
+        configFile: 'mcp-host-headless.json',
         portKey: 'hostHeadless',
         headless: true,
         listenHost: '127.0.0.1'
     },
-    'host-headed': {
+    'mcp-host-headed': {
         type: 'host',
-        configFile: 'host-headed.json',
+        engine: 'mcp',
+        configFile: 'mcp-host-headed.json',
         portKey: 'hostHeaded',
         headless: false,
         listenHost: '127.0.0.1'
+    },
+    'cli-host-headless': {
+        type: 'host',
+        engine: 'cli',
+        configFile: 'cli-host-headless.json',
+        portKey: 'cliHostHeadless',
+        headless: true,
+        listenHost: '0.0.0.0'
+    },
+    'cli-host-headed': {
+        type: 'host',
+        engine: 'cli',
+        configFile: 'cli-host-headed.json',
+        portKey: 'cliHostHeaded',
+        headless: false,
+        listenHost: '0.0.0.0'
     }
 };
 
@@ -67,6 +87,14 @@ const DEFAULT_FINGERPRINT_PROFILE = {
 };
 const DISABLE_WEBRTC_LAUNCH_ARGS = ['--disable-webrtc'];
 
+function isMcpScene(sceneName) {
+    return Boolean(SCENE_DEFS[sceneName] && SCENE_DEFS[sceneName].engine === 'mcp');
+}
+
+function isCliScene(sceneName) {
+    return Boolean(SCENE_DEFS[sceneName] && SCENE_DEFS[sceneName].engine === 'cli');
+}
+
 function platformFromUserAgent(userAgent) {
     const ua = String(userAgent || '').toLowerCase();
     if (ua.includes('macintosh') || ua.includes('mac os x')) {
@@ -264,6 +292,7 @@ class PlaywrightPlugin {
         const defaultConfig = {
             runtime: 'mixed',
             enabledScenes: [...SCENE_ORDER],
+            cliSessionScene: 'cli-host-headless',
             hostListen: '127.0.0.1',
             mcpDefaultHost: 'host.docker.internal',
             dockerTag: process.env.PLAYWRIGHT_MCP_DOCKER_TAG || 'latest',
@@ -281,6 +310,8 @@ class PlaywrightPlugin {
                 contHeaded: 8932,
                 hostHeadless: 8933,
                 hostHeaded: 8934,
+                cliHostHeadless: 8935,
+                cliHostHeaded: 8936,
                 contHeadedNoVnc: 6080
             }
         };
@@ -306,6 +337,7 @@ class PlaywrightPlugin {
             asStringArray(this.globalConfig.enabledScenes, [...defaultConfig.enabledScenes])
         );
         merged.containerRuntime = this.resolveContainerRuntime(merged.containerRuntime);
+        merged.cliSessionScene = String(merged.cliSessionScene || defaultConfig.cliSessionScene).trim();
         merged.navigatorPlatform = String(merged.navigatorPlatform || defaultConfig.navigatorPlatform).trim() || defaultConfig.navigatorPlatform;
         merged.disableWebRTC = asBoolean(merged.disableWebRTC, defaultConfig.disableWebRTC);
 
@@ -317,6 +349,9 @@ class PlaywrightPlugin {
         if (invalidScene) {
             throw new Error(`playwright.enabledScenes 包含未知场景: ${invalidScene}`);
         }
+        if (merged.cliSessionScene && !isCliScene(merged.cliSessionScene)) {
+            throw new Error(`playwright.cliSessionScene 无效: ${merged.cliSessionScene}`);
+        }
 
         return merged;
     }
@@ -412,6 +447,40 @@ class PlaywrightPlugin {
         return !fs.existsSync(this.sceneConfigPath(sceneName));
     }
 
+    sceneEndpointPath(sceneName) {
+        return path.join(this.config.runDir, `${sceneName}.endpoint.json`);
+    }
+
+    readSceneEndpoint(sceneName) {
+        const filePath = this.sceneEndpointPath(sceneName);
+        if (!fs.existsSync(filePath)) {
+            return null;
+        }
+        try {
+            return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        } catch {
+            return null;
+        }
+    }
+
+    writeSceneEndpoint(sceneName, payload) {
+        fs.mkdirSync(this.config.runDir, { recursive: true });
+        fs.writeFileSync(this.sceneEndpointPath(sceneName), `${JSON.stringify(payload, null, 4)}\n`, 'utf8');
+    }
+
+    removeSceneEndpoint(sceneName) {
+        fs.rmSync(this.sceneEndpointPath(sceneName), { force: true });
+    }
+
+    sceneCliAttachConfigPath(sceneName) {
+        return path.join(this.config.runDir, `${sceneName}.cli-attach.json`);
+    }
+
+    writeSceneCliAttachConfig(sceneName, payload) {
+        fs.mkdirSync(this.config.runDir, { recursive: true });
+        fs.writeFileSync(this.sceneCliAttachConfigPath(sceneName), `${JSON.stringify(payload, null, 4)}\n`, 'utf8');
+    }
+
     sceneInitScriptPath(sceneName) {
         const configFile = path.basename(this.sceneConfigPath(sceneName), '.json');
         return path.join(this.config.configDir, `${configFile}.init.js`);
@@ -479,6 +548,9 @@ class PlaywrightPlugin {
     }
 
     defaultBrowserName(sceneName) {
+        if (isCliScene(sceneName)) {
+            return 'chromium';
+        }
         const cfg = this.buildSceneConfig(sceneName);
         const browserName = cfg && cfg.browser && cfg.browser.browserName;
         return String(browserName || 'chromium');
@@ -494,10 +566,10 @@ class PlaywrightPlugin {
     }
 
     ensureHostScenePrerequisites(sceneName) {
-        if (!this.sceneConfigMissing(sceneName)) {
+        if (!isCliScene(sceneName) && !this.sceneConfigMissing(sceneName)) {
             return;
         }
-        this.runCmd([this.localBinPath('playwright'), 'install', '--with-deps', this.defaultBrowserName(sceneName)], { check: true });
+        this.runCmd([this.playwrightBinPath(sceneName), 'install', '--with-deps', this.defaultBrowserName(sceneName)], { check: true });
     }
 
     scenePidFile(sceneName) {
@@ -517,6 +589,26 @@ class PlaywrightPlugin {
         return binPath;
     }
 
+    playwrightBinPath(sceneName) {
+        if (!isCliScene(sceneName)) {
+            return this.localBinPath('playwright');
+        }
+
+        const filename = process.platform === 'win32' ? 'playwright.cmd' : 'playwright';
+        const candidates = [
+            path.join(this.projectRoot, 'node_modules', '@playwright', 'mcp', 'node_modules', '.bin', filename),
+            path.join(this.projectRoot, 'node_modules', '.bin', filename)
+        ];
+
+        for (const candidate of candidates) {
+            if (fs.existsSync(candidate)) {
+                return candidate;
+            }
+        }
+
+        throw new Error(`local binary not found for ${sceneName}. Run npm install first.`);
+    }
+
     extensionDirPath() {
         return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'extensions');
     }
@@ -650,22 +742,25 @@ class PlaywrightPlugin {
         return { containerPaths, volumeMounts };
     }
 
-    buildSceneConfig(sceneName, options = {}) {
-        const def = SCENE_DEFS[sceneName];
-        const port = this.scenePort(sceneName);
-        const extensionPaths = asStringArray(options.extensionPaths, []);
-        const initScript = asStringArray(options.initScript, []);
-        const baseLaunchArgs = [
+    baseLaunchArgs() {
+        return [
             `--user-agent=${DEFAULT_FINGERPRINT_PROFILE.userAgent}`,
             `--lang=${DEFAULT_FINGERPRINT_PROFILE.locale}`,
             `--window-size=${DEFAULT_FINGERPRINT_PROFILE.width},${DEFAULT_FINGERPRINT_PROFILE.height}`,
             '--disable-blink-features=AutomationControlled',
             '--force-webrtc-ip-handling-policy=disable_non_proxied_udp'
         ];
+    }
+
+    buildMcpSceneConfig(sceneName, options = {}) {
+        const def = SCENE_DEFS[sceneName];
+        const port = this.scenePort(sceneName);
+        const extensionPaths = asStringArray(options.extensionPaths, []);
+        const initScript = asStringArray(options.initScript, []);
         const launchOptions = {
             channel: 'chromium',
             headless: def.headless,
-            args: [...baseLaunchArgs]
+            args: [...this.baseLaunchArgs()]
         };
 
         if (extensionPaths.length > 0) {
@@ -676,7 +771,7 @@ class PlaywrightPlugin {
         }
 
         return {
-            outputDir: '/tmp/playwright-mcp',
+            outputDir: '/tmp/.playwright-mcp',
             server: {
                 host: def.listenHost,
                 port,
@@ -712,8 +807,44 @@ class PlaywrightPlugin {
         };
     }
 
+    buildCliSceneConfig(sceneName, options = {}) {
+        const def = SCENE_DEFS[sceneName];
+        const extensionPaths = asStringArray(options.extensionPaths, []);
+        const payload = {
+            host: def.listenHost,
+            port: this.scenePort(sceneName),
+            wsPath: `/${sceneName}-${crypto.randomBytes(8).toString('hex')}`,
+            headless: def.headless,
+            channel: 'chromium',
+            chromiumSandbox: true,
+            args: [...this.baseLaunchArgs()]
+        };
+
+        if (extensionPaths.length > 0) {
+            payload.args.push(...this.buildExtensionLaunchArgs(extensionPaths));
+        }
+        if (this.config.disableWebRTC) {
+            payload.args.push(...DISABLE_WEBRTC_LAUNCH_ARGS);
+        }
+
+        return payload;
+    }
+
+    buildSceneConfig(sceneName, options = {}) {
+        if (isCliScene(sceneName)) {
+            return this.buildCliSceneConfig(sceneName, options);
+        }
+        return this.buildMcpSceneConfig(sceneName, options);
+    }
+
     ensureSceneConfig(sceneName, options = {}) {
         fs.mkdirSync(this.config.configDir, { recursive: true });
+        if (isCliScene(sceneName)) {
+            const payload = this.buildCliSceneConfig(sceneName, options);
+            const filePath = this.sceneConfigPath(sceneName);
+            fs.writeFileSync(filePath, `${JSON.stringify(payload, null, 4)}\n`, 'utf8');
+            return filePath;
+        }
         const initScriptPath = this.ensureSceneInitScript(sceneName);
         const configuredInitScript = asStringArray(options.initScript, []);
         const initScript = configuredInitScript.length > 0 ? configuredInitScript : [initScriptPath];
@@ -772,13 +903,13 @@ class PlaywrightPlugin {
             PLAYWRIGHT_MCP_NOVNC_PORT: String(this.config.ports.contHeadedNoVnc)
         };
 
-        if (sceneName === 'cont-headed') {
+        if (sceneName === 'mcp-cont-headed') {
             const envKey = this.config.vncPasswordEnvKey;
             let password = process.env[envKey];
             if (!password) {
                 password = this.randomAlnum(16);
                 if (requireVncPassword) {
-                    this.writeStdout(`[up] cont-headed ${envKey} not set; generated random 16-char password: ${password}`);
+                    this.writeStdout(`[up] mcp-cont-headed ${envKey} not set; generated random 16-char password: ${password}`);
                 }
             }
             env.VNC_PASSWORD = password;
@@ -816,6 +947,37 @@ class PlaywrightPlugin {
         return overridePath;
     }
 
+    buildCliSessionIntegration(dockerCmd) {
+        const sceneName = this.config.cliSessionScene;
+        if (!sceneName) {
+            return { envEntries: [], extraArgs: [], volumeEntries: [] };
+        }
+
+        const endpoint = this.readSceneEndpoint(sceneName);
+        if (!endpoint || !Number.isInteger(endpoint.port) || endpoint.port <= 0 || typeof endpoint.wsPath !== 'string' || !endpoint.wsPath) {
+            return { envEntries: [], extraArgs: [], volumeEntries: [] };
+        }
+
+        const normalizedDockerCmd = String(dockerCmd || '').trim().toLowerCase();
+        const connectHost = normalizedDockerCmd === 'podman' ? 'host.containers.internal' : 'host.docker.internal';
+        const remoteEndpoint = `ws://${connectHost}:${endpoint.port}${endpoint.wsPath}`;
+        const hostConfigPath = this.sceneCliAttachConfigPath(sceneName);
+        const containerConfigPath = `/tmp/manyoyo-playwright/${sceneName}.cli-attach.json`;
+        this.writeSceneCliAttachConfig(sceneName, {
+            browser: {
+                remoteEndpoint
+            }
+        });
+        const envEntries = [
+            `PLAYWRIGHT_MCP_CONFIG=${containerConfigPath}`
+        ];
+        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)) {
@@ -972,8 +1134,21 @@ class PlaywrightPlugin {
         return cp.returncode === 0 ? 0 : 1;
     }
 
-    spawnHostProcess(mcpBinPath, cfgPath, logFd) {
-        return spawn(mcpBinPath, ['--config', String(cfgPath)], {
+    hostLaunchCommand(sceneName, cfgPath) {
+        if (isCliScene(sceneName)) {
+            return {
+                command: this.playwrightBinPath(sceneName),
+                args: ['launch-server', '--browser', this.defaultBrowserName(sceneName), '--config', String(cfgPath)]
+            };
+        }
+        return {
+            command: this.localBinPath('playwright-mcp'),
+            args: ['--config', String(cfgPath)]
+        };
+    }
+
+    spawnHostProcess(command, args, logFd) {
+        return spawn(command, args, {
             detached: true,
             stdio: ['ignore', logFd, logFd]
         });
@@ -998,7 +1173,9 @@ class PlaywrightPlugin {
 
     hostScenePids(sceneName) {
         const cfgPath = this.sceneConfigPath(sceneName);
-        const pattern = `playwright-mcp.*--config ${cfgPath}`;
+        const pattern = isCliScene(sceneName)
+            ? `playwright.*launch-server.*--config ${cfgPath}`
+            : `playwright-mcp.*--config ${cfgPath}`;
         const cp = this.runCmd(['pgrep', '-f', pattern], { captureOutput: true, check: false });
 
         if (cp.returncode !== 0 || !cp.stdout.trim()) {
@@ -1043,6 +1220,7 @@ class PlaywrightPlugin {
         const pidFile = this.scenePidFile(sceneName);
         const logFile = this.sceneLogFile(sceneName);
         const port = this.scenePort(sceneName);
+        this.removeSceneEndpoint(sceneName);
 
         let managedPids = this.hostScenePids(sceneName);
         if (managedPids.length > 0 && (await this.portReady(port))) {
@@ -1058,22 +1236,29 @@ class PlaywrightPlugin {
 
         fs.rmSync(pidFile, { force: true });
         const logFd = fs.openSync(logFile, 'a');
-        let mcpBinPath = '';
+        let launchCommand = null;
         try {
-            mcpBinPath = this.localBinPath('playwright-mcp');
+            launchCommand = this.hostLaunchCommand(sceneName, cfgPath);
         } catch (error) {
             fs.closeSync(logFd);
             this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
             return 1;
         }
 
-        const starter = this.spawnHostProcess(mcpBinPath, cfgPath, logFd);
+        const starter = this.spawnHostProcess(launchCommand.command, launchCommand.args, logFd);
         fs.closeSync(logFd);
         if (typeof starter.unref === 'function') {
             starter.unref();
         }
 
         if (await this.waitForPort(port)) {
+            if (isCliScene(sceneName)) {
+                const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
+                this.writeSceneEndpoint(sceneName, {
+                    port,
+                    wsPath: String(cfg.wsPath || '')
+                });
+            }
             managedPids = await this.waitForHostPids(sceneName, starter.pid);
             if (managedPids.length > 0) {
                 fs.writeFileSync(pidFile, `${managedPids[0]}`, 'utf8');
@@ -1099,6 +1284,7 @@ class PlaywrightPlugin {
         const pidFile = this.scenePidFile(sceneName);
         const port = this.scenePort(sceneName);
         const managedPids = this.hostScenePids(sceneName);
+        this.removeSceneEndpoint(sceneName);
 
         for (const pid of managedPids) {
             try {
@@ -1337,7 +1523,7 @@ class PlaywrightPlugin {
             return 1;
         }
 
-        const scenes = this.resolveTargets('all');
+        const scenes = this.resolveTargets('all').filter(sceneName => isMcpScene(sceneName));
         for (const sceneName of scenes) {
             const url = `http://${host}:${this.scenePort(sceneName)}/mcp`;
             this.writeStdout(`claude mcp add -t http -s user playwright-${sceneName} ${url}`);
@@ -1391,7 +1577,7 @@ class PlaywrightPlugin {
         return 1;
     }
 
-    async run({ action, scene = 'host-headless', host = '', extensionPaths = [], extensionNames = [], prodversion = '' }) {
+    async run({ action, scene = 'mcp-host-headless', host = '', extensionPaths = [], extensionNames = [], prodversion = '' }) {
         if (action === 'ls') {
             return this.printSummary();
         }

package/lib/web/server.js

@@ -778,6 +778,7 @@ function buildStaticContainerRuntime(ctx, containerName) {
         imageName: ctx.imageName,
         imageVersion: ctx.imageVersion,
         contModeArgs: Array.isArray(ctx.contModeArgs) ? ctx.contModeArgs.slice() : [],
+        containerExtraArgs: Array.isArray(ctx.containerExtraArgs) ? ctx.containerExtraArgs.slice() : [],
         containerEnvs: Array.isArray(ctx.containerEnvs) ? ctx.containerEnvs.slice() : [],
         containerVolumes: Array.isArray(ctx.containerVolumes) ? ctx.containerVolumes.slice() : [],
         containerPorts: Array.isArray(ctx.containerPorts) ? ctx.containerPorts.slice() : [],
@@ -918,6 +919,7 @@ function buildCreateRuntime(ctx, state, payload) {
         imageName,
         imageVersion,
         contModeArgs,
+        containerExtraArgs: Array.isArray(ctx.containerExtraArgs) ? ctx.containerExtraArgs.slice() : [],
         containerEnvs,
         containerVolumes,
         containerPorts,
@@ -1019,6 +1021,7 @@ async function ensureWebContainer(ctx, state, containerInput) {
             imageName: runtime.imageName,
             imageVersion: runtime.imageVersion,
             contModeArgs: runtime.contModeArgs,
+            containerExtraArgs: runtime.containerExtraArgs,
             containerEnvs: runtime.containerEnvs,
             containerVolumes: runtime.containerVolumes,
             containerPorts: runtime.containerPorts,
@@ -1770,6 +1773,7 @@ async function startWebServer(options) {
         execCommand: options.execCommand,
         execCommandSuffix: options.execCommandSuffix,
         contModeArgs: options.contModeArgs,
+        containerExtraArgs: options.containerExtraArgs,
         containerEnvs: options.containerEnvs,
         containerVolumes: options.containerVolumes,
         containerPorts: options.containerPorts,

package/manyoyo.example.json

@@ -6,7 +6,7 @@
     "hostPath": "/path/to/your/project",
     "containerPath": "/path/to/your/project",
     "imageName": "localhost/xcanwin/manyoyo",
-    "imageVersion": "1.8.4-common",
+    "imageVersion": "1.8.8-common",
     "containerMode": "common",
 
     // 容器启动环境（env 按 key 合并覆盖；其余数组参数会累加）
@@ -50,10 +50,12 @@
             // mixed: 支持容器+宿主机；container: 仅容器；host: 仅宿主机
             "runtime": "mixed",
             // 启用场景（可按需裁剪）
-            "enabledScenes": ["cont-headless", "cont-headed", "host-headless", "host-headed"],
+            "enabledScenes": ["mcp-cont-headless", "mcp-cont-headed", "mcp-host-headless", "mcp-host-headed", "cli-host-headless", "cli-host-headed"],
+            // my run 默认注入的 playwright-cli 宿主场景
+            "cliSessionScene": "cli-host-headless",
             // mcp-add 默认 host（可改为 localhost / 127.0.0.1）
             "mcpDefaultHost": "host.docker.internal",
-            // cont-headed 场景读取的密码环境变量名（默认 VNC_PASSWORD）
+            // mcp-cont-headed 场景读取的密码环境变量名（默认 VNC_PASSWORD）
             "vncPasswordEnvKey": "VNC_PASSWORD",
             // playwright ext-download 的 CRX prodversion 参数
             "extensionProdversion": "132.0.0.0",
@@ -66,6 +68,8 @@
                 "contHeaded": 8932,
                 "hostHeadless": 8933,
                 "hostHeaded": 8934,
+                "cliHostHeadless": 8935,
+                "cliHostHeaded": 8936,
                 "contHeadedNoVnc": 6080
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.3.10",
-    "imageVersion": "1.8.4-common",
+    "version": "5.4.4",
+    "imageVersion": "1.8.8-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
         "manyoyo",