@xcanwin/manyoyo 5.1.3 → 5.1.4

package/bin/manyoyo.js

@@ -874,7 +874,8 @@ async function setupCommander() {
             pluginName: params.pluginName || 'playwright',
             pluginScene: params.scene || 'host-headless',
             pluginHost: params.host || '',
-            pluginExtensions: Array.isArray(params.extensions) ? params.extensions : [],
+            pluginExtensionPaths: Array.isArray(params.extensionPaths) ? params.extensionPaths : [],
+            pluginExtensionNames: Array.isArray(params.extensionNames) ? params.extensionNames : [],
             pluginProdversion: params.prodversion || ''
         });
     };
@@ -896,14 +897,16 @@ async function setupCommander() {
                 .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)');
 
             if (action === 'up') {
-                appendArrayOption(sceneCommand, '--ext <path>', '追加浏览器扩展目录（可多次传入；目录需包含 manifest.json）');
+                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 || 'host-headless',
-                extensions: action === 'up' ? (options.ext || []) : []
+                extensionPaths: action === 'up' ? (options.extPath || []) : [],
+                extensionNames: action === 'up' ? (options.extName || []) : []
             }, options));
         });
 
@@ -1114,7 +1117,8 @@ async function setupCommander() {
                 pluginName: options.pluginName,
                 scene: options.pluginScene || 'host-headless',
                 host: options.pluginHost || '',
-                extensions: Array.isArray(options.pluginExtensions) ? options.pluginExtensions : [],
+                extensionPaths: Array.isArray(options.pluginExtensionPaths) ? options.pluginExtensionPaths : [],
+                extensionNames: Array.isArray(options.pluginExtensionNames) ? options.pluginExtensionNames : [],
                 prodversion: options.pluginProdversion || ''
             },
             pluginGlobalConfig: config,

package/lib/plugin/index.js

@@ -53,7 +53,8 @@ async function runPluginCommand(request, options = {}) {
         action,
         scene: request.scene,
         host: request.host,
-        extensions: request.extensions,
+        extensionPaths: request.extensionPaths,
+        extensionNames: request.extensionNames,
         prodversion: request.prodversion
     });
 }

package/lib/plugin/playwright.js

@@ -339,6 +339,32 @@ class PlaywrightPlugin {
         return path.join(this.config.configDir, def.configFile);
     }
 
+    sceneConfigMissing(sceneName) {
+        return !fs.existsSync(this.sceneConfigPath(sceneName));
+    }
+
+    defaultBrowserName(sceneName) {
+        const cfg = this.buildSceneConfig(sceneName);
+        const browserName = cfg && cfg.browser && cfg.browser.browserName;
+        return String(browserName || 'chromium');
+    }
+
+    ensureContainerScenePrerequisites(sceneName) {
+        if (!this.sceneConfigMissing(sceneName)) {
+            return;
+        }
+        const tag = String(this.config.dockerTag || 'latest').trim() || 'latest';
+        const image = `mcr.microsoft.com/playwright/mcp:${tag}`;
+        this.runCmd([this.config.containerRuntime, 'pull', image], { check: true });
+    }
+
+    ensureHostScenePrerequisites(sceneName) {
+        if (!this.sceneConfigMissing(sceneName)) {
+            return;
+        }
+        this.runCmd(['npx', '-y', 'playwright-core', 'install', this.defaultBrowserName(sceneName)], { check: true });
+    }
+
     scenePidFile(sceneName) {
         return path.join(this.config.runDir, `${sceneName}.pid`);
     }
@@ -430,6 +456,24 @@ class PlaywrightPlugin {
         return uniquePaths;
     }
 
+    resolveNamedExtensionPaths(extensionNames = []) {
+        const names = asStringArray(extensionNames, []);
+        const extensionRoot = path.resolve(this.extensionDirPath());
+
+        return names.map(name => {
+            if (name.includes('/') || name.includes('\\') || name === '.' || name === '..') {
+                throw new Error(`扩展名称无效: ${name}`);
+            }
+            return path.join(extensionRoot, name);
+        });
+    }
+
+    resolveExtensionInputs(options = {}) {
+        const extensionPaths = asStringArray(options.extensionPaths, []);
+        const namedPaths = this.resolveNamedExtensionPaths(options.extensionNames || []);
+        return this.resolveExtensionPaths([...extensionPaths, ...namedPaths]);
+    }
+
     buildExtensionLaunchArgs(extensionPaths) {
         const joined = extensionPaths.join(',');
         return [
@@ -601,6 +645,12 @@ class PlaywrightPlugin {
             return 1;
         }
 
+        try {
+            this.ensureContainerScenePrerequisites(sceneName);
+        } catch (error) {
+            return error.returncode || 1;
+        }
+
         const incomingExtensionPaths = asStringArray(options.extensionPaths, []);
         let configOptions = { ...options, extensionPaths: incomingExtensionPaths };
         const composeFiles = [this.containerComposePath(sceneName)];
@@ -798,6 +848,12 @@ class PlaywrightPlugin {
             return 1;
         }
 
+        try {
+            this.ensureHostScenePrerequisites(sceneName);
+        } catch (error) {
+            return error.returncode || 1;
+        }
+
         fs.mkdirSync(this.config.runDir, { recursive: true });
         const cfgPath = this.ensureSceneConfig(sceneName, options);
         const pidFile = this.scenePidFile(sceneName);
@@ -1137,7 +1193,7 @@ class PlaywrightPlugin {
         return 1;
     }
 
-    async run({ action, scene = 'host-headless', host = '', extensions = [], prodversion = '' }) {
+    async run({ action, scene = 'host-headless', host = '', extensionPaths = [], extensionNames = [], prodversion = '' }) {
         if (action === 'ls') {
             return this.printSummary();
         }
@@ -1160,14 +1216,14 @@ class PlaywrightPlugin {
             return 1;
         }
 
-        const extensionPaths = action === 'up'
-            ? this.resolveExtensionPaths(extensions)
+        const resolvedExtensionPaths = action === 'up'
+            ? this.resolveExtensionInputs({ extensionPaths, extensionNames })
             : [];
 
         let rc = 0;
         for (const sceneName of targets) {
             // eslint-disable-next-line no-await-in-loop
-            const code = await this.runOnScene(action, sceneName, { extensionPaths });
+            const code = await this.runOnScene(action, sceneName, { extensionPaths: resolvedExtensionPaths });
             if (code !== 0) {
                 rc = 1;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "imageVersion": "1.8.1-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [