@xcanwin/manyoyo 8.2.1 → 8.3.1

package/README.en.md

@@ -0,0 +1,88 @@
+<p align="center">
+  <img src="./assets/manyoyo-logo-09-cyberpunk-terminal.svg" alt="MANYOYO logo" width="560" />
+</p>
+
+# <p align="center"><a href="https://github.com/xcanwin/manyoyo">MANYOYO</a></p>
+<p align="center"><b>MANYOYO – open-source sandbox for running AI coding agents (Claude Code / Codex / Gemini) safely in Docker/Podman</b></p>
+<p align="center">Run Claude Code / Codex / Gemini / OpenCode in YOLO mode inside a container: let the AI go wild without hurting your computer.</p>
+<p align="center">
+  <a href="https://www.npmjs.com/package/@xcanwin/manyoyo"><img alt="npm" src="https://img.shields.io/npm/v/@xcanwin/manyoyo?style=flat-square" /></a>
+  <a href="https://github.com/xcanwin/manyoyo/actions/workflows/npm-publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/xcanwin/manyoyo/npm-publish.yml?style=flat-square" /></a>
+  <a href="https://github.com/xcanwin/manyoyo/blob/main/LICENSE"><img alt="license" src="https://img.shields.io/badge/License-MIT-yellow.svg" /></a>
+</p>
+
+<p align="center">
+  <a href="README.md">中文</a> |
+  <a href="README.en.md"><b>English</b></a>
+</p>
+<p align="center">
+  Docs: <a href="https://xcanwin.github.io/manyoyo/en/">https://xcanwin.github.io/manyoyo/en/</a>
+</p>
+
+---
+
+## Install
+
+### macOS / Linux (recommended)
+
+```bash
+curl -fsSL https://github.com/xcanwin/manyoyo/raw/main/scripts/install.sh | sh
+```
+
+When it finishes, follow the on-screen prompts to finish setup. macOS needs nothing installed first. Linux: if the container runtime is missing, the installer explains why and, with your consent, installs it with sudo.
+
+### Already have Node.js and Docker/Podman
+
+```bash
+npm install -g @xcanwin/manyoyo
+manyoyo
+```
+
+## Daily use
+
+```bash
+manyoyo            # open the web UI
+manyoyo update     # upgrade
+manyoyo uninstall  # uninstall (config and data are kept by default)
+```
+
+## Command line (optional)
+
+```bash
+manyoyo init all   # import the agent configs already on this machine
+manyoyo run -y c   # start Claude Code in YOLO mode inside the sandbox
+```
+
+The default image `ghcr.io/xcanwin/manyoyo` is pulled automatically on first use; run `manyoyo build --iv 2.1.1-common` only if you need a custom image. More commands: [CLI reference](https://xcanwin.github.io/manyoyo/en/reference/cli-options).
+
+## What it does
+
+- **Multiple agents**: `claude`, `codex`, `gemini`, `opencode` behind one entry point
+- **Container isolation**: Docker / Podman; the agent only sees the work directory you give it
+- **Web UI**: chat, browse files and open a terminal in the browser, phone friendly
+- **One config**: run profiles, environment variables, mounts and image arguments in `~/.manyoyo/manyoyo.json`
+- **One command** to install, upgrade and uninstall
+
+| | Running the agent CLI directly | MANYOYO |
+| --- | --- | --- |
+| Host exposure | High | Lower |
+| Run boundary | Scattered | Centralised in the container and config |
+| Reproducible environment | Weak | Strong (image + config) |
+| High-risk mode warnings | Left to the tool | Explicit YOLO / SOLO / sock warnings |
+
+## Security notes
+
+MANYOYO reduces risk but is not "absolutely safe": the main isolation is a container, not a virtual machine; `YOLO / SOLO` can still run dangerous commands; `sock` mode exposes the host Docker socket; set a strong password before listening on a public address. See [Security notes](https://xcanwin.github.io/manyoyo/en/guide/security).
+
+## Docs
+
+- 中文: <https://xcanwin.github.io/manyoyo/>
+- English: <https://xcanwin.github.io/manyoyo/en/> ([Install](https://xcanwin.github.io/manyoyo/en/guide/quick-start), [CLI reference](https://xcanwin.github.io/manyoyo/en/reference/cli-options), [Configuration](https://xcanwin.github.io/manyoyo/en/configuration/), [FAQ](https://xcanwin.github.io/manyoyo/en/troubleshooting/))
+
+## License
+
+MIT
+
+## Contributing
+
+[Issues](https://github.com/xcanwin/manyoyo/issues) and pull requests are welcome.

package/README.md

@@ -3,7 +3,8 @@
 </p>
 
 # <p align="center"><a href="https://github.com/xcanwin/manyoyo">MANYOYO（慢悠悠）</a></p>
-<p align="center">让 Claude Code / Codex / Gemini / OpenCode 在容器里放心跑 YOLO 模式：AI 随便折腾，伤不到你的电脑。</p>
+<p align="center"><b>MANYOYO – open-source sandbox for running AI coding agents (Claude Code / Codex / Gemini) safely in Docker/Podman</b></p>
+<p align="center">开源 AI Agent 沙箱：让 Claude Code / Codex / Gemini / OpenCode 在容器里放心跑 YOLO 模式，AI 随便折腾，伤不到你的电脑。</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@xcanwin/manyoyo"><img alt="npm" src="https://img.shields.io/npm/v/@xcanwin/manyoyo?style=flat-square" /></a>
   <a href="https://github.com/xcanwin/manyoyo/actions/workflows/npm-publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/xcanwin/manyoyo/npm-publish.yml?style=flat-square" /></a>
@@ -12,7 +13,7 @@
 
 <p align="center">
   <a href="README.md"><b>中文</b></a> |
-  <a href="https://xcanwin.github.io/manyoyo/en/">English</a>
+  <a href="README.en.md">English</a>
 </p>
 <p align="center">
   文档：<a href="https://xcanwin.github.io/manyoyo/">https://xcanwin.github.io/manyoyo/</a>
@@ -28,7 +29,7 @@
 curl -fsSL https://github.com/xcanwin/manyoyo/raw/main/scripts/install.sh | sh
 ```
 
-装完浏览器自动打开，按向导选 Agent、填 Key 就能开始对话。macOS 不需要预装任何东西；Linux 需要已有 Docker 或 Podman。
+装完按屏幕提示完成配置。macOS 不需要预装任何东西。Linux：缺少容器环境时，安装器会说明原因，征得你同意后用 sudo 自动安装。
 
 ### 已有 Node.js 和 Docker/Podman
 
@@ -52,7 +53,7 @@ manyoyo init all   # 把本机已有的 Agent 配置搬进来
 manyoyo run -y c   # 在沙箱里以 YOLO 模式启动 Claude Code
 ```
 
-默认镜像 `ghcr.io/xcanwin/manyoyo` 首次使用时自动拉取；需要自定义镜像时再执行 `manyoyo build --iv 2.1.0-common`。更多命令见[命令速查](https://xcanwin.github.io/manyoyo/reference/cli-options)。
+默认镜像 `ghcr.io/xcanwin/manyoyo` 首次使用时自动拉取；需要自定义镜像时再执行 `manyoyo build --iv 2.1.1-common`。更多命令见[命令速查](https://xcanwin.github.io/manyoyo/reference/cli-options)。
 
 ## 它能做什么
 

package/bin/manyoyo.js

@@ -9,7 +9,7 @@ const net = require('net');
 const readline = require('readline');
 const { Command, Help } = require('commander');
 const { startWebServer } = require('../lib/web/server');
-const { buildContainerRunArgs, buildContainerRunCommand } = require('../lib/container-run');
+const { buildContainerRunArgs, buildContainerRunCommand, runWithEnvFile } = require('../lib/container-run');
 const { getManyoyoConfigPath, readManyoyoConfig, syncGlobalImageVersion } = require('../lib/global-config');
 const { resolveUpdateImageVersion } = require('../lib/image-version-policy');
 const { selectContainerRuntime, mergeRuntimeEnv } = require('../lib/container-runtime');
@@ -34,7 +34,7 @@ const { resolveAgentResumeArg, buildAgentResumeCommand } = require('../lib/agent
 const { resolveYoloCommand } = require('../lib/agent-adapters');
 const { runDoctorChecks, applyDoctorFixes } = require('../lib/doctor');
 const { resolveContainerMode } = require('../lib/container-modes');
-const { runPluginCommand, createPlugin } = require('../lib/plugin');
+const { runPlaywrightCommand, buildContainerIntegration, mergeIntegration } = require('../lib/plugin');
 const { buildManyoyoLogPath } = require('../lib/log-path');
 const { resolveRuntimeConfig } = require('../lib/runtime-resolver');
 const { resolveWorktreeSupport } = require('../lib/worktrees');
@@ -47,6 +47,7 @@ const { applyAptMirror } = require('../lib/mirrors');
 const {
     sanitizeSensitiveData,
     sanitizeServeLogText,
+    redactCommandArgs,
     formatServeLogValue,
     getServeProcessSnapshot
 } = require('../lib/serve-log');
@@ -122,6 +123,7 @@ const IMAGE_VERSION_TAG_PATTERN = /^(\d+\.\d+\.\d+)-([A-Za-z0-9][A-Za-z0-9_.-]*)
 
 // Docker command (will be set by ensure_docker)
 let DOCKER_CMD = 'docker';
+let PLAYWRIGHT_PLUGIN_CONFIG = { globalConfig: {}, runConfig: {} };
 // 仅运行时子进程使用的完整 env（私有 Podman 才有值），不要写回 process.env
 let DOCKER_ENV;
 let CONTAINER_RUNTIME = null;
@@ -602,61 +604,21 @@ 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);
+// Playwright 浏览器模式的容器参数；在容器创建时（运行时已确定）才计算，失败只警告，不影响 run
+async function applyPlaywrightIntegration(runtime) {
+    const integration = await buildContainerIntegration({
+        ...PLAYWRIGHT_PLUGIN_CONFIG,
+        dryRun: runtime.showCommand,
+        runtimeCommand: DOCKER_CMD,
+        envEntries: runtime.containerEnvs.filter((_, i) => i % 2 === 1)
+    });
+    if (integration.warning) {
+        console.warn(`${YELLOW}⚠️  ${integration.warning}${NC}`);
     }
+    const merged = mergeIntegration(runtime, integration);
+    runtime.containerEnvs = merged.containerEnvs;
+    runtime.containerVolumes = merged.containerVolumes;
+    runtime.containerExtraArgs = merged.containerExtraArgs;
 }
 
 function addVolume(volume) {
@@ -728,6 +690,18 @@ async function ensureRunImage(runtime) {
     });
 }
 
+// 把 run 失败的 stderr 尾部（已打码）与可执行的修复提示拼进错误信息，而不是只剩一行 Command failed
+function explainCreateFailure(err) {
+    const raw = getCommandFailureText(err);
+    const tail = sanitizeServeLogText(String(err && err.stderr || '')).trim().split('\n').slice(-8).join('\n');
+    const info = describeError(raw, { command: DOCKER_CMD });
+    const parts = [err.message];
+    if (tail) parts.push(tail);
+    if (info && info.code === 'ROOTLESS_NETWORK_MISSING') parts.push(`提示: ${info.reason}\n${info.action}`);
+    err.message = parts.join('\n');
+    return err;
+}
+
 function showImagePullHint(err) {
     const info = describeError(getCommandFailureText(err), { imageRef: `${IMAGE_NAME}:${IMAGE_VERSION}` });
     if (!info || !['IMAGE_PULL_FAILED', 'IMAGE_NOT_FOUND'].includes(info.code)) {
@@ -753,7 +727,7 @@ function runCmd(cmd, args, options = {}) {
         if (options.ignoreError) {
             return result.stdout || '';
         }
-        const err = new Error(`Command failed: ${cmd} ${args.join(' ')}`);
+        const err = new Error(`Command failed: ${cmd} ${redactCommandArgs(args).join(' ')}`);
         err.stdout = result.stdout;
         err.stderr = result.stderr;
         err.status = result.status;
@@ -1188,79 +1162,6 @@ 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 || 'mcp-host-headless',
-            pluginHost: params.host || '',
-            pluginExtensionPaths: Array.isArray(params.extensionPaths) ? params.extensionPaths : [],
-            pluginExtensionNames: Array.isArray(params.extensionNames) ? params.extensionNames : [],
-            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(`执行 playwright ${action} 场景（scene 默认 mcp-host-headless）`)
-                .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)');
-
-            if (action === 'up') {
-                appendArrayOption(sceneCommand, '--ext-path <path>', '追加浏览器扩展目录（可多次传入；目录需包含 manifest.json）');
-                appendArrayOption(sceneCommand, '--ext-name <name>', '追加 ~/.manyoyo/plugin/playwright/extensions/ 下的扩展目录名（可多次传入）');
-            }
-
-            sceneCommand.action((scene, options) => selectPluginAction({
-                action,
-                pluginName: 'playwright',
-                scene: scene || 'mcp-host-headless',
-                extensionPaths: action === 'up' ? (options.extPath || []) : [],
-                extensionNames: action === 'up' ? (options.extName || []) : []
-            }, 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('cli-add')
-            .description('输出 playwright-cli skill 安装命令')
-            .action(() => selectPluginAction({
-                action: 'cli-add',
-                pluginName: 'playwright',
-                scene: 'all'
-            }));
-
-        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)
         .optionsGroup('选项:')
@@ -1441,25 +1342,45 @@ https://github.com/xcanwin/manyoyo
         });
     });
 
-    const playwrightCommand = program.command('playwright').helpGroup('网页服务与插件:').description('管理 Playwright 插件服务');
+    const selectPlaywright = (action, params = {}, options = {}) => {
+        selectAction('playwright', { ...options, playwrightRequest: { action, ...params } });
+    };
+    const playwrightCommand = program.command('playwright').helpGroup('网页服务与插件:')
+        .description('管理容器内浏览器的模式（默认无需任何命令）')
+        .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+        .action(options => selectPlaywright('overview', {}, options));
     playwrightCommand.addHelpText('after', `
-示例:
-  ${MANYOYO_NAME} playwright up mcp-host-headless     启动 MCP 宿主场景（默认/推荐）
-  ${MANYOYO_NAME} playwright up cli-host-headless     启动 CLI 宿主场景（供容器内 playwright-cli 附着）
+模式（同一时间只有一个）:
+  (默认)   容器内虚拟屏里的有头浏览器，什么都不用做
+  headed   宿主机上有窗口的浏览器：${MANYOYO_NAME} playwright up headed
+  chrome   你正在用的 Chrome（沿用登录状态，有风险）：${MANYOYO_NAME} playwright up chrome
+  vnc      独立容器里的浏览器，用 noVNC 网页观看：${MANYOYO_NAME} playwright up vnc
 `);
-    registerPlaywrightAliasCommands(playwrightCommand);
-
-    const pluginCommand = program.command('plugin', { hidden: true }).description('管理 manyoyo 插件');
-    pluginCommand.command('ls')
-        .description('列出可用插件与启用场景')
+    playwrightCommand.command('up [mode]')
+        .description('切换到 headed / chrome / vnc 模式（不带参数列出全部模式）')
         .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
-        .action(options => selectPluginAction({
-            action: 'ls',
-            pluginName: 'playwright',
-            scene: 'all'
+        .option('--ext-path <path>', '追加浏览器扩展目录（可多次传入；目录需包含 manifest.json；仅 headed、vnc）', (value, previous = []) => [...previous, value])
+        .option('--ext-name <name>', '追加 ~/.manyoyo/plugin/playwright/extensions/ 下的扩展目录名（可多次传入；仅 headed、vnc）', (value, previous = []) => [...previous, value])
+        .action((mode, options) => selectPlaywright('up', {
+            mode: mode || '',
+            extensionPaths: options.extPath || [],
+            extensionNames: options.extName || []
         }, options));
-    const pluginPlaywrightCommand = pluginCommand.command('playwright').description('管理 playwright 插件服务');
-    registerPlaywrightAliasCommands(pluginPlaywrightCommand);
+    [
+        ['down', '停止当前模式，回到默认模式'],
+        ['status', '查看当前模式并真实探测浏览器是否可用（不可用时退出码非 0）'],
+        ['logs', '查看当前模式的浏览器服务日志'],
+        ['mcp-add', '输出在容器内注册 Playwright MCP（stdio，随当前模式自动切换）的命令']
+    ].forEach(([action, description]) => {
+        playwrightCommand.command(action)
+            .description(description)
+            .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+            .action(options => selectPlaywright(action, {}, options));
+    });
+    playwrightCommand.command('ext-download')
+        .description('下载并解压 Playwright 扩展到 ~/.manyoyo/plugin/playwright/extensions/')
+        .option('--prodversion <ver>', 'CRX 下载使用的 Chrome 版本号 (默认 132.0.0.0)')
+        .action(options => selectPlaywright('ext-download', { prodversion: options.prodversion || '' }, options));
 
     // 安装包装完后调用的隐藏入口（不在帮助里）：按有头 / 无头决定下一步
     if (process.argv[2] === '--post-install') {
@@ -1473,6 +1394,9 @@ https://github.com/xcanwin/manyoyo
         await runAppLauncher({ force: launcherArgs.force });
     }
 
+    // 顶层 -V 与 -v 等价（commander 只允许一个短选项；子命令里的 -v 仍是 --volume，不受影响）
+    if (process.argv.length === 3 && process.argv[2] === '-V') process.argv[2] = '-v';
+
     // Pre-handle -x/--shell-full: treat all following args as a single command
     normalizeShellFullArgv(process.argv);
     normalizeWorktreeArgv(process.argv);
@@ -1509,7 +1433,7 @@ https://github.com/xcanwin/manyoyo
 
     UPDATE_CHECK_ENABLED = config.updateCheck !== false;
     MIRRORS = normalizeMirrors(config.mirrors);
-    const noDockerActions = new Set(['init', 'update', 'config-show', 'plugin', 'doctor', 'uninstall', 'podman', 'setup']);
+    const noDockerActions = new Set(['init', 'update', 'config-show', 'playwright', 'doctor', 'uninstall', 'podman', 'setup']);
     if (isServerStopMode || isServerListMode) {
         noDockerActions.add('serve');
     }
@@ -1563,26 +1487,20 @@ https://github.com/xcanwin/manyoyo
         process.exit(0);
     }
 
-    if (selectedAction === 'plugin') {
+    if (selectedAction === 'playwright') {
         const runConfig = options.run ? loadRunConfig(options.run, config) : {};
         return {
-            isPluginMode: true,
-            pluginRequest: {
-                action: options.pluginAction,
-                pluginName: options.pluginName,
-                scene: options.pluginScene || 'mcp-host-headless',
-                host: options.pluginHost || '',
-                extensionPaths: Array.isArray(options.pluginExtensionPaths) ? options.pluginExtensionPaths : [],
-                extensionNames: Array.isArray(options.pluginExtensionNames) ? options.pluginExtensionNames : [],
-                prodversion: options.pluginProdversion || ''
-            },
-            pluginGlobalConfig: config,
-            pluginRunConfig: runConfig
+            isPlaywrightMode: true,
+            playwrightRequest: options.playwrightRequest,
+            playwrightGlobalConfig: config,
+            playwrightRunConfig: runConfig
         };
     }
 
-    // Load run config if specified
-    const runConfig = options.run ? loadRunConfig(options.run, config) : {};
+    // Load run config if specified；doctor 不带 -r 且 runs 里只有一个配置时，按它检查
+    const runsMap = config.runs && typeof config.runs === 'object' && !Array.isArray(config.runs) ? Object.keys(config.runs) : [];
+    const runNameToLoad = options.run || (selectedAction === 'doctor' && runsMap.length === 1 ? runsMap[0] : '');
+    const runConfig = runNameToLoad ? loadRunConfig(runNameToLoad, config) : {};
     const globalFirstConfig = normalizeFirstConfig(config.first, '全局配置');
     const runFirstConfig = normalizeFirstConfig(runConfig.first, '运行配置');
 
@@ -1644,7 +1562,7 @@ https://github.com/xcanwin/manyoyo
     const firstEnvMap = resolvedRuntime.first.env;
     Object.entries(firstEnvMap).forEach(([key, value]) => addEnvTo(FIRST_CONTAINER_ENVS, `${key}=${value}`));
 
-    applyPlaywrightCliSessionIntegration(config, runConfig);
+    PLAYWRIGHT_PLUGIN_CONFIG = { globalConfig: config, runConfig };
 
     const volumeList = resolvedRuntime.volumes;
     volumeList.forEach(v => addVolume(v));
@@ -1814,7 +1732,7 @@ https://github.com/xcanwin/manyoyo
         isServerDetach: Boolean(selectedAction === 'serve' && options.detach),
         isServerListenSpecified: Boolean(isServerMode && options.server !== true),
         updateAgents: Boolean(options.updateAgents),
-        isPluginMode: false
+        isPlaywrightMode: false
     };
 }
 
@@ -2165,6 +2083,8 @@ async function createNewContainer(runtime) {
     );
     const defaultCommand = runtime.execCommand;
 
+    await applyPlaywrightIntegration(runtime);
+
     if (runtime.showCommand) {
         console.log(buildDockerRunCmd(runtime));
         process.exit(0);
@@ -2175,10 +2095,12 @@ async function createNewContainer(runtime) {
     // 使用数组参数执行命令（安全方式）
     try {
         const args = buildDockerRunArgs(runtime);
-        dockerExecArgs(args, { stdio: 'pipe' });
+        runWithEnvFile(args, path.join(os.homedir(), '.manyoyo', 'tmp'), finalArgs => dockerExecArgs(finalArgs, { stdio: 'pipe' }));
     } catch (e) {
         showImagePullHint(e);
-        throw e;
+        // 失败的 run 可能留下 Created 状态的容器；这个名字创建前不存在，所以只清理本次留下的这一个
+        try { dockerExecArgs(['rm', '-f', runtime.containerName], { stdio: 'pipe' }); } catch (cleanupError) { /* 尽力清理 */ }
+        throw explainCreateFailure(e);
     }
 
     // Wait for container to be ready
@@ -2223,7 +2145,7 @@ function buildDockerRunArgs(runtime) {
  * @returns {string} 命令字符串
  */
 function buildDockerRunCmd(runtime) {
-    const args = buildDockerRunArgs(runtime);
+    const args = redactCommandArgs(buildDockerRunArgs(runtime));
     return buildContainerRunCommand(DOCKER_CMD, args);
 }
 
@@ -2453,6 +2375,11 @@ async function runWebServerMode(runtime) {
         fetchLatest: () => appUpdate.fetchLatestRelease()
     });
 
+    // 启动时检查 Playwright 当前模式是否还活着，失效就回退到默认模式（只警告，不阻塞启动）
+    buildContainerIntegration({ ...PLAYWRIGHT_PLUGIN_CONFIG, runtimeCommand: DOCKER_CMD })
+        .then(integration => { if (integration.warning) console.warn(`${YELLOW}⚠️  ${integration.warning}${NC}`); })
+        .catch(() => {});
+
     const needRuntimeHeal = !isRuntimeProven();
     if (needRuntimeHeal) {
         RUNTIME_STATE.status = 'starting';
@@ -2566,11 +2493,10 @@ async function main() {
         // 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, '..'),
+        if (modeState.isPlaywrightMode) {
+            const exitCode = await runPlaywrightCommand(modeState.playwrightRequest, {
+                globalConfig: modeState.playwrightGlobalConfig,
+                runConfig: modeState.playwrightRunConfig,
                 stdout: process.stdout,
                 stderr: process.stderr
             });

package/docker/manyoyo.Dockerfile

@@ -95,7 +95,9 @@ ARG PY_TEXT_EXTRA_PIP_PACKAGES=""
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8 \
     PIP_ROOT_USER_ACTION=ignore \
-    PLAYWRIGHT_MCP_CONFIG=/app/config/cli-cont-headless.json
+    NO_UPDATE_NOTIFIER=1 \
+    DISPLAY=:99 \
+    PLAYWRIGHT_MCP_CONFIG=/run/manyoyo-playwright/config.json
 
 # 合并系统依赖与 Python 安装为单层，减少镜像体积
 RUN <<EOX
@@ -152,8 +154,6 @@ EOX
 # 从 cache-stage 复制 Node.js（缓存或下载）
 COPY --from=cache-stage /opt/node /usr/local
 COPY ./package.json /tmp/manyoyo-package.json
-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
 
@@ -230,12 +230,18 @@ RUN <<EOX
         cp /tmp/docker-res/opencode/opencode.json ~/.config/opencode/opencode.json
     ;; esac
 
-    # 安装 Playwright CLI skills（不在镜像构建阶段下载浏览器）
+    # 安装 Playwright CLI skills 与 chromium 浏览器
     PLAYWRIGHT_CLI_INSTALL_DIR=/tmp/playwright-cli-install
     mkdir -p "$PLAYWRIGHT_CLI_INSTALL_DIR/.playwright"
     cd "$PLAYWRIGHT_CLI_INSTALL_DIR"
     PLAYWRIGHT_CLI_VERSION=$(node -p "const pkg = require('/tmp/manyoyo-package.json'); const value = String(pkg.playwrightCliVersion || '').trim(); if (!value) { throw new Error('package.json.playwrightCliVersion is required'); } value")
     npm install -g "@playwright/cli@${PLAYWRIGHT_CLI_VERSION}"
+    # 浏览器与系统依赖都用 @playwright/cli 自带的 playwright-core 安装；
+    # 默认在 Xvfb 虚拟屏（配轻量窗口管理器）里跑有头浏览器，所以装 xvfb、fluxbox 与常见字体；x11vnc / noVNC 供 playwright vnc 模式使用
+    PLAYWRIGHT_CORE_CLI="$(npm root -g)/@playwright/cli/node_modules/playwright-core/cli.js"
+    node "$PLAYWRIGHT_CORE_CLI" install-deps chromium
+    apt-get install -y --no-install-recommends xvfb fluxbox x11vnc novnc websockify fonts-noto-cjk fonts-noto-color-emoji fonts-liberation
+    node "$PLAYWRIGHT_CORE_CLI" install --no-shell chromium
     playwright-cli install --skills
     PLAYWRIGHT_CLI_SKILL_SOURCE="$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli"
     for target in ~/.claude/skills/playwright-cli ~/.codex/skills/playwright-cli ~/.gemini/skills/playwright-cli; do
@@ -252,6 +258,12 @@ RUN <<EOX
     rm -f /var/log/dpkg.log /var/log/bootstrap.log /var/lib/dpkg/status-old /var/cache/debconf/templates.dat-old
 EOX
 
+# Playwright 默认配置（挂载宿主机目录时会被覆盖，路径固定）与按需启动 Xvfb 的 playwright-cli 包装
+COPY ./docker/res/playwright/browser.json /run/manyoyo-playwright/config.json
+COPY ./docker/res/playwright/stealth.init.js /run/manyoyo-playwright/stealth.init.js
+COPY --chmod=755 ./docker/res/playwright/playwright-cli.sh /usr/local/sbin/playwright-cli
+RUN ln -s playwright-cli /usr/local/sbin/playwright-mcp
+
 # 从 cache-stage 复制 JDT LSP 到最终位置，避免中转层残留
 COPY --from=cache-stage /opt/jdtls /root/.local/share/jdtls
 

package/docker/res/claude/settings.json

@@ -1,4 +1,9 @@
 {
+    "attribution": {
+        "commit": "",
+        "pr": "",
+        "sessionUrl": false
+    },
     "statusLine": {
         "type": "command",
         "command": "bash /root/.claude/statusline.sh"

package/docker/res/playwright/browser.json

@@ -0,0 +1,28 @@
+{
+    "outputDir": "/tmp/.playwright-cli",
+    "browser": {
+        "chromiumSandbox": false,
+        "browserName": "chromium",
+        "initScript": [
+            "/run/manyoyo-playwright/stealth.init.js"
+        ],
+        "contextOptions": {
+            "locale": "en-US",
+            "timezoneId": "UTC",
+            "viewport": null,
+            "extraHTTPHeaders": {
+                "Accept-Language": "en-US,en;q=0.9"
+            }
+        },
+        "launchOptions": {
+            "channel": "chromium",
+            "headless": false,
+            "args": [
+                "--lang=en-US",
+                "--window-size=1920,1080",
+                "--disable-blink-features=AutomationControlled",
+                "--force-webrtc-ip-handling-policy=disable_non_proxied_udp"
+            ]
+        }
+    }
+}

package/docker/res/playwright/playwright-cli.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# 按需启动 Xvfb 与轻量窗口管理器（多个会话共用 :99），浏览器以有头模式跑在虚拟屏里。
+# 以 playwright-cli 名字调用时交给 @playwright/cli；以 playwright-mcp 名字调用时启动 stdio MCP（读同一份 $PLAYWRIGHT_MCP_CONFIG）。
+export DISPLAY=:99
+CONFIG="${PLAYWRIGHT_MCP_CONFIG:-/run/manyoyo-playwright/config.json}"
+# 浏览器在容器外（headed / chrome / vnc）时不需要虚拟屏
+if ! grep -qE '"(remoteEndpoint|cdpEndpoint)"' "$CONFIG" 2>/dev/null; then
+    # 以锁文件里的进程是否活着为准；容器被 kill 后遗留的 socket 与锁文件要清掉
+    if ! kill -0 "$(cat /tmp/.X99-lock 2>/dev/null)" 2>/dev/null; then
+        rm -f /tmp/.X99-lock /tmp/.X11-unix/X99
+        setsid Xvfb :99 -screen 0 1920x1080x24 -nolisten tcp >/dev/null 2>&1 &
+        i=0
+        while [ ! -S /tmp/.X11-unix/X99 ] && [ "$i" -lt 50 ]; do
+            sleep 0.1
+            i=$((i + 1))
+        done
+        # 窗口管理器让窗口有真实的外框与工作区（screen.availHeight < height），不再是裸 X 屏
+        setsid fluxbox >/dev/null 2>&1 &
+        sleep 0.5
+    fi
+fi
+PACKAGE=/usr/local/lib/node_modules/@playwright/cli
+if [ "$(basename "$0")" = "playwright-mcp" ]; then
+    exec node "$PACKAGE/node_modules/playwright-core/cli.js" mcp --config "$CONFIG" "$@"
+fi
+exec node "$PACKAGE/playwright-cli.js" "$@"