@xcanwin/manyoyo 8.2.1 → 8.3.1

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/container-run.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
 const { buildMirrorEnvArgs } = require('./mirrors');
 
 function sanitizeDefaultCommand(defaultCommand) {
@@ -26,6 +29,38 @@ function buildContainerRunArgs(options) {
     return args;
 }
 
+/**
+ * 把命令行里的 `--env KEY=值` 挪进 0600 的临时 env 文件，改用 `--env-file` 传入，
+ * 避免密钥出现在 ps / /proc 与错误信息里；exec 返回（或抛错）后立即删除文件。
+ * 没有 KEY=值 形式的 env 时原样执行。
+ */
+function runWithEnvFile(args, dir, exec) {
+    const rest = [];
+    const lines = [];
+    let envFileIndex = -1;
+    for (let i = 0; i < args.length; i++) {
+        if (args[i] === '--env' && /^[^=]+=/.test(String(args[i + 1] ?? ''))) {
+            if (envFileIndex < 0) envFileIndex = rest.length;
+            lines.push(args[i + 1]);
+            i += 1;
+        } else {
+            rest.push(args[i]);
+        }
+    }
+    if (!lines.length) return exec(args);
+
+    fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+    fs.chmodSync(dir, 0o700);
+    const file = path.join(dir, `env-${process.pid}-${crypto.randomBytes(4).toString('hex')}`);
+    fs.writeFileSync(file, `${lines.join('\n')}\n`, { mode: 0o600, flag: 'wx' });
+    rest.splice(envFileIndex, 0, '--env-file', file);
+    try {
+        return exec(rest);
+    } finally {
+        fs.rmSync(file, { force: true });
+    }
+}
+
 function quoteShellArg(value) {
     const text = String(value);
     if (text.includes(' ') || text.includes('"') || text.includes('=')) {
@@ -40,5 +75,6 @@ function buildContainerRunCommand(dockerCmd, args) {
 
 module.exports = {
     buildContainerRunArgs,
+    runWithEnvFile,
     buildContainerRunCommand
 };

package/lib/doctor.js

@@ -2,6 +2,8 @@
 
 const { resolveContainerMode } = require('./container-modes');
 const { resolveAgentProgram } = require('./agent-resume');
+const { describeError } = require('./error-hints');
+const { checkRootlessNetwork } = require('./rootless-network');
 
 function createCheck(code, status, summary, action = '', detail = '') {
     return { code, status, summary, action, detail };
@@ -9,6 +11,8 @@ function createCheck(code, status, summary, action = '', detail = '') {
 
 // 卡死的 daemon（如无响应的 Docker Desktop）不能让诊断无限挂起
 const COMMAND_TIMEOUT_MS = 10000;
+// 真实启动一次容器（含网络配置），比 info 慢
+const START_TEST_TIMEOUT_MS = 60000;
 
 // runCommand 可以是同步或异步执行器；serve 里传异步的，避免阻塞事件循环
 async function runDoctorChecks(options = {}) {
@@ -45,13 +49,37 @@ async function runDoctorChecks(options = {}) {
         } catch (error) {
             checks.push(createCheck('DAEMON_UNAVAILABLE', 'error', `${runtimeCommand} daemon 不可用`, `启动 ${runtimeCommand} daemon 后重试。`, error.message || ''));
         }
+        const network = await checkRootlessNetwork(runCommand, { command: runtimeCommand, env: runtimeEnv, timeout: COMMAND_TIMEOUT_MS, platform: options.platform });
+        if (network && network.missing) {
+            checks.push(createCheck('ROOTLESS_NETWORK_MISSING', 'error', network.reason, network.action));
+        } else if (network) {
+            checks.push(createCheck('ROOTLESS_NETWORK_OK', 'ok', `rootless 网络组件可用: ${network.component}`));
+        }
+        const image = `${options.imageName || ''}:${options.imageVersion || ''}`;
+        let imageAvailable = false;
         try {
-            const image = `${options.imageName || ''}:${options.imageVersion || ''}`;
             const detail = String(await runCommand(runtimeCommand, ['image', 'inspect', image], { env: runtimeEnv, timeout: COMMAND_TIMEOUT_MS }) || '').trim();
             checks.push(createCheck('IMAGE_AVAILABLE', 'ok', `镜像可用: ${image}`, '', detail));
+            imageAvailable = true;
         } catch (error) {
             checks.push(createCheck('IMAGE_MISSING', 'warning', '目标镜像尚不可用', '执行 manyoyo build，或拉取匹配镜像。', error.message || ''));
         }
+        // 镜像在、网络组件也没查出问题时，真实启动一次：info 正常不代表容器能起来
+        if (imageAvailable && !(network && network.missing)) {
+            try {
+                await runCommand(runtimeCommand, ['run', '--rm', '--entrypoint', '', image, 'true'], { env: runtimeEnv, timeout: START_TEST_TIMEOUT_MS });
+                checks.push(createCheck('CONTAINER_START_OK', 'ok', '容器可以正常启动'));
+            } catch (error) {
+                const raw = `${error.message || ''}\n${error.stderr || ''}`;
+                const info = describeError(raw, { command: runtimeCommand, imageRef: image });
+                checks.push(createCheck(
+                    'CONTAINER_START_FAILED', 'error',
+                    info ? info.reason : '容器无法启动',
+                    info ? info.action : `手动执行 ${runtimeCommand} run --rm ${image} true 查看原因。`,
+                    String(error.stderr || error.message || '').trim().split('\n').slice(-5).join('\n')
+                ));
+            }
+        }
     }
 
     checks.push(options.configExists === true
@@ -71,9 +99,13 @@ async function runDoctorChecks(options = {}) {
     }
 
     const pluginConfig = options.pluginConfig;
-    checks.push(pluginConfig && typeof pluginConfig === 'object' && !Array.isArray(pluginConfig)
-        ? createCheck('PLUGIN_CONFIG_VALID', 'ok', '插件配置有效')
-        : createCheck('PLUGIN_CONFIG_INVALID', 'warning', '插件配置不存在或格式无效', '将 plugins 配置为对象(map)。'));
+    if (pluginConfig === undefined || pluginConfig === null) {
+        checks.push(createCheck('PLUGIN_CONFIG_VALID', 'ok', '未配置插件'));
+    } else {
+        checks.push(typeof pluginConfig === 'object' && !Array.isArray(pluginConfig)
+            ? createCheck('PLUGIN_CONFIG_VALID', 'ok', '插件配置有效')
+            : createCheck('PLUGIN_CONFIG_INVALID', 'warning', '插件配置格式无效', '将 plugins 配置为对象(map)。'));
+    }
 
     if (options.portStatus === 'available') {
         checks.push(createCheck('PORT_AVAILABLE', 'ok', '监听端口可用'));

package/lib/error-hints.js

@@ -1,7 +1,14 @@
 'use strict';
 
+const { describeMissing } = require('./rootless-network');
+
 // 原始运行时/系统错误 -> “原因 + 下一步”。新增映射只改这里。
 const RULES = [
+    {
+        code: 'ROOTLESS_NETWORK_MISSING',
+        pattern: /could not find (slirp4netns|pasta)/i,
+        describe: (ctx, match) => describeMissing(match[1].toLowerCase(), ctx)
+    },
     {
         code: 'PODMAN_MACHINE_UNAVAILABLE',
         pattern: /Cannot connect to Podman|unable to connect to Podman socket|podman machine start|podman system connection/i,
@@ -78,8 +85,9 @@ function describeError(text, context = {}) {
     const raw = String(text || '');
     const ctx = { command: 'docker', imageRef: '', port: '', ...context };
     for (const rule of RULES) {
-        if (rule.pattern.test(raw)) {
-            return { code: rule.code, ...rule.describe(ctx) };
+        const match = rule.pattern.exec(raw);
+        if (match) {
+            return { code: rule.code, ...rule.describe(ctx, match) };
         }
     }
     return null;

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

@@ -235,12 +235,30 @@ function formatPropertyKey(key) {
     return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(key) ? key : JSON.stringify(key);
 }
 
+// 某个位置所在行的缩进
+function lineIndentAt(text, index) {
+    const lineStart = text.lastIndexOf('\n', index - 1) + 1;
+    return /^[ \t]*/.exec(text.slice(lineStart))[0];
+}
+
+// 多行值（JSON.stringify 的结果）的后续行补上插入位置的缩进，否则内层会顶格
+function reindent(valueText, indent) {
+    return String(valueText).replace(/\n/g, `\n${indent}`);
+}
+
 // 永远只在对象的 '{' 后面插入，不管这个对象原来是空的还是已经有属性——
 // 不用去判断"是不是最后一个属性、要不要补逗号"，语法上总是安全的
 function insertObjectProperty(text, objectStartIndex, key, valueText) {
-    const prefix = `\n    ${formatPropertyKey(key)}: `;
-    const insertion = `${prefix}${valueText},`;
-    const insertPos = objectStartIndex + 1;
+    const objectIndent = lineIndentAt(text, objectStartIndex);
+    const childIndent = `${objectIndent}    `;
+    const prefix = `\n${childIndent}${formatPropertyKey(key)}: `;
+    // '{' 同一行后面只有空白或 // 注释时，插到该行末尾，注释留在 '{' 那一行，不会被挪到新属性后面
+    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 = tailIsTrivia ? lineEnd : objectStartIndex + 1;
     const nextText = `${text.slice(0, insertPos)}${insertion}${text.slice(insertPos)}`;
     return { text: nextText, valueStart: insertPos + prefix.length };
 }
@@ -269,7 +287,7 @@ function upsertValueByPath(text, pathParts, valueText) {
         if (existingRange) {
             if (isLast) {
                 return applyTextReplacements(currentText, [
-                    { start: existingRange.start, end: existingRange.end, text: valueText }
+                    { start: existingRange.start, end: existingRange.end, text: reindent(valueText, lineIndentAt(currentText, existingRange.start)) }
                 ]);
             }
             const nextObjectStart = skipTrivia(currentText, existingRange.start);

package/lib/plugin/fingerprint.js

@@ -0,0 +1,176 @@
+'use strict';
+
+// 浏览器指纹的唯一数据源：宿主机生成的配置与镜像内的 docker/res/playwright/* 都从这里生成。
+// 原则是各项信号自洽：UA、Client Hints、平台、字体、WebGL 一律用浏览器真实值，不做自相矛盾的伪装；
+// 只固定语言、时区、窗口形态与自动化痕迹。
+
+const CONTAINER_CONFIG_DIR = '/run/manyoyo-playwright';
+const CONTAINER_CONFIG_PATH = `${CONTAINER_CONFIG_DIR}/config.json`;
+const CONTAINER_INIT_SCRIPT_PATH = `${CONTAINER_CONFIG_DIR}/stealth.init.js`;
+const CONTAINER_OUTPUT_DIR = '/tmp/.playwright-cli';
+
+const DEFAULT_PROFILE = {
+    locale: 'en-US',
+    timezoneId: 'UTC',
+    navigatorPlatform: '',
+    disableWebRTC: false
+};
+
+function resolveProfile(options = {}) {
+    const text = (value, fallback) => String(value || '').trim() || fallback;
+    return {
+        locale: text(options.locale, DEFAULT_PROFILE.locale),
+        timezoneId: text(options.timezoneId, DEFAULT_PROFILE.timezoneId),
+        navigatorPlatform: text(options.navigatorPlatform, DEFAULT_PROFILE.navigatorPlatform),
+        disableWebRTC: options.disableWebRTC === true
+    };
+}
+
+function acceptLanguage(locale) {
+    const language = String(locale).split('-')[0];
+    return language === locale ? `${locale};q=0.9` : `${locale},${language};q=0.9`;
+}
+
+// 宿主机的时区与系统语言，作为默认值
+function detectHostProfile() {
+    const resolved = Intl.DateTimeFormat().resolvedOptions();
+    return { locale: resolved.locale, timezoneId: resolved.timeZone };
+}
+
+// window: 'virtual' 为容器内 1920x1080 虚拟屏；'native' 为真实桌面，最大化即可
+function buildLaunchArgs(options = {}, window = 'native') {
+    const profile = resolveProfile(options);
+    const args = [
+        `--lang=${profile.locale}`,
+        window === 'virtual' ? '--window-size=1920,1080' : '--start-maximized',
+        '--disable-blink-features=AutomationControlled',
+        '--force-webrtc-ip-handling-policy=disable_non_proxied_udp'
+    ];
+    if (profile.disableWebRTC) {
+        args.push('--disable-webrtc');
+    }
+    return args;
+}
+
+// 有头浏览器不设置 viewport / screen，让窗口尺寸与屏幕尺寸像真实窗口一样不同
+function buildContextOptions(options = {}) {
+    const profile = resolveProfile(options);
+    return {
+        locale: profile.locale,
+        timezoneId: profile.timezoneId,
+        viewport: null,
+        extraHTTPHeaders: {
+            'Accept-Language': acceptLanguage(profile.locale)
+        }
+    };
+}
+
+function buildInitScript(options = {}) {
+    const profile = resolveProfile(options);
+    // 首个页面加载时窗口尚未显示，outerWidth/outerHeight 会读到 0（无头浏览器的典型特征）；
+    // 只在读到 0 时用 inner 尺寸加上工具栏高度补上，真实窗口的值原样返回
+    const lines = [
+        "'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 (_) {}'
+    ];
+    if (profile.navigatorPlatform) {
+        lines.push(
+            '    try {',
+            '        const navProto = Object.getPrototypeOf(navigator);',
+            "        Object.defineProperty(navProto, 'platform', {",
+            '            configurable: true,',
+            `            get: () => ${JSON.stringify(profile.navigatorPlatform)}`,
+            '        });',
+            '    } catch (_) {}'
+        );
+    }
+    if (profile.disableWebRTC) {
+        lines.push(
+            '    try {',
+            "        const blocked = ['RTCPeerConnection', 'webkitRTCPeerConnection', 'RTCIceCandidate', 'RTCRtpSender', 'RTCRtpReceiver', 'RTCRtpTransceiver', 'RTCDataChannel'];",
+            '        for (const name of blocked) {',
+            '            Object.defineProperty(globalThis, name, { configurable: true, writable: true, value: undefined });',
+            '        }',
+            '        if (navigator.mediaDevices) {',
+            "            Object.defineProperty(navigator.mediaDevices, 'getUserMedia', {",
+            '                configurable: true,',
+            '                writable: true,',
+            "                value: async () => { throw new DOMException('WebRTC is disabled', 'NotAllowedError'); }",
+            '            });',
+            '        }',
+            '    } catch (_) {}'
+        );
+    }
+    lines.push('})();', '');
+    return lines.join('\n');
+}
+
+// 容器内 playwright-cli 读取的配置。
+// default: 容器内 Xvfb 里的有头浏览器；ws: 附着宿主机 launch-server；cdp: 附着用户自己的 Chrome（不注入指纹）
+function buildContainerConfig(kind, options = {}) {
+    const base = { outputDir: CONTAINER_OUTPUT_DIR };
+    if (kind === 'cdp') {
+        return { ...base, browser: { cdpEndpoint: options.endpoint, cdpTimeout: 60000 } };
+    }
+    const fingerprint = {
+        initScript: [CONTAINER_INIT_SCRIPT_PATH],
+        contextOptions: buildContextOptions(options)
+    };
+    if (kind === 'ws') {
+        // launch-server 不预创建 context，必须 isolated 才会自建
+        return { ...base, browser: { remoteEndpoint: options.endpoint, isolated: true, ...fingerprint } };
+    }
+    return {
+        ...base,
+        browser: {
+            // 容器内是 root，Chromium 不允许 root 开沙箱
+            chromiumSandbox: false,
+            browserName: 'chromium',
+            ...fingerprint,
+            launchOptions: {
+                channel: 'chromium',
+                headless: false,
+                args: buildLaunchArgs(options, 'virtual')
+            }
+        }
+    };
+}
+
+// 宿主机 playwright launch-server 的配置
+function buildServerConfig({ host, port, wsPath, headless = false, window = 'native', chromiumSandbox = true, extensionArgs = [], ...profileOptions }) {
+    return {
+        host,
+        port,
+        wsPath,
+        headless,
+        channel: 'chromium',
+        chromiumSandbox,
+        args: [...buildLaunchArgs(profileOptions, window), ...extensionArgs]
+    };
+}
+
+module.exports = {
+    CONTAINER_CONFIG_DIR,
+    CONTAINER_CONFIG_PATH,
+    CONTAINER_INIT_SCRIPT_PATH,
+    DEFAULT_PROFILE,
+    resolveProfile,
+    detectHostProfile,
+    acceptLanguage,
+    buildLaunchArgs,
+    buildContextOptions,
+    buildInitScript,
+    buildContainerConfig,
+    buildServerConfig
+};

package/lib/plugin/index.js

@@ -2,67 +2,82 @@
 
 const { PlaywrightPlugin } = require('./playwright');
 
-const AVAILABLE_PLUGINS = ['playwright'];
-
 function asObject(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        return {};
-    }
-    return value;
-}
-
-function getPluginConfigs(pluginName, globalConfig, runConfig) {
-    const globalPlugins = asObject(asObject(globalConfig).plugins);
-    const runPlugins = asObject(asObject(runConfig).plugins);
-    return {
-        globalPluginConfig: asObject(globalPlugins[pluginName]),
-        runPluginConfig: asObject(runPlugins[pluginName])
-    };
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
 }
 
-function createPlugin(pluginName, options = {}) {
-    if (pluginName !== 'playwright') {
-        throw new Error(`未知插件: ${pluginName}`);
-    }
-
-    const cfg = getPluginConfigs(pluginName, options.globalConfig, options.runConfig);
+// 全局配置与 runs.<name> 里的 plugins.playwright 分别传入，后者覆盖前者
+function createPlaywrightPlugin(options = {}) {
+    const pluginConfig = config => asObject(asObject(asObject(config).plugins).playwright);
     return new PlaywrightPlugin({
-        projectRoot: options.projectRoot,
         stdout: options.stdout,
         stderr: options.stderr,
-        globalConfig: cfg.globalPluginConfig,
-        runConfig: cfg.runPluginConfig,
+        runtime: options.runtime,
+        homeDir: options.homeDir,
+        globalConfig: pluginConfig(options.globalConfig),
+        runConfig: pluginConfig(options.runConfig),
         rootGlobalConfig: asObject(options.globalConfig),
         rootRunConfig: asObject(options.runConfig)
     });
 }
 
-async function runPluginCommand(request, options = {}) {
-    const action = String(request && request.action || '').trim();
-
-    if (action === 'ls') {
-        const plugin = createPlugin('playwright', options);
-        return await plugin.run({ action: 'ls' });
-    }
-
-    const pluginName = String(request && request.pluginName || '').trim();
-    if (!pluginName) {
-        throw new Error('plugin 名称不能为空');
-    }
+async function runPlaywrightCommand(request, options = {}) {
+    return await createPlaywrightPlugin(options).run(request);
+}
 
-    const plugin = createPlugin(pluginName, options);
-    return await plugin.run({
-        action,
-        scene: request.scene,
-        host: request.host,
-        extensionPaths: request.extensionPaths,
-        extensionNames: request.extensionNames,
-        prodversion: request.prodversion
+// 新建会话容器时要加的参数：CLI 的 run 与 Web 建会话共用这一个入口。
+// 返回扁平的 run 参数数组（--env / --volume / 其余），以及要给用户看的警告；不会抛错。
+async function buildContainerIntegration(options = {}) {
+    const plugin = createPlaywrightPlugin(options);
+    const integration = await plugin.buildContainerIntegration({
+        runtimeCommand: options.runtimeCommand,
+        envEntries: options.envEntries || [],
+        dryRun: options.dryRun === true
     });
+    return {
+        envArgs: integration.env.flatMap(entry => ['--env', entry]),
+        volumeArgs: integration.volumes.flatMap(volume => ['--volume', volume]),
+        extraArgs: integration.extraArgs,
+        warning: integration.warning
+    };
+}
+
+// 把集成参数并进已有的扁平参数数组：已有的 env 不覆盖（NO_PROXY 由集成在原值上追加，故替换），volume 与其余参数去重
+function mergeIntegration(runtime, integration) {
+    const keyOf = entry => String(entry).split('=')[0];
+    const proxyKeys = new Set(['NO_PROXY', 'no_proxy']);
+    const pairs = args => {
+        const out = [];
+        for (let i = 0; i + 1 < args.length; i += 2) {
+            out.push([args[i], args[i + 1]]);
+        }
+        return out;
+    };
+    const existingEnv = pairs(runtime.containerEnvs || []);
+    const kept = existingEnv.filter(([head, value]) => !(head === '--env' && proxyKeys.has(keyOf(value))));
+    const present = new Set(kept.filter(([head]) => head === '--env').map(([, value]) => keyOf(value)));
+    const added = pairs(integration.envArgs).filter(([, value]) => proxyKeys.has(keyOf(value)) || !present.has(keyOf(value)));
+    const append = (base, extra) => {
+        const seen = new Set(pairs(base).map(pair => pair.join('\u0000')));
+        const out = [...base];
+        for (const pair of pairs(extra)) {
+            if (!seen.has(pair.join('\u0000'))) {
+                seen.add(pair.join('\u0000'));
+                out.push(...pair);
+            }
+        }
+        return out;
+    };
+    return {
+        containerEnvs: [...kept, ...added].flat(),
+        containerVolumes: append(runtime.containerVolumes || [], integration.volumeArgs),
+        containerExtraArgs: append(runtime.containerExtraArgs || [], integration.extraArgs)
+    };
 }
 
 module.exports = {
-    AVAILABLE_PLUGINS,
-    createPlugin,
-    runPluginCommand
+    buildContainerIntegration,
+    mergeIntegration,
+    createPlaywrightPlugin,
+    runPlaywrightCommand
 };

package/lib/plugin/playwright-assets/vnc-entry.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+# 在 Xvfb 里跑有头浏览器服务，并用 x11vnc + noVNC 让用户在网页上观看
+set -eu
+
+export DISPLAY=:99
+: "${VNC_PASSWORD:?VNC_PASSWORD is required}"
+
+rm -f /tmp/.X99-lock
+Xvfb :99 -screen 0 1920x1080x24 -nolisten tcp &
+i=0
+while [ ! -S /tmp/.X11-unix/X99 ] && [ "$i" -lt 50 ]; do
+    sleep 0.1
+    i=$((i + 1))
+done
+fluxbox >/tmp/fluxbox.log 2>&1 &
+x11vnc -display :99 -forever -shared -rfbport 5900 -passwd "$VNC_PASSWORD" >/tmp/x11vnc.log 2>&1 &
+websockify --web=/usr/share/novnc/ 6080 localhost:5900 >/tmp/websockify.log 2>&1 &
+
+exec node /run/manyoyo-playwright-vnc/playwright-server.js \
+    /usr/local/lib/node_modules/@playwright/cli/node_modules/playwright-core \
+    /run/manyoyo-playwright-vnc/server.json