@xcanwin/manyoyo 8.3.0 → 8.3.1

package/README.en.md

@@ -53,7 +53,7 @@ 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.0-common` only if you need a custom image. More commands: [CLI reference](https://xcanwin.github.io/manyoyo/en/reference/cli-options).
+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
 

package/README.md

@@ -53,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

@@ -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');
@@ -123,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;
@@ -603,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) {
@@ -1201,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('选项:')
@@ -1454,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') {
@@ -1525,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');
     }
@@ -1579,21 +1487,13 @@ 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
         };
     }
 
@@ -1662,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));
@@ -1832,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
     };
 }
 
@@ -2183,6 +2083,8 @@ async function createNewContainer(runtime) {
     );
     const defaultCommand = runtime.execCommand;
 
+    await applyPlaywrightIntegration(runtime);
+
     if (runtime.showCommand) {
         console.log(buildDockerRunCmd(runtime));
         process.exit(0);
@@ -2473,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';
@@ -2586,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/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" "$@"

package/docker/res/playwright/stealth.init.js

@@ -0,0 +1,14 @@
+'use strict';
+(function () {
+    try {
+        const toolbar = 87;
+        const patch = (name, fallback, getter) => {
+            const original = Object.getOwnPropertyDescriptor(window, name);
+            if (!original || !original.get) return;
+            const real = original.get;
+            Object.defineProperty(window, name, { ...original, get: getter(function () { const value = real.call(this); return value === 0 ? fallback() : value; }) });
+        };
+        patch('outerWidth', () => window.innerWidth, fn => Object.getOwnPropertyDescriptor({ get outerWidth() { return fn.call(this); } }, 'outerWidth').get);
+        patch('outerHeight', () => window.innerHeight + toolbar, fn => Object.getOwnPropertyDescriptor({ get outerHeight() { return fn.call(this); } }, 'outerHeight').get);
+    } catch (_) {}
+})();

package/lib/global-config.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const JSON5 = require('json5');
-const { findTopLevelPropertyValueRange } = require('./json5-text-edit');
+const { upsertValueByPath } = require('./json5-text-edit');
 const { writeConfigFileSecure } = require('./secure-file');
 
 function getManyoyoConfigPath(homeDir = os.homedir()) {
@@ -38,23 +38,8 @@ function readManyoyoConfig(homeDir = os.homedir()) {
     }
 }
 
-function insertTopLevelImageVersion(text, imageVersion) {
-    const openBraceIndex = text.indexOf('{');
-    if (openBraceIndex === -1) {
-        return null;
-    }
-
-    const newlineIndex = text.indexOf('\n', openBraceIndex);
-    const insertIndex = newlineIndex === -1 ? openBraceIndex + 1 : newlineIndex + 1;
-    return `${text.slice(0, insertIndex)}    imageVersion: ${JSON.stringify(imageVersion)},\n${text.slice(insertIndex)}`;
-}
-
 function updateImageVersionText(text, imageVersion) {
-    const range = findTopLevelPropertyValueRange(text, 'imageVersion');
-    if (range) {
-        return `${text.slice(0, range.start)}${JSON.stringify(imageVersion)}${text.slice(range.end)}`;
-    }
-    return insertTopLevelImageVersion(text, imageVersion);
+    return upsertValueByPath(text, ['imageVersion'], JSON.stringify(imageVersion));
 }
 
 function syncGlobalImageVersion(imageVersion, options = {}) {
@@ -87,22 +72,12 @@ function syncGlobalImageVersion(imageVersion, options = {}) {
         };
     }
 
-    const nextConfig = {
-        ...currentConfig,
-        imageVersion
-    };
-
-    if (result.exists) {
-        const currentText = fs.readFileSync(configPath, 'utf-8');
-        const updatedText = updateImageVersionText(currentText, imageVersion);
-        if (updatedText) {
-            writeConfigFileSecure(configPath, updatedText.endsWith('\n') ? updatedText : `${updatedText}\n`);
-        } else {
-            writeConfigFileSecure(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
-        }
-    } else {
-        writeConfigFileSecure(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
-    }
+    // 只在原文上局部替换，保留注释与格式；文件不存在或为空时写标准 JSON
+    const currentText = result.exists ? fs.readFileSync(configPath, 'utf-8') : '';
+    const updatedText = currentText.trim()
+        ? updateImageVersionText(currentText, imageVersion)
+        : `${JSON.stringify({ imageVersion }, null, 4)}\n`;
+    writeConfigFileSecure(configPath, updatedText.endsWith('\n') ? updatedText : `${updatedText}\n`);
 
     return {
         updated: true,

package/lib/init-config.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { writeConfigFileSecure } = require('./secure-file');
+const { upsertValueByPath } = require('./json5-text-edit');
 
 // 每个 Agent 需要哪些环境变量：CLI init 与 Web 首次向导共用的单一数据源。
 // requiredAnyOf：其中任意一个非空即视为该 Agent 可用。
@@ -414,6 +415,9 @@ async function initAgentConfigs(rawAgents, options = {}) {
         }
         runsMap = { ...manyoyoConfig.runs };
     }
+    // 只在原文上局部写入各 runs.<agent>，保留用户的注释与格式
+    const originalRaw = fs.existsSync(manyoyoConfigPath) ? fs.readFileSync(manyoyoConfigPath, 'utf-8') : '';
+    let nextRaw = originalRaw;
 
     let hasConfigChanged = false;
     ctx.log(`${CYAN}🧭 正在初始化 MANYOYO 配置: ${agents.join(', ')}${NC}`);
@@ -427,6 +431,7 @@ async function initAgentConfigs(rawAgents, options = {}) {
         if (shouldWriteRun) {
             const buildResult = buildInitRunProfile(agent, spec.yolo, data.volumes, data.keys, data.values);
             runsMap[agent] = buildResult.runProfile;
+            if (originalRaw.trim()) nextRaw = upsertValueByPath(nextRaw, ['runs', agent], JSON.stringify(buildResult.runProfile, null, 4));
             writeResult = { missingKeys: buildResult.missingKeys, unsafeKeys: buildResult.unsafeKeys };
             hasConfigChanged = true;
         }
@@ -450,8 +455,12 @@ async function initAgentConfigs(rawAgents, options = {}) {
     }
 
     if (hasConfigChanged || !fs.existsSync(manyoyoConfigPath)) {
-        manyoyoConfig.runs = runsMap;
-        writeConfigFileSecure(manyoyoConfigPath, `${JSON.stringify(manyoyoConfig, null, 4)}\n`);
+        if (originalRaw.trim()) {
+            writeConfigFileSecure(manyoyoConfigPath, nextRaw);
+        } else {
+            // 新文件没有可保留的注释，写标准 JSON
+            writeConfigFileSecure(manyoyoConfigPath, `${JSON.stringify({ ...manyoyoConfig, runs: runsMap }, null, 4)}\n`);
+        }
     }
 }
 

package/lib/json5-text-edit.js

@@ -252,10 +252,13 @@ function insertObjectProperty(text, objectStartIndex, key, valueText) {
     const objectIndent = lineIndentAt(text, objectStartIndex);
     const childIndent = `${objectIndent}    `;
     const prefix = `\n${childIndent}${formatPropertyKey(key)}: `;
-    // 空对象：闭合的 } 另起一行，不要贴在逗号后面
-    const closesRightAfter = text[skipTrivia(text, objectStartIndex + 1)] === '}';
+    // '{' 同一行后面只有空白或 // 注释时，插到该行末尾，注释留在 '{' 那一行，不会被挪到新属性后面
+    const lineEnd = text.indexOf('\n', objectStartIndex + 1);
+    const tailIsTrivia = lineEnd !== -1 && /^\s*(\/\/.*)?$/.test(text.slice(objectStartIndex + 1, lineEnd));
+    // 空对象且 } 紧跟在同一行：闭合的 } 另起一行；} 已在后面的行上就不再补，避免多出空行
+    const closesRightAfter = !tailIsTrivia && text[skipTrivia(text, objectStartIndex + 1)] === '}';
     const insertion = `${prefix}${reindent(valueText, childIndent)},${closesRightAfter ? `\n${objectIndent}` : ''}`;
-    const insertPos = objectStartIndex + 1;
+    const insertPos = tailIsTrivia ? lineEnd : objectStartIndex + 1;
     const nextText = `${text.slice(0, insertPos)}${insertion}${text.slice(insertPos)}`;
     return { text: nextText, valueStart: insertPos + prefix.length };
 }