@xcanwin/manyoyo 5.9.3 → 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 往往需要：
@@ -129,6 +137,7 @@ manyoyo serve 127.0.0.1:3000 -U admin -P 123456
 manyoyo serve 127.0.0.1:3000 -U admin -P 123456 -d
 manyoyo serve 127.0.0.1:3000 -d   # 未设置密码时会打印本次随机密码
 manyoyo serve 127.0.0.1:3000 --stop   # 停止指定后台服务
+manyoyo serve 127.0.0.1:3000 -U admin -P 123456 -d --restart   # 重启指定后台服务
 
 # 查看配置与命令拼装
 manyoyo config show
@@ -144,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>)')
@@ -1128,6 +1147,7 @@ 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} serve 0.0.0.0:3000 -U admin -P 123 -d --restart  重启指定后台网页服务
   ${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           多次使用静默选项
@@ -1155,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));
@@ -1176,6 +1197,7 @@ Notes:
     applyRunStyleOptions(serveCommand, { includeRmOnExit: false, includeWebAuthOptions: true });
     serveCommand.option('-d, --detach', '后台启动网页服务并立即返回');
     serveCommand.option('--stop', '停止后台网页服务；必须显式传入 listen');
+    serveCommand.option('--restart', '重启后台网页服务；必须显式传入 listen');
     serveCommand.action((listen, options) => {
         selectAction('serve', {
             ...options,
@@ -1258,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);
@@ -1278,6 +1301,11 @@ Notes:
     const isShowCommandMode = selectedAction === 'config-command';
     const isServerMode = options.server !== undefined;
     const isServerStopMode = Boolean(selectedAction === 'serve' && options.stop);
+    const isServerRestartMode = Boolean(selectedAction === 'serve' && options.restart);
+
+    if (isServerStopMode && isServerRestartMode) {
+        throw new Error('serve --stop 与 --restart 不能同时使用');
+    }
 
     const noDockerActions = new Set(['init', 'update', 'install', 'config-show', 'plugin']);
     if (isServerStopMode) {
@@ -1350,7 +1378,8 @@ Notes:
         normalizeCliEnvMap,
         mergeArrayConfig,
         normalizeVolume,
-        parseServerListen
+        parseServerListen,
+        resolveWorktreeSupport
     });
 
     HOST_PATH = resolvedRuntime.hostPath;
@@ -1425,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 || "",
@@ -1472,8 +1505,10 @@ Notes:
         isShowCommandMode,
         isServerMode,
         isServerStop: isServerStopMode,
+        isServerRestart: isServerRestartMode,
         isServerDetach: Boolean(selectedAction === 'serve' && options.detach),
         isServerListenSpecified: Boolean(isServerMode && options.server !== true),
+        updateAgents: Boolean(options.updateAgents),
         isPluginMode: false
     };
 }
@@ -1502,6 +1537,7 @@ function createRuntimeContext(modeState = {}) {
         rmOnExit: RM_ON_EXIT,
         serverMode: Boolean(modeState.isServerMode),
         serverStop: Boolean(modeState.isServerStop),
+        serverRestart: Boolean(modeState.isServerRestart),
         serverDetach: Boolean(modeState.isServerDetach),
         serverListenSpecified: Boolean(modeState.isServerListenSpecified),
         serverHost: SERVER_HOST,
@@ -1553,7 +1589,7 @@ function buildDetachedServeArgv(argv) {
     const result = [];
     for (let i = 0; i < argv.length; i++) {
         const arg = String(argv[i] || '');
-        if (arg === '-d' || arg === '--detach') {
+        if (arg === '-d' || arg === '--detach' || arg === '--restart') {
             continue;
         }
         result.push(arg);
@@ -1663,15 +1699,16 @@ function writeServePidFile(runtime, serverHandle) {
     return pidFile.path;
 }
 
-async function stopServeProcess(runtime) {
+async function stopServeProcess(runtime, options = {}) {
+    const commandName = options.commandName || '--stop';
     if (!runtime || !runtime.serverListenSpecified) {
-        throw new Error('serve --stop 必须显式传入 listen，例如 manyoyo serve 127.0.0.1:3000 --stop');
+        throw new Error(`serve ${commandName} 必须显式传入 listen，例如 manyoyo serve 127.0.0.1:3000 ${commandName}`);
     }
     const target = getServePidTarget(runtime.serverHost, runtime.serverPort);
     if (!target) {
         const label = buildServeListenLabel(runtime.serverHost, runtime.serverPort);
         console.log(`${YELLOW}⚠️  未发现运行中的 serve 实例: ${label}${NC}`);
-        return;
+        return false;
     }
     try {
         process.kill(target.pid, 'SIGTERM');
@@ -1692,6 +1729,7 @@ async function stopServeProcess(runtime) {
     }
     removeServePidFile(target.path);
     console.log(`${GREEN}✅ 已停止 serve: ${target.listen} (pid: ${target.pid})${NC}`);
+    return true;
 }
 
 function relaunchServeDetached(runtime) {
@@ -1711,7 +1749,7 @@ function relaunchServeDetached(runtime) {
     });
     child.unref();
 
-    console.log(`${GREEN}✅ serve 已转入后台运行${NC}`);
+    console.log(`${GREEN}✅ MANYOYO Web 服务已在后台启动: http://${buildServeListenLabel(runtime.serverHost, runtime.serverPort)}${NC}`);
     console.log(`PID: ${child.pid}`);
     console.log(`日志: ${serveLog.path}`);
     console.log(`登录用户名: ${runtime.serverAuthUser}`);
@@ -2064,6 +2102,9 @@ async function main() {
                 await stopServeProcess(runtime);
                 return;
             }
+            if (runtime.serverRestart) {
+                await stopServeProcess(runtime, { commandName: '--restart' });
+            }
             if (runtime.serverDetach) {
                 relaunchServeDetached(runtime);
                 return;
@@ -2093,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,
@@ -2101,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,