@xcanwin/manyoyo 5.10.3 → 5.10.4

package/bin/manyoyo.js

@@ -1138,6 +1138,7 @@ async function setupCommander() {
 示例:
   ${MANYOYO_NAME} update                              更新 MANYOYO 到最新版本
   ${MANYOYO_NAME} build --iv ${IMAGE_VERSION_HELP_EXAMPLE} --yes       构建镜像
+  ${MANYOYO_NAME} build --update-agents --yes         仅更新已有镜像内已存在的 Agent CLI
   ${MANYOYO_NAME} init all                            从本机 Agent 配置初始化 ~/.manyoyo
   ${MANYOYO_NAME} run -r claude                       使用 manyoyo.json 的 runs.claude 快速启动
   ${MANYOYO_NAME} run -r codex --ss "resume --last"   使用命令后缀

package/docker/res/update-agents.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+TARGETS="${MANYOYO_AGENT_UPDATE_TARGETS:-claude=@anthropic-ai/claude-code@latest codex=@openai/codex@latest}"
+
+read -r -a agent_targets <<< "$TARGETS"
+
+print_agent_versions() {
+    for target in "${agent_targets[@]}"; do
+        agent="${target%%=*}"
+        if command -v "$agent" >/dev/null 2>&1; then
+            printf "%s: " "$agent"
+            "$agent" --version || echo "version check failed"
+        else
+            printf "%s: skipped (command not found)\n" "$agent"
+        fi
+    done
+    printf "npm: "
+    npm --version
+}
+
+update_packages=()
+for target in "${agent_targets[@]}"; do
+    agent="${target%%=*}"
+    package_name="${target#*=}"
+    if [ -n "$agent" ] && [ -n "$package_name" ] && [ "$agent" != "$package_name" ] && command -v "$agent" >/dev/null 2>&1; then
+        update_packages+=("$package_name")
+    fi
+done
+
+echo "[manyoyo] Agent CLI versions before update:"
+print_agent_versions
+
+if [ "${#update_packages[@]}" -gt 0 ]; then
+    npm_config_update_notifier=false npm install -g npm@latest "${update_packages[@]}"
+else
+    echo "[manyoyo] No existing Agent CLI found; skip npm install."
+fi
+
+echo "[manyoyo] Agent CLI versions after update:"
+print_agent_versions
+
+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

package/lib/image-build.js

@@ -396,20 +396,22 @@ 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_UPDATE_TARGETS = [
+    { name: 'claude', packageName: '@anthropic-ai/claude-code@latest', base: true },
+    { name: 'codex', packageName: '@openai/codex@latest', base: true },
+    { name: 'gemini', packageName: '@google/gemini-cli@latest' },
+    { name: 'opencode', packageName: '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 resolveAgentUpdateTargets(imageTool) {
+    const tools = new Set(String(imageTool || 'common').split(',').map(value => value.trim()).filter(Boolean));
+    const hasFull = tools.has('full');
+    return AGENT_UPDATE_TARGETS.filter(target => target.base || hasFull || tools.has(target.name));
+}
+
+function formatAgentUpdateTargets(targets) {
+    return targets.map(target => `${target.name}=${target.packageName}`).join(' ');
+}
 
 function createAgentUpdateContainerName() {
     return `manyoyo-update-agents-${crypto.randomBytes(6).toString('hex')}`;
@@ -429,7 +431,7 @@ function parseImageConfig(rawConfig) {
 
 function isAgentUpdateCommand(cmd) {
     const text = Array.isArray(cmd) ? cmd.join(' ') : String(cmd || '');
-    return AGENT_UPDATE_PACKAGES.some(pkg => text.includes(pkg));
+    return AGENT_UPDATE_TARGETS.some(target => text.includes(target.packageName));
 }
 
 function buildImageImportChangeArgs(config) {
@@ -475,30 +477,18 @@ function buildImageImportChangeArgs(config) {
 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
-    ];
+    let updateTargets = resolveAgentUpdateTargets(ctx.imageTool);
+    const updateScriptPath = path.join(ctx.rootDir, 'docker', 'res', 'update-agents.sh');
     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`);
+
+    if (!fs.existsSync(updateScriptPath)) {
+        ctx.error(`${RED}错误: 找不到 Agent CLI 更新脚本: ${updateScriptPath}${NC}`);
+        ctx.exit(1);
+        return;
+    }
 
     try {
         imageConfig = parseImageConfig(ctx.runCmd(ctx.dockerCmd, [
@@ -515,6 +505,19 @@ async function updateAgentsInExistingImage(ctx, fullImageTag) {
         return;
     }
 
+    ctx.log(`${BLUE}更新范围: 已存在的 ${updateTargets.map(target => target.name).join('/')} CLI -> latest${NC}\n`);
+
+    const runArgs = [
+        'run',
+        '--name', containerName,
+        '--network', 'host',
+        '--volume', `${updateScriptPath}:/usr/local/bin/manyoyo-update-agents.sh:ro`,
+        '--env', `MANYOYO_AGENT_UPDATE_TARGETS=${formatAgentUpdateTargets(updateTargets)}`,
+        fullImageTag,
+        '/bin/bash',
+        '/usr/local/bin/manyoyo-update-agents.sh'
+    ];
+
     const importArgs = [
         'import',
         ...buildImageImportChangeArgs(imageConfig),
@@ -593,6 +596,7 @@ async function buildImage(options = {}) {
     } else {
         imageTool = toolFromArgs;
     }
+    ctx.imageTool = imageTool;
 
     const fullImageTag = `${ctx.imageName}:${version}-${imageTool}`;
     if (ctx.updateAgents) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.10.3",
+    "version": "5.10.4",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",