@xcanwin/manyoyo 5.9.11 → 5.10.3

package/README.md

@@ -21,6 +21,14 @@
 
 ---
 
+## 生态仓库
+
+| 仓库 | 定位 |
+|------|------|
+| [manyoyo](https://github.com/xcanwin/manyoyo) | CLI + 容器运行时 + Web 服务 |
+| [manyoyo-app](https://github.com/xcanwin/manyoyo-app) | Flutter 原生 UI 客户端（macOS / Windows / iOS / Android） |
+| [manyoyo-studio](https://github.com/xcanwin/manyoyo-studio) | Electron 桌面端 + Capacitor 移动端 |
+
 ## 为什么是 MANYOYO
 
 AI Agent CLI 往往需要：
@@ -145,6 +153,9 @@ manyoyo build --iv 1.9.0-common
 # full 版本
 manyoyo build --iv 1.9.0-full
 
+# 仅更新已有镜像内 Agent CLI 到 latest，不重建 Dockerfile
+manyoyo build --iv 1.9.0-full --update-agents --yes
+
 # 自定义工具集
 manyoyo build --iba TOOL=go,codex,java,gemini
 ```

package/bin/manyoyo.js

@@ -17,6 +17,7 @@ const { resolveAgentResumeArg, buildAgentResumeCommand } = require('../lib/agent
 const { runPluginCommand, createPlugin } = require('../lib/plugin');
 const { buildManyoyoLogPath } = require('../lib/log-path');
 const { resolveRuntimeConfig } = require('../lib/runtime-resolver');
+const { resolveWorktreeSupport } = require('../lib/worktrees');
 const {
     parseEnvEntry: parseEnvEntryOrThrow,
     normalizeVolume
@@ -938,6 +939,22 @@ function normalizeShellFullArgv(argv) {
     }
 }
 
+function normalizeWorktreeArgv(argv) {
+    for (let i = 0; i < argv.length; i += 1) {
+        if (argv[i] === '--wt') {
+            argv[i] = '--worktrees';
+            continue;
+        }
+        if (argv[i] === '--wtr') {
+            argv[i] = '--worktrees-root';
+            continue;
+        }
+        if (typeof argv[i] === 'string' && argv[i].startsWith('--wtr=')) {
+            argv[i] = `--worktrees-root=${argv[i].slice('--wtr='.length)}`;
+        }
+    }
+}
+
 function appendArrayOption(command, flags, description) {
     return command.option(
         flags,
@@ -983,6 +1000,8 @@ function applyRunStyleOptions(command, options = {}) {
     appendArrayOption(command, '-p, --port <port>', '设置端口映射 XXX:YYY (可多次使用)');
 
     command
+        .option('--worktrees', '启用 Git worktrees 根目录自动挂载 (别名: --wt)')
+        .option('--worktrees-root <path>', '指定项目级 Git worktrees 根目录 (仅支持绝对路径; 隐式启用 --worktrees; 别名: --wtr)')
         .option('--sp, --shell-prefix <command>', '主命令前缀 (常用于临时环境变量)')
         .option('-s, --shell <command>', '主命令')
         .option('--ss, --shell-suffix <command>', '主命令后缀 (追加到 -s 之后，等价于 -- <args>)')
@@ -1156,6 +1175,7 @@ Notes:
         .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
         .option('--in, --image-name <name>', '指定镜像名称')
         .option('--iv, --image-ver <version>', '指定镜像版本 (格式: x.y.z-后缀，如 1.7.4-common)')
+        .option('--update-agents', '仅更新已有镜像内 Agent CLI 到 latest (Claude/Codex/Gemini/OpenCode)')
         .option('--yes', '所有提示自动确认 (用于CI/脚本)');
     appendArrayOption(buildCommand, '--iba, --image-build-arg <arg>', '构建镜像时传参给dockerfile (可多次使用)');
     buildCommand.action(options => selectAction('build', options));
@@ -1260,6 +1280,7 @@ Notes:
 
     // Pre-handle -x/--shell-full: treat all following args as a single command
     normalizeShellFullArgv(process.argv);
+    normalizeWorktreeArgv(process.argv);
 
     // Parse arguments
     program.allowUnknownOption(false);
@@ -1357,7 +1378,8 @@ Notes:
         normalizeCliEnvMap,
         mergeArrayConfig,
         normalizeVolume,
-        parseServerListen
+        parseServerListen,
+        resolveWorktreeSupport
     });
 
     HOST_PATH = resolvedRuntime.hostPath;
@@ -1432,6 +1454,10 @@ Notes:
             volumes: volumeList,
             ports: portList,
             imageBuildArgs: buildArgList,
+            worktrees: resolvedRuntime.worktrees,
+            worktreesRoot: resolvedRuntime.worktreesRoot,
+            worktreeRepoRoot: resolvedRuntime.worktreeRepoRoot,
+            worktreeMainRepoRoot: resolvedRuntime.worktreeMainRepoRoot,
             containerMode: contModeValue || "",
             shellPrefix: EXEC_COMMAND_PREFIX.trim(),
             shell: EXEC_COMMAND || "",
@@ -1482,6 +1508,7 @@ Notes:
         isServerRestart: isServerRestartMode,
         isServerDetach: Boolean(selectedAction === 'serve' && options.detach),
         isServerListenSpecified: Boolean(isServerMode && options.server !== true),
+        updateAgents: Boolean(options.updateAgents),
         isPluginMode: false
     };
 }
@@ -2107,6 +2134,7 @@ async function main() {
                 parseImageVersionTag,
                 manyoyoName: MANYOYO_NAME,
                 yesMode: Boolean(modeState.yesMode),
+                updateAgents: Boolean(modeState.updateAgents),
                 dockerCmd: DOCKER_CMD,
                 rootDir: path.join(__dirname, '..'),
                 loadConfig,
@@ -2115,7 +2143,9 @@ async function main() {
                 pruneDanglingImages,
                 colors: { RED, GREEN, YELLOW, BLUE, CYAN, NC }
             });
-            syncBuiltImageVersionToGlobalConfig(runtime.imageVersion);
+            if (!modeState.updateAgents) {
+                syncBuiltImageVersionToGlobalConfig(runtime.imageVersion);
+            }
             process.exit(0);
         }
 

package/lib/image-build.js

@@ -396,6 +396,159 @@ function runCmdPipeline(leftCmd, leftArgs, rightCmd, rightArgs, options = {}) {
     });
 }
 
+const AGENT_UPDATE_PACKAGES = [
+    'npm@latest',
+    '@anthropic-ai/claude-code@latest',
+    '@openai/codex@latest',
+    '@google/gemini-cli@latest',
+    'opencode-ai@latest'
+];
+const AGENT_VERSION_CHECK_COMMAND = [
+    'printf "claude: " && claude --version',
+    'printf "codex: " && codex --version',
+    'printf "gemini: " && gemini --version',
+    'printf "opencode: " && opencode --version',
+    'printf "npm: " && npm --version'
+].join(' && ');
+
+function createAgentUpdateContainerName() {
+    return `manyoyo-update-agents-${crypto.randomBytes(6).toString('hex')}`;
+}
+
+const MANYOYO_DEFAULT_CMD = ['supervisord', '-n', '-c', '/etc/supervisor/supervisord.conf'];
+
+function parseImageConfig(rawConfig) {
+    if (!rawConfig || typeof rawConfig !== 'string') return {};
+    try {
+        const parsed = JSON.parse(rawConfig);
+        return parsed && typeof parsed === 'object' ? parsed : {};
+    } catch (e) {
+        return {};
+    }
+}
+
+function isAgentUpdateCommand(cmd) {
+    const text = Array.isArray(cmd) ? cmd.join(' ') : String(cmd || '');
+    return AGENT_UPDATE_PACKAGES.some(pkg => text.includes(pkg));
+}
+
+function buildImageImportChangeArgs(config) {
+    const changes = [];
+    const envList = Array.isArray(config.Env) ? config.Env : [];
+    envList.forEach(env => {
+        if (typeof env === 'string' && env.trim()) {
+            changes.push('--change', `ENV ${env}`);
+        }
+    });
+
+    if (config.Entrypoint) {
+        changes.push('--change', `ENTRYPOINT ${JSON.stringify(config.Entrypoint)}`);
+    }
+
+    const cmd = isAgentUpdateCommand(config.Cmd) ? MANYOYO_DEFAULT_CMD : (config.Cmd || MANYOYO_DEFAULT_CMD);
+    changes.push('--change', `CMD ${JSON.stringify(cmd)}`);
+
+    const workingDir = typeof config.WorkingDir === 'string' && config.WorkingDir.trim()
+        ? config.WorkingDir
+        : '/tmp';
+    changes.push('--change', `WORKDIR ${workingDir}`);
+
+    if (typeof config.User === 'string' && config.User.trim()) {
+        changes.push('--change', `USER ${config.User}`);
+    }
+
+    const exposedPorts = config.ExposedPorts && typeof config.ExposedPorts === 'object'
+        ? Object.keys(config.ExposedPorts)
+        : [];
+    exposedPorts.forEach(port => {
+        if (port) changes.push('--change', `EXPOSE ${port}`);
+    });
+
+    const labels = config.Labels && typeof config.Labels === 'object' ? config.Labels : {};
+    Object.entries(labels).forEach(([key, value]) => {
+        changes.push('--change', `LABEL ${key}=${value}`);
+    });
+
+    return changes;
+}
+
+async function updateAgentsInExistingImage(ctx, fullImageTag) {
+    const { RED, GREEN, YELLOW, BLUE, CYAN, NC } = ctx.colors;
+    const containerName = ctx.agentUpdateContainerName || createAgentUpdateContainerName();
+    const updateScript = [
+        'echo "[manyoyo] Agent CLI versions before update:"',
+        AGENT_VERSION_CHECK_COMMAND,
+        `npm_config_update_notifier=false npm install -g ${AGENT_UPDATE_PACKAGES.map(quoteShellArg).join(' ')}`,
+        'echo "[manyoyo] Agent CLI versions after update:"',
+        AGENT_VERSION_CHECK_COMMAND,
+        'npm_config_update_notifier=false npm cache clean --force --loglevel=error',
+        'rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/.cache/node-gyp ~/.claude/plugins/cache ~/go/pkg/mod/cache',
+        'rm -f /var/log/dpkg.log /var/log/bootstrap.log /var/lib/dpkg/status-old /var/cache/debconf/templates.dat-old'
+    ].join(' && ');
+    const runArgs = [
+        'run',
+        '--name', containerName,
+        '--network', 'host',
+        fullImageTag,
+        '/bin/bash',
+        '-lc',
+        updateScript
+    ];
+    const cleanupArgs = ['rm', '-f', containerName];
+    let imageConfig = {};
+
+    ctx.log(`${CYAN}🔄 正在更新已有镜像内 Agent CLI: ${YELLOW}${fullImageTag}${NC}`);
+    ctx.log(`${BLUE}更新范围: Claude/Codex/Gemini/OpenCode CLI -> latest${NC}\n`);
+
+    try {
+        imageConfig = parseImageConfig(ctx.runCmd(ctx.dockerCmd, [
+            'image',
+            'inspect',
+            fullImageTag,
+            '--format',
+            '{{json .Config}}'
+        ], { stdio: 'pipe' }));
+    } catch (e) {
+        ctx.error(`${RED}错误: 找不到本地镜像 ${fullImageTag}${NC}`);
+        ctx.error(`${YELLOW}请先执行 ${ctx.manyoyoName} build --iv ${fullImageTag.split(':').pop()} --yes 构建镜像。${NC}`);
+        ctx.exit(1);
+        return;
+    }
+
+    const importArgs = [
+        'import',
+        ...buildImageImportChangeArgs(imageConfig),
+        '-',
+        fullImageTag
+    ];
+
+    ctx.log(`${BLUE}准备执行命令:${NC}`);
+    ctx.log(`${ctx.dockerCmd} ${runArgs.map(quoteShellArg).join(' ')}`);
+    ctx.log(`${ctx.dockerCmd} export ${quoteShellArg(containerName)} | ${ctx.dockerCmd} ${importArgs.map(quoteShellArg).join(' ')}`);
+    ctx.log(`${ctx.dockerCmd} ${cleanupArgs.map(quoteShellArg).join(' ')}\n`);
+
+    if (!ctx.yesMode) {
+        await ctx.askQuestion('❔ 是否继续更新并覆盖当前镜像 tag? [ 直接回车=继续, ctrl+c=取消 ]: ');
+        ctx.log('');
+    }
+
+    const updateStartTime = Date.now();
+    try {
+        ctx.runCmd(ctx.dockerCmd, runArgs, { stdio: 'inherit' });
+        await ctx.runCmdPipeline(ctx.dockerCmd, ['export', containerName], ctx.dockerCmd, importArgs, { stdio: 'inherit' });
+        const updateDuration = ((Date.now() - updateStartTime) / 1000).toFixed(1);
+        ctx.log(`\n${GREEN}✅ Agent CLI 更新成功: ${fullImageTag}${NC}`);
+        ctx.log(`${GREEN}⏱️  更新耗时: ${updateDuration} 秒${NC}`);
+    } catch (e) {
+        ctx.error(`${RED}错误: Agent CLI 更新失败${NC}`);
+        ctx.exit(1);
+    } finally {
+        try {
+            ctx.runCmd(ctx.dockerCmd, cleanupArgs, { stdio: 'inherit', ignoreError: true });
+        } catch (e) {}
+    }
+}
+
 async function buildImage(options = {}) {
     const ctx = {
         imageBuildArgs: Array.isArray(options.imageBuildArgs) ? [...options.imageBuildArgs] : [],
@@ -406,6 +559,8 @@ async function buildImage(options = {}) {
         parseImageVersionTag: options.parseImageVersionTag,
         manyoyoName: options.manyoyoName || 'manyoyo',
         yesMode: Boolean(options.yesMode),
+        updateAgents: Boolean(options.updateAgents),
+        agentUpdateContainerName: options.agentUpdateContainerName || '',
         dockerCmd: options.dockerCmd || 'docker',
         rootDir: options.rootDir || process.cwd(),
         loadConfig: options.loadConfig || (() => ({})),
@@ -440,6 +595,11 @@ async function buildImage(options = {}) {
     }
 
     const fullImageTag = `${ctx.imageName}:${version}-${imageTool}`;
+    if (ctx.updateAgents) {
+        await updateAgentsInExistingImage(ctx, fullImageTag);
+        return;
+    }
+
     ctx.log(`${CYAN}🔨 正在构建镜像: ${YELLOW}${fullImageTag}${NC}`);
     ctx.log(`${BLUE}构建组件类型: ${imageTool}${NC}\n`);
 

package/lib/runtime-resolver.js

@@ -23,6 +23,7 @@ function resolveRuntimeConfig(options = {}) {
     const mergeArrayConfig = params.mergeArrayConfig;
     const normalizeVolume = params.normalizeVolume;
     const parseServerListen = params.parseServerListen;
+    const resolveWorktreeSupport = params.resolveWorktreeSupport;
     const argv = Array.isArray(params.argv) ? params.argv : [];
     const isServerMode = params.isServerMode === true;
     const isServerStopMode = params.isServerStopMode === true;
@@ -104,7 +105,7 @@ function resolveRuntimeConfig(options = {}) {
         ...normalizeCliEnvMap(cliOptions.firstEnv)
     };
 
-    const volumes = mergeArrayConfig(globalConfig.volumes, runConfig.volumes, cliOptions.volume)
+    let volumes = mergeArrayConfig(globalConfig.volumes, runConfig.volumes, cliOptions.volume)
         .map(volume => normalizeVolume(volume));
     const ports = mergeArrayConfig(globalConfig.ports, runConfig.ports, cliOptions.port);
     const imageBuildArgs = mergeArrayConfig(globalConfig.imageBuildArgs, runConfig.imageBuildArgs, cliOptions.imageBuildArg);
@@ -151,6 +152,25 @@ function resolveRuntimeConfig(options = {}) {
         hostPath = defaults.hostPath;
     }
 
+    let worktreeState = {
+        enabled: false,
+        worktreesRoot: null,
+        worktreeRepoRoot: null,
+        worktreeMainRepoRoot: null,
+        extraVolumes: []
+    };
+
+    if (typeof resolveWorktreeSupport === 'function') {
+        worktreeState = resolveWorktreeSupport({
+            enabled: Boolean(cliOptions.worktrees || cliOptions.worktreesRoot),
+            hostPath,
+            containerPath,
+            worktreesRoot: cliOptions.worktreesRoot,
+            volumes
+        });
+        volumes = volumes.concat(worktreeState.extraVolumes || []);
+    }
+
     return {
         hostPath,
         containerName,
@@ -164,6 +184,10 @@ function resolveRuntimeConfig(options = {}) {
         volumes,
         ports,
         imageBuildArgs,
+        worktrees: Boolean(worktreeState.enabled),
+        worktreesRoot: worktreeState.worktreesRoot,
+        worktreeRepoRoot: worktreeState.worktreeRepoRoot,
+        worktreeMainRepoRoot: worktreeState.worktreeMainRepoRoot,
         containerMode,
         yolo,
         quiet,

package/lib/worktrees.js

@@ -0,0 +1,132 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+function defaultRunGitCommand(targetPath, args) {
+    const result = spawnSync('git', ['-C', targetPath, ...args], {
+        encoding: 'utf-8'
+    });
+
+    if (result.status !== 0) {
+        const stderr = String(result.stderr || '').trim();
+        throw new Error(stderr || `git ${args.join(' ')} 执行失败`);
+    }
+
+    return String(result.stdout || '').trim();
+}
+
+function normalizeAbsolutePath(targetPath) {
+    return path.resolve(String(targetPath || '').trim());
+}
+
+function isDescendantPath(parentPath, targetPath) {
+    const relativePath = path.relative(parentPath, targetPath);
+    return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath));
+}
+
+function detectGitWorktreeContext(targetPath, deps = {}) {
+    const fsApi = deps.fs || fs;
+    const pathApi = deps.path || path;
+    const runGitCommand = deps.runGitCommand || defaultRunGitCommand;
+    const absoluteTargetPath = normalizeAbsolutePath(targetPath);
+
+    if (!fsApi.existsSync(absoluteTargetPath)) {
+        throw new Error(`启用 --worktrees 时宿主机路径不存在: ${absoluteTargetPath}`);
+    }
+
+    const stats = fsApi.statSync(absoluteTargetPath);
+    if (!stats.isDirectory()) {
+        throw new Error(`启用 --worktrees 时宿主机路径必须为目录: ${absoluteTargetPath}`);
+    }
+
+    let repoRoot;
+    let commonDirRaw;
+    try {
+        repoRoot = pathApi.resolve(runGitCommand(absoluteTargetPath, ['rev-parse', '--show-toplevel']));
+        commonDirRaw = runGitCommand(absoluteTargetPath, ['rev-parse', '--git-common-dir']);
+    } catch (error) {
+        throw new Error(`启用 --worktrees 失败: ${absoluteTargetPath} 不在 Git 仓库内`);
+    }
+
+    const commonDir = pathApi.isAbsolute(commonDirRaw)
+        ? pathApi.normalize(commonDirRaw)
+        : pathApi.resolve(repoRoot, commonDirRaw);
+    const mainRepoRoot = pathApi.dirname(commonDir);
+    const projectName = pathApi.basename(mainRepoRoot);
+
+    return {
+        targetPath: absoluteTargetPath,
+        repoRoot,
+        mainRepoRoot,
+        isWorktree: repoRoot !== mainRepoRoot,
+        projectName,
+        defaultWorktreesRoot: pathApi.join(pathApi.dirname(mainRepoRoot), 'worktrees', projectName)
+    };
+}
+
+function shouldAddSamePathMount(hostPath, containerPath, targetPath) {
+    if (hostPath !== containerPath) {
+        return true;
+    }
+    return !isDescendantPath(hostPath, targetPath);
+}
+
+function resolveWorktreeSupport(options = {}, deps = {}) {
+    const fsApi = deps.fs || fs;
+    const pathApi = deps.path || path;
+    const enabled = options.enabled === true || Boolean(options.worktreesRoot);
+
+    if (!enabled) {
+        return {
+            enabled: false,
+            worktreesRoot: null,
+            worktreeRepoRoot: null,
+            worktreeMainRepoRoot: null,
+            extraVolumes: []
+        };
+    }
+
+    const hostPath = normalizeAbsolutePath(options.hostPath);
+    const containerPath = String(options.containerPath || hostPath).trim() || hostPath;
+    const detected = detectGitWorktreeContext(hostPath, deps);
+    let worktreesRoot = options.worktreesRoot;
+
+    if (worktreesRoot !== undefined && worktreesRoot !== null && String(worktreesRoot).trim() !== '') {
+        if (!pathApi.isAbsolute(worktreesRoot)) {
+            throw new Error(`--worktrees-root 仅支持绝对路径: ${worktreesRoot}`);
+        }
+        worktreesRoot = pathApi.resolve(worktreesRoot);
+    } else {
+        worktreesRoot = detected.defaultWorktreesRoot;
+    }
+
+    fsApi.mkdirSync(worktreesRoot, { recursive: true });
+
+    const existingVolumes = new Set((options.volumes || []).map(item => String(item)));
+    const extraVolumes = [];
+    [detected.mainRepoRoot, worktreesRoot].forEach(targetPath => {
+        if (!shouldAddSamePathMount(hostPath, containerPath, targetPath)) {
+            return;
+        }
+        const volume = `${targetPath}:${targetPath}`;
+        if (existingVolumes.has(volume) || extraVolumes.includes(volume)) {
+            return;
+        }
+        extraVolumes.push(volume);
+    });
+
+    return {
+        enabled: true,
+        worktreesRoot,
+        worktreeRepoRoot: detected.repoRoot,
+        worktreeMainRepoRoot: detected.mainRepoRoot,
+        extraVolumes
+    };
+}
+
+module.exports = {
+    detectGitWorktreeContext,
+    resolveWorktreeSupport
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.9.11",
+    "version": "5.10.3",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
@@ -87,6 +87,7 @@
         "esbuild": "^0.25.12",
         "glob": "^13.0.6",
         "minimatch": "^10.2.2",
+        "postcss": "^8.5.10",
         "test-exclude": "^8.0.0",
         "vite": "^6.4.2"
     },