@xcanwin/manyoyo 5.4.4 → 5.4.6

package/bin/manyoyo.js

@@ -8,9 +8,9 @@ const crypto = require('crypto');
 const net = require('net');
 const readline = require('readline');
 const { Command } = require('commander');
-const JSON5 = require('json5');
 const { startWebServer } = require('../lib/web/server');
 const { buildContainerRunArgs, buildContainerRunCommand } = require('../lib/container-run');
+const { getManyoyoConfigPath, readManyoyoConfig, syncGlobalImageVersion } = require('../lib/global-config');
 const { initAgentConfigs } = require('../lib/init-config');
 const { buildImage } = require('../lib/image-build');
 const { resolveAgentResumeArg, buildAgentResumeCommand } = require('../lib/agent-resume');
@@ -309,19 +309,29 @@ function installServeProcessDiagnostics(logger) {
  * @returns {Config} 配置对象
  */
 function loadConfig() {
-    const configPath = path.join(os.homedir(), '.manyoyo', 'manyoyo.json');
-    if (fs.existsSync(configPath)) {
-        try {
-            const config = JSON5.parse(fs.readFileSync(configPath, 'utf-8'));
-            return config;
-        } catch (e) {
-            console.error(`${YELLOW}⚠️  配置文件格式错误: ${configPath}${NC}`);
+    const result = readManyoyoConfig();
+    if (result.exists) {
+        if (result.parseError) {
+            console.error(`${YELLOW}⚠️  配置文件格式错误: ${result.path}${NC}`);
             return {};
         }
+        return result.config;
     }
     return {};
 }
 
+function syncBuiltImageVersionToGlobalConfig(imageVersion) {
+    const syncResult = syncGlobalImageVersion(imageVersion);
+    if (syncResult.updated) {
+        console.log(`${GREEN}✅ 已同步 ${path.basename(getManyoyoConfigPath())} 的 imageVersion: ${imageVersion}${NC}`);
+        return;
+    }
+    if (syncResult.reason === 'unchanged') {
+        return;
+    }
+    console.log(`${YELLOW}⚠️  镜像构建成功，但未更新 imageVersion: ${syncResult.path}${NC}`);
+}
+
 function loadRunConfig(name, config) {
     const runName = String(name || '').trim();
     if (!runName) {
@@ -1971,6 +1981,7 @@ async function main() {
                 pruneDanglingImages,
                 colors: { RED, GREEN, YELLOW, BLUE, CYAN, NC }
             });
+            syncBuiltImageVersionToGlobalConfig(runtime.imageVersion);
             process.exit(0);
         }
 

package/lib/global-config.js

@@ -0,0 +1,88 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const JSON5 = require('json5');
+
+function getManyoyoConfigPath(homeDir = os.homedir()) {
+    return path.join(homeDir, '.manyoyo', 'manyoyo.json');
+}
+
+function readManyoyoConfig(homeDir = os.homedir()) {
+    const configPath = getManyoyoConfigPath(homeDir);
+    if (!fs.existsSync(configPath)) {
+        return {
+            path: configPath,
+            exists: false,
+            config: {}
+        };
+    }
+
+    try {
+        const config = JSON5.parse(fs.readFileSync(configPath, 'utf-8'));
+        return {
+            path: configPath,
+            exists: true,
+            config
+        };
+    } catch (error) {
+        return {
+            path: configPath,
+            exists: true,
+            config: {},
+            parseError: error
+        };
+    }
+}
+
+function syncGlobalImageVersion(imageVersion, options = {}) {
+    const homeDir = options.homeDir || os.homedir();
+    const result = readManyoyoConfig(homeDir);
+    const configPath = result.path;
+
+    if (result.parseError) {
+        return {
+            updated: false,
+            path: configPath,
+            reason: 'parse-error'
+        };
+    }
+
+    const currentConfig = result.config;
+    if (typeof currentConfig !== 'object' || currentConfig === null || Array.isArray(currentConfig)) {
+        return {
+            updated: false,
+            path: configPath,
+            reason: 'invalid-root'
+        };
+    }
+
+    if (currentConfig.imageVersion === imageVersion) {
+        return {
+            updated: false,
+            path: configPath,
+            reason: 'unchanged'
+        };
+    }
+
+    const nextConfig = {
+        ...currentConfig,
+        imageVersion
+    };
+
+    fs.mkdirSync(path.dirname(configPath), { recursive: true });
+    fs.writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 4)}\n`);
+
+    return {
+        updated: true,
+        path: configPath,
+        reason: result.exists ? 'updated' : 'created'
+    };
+}
+
+module.exports = {
+    getManyoyoConfigPath,
+    readManyoyoConfig,
+    syncGlobalImageVersion
+};

package/lib/plugin/playwright.js

@@ -25,7 +25,7 @@ const SCENE_DEFS = {
         composeFile: 'compose-headless.yaml',
         projectName: 'my-playwright-mcp-cont-headless',
         containerName: 'my-playwright-mcp-cont-headless',
-        portKey: 'contHeadless',
+        portKey: 'mcpContHeadless',
         headless: true,
         listenHost: '0.0.0.0'
     },
@@ -36,7 +36,7 @@ const SCENE_DEFS = {
         composeFile: 'compose-headed.yaml',
         projectName: 'my-playwright-mcp-cont-headed',
         containerName: 'my-playwright-mcp-cont-headed',
-        portKey: 'contHeaded',
+        portKey: 'mcpContHeaded',
         headless: false,
         listenHost: '0.0.0.0'
     },
@@ -44,7 +44,7 @@ const SCENE_DEFS = {
         type: 'host',
         engine: 'mcp',
         configFile: 'mcp-host-headless.json',
-        portKey: 'hostHeadless',
+        portKey: 'mcpHostHeadless',
         headless: true,
         listenHost: '127.0.0.1'
     },
@@ -52,7 +52,7 @@ const SCENE_DEFS = {
         type: 'host',
         engine: 'mcp',
         configFile: 'mcp-host-headed.json',
-        portKey: 'hostHeaded',
+        portKey: 'mcpHostHeaded',
         headless: false,
         listenHost: '127.0.0.1'
     },
@@ -293,7 +293,6 @@ class PlaywrightPlugin {
             runtime: 'mixed',
             enabledScenes: [...SCENE_ORDER],
             cliSessionScene: 'cli-host-headless',
-            hostListen: '127.0.0.1',
             mcpDefaultHost: 'host.docker.internal',
             dockerTag: process.env.PLAYWRIGHT_MCP_DOCKER_TAG || 'latest',
             containerRuntime: '',
@@ -306,13 +305,13 @@ class PlaywrightPlugin {
             disableWebRTC: false,
             composeDir: path.join(__dirname, 'playwright-assets'),
             ports: {
-                contHeadless: 8931,
-                contHeaded: 8932,
-                hostHeadless: 8933,
-                hostHeaded: 8934,
+                mcpContHeadless: 8931,
+                mcpContHeaded: 8932,
+                mcpHostHeadless: 8933,
+                mcpHostHeaded: 8934,
                 cliHostHeadless: 8935,
                 cliHostHeaded: 8936,
-                contHeadedNoVnc: 6080
+                mcpContHeadedNoVnc: 6080
             }
         };
 
@@ -481,15 +480,15 @@ class PlaywrightPlugin {
         fs.writeFileSync(this.sceneCliAttachConfigPath(sceneName), `${JSON.stringify(payload, null, 4)}\n`, 'utf8');
     }
 
+    removeSceneCliAttachConfig(sceneName) {
+        fs.rmSync(this.sceneCliAttachConfigPath(sceneName), { force: true });
+    }
+
     sceneInitScriptPath(sceneName) {
         const configFile = path.basename(this.sceneConfigPath(sceneName), '.json');
         return path.join(this.config.configDir, `${configFile}.init.js`);
     }
 
-    legacySceneInitScriptPath(sceneName) {
-        return path.join(this.config.configDir, `${sceneName}.init.js`);
-    }
-
     buildInitScriptContent() {
         const lines = [
             "'use strict';",
@@ -540,10 +539,6 @@ class PlaywrightPlugin {
         const filePath = this.sceneInitScriptPath(sceneName);
         const content = this.buildInitScriptContent();
         fs.writeFileSync(filePath, content, 'utf8');
-        const legacyFilePath = this.legacySceneInitScriptPath(sceneName);
-        if (legacyFilePath !== filePath) {
-            fs.rmSync(legacyFilePath, { force: true });
-        }
         return filePath;
     }
 
@@ -900,7 +895,7 @@ class PlaywrightPlugin {
             PLAYWRIGHT_MCP_CONFIG_PATH: cfgPath,
             PLAYWRIGHT_MCP_CONTAINER_NAME: def.containerName,
             PLAYWRIGHT_MCP_IMAGE: this.config.headedImage,
-            PLAYWRIGHT_MCP_NOVNC_PORT: String(this.config.ports.contHeadedNoVnc)
+            PLAYWRIGHT_MCP_NOVNC_PORT: String(this.config.ports.mcpContHeadedNoVnc)
         };
 
         if (sceneName === 'mcp-cont-headed') {
@@ -1221,6 +1216,7 @@ class PlaywrightPlugin {
         const logFile = this.sceneLogFile(sceneName);
         const port = this.scenePort(sceneName);
         this.removeSceneEndpoint(sceneName);
+        this.removeSceneCliAttachConfig(sceneName);
 
         let managedPids = this.hostScenePids(sceneName);
         if (managedPids.length > 0 && (await this.portReady(port))) {
@@ -1285,6 +1281,7 @@ class PlaywrightPlugin {
         const port = this.scenePort(sceneName);
         const managedPids = this.hostScenePids(sceneName);
         this.removeSceneEndpoint(sceneName);
+        this.removeSceneCliAttachConfig(sceneName);
 
         for (const pid of managedPids) {
             try {

package/manyoyo.example.json

@@ -64,13 +64,13 @@
             // 是否禁用 WebRTC（默认 false）
             "disableWebRTC": false,
             "ports": {
-                "contHeadless": 8931,
-                "contHeaded": 8932,
-                "hostHeadless": 8933,
-                "hostHeaded": 8934,
+                "mcpContHeadless": 8931,
+                "mcpContHeaded": 8932,
+                "mcpHostHeadless": 8933,
+                "mcpHostHeaded": 8934,
                 "cliHostHeadless": 8935,
                 "cliHostHeaded": 8936,
-                "contHeadedNoVnc": 6080
+                "mcpContHeadedNoVnc": 6080
             }
         }
     },

package/package.json

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