@xcanwin/manyoyo 5.4.6 → 5.4.14

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.8-common
+manyoyo build --iv 1.8.12-common
 manyoyo init all
 manyoyo run -r claude
 ```
@@ -137,10 +137,10 @@ manyoyo config command
 
 ```bash
 # common 版本
-manyoyo build --iv 1.8.8-common
+manyoyo build --iv 1.8.12-common
 
 # full 版本
-manyoyo build --iv 1.8.8-full
+manyoyo build --iv 1.8.12-full
 
 # 自定义工具集
 manyoyo build --iba TOOL=go,codex,java,gemini

package/bin/manyoyo.js

@@ -570,6 +570,42 @@ function addEnvFile(envFile) {
     return addEnvFileTo(CONTAINER_ENVS, envFile);
 }
 
+function expandHomeAliasPath(filePath) {
+    const text = String(filePath || '').trim();
+    const homeDir = process.env.HOME || os.homedir();
+
+    if (text === '~') {
+        return homeDir;
+    }
+    if (text.startsWith('~/')) {
+        return path.join(homeDir, text.slice(2));
+    }
+    if (text === '$HOME') {
+        return homeDir;
+    }
+    if (text.startsWith('$HOME/')) {
+        return path.join(homeDir, text.slice('$HOME/'.length));
+    }
+
+    return text;
+}
+
+function normalizeVolume(volume) {
+    const text = String(volume || '').trim();
+    if (!text.startsWith('~') && !text.startsWith('$HOME')) {
+        return text;
+    }
+
+    const separatorIndex = text.indexOf(':');
+    if (separatorIndex === -1) {
+        return expandHomeAliasPath(text);
+    }
+
+    const hostPath = text.slice(0, separatorIndex);
+    const rest = text.slice(separatorIndex);
+    return `${expandHomeAliasPath(hostPath)}${rest}`;
+}
+
 function hasEnvKey(targetEnvs, key) {
     for (let i = 0; i < targetEnvs.length; i += 2) {
         if (targetEnvs[i] !== '--env') {
@@ -1071,6 +1107,14 @@ async function setupCommander() {
                 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)')
@@ -1109,8 +1153,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 mcp-host-headless         启动 playwright 默认场景（推荐）
-  ${MANYOYO_NAME} plugin playwright up mcp-host-headless  通过 plugin 命名空间启动
+  ${MANYOYO_NAME} playwright up mcp-host-headless     启动 playwright MCP 宿主场景（默认/推荐）
+  ${MANYOYO_NAME} playwright up cli-host-headless     启动 playwright CLI 宿主场景（供容器内 playwright-cli 附着）
   ${MANYOYO_NAME} run -n test -q tip -q cmd           多次使用静默选项
         `);
 
@@ -1372,7 +1416,8 @@ Notes:
 
     applyPlaywrightCliSessionIntegration(config, runConfig);
 
-    const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume);
+    const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume)
+        .map(normalizeVolume);
     volumeList.forEach(v => addVolume(v));
 
     const portList = mergeArrayConfig(config.ports, runConfig.ports, options.port);

package/docker/manyoyo.Dockerfile

@@ -127,6 +127,7 @@ 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/
@@ -202,32 +203,30 @@ RUN <<EOX
     ;; 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}"
+    mkdir -p "$PLAYWRIGHT_CLI_INSTALL_DIR/.playwright"
+    echo '{"browser":{"browserName":"chromium","launchOptions":{"channel":"chromium"}}}' > "${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright/cli.config.json"
+    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 --config="${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright/cli.config.json" 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
+        mkdir -p "$target"
+        cp -R "$PLAYWRIGHT_CLI_SKILL_SOURCE/." "$target/"
+    done
+    cd "$OLDPWD"
+    rm -rf "$PLAYWRIGHT_CLI_INSTALL_DIR"
 
     # 清理
     npm cache clean --force
+    rm -f /tmp/manyoyo-package.json
     rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
 EOX
 
+COPY ./docker/res/playwright/playwright-cli-wrapper.sh /usr/local/bin/playwright-cli
+RUN chmod +x /usr/local/bin/playwright-cli
+
 # 从 cache-stage 复制 JDT LSP（缓存或下载）
 COPY --from=cache-stage /opt/jdtls /tmp/jdtls-cache
 

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

@@ -0,0 +1,82 @@
+#!/usr/bin/env sh
+set -eu
+
+PLAYWRIGHT_NODE_BIN="${PLAYWRIGHT_NODE_BIN:-node}"
+PLAYWRIGHT_CLI_ROOT="/usr/local/lib/node_modules/@playwright/cli/node_modules/playwright"
+PLAYWRIGHT_CLI_PROGRAM="${PLAYWRIGHT_CLI_ROOT}/lib/cli/client/program.js"
+PLAYWRIGHT_REAL_CLI="${PLAYWRIGHT_CLI_ROOT}/cli.js"
+
+resolve_browser() {
+    browser=""
+
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            --browser=*)
+                browser="${1#--browser=}"
+                ;;
+            --browser)
+                shift
+                if [ "$#" -gt 0 ]; then
+                    browser="$1"
+                    shift
+                fi
+                continue
+                ;;
+            --)
+                break
+                ;;
+            -*)
+                ;;
+            *)
+                if [ -z "$browser" ]; then
+                    browser="$1"
+                fi
+                ;;
+        esac
+        shift
+    done
+
+    if [ -n "$browser" ]; then
+        printf '%s\n' "$browser"
+        return 0
+    fi
+
+    "$PLAYWRIGHT_NODE_BIN" <<'NODE'
+const fs = require('fs');
+const path = require('path');
+
+const candidates = [
+    process.env.PLAYWRIGHT_MCP_CONFIG,
+    path.resolve('.playwright/cli.config.json')
+].filter(Boolean);
+
+for (const filePath of candidates) {
+    try {
+        const config = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        const browser = config && config.browser ? config.browser : {};
+        const launchOptions = browser.launchOptions || {};
+        const channel = String(launchOptions.channel || browser.browserName || '').trim();
+        if (channel) {
+            process.stdout.write(channel);
+            process.exit(0);
+        }
+    } catch (_) {}
+}
+
+process.stdout.write('chromium');
+NODE
+}
+
+if [ "${1-}" = "install-browser" ]; then
+    shift
+    for arg in "$@"; do
+        if [ "$arg" = "--help" ] || [ "$arg" = "-h" ]; then
+            exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_CLI_PROGRAM" install-browser "$@"
+        fi
+    done
+
+    BROWSER="$(resolve_browser "$@")"
+    exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_REAL_CLI" install "$BROWSER"
+fi
+
+exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_CLI_PROGRAM" "$@"

package/lib/global-config.js

@@ -36,6 +36,223 @@ function readManyoyoConfig(homeDir = os.homedir()) {
     }
 }
 
+function readQuotedString(text, startIndex) {
+    const quote = text[startIndex];
+    let value = '';
+
+    for (let i = startIndex + 1; i < text.length; i += 1) {
+        const ch = text[i];
+        if (ch === '\\') {
+            value += ch;
+            if (i + 1 < text.length) {
+                value += text[i + 1];
+                i += 1;
+            }
+            continue;
+        }
+        if (ch === quote) {
+            return {
+                value,
+                end: i + 1
+            };
+        }
+        value += ch;
+    }
+
+    return null;
+}
+
+function isIdentifierStart(ch) {
+    return /[A-Za-z_$]/.test(ch);
+}
+
+function isIdentifierPart(ch) {
+    return /[A-Za-z0-9_$]/.test(ch);
+}
+
+function skipWhitespace(text, index) {
+    let i = index;
+    while (i < text.length && /\s/.test(text[i])) {
+        i += 1;
+    }
+    return i;
+}
+
+function findTopLevelPropertyValueRange(text, propertyName) {
+    let depth = 0;
+    let inString = '';
+    let inLineComment = false;
+    let inBlockComment = false;
+
+    for (let i = 0; i < text.length; i += 1) {
+        const ch = text[i];
+        const next = text[i + 1];
+
+        if (inLineComment) {
+            if (ch === '\n') inLineComment = false;
+            continue;
+        }
+        if (inBlockComment) {
+            if (ch === '*' && next === '/') {
+                inBlockComment = false;
+                i += 1;
+            }
+            continue;
+        }
+        if (inString) {
+            if (ch === '\\') {
+                i += 1;
+                continue;
+            }
+            if (ch === inString) inString = '';
+            continue;
+        }
+
+        if (ch === '/' && next === '/') {
+            inLineComment = true;
+            i += 1;
+            continue;
+        }
+        if (ch === '/' && next === '*') {
+            inBlockComment = true;
+            i += 1;
+            continue;
+        }
+        if (depth === 1 && !/\s|,/.test(ch)) {
+            let property = '';
+            let cursor = i;
+            if (ch === '"' || ch === '\'') {
+                const token = readQuotedString(text, i);
+                if (!token) {
+                    return null;
+                }
+                property = token.value;
+                cursor = token.end;
+            } else if (isIdentifierStart(ch)) {
+                cursor = i + 1;
+                while (cursor < text.length && isIdentifierPart(text[cursor])) {
+                    cursor += 1;
+                }
+                property = text.slice(i, cursor);
+            }
+
+            if (property) {
+                const colonIndex = skipWhitespace(text, cursor);
+                if (text[colonIndex] === ':') {
+                    if (property !== propertyName) {
+                        i = colonIndex;
+                        continue;
+                    }
+
+                    let valueStart = skipWhitespace(text, colonIndex + 1);
+                    let valueEnd = valueStart;
+                    let valueString = '';
+                    let valueLineComment = false;
+                    let valueBlockComment = false;
+                    let valueDepth = 0;
+
+                    for (; valueEnd < text.length; valueEnd += 1) {
+                        const valueCh = text[valueEnd];
+                        const valueNext = text[valueEnd + 1];
+
+                        if (valueLineComment) {
+                            if (valueCh === '\n') valueLineComment = false;
+                            continue;
+                        }
+                        if (valueBlockComment) {
+                            if (valueCh === '*' && valueNext === '/') {
+                                valueBlockComment = false;
+                                valueEnd += 1;
+                            }
+                            continue;
+                        }
+                        if (valueString) {
+                            if (valueCh === '\\') {
+                                valueEnd += 1;
+                                continue;
+                            }
+                            if (valueCh === valueString) valueString = '';
+                            continue;
+                        }
+
+                        if (valueCh === '/' && valueNext === '/') {
+                            valueLineComment = true;
+                            valueEnd += 1;
+                            continue;
+                        }
+                        if (valueCh === '/' && valueNext === '*') {
+                            valueBlockComment = true;
+                            valueEnd += 1;
+                            continue;
+                        }
+                        if (valueCh === '"' || valueCh === '\'') {
+                            valueString = valueCh;
+                            continue;
+                        }
+                        if (valueCh === '{' || valueCh === '[' || valueCh === '(') {
+                            valueDepth += 1;
+                            continue;
+                        }
+                        if (valueCh === '}' || valueCh === ']' || valueCh === ')') {
+                            if (valueDepth === 0) {
+                                break;
+                            }
+                            valueDepth -= 1;
+                            continue;
+                        }
+                        if (valueDepth === 0 && valueCh === ',') {
+                            break;
+                        }
+                    }
+
+                    while (valueEnd > valueStart && /\s/.test(text[valueEnd - 1])) {
+                        valueEnd -= 1;
+                    }
+
+                    return {
+                        start: valueStart,
+                        end: valueEnd
+                    };
+                }
+            }
+        }
+
+        if (ch === '"' || ch === '\'') {
+            inString = ch;
+            continue;
+        }
+        if (ch === '{' || ch === '[') {
+            depth += 1;
+            continue;
+        }
+        if (ch === '}' || ch === ']') {
+            depth -= 1;
+            continue;
+        }
+    }
+
+    return null;
+}
+
+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);
+}
+
 function syncGlobalImageVersion(imageVersion, options = {}) {
     const homeDir = options.homeDir || os.homedir();
     const result = readManyoyoConfig(homeDir);
@@ -72,7 +289,17 @@ function syncGlobalImageVersion(imageVersion, options = {}) {
     };
 
     fs.mkdirSync(path.dirname(configPath), { recursive: true });
-    fs.writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
+    if (result.exists) {
+        const currentText = fs.readFileSync(configPath, 'utf-8');
+        const updatedText = updateImageVersionText(currentText, imageVersion);
+        if (updatedText) {
+            fs.writeFileSync(configPath, updatedText.endsWith('\n') ? updatedText : `${updatedText}\n`);
+        } else {
+            fs.writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
+        }
+    } else {
+        fs.writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
+    }
 
     return {
         updated: true,

package/lib/plugin/playwright.js

@@ -6,6 +6,7 @@ const os = require('os');
 const path = require('path');
 const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
+const { playwrightCliVersion: PLAYWRIGHT_CLI_VERSION } = require('../../package.json');
 
 const EXTENSIONS = [
     ['ublock-origin-lite', 'ddkjiahejlhfcafbddmgiahcphecmpfh'],
@@ -290,6 +291,7 @@ class PlaywrightPlugin {
         const homeDir = os.homedir();
         const pluginRootDir = path.join(homeDir, '.manyoyo', 'plugin', 'playwright');
         const defaultConfig = {
+            homeDir,
             runtime: 'mixed',
             enabledScenes: [...SCENE_ORDER],
             cliSessionScene: 'cli-host-headless',
@@ -379,6 +381,29 @@ class PlaywrightPlugin {
         this.stderr.write(`${line}\n`);
     }
 
+    remindCliSessionScene(sceneName) {
+        if (!isCliScene(sceneName)) {
+            return;
+        }
+        if (sceneName !== 'cli-host-headed') {
+            return;
+        }
+        if (this.config.cliSessionScene === sceneName) {
+            return;
+        }
+        this.writeStdout('[tip] 如果希望容器内 manyoyo run 自动附着到当前 CLI 宿主场景，请在 ~/.manyoyo/manyoyo.json 中设置:');
+        this.writeStdout('{');
+        this.writeStdout('    "volumes": [');
+        this.writeStdout('        "~/.manyoyo/.cache/ms-playwright:/root/.cache/ms-playwright"');
+        this.writeStdout('    ],');
+        this.writeStdout('    "plugins": {');
+        this.writeStdout('        "playwright": {');
+        this.writeStdout('            "cliSessionScene": "cli-host-headed"');
+        this.writeStdout('        }');
+        this.writeStdout('    }');
+        this.writeStdout('}');
+    }
+
     randomAlnum(length = 16) {
         const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
         let out = '';
@@ -605,11 +630,22 @@ class PlaywrightPlugin {
     }
 
     extensionDirPath() {
-        return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'extensions');
+        return path.join(this.config.homeDir, '.manyoyo', 'plugin', 'playwright', 'extensions');
     }
 
     extensionTmpDirPath() {
-        return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'tmp-crx');
+        return path.join(this.config.homeDir, '.manyoyo', 'plugin', 'playwright', 'tmp-crx');
+    }
+
+    cliBrowserCacheDirPath() {
+        return path.join(this.config.homeDir, '.manyoyo', '.cache', 'ms-playwright');
+    }
+
+    ensureCliHostHeadedCacheDir(sceneName) {
+        if (sceneName !== 'cli-host-headed') {
+            return;
+        }
+        fs.mkdirSync(this.cliBrowserCacheDirPath(), { recursive: true });
     }
 
     resolveTargets(sceneName = 'all') {
@@ -1204,6 +1240,7 @@ class PlaywrightPlugin {
 
     async startHost(sceneName, options = {}) {
         try {
+            this.ensureCliHostHeadedCacheDir(sceneName);
             this.ensureHostScenePrerequisites(sceneName);
         } catch (error) {
             this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
@@ -1259,6 +1296,7 @@ class PlaywrightPlugin {
             if (managedPids.length > 0) {
                 fs.writeFileSync(pidFile, `${managedPids[0]}`, 'utf8');
                 this.writeStdout(`[up] ${sceneName} ready on 127.0.0.1:${port} (pid(s) ${managedPids.join(' ')})`);
+                this.remindCliSessionScene(sceneName);
                 return 0;
             }
         }
@@ -1539,6 +1577,26 @@ class PlaywrightPlugin {
         return 0;
     }
 
+    printCliAdd() {
+        const lines = [
+            'PLAYWRIGHT_CLI_INSTALL_DIR="${TMPDIR:-/tmp}/manyoyo-playwright-cli-install-$$"',
+            'mkdir -p "$PLAYWRIGHT_CLI_INSTALL_DIR/.playwright"',
+            'echo \'{"browser":{"browserName":"chromium","launchOptions":{"channel":"chromium"}}}\' > "$PLAYWRIGHT_CLI_INSTALL_DIR/.playwright/cli.config.json"',
+            'cd "$PLAYWRIGHT_CLI_INSTALL_DIR"',
+            `npm install -g @playwright/cli@${PLAYWRIGHT_CLI_VERSION}`,
+            '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',
+            '    mkdir -p "$target"',
+            '    cp -R "$PLAYWRIGHT_CLI_SKILL_SOURCE/." "$target/"',
+            'done',
+            'cd "$OLDPWD"',
+            'rm -rf "$PLAYWRIGHT_CLI_INSTALL_DIR"'
+        ];
+        this.writeStdout(lines.join('\n'));
+        return 0;
+    }
+
     printSummary() {
         const scenes = this.resolveTargets('all');
         this.writeStdout(`playwright\truntime=${this.config.runtime}\tscenes=${scenes.join(',')}`);
@@ -1583,6 +1641,10 @@ class PlaywrightPlugin {
             return this.printMcpAdd(host);
         }
 
+        if (action === 'cli-add') {
+            return this.printCliAdd();
+        }
+
         if (action === 'ext-download') {
             return await this.downloadExtensions({ prodversion });
         }

package/package.json

@@ -1,7 +1,8 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.4.6",
-    "imageVersion": "1.8.8-common",
+    "version": "5.4.14",
+    "imageVersion": "1.8.12-common",
+    "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
         "manyoyo",