@xcanwin/manyoyo 4.2.0 → 4.2.4

package/README.md

@@ -119,6 +119,7 @@ manyoyo -y c          # Claude Code（或 claude / cc）
 manyoyo -y gm         # Gemini（或 gemini / g）
 manyoyo -y cx         # Codex（或 codex）
 manyoyo -y oc         # OpenCode（或 opencode）
+manyoyo --update      # 更新 MANYOYO（全局 npm 安装场景）
 
 # 容器管理
 manyoyo -l

package/bin/manyoyo.js

@@ -640,6 +640,35 @@ function installManyoyo(name) {
     process.exit(0);
 }
 
+function updateManyoyo() {
+    let isLocalFileInstall = false;
+    try {
+        const listOutput = runCmd('npm', ['ls', '-g', '@xcanwin/manyoyo', '--json', '--long'], { stdio: 'pipe' });
+        const listJson = JSON.parse(listOutput || '{}');
+        const dep = listJson && listJson.dependencies && listJson.dependencies['@xcanwin/manyoyo'];
+        const resolved = dep && typeof dep.resolved === 'string' ? dep.resolved : '';
+        const depPath = dep && typeof dep.path === 'string' ? dep.path : '';
+
+        if (resolved.startsWith('file:')) {
+            isLocalFileInstall = true;
+        } else if (depPath && fs.existsSync(depPath)) {
+            isLocalFileInstall = fs.lstatSync(depPath).isSymbolicLink();
+        }
+    } catch (e) {
+        // ignore detect errors and fallback to registry update
+    }
+
+    if (isLocalFileInstall) {
+        console.log(`${YELLOW}ℹ️  检测到 MANYOYO 为本地 file 安装（npm install -g . / npm link），跳过在线更新。${NC}`);
+        console.log(`${YELLOW}   如需更新，请在本地仓库拉取最新代码后重新安装。${NC}`);
+        return;
+    }
+
+    console.log(`${CYAN}🔄 正在更新 ${MANYOYO_NAME} 到最新版本...${NC}`);
+    runCmd('npm', ['update', '-g', '@xcanwin/manyoyo'], { stdio: 'inherit' });
+    console.log(`${GREEN}✅ 更新完成，请重新执行 ${MANYOYO_NAME} --version 确认版本。${NC}`);
+}
+
 function getContList() {
     try {
         const result = execSync(`${DOCKER_CMD} ps -a --size --filter "ancestor=manyoyo" --filter "ancestor=$(${DOCKER_CMD} images -a --format '{{.Repository}}:{{.Tag}}' | grep manyoyo)" --format "table {{.Names}}\\t{{.Status}}\\t{{.Size}}\\t{{.ID}}\\t{{.Image}}\\t{{.Ports}}\\t{{.Networks}}\\t{{.Mounts}}"`,
@@ -724,6 +753,7 @@ async function setupCommander() {
   -- <args...>  → 直接透传命令后缀（优先级最高）
 
 示例:
+  ${MANYOYO_NAME} --update                            更新 MANYOYO 到最新版本
   ${MANYOYO_NAME} --ib --iv ${IMAGE_VERSION_HELP_EXAMPLE}              构建镜像
   ${MANYOYO_NAME} --init-config all                   从本机 Agent 配置初始化 ~/.manyoyo
   ${MANYOYO_NAME} -r claude                           使用 manyoyo.json 的 runs.claude 快速启动
@@ -751,6 +781,7 @@ async function setupCommander() {
         .option('--ib, --image-build', '构建镜像')
         .option('--iba, --image-build-arg <arg>', '构建镜像时传参给dockerfile (可多次使用)', (value, previous) => [...(previous || []), value], [])
         .option('--init-config [agents]', '初始化 Agent 配置到 ~/.manyoyo (all 或逗号分隔: claude,codex,gemini,opencode)')
+        .option('--update', '更新 MANYOYO（若检测为本地 file 安装则跳过）')
         .option('--irm, --image-remove', '清理悬空镜像和 <none> 镜像')
         .option('-e, --env <env>', '设置环境变量 XXX=YYY (可多次使用)', (value, previous) => [...(previous || []), value], [])
         .option('--ef, --env-file <file>', '设置环境变量通过文件 (仅支持绝对路径，如 /abs/path.env)', (value, previous) => [...(previous || []), value], [])
@@ -784,8 +815,9 @@ async function setupCommander() {
     }
 
     const isInitConfigMode = process.argv.some(arg => arg === '--init-config' || arg.startsWith('--init-config='));
-    // init-config 只处理本地文件，不依赖 docker/podman
-    if (!isInitConfigMode) {
+    const isUpdateMode = process.argv.includes('--update');
+    // init-config/update 只处理本地文件或 npm，不依赖 docker/podman
+    if (!isInitConfigMode && !isUpdateMode) {
         // Ensure docker/podman is available
         ensureDocker();
     }
@@ -803,6 +835,11 @@ async function setupCommander() {
         YES_MODE = true;
     }
 
+    if (options.update) {
+        updateManyoyo();
+        process.exit(0);
+    }
+
     if (options.initConfig !== undefined) {
         await initAgentConfigs(options.initConfig, {
             yesMode: YES_MODE,

package/lib/image-build.js

@@ -43,7 +43,7 @@ function createBuildCacheContext(ctx) {
     return {
         cacheDir,
         timestampFile,
-        cacheTTLDays: config.cacheTTL || ctx.cacheTtlDays,
+        cacheTTLDays: config.cacheTTL ?? ctx.cacheTtlDays,
         nodeMirrors: [config.nodeMirror, 'https://mirrors.tencent.com/nodejs-release', 'https://nodejs.org/dist'].filter(Boolean),
         timestamps: loadBuildCacheTimestamps(timestampFile),
         now: new Date()
@@ -253,19 +253,50 @@ function extractBuildArgValues(args) {
     return values;
 }
 
-function buildPodmanBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs) {
+function isBuildCapabilityError(error) {
+    const combined = [
+        error && error.message ? error.message : '',
+        error && error.stderr ? String(error.stderr) : '',
+        error && error.stdout ? String(error.stdout) : ''
+    ].join('\n').toLowerCase();
+
+    const patterns = [
+        /unknown flag/,
+        /unknown shorthand flag/,
+        /unknown option/,
+        /unrecognized option/,
+        /unknown instruction:\s*"?((case|if|then|fi|for|while|do|done|esac))"?/,
+        /buildx .* not available/,
+        /buildx .* not found/,
+        /buildx .* not enabled/,
+        /'buildx' is not a docker command/,
+        /the --load option requires buildx/,
+        /unsupported.*--load/,
+        /does not support.*--load/,
+        /driver .* not supported/,
+        /no such plugin.*buildx/
+    ];
+    return patterns.some(pattern => pattern.test(combined));
+}
+
+function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs) {
     const dockerfileRelativePath = path.relative(ctx.rootDir, dockerfilePath).split(path.sep).join('/');
     const buildArgs = extractBuildArgValues(imageBuildArgs);
     const args = [
         'run', '--rm', '--privileged',
+        '--network', `host`,
         '--volume', `${ctx.rootDir}:/workspace`,
         '--entrypoint', 'buildctl-daemonless.sh',
-        'moby/buildkit:latest',
+        'docker.io/moby/buildkit:latest',
         'build',
         '--frontend', 'dockerfile.v0',
         '--local', 'context=/workspace',
         '--local', 'dockerfile=/workspace',
-        '--opt', `filename=${dockerfileRelativePath}`
+        '--opt', `filename=${dockerfileRelativePath}`,
+        '--opt', `build-arg:HTTP_PROXY=$HTTP_PROXY`,
+        '--opt', `build-arg:HTTPS_PROXY=$HTTPS_PROXY`,
+        '--opt', `build-arg:ALL_PROXY=$ALL_PROXY`,
+        '--opt', `build-arg:NO_PROXY=$NO_PROXY`
     ];
 
     for (const value of buildArgs) {
@@ -397,48 +428,53 @@ async function buildImage(options = {}) {
         '--progress=plain',
         '--no-cache'
     ];
+    const buildkitRunArgs = buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs);
 
-    ctx.log(`${BLUE}准备执行命令:${NC}`);
-    const usePodmanBuildkit = ctx.dockerCmd === 'podman';
-    const buildkitRunArgs = usePodmanBuildkit
-        ? buildPodmanBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
-        : [];
-    if (usePodmanBuildkit) {
-        ctx.log(`${ctx.dockerCmd} ${buildkitRunArgs.map(quoteShellArg).join(' ')} | ${ctx.dockerCmd} load\n`);
-    } else {
-        ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
+    function logBuildSuccess() {
+        ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
+        ctx.log(`${BLUE}使用镜像:${NC}`);
+        ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
+        ctx.pruneDanglingImages();
     }
 
+    ctx.log(`${BLUE}准备执行命令:${NC}`);
+    ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
+
     if (!ctx.yesMode) {
         await ctx.askQuestion('❔ 是否继续构建? [ 直接回车=继续, ctrl+c=取消 ]: ');
         ctx.log('');
     }
 
-    if (usePodmanBuildkit) {
-        try {
-            await ctx.runCmdPipeline(ctx.dockerCmd, buildkitRunArgs, ctx.dockerCmd, ['load'], { stdio: 'inherit' });
-            ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
-            ctx.log(`${BLUE}使用镜像:${NC}`);
-            ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
-            ctx.pruneDanglingImages();
+    try {
+        ctx.runCmd(ctx.dockerCmd, buildArgs, { stdio: 'inherit' });
+        logBuildSuccess();
+        return;
+    } catch (e) {
+        const stderrText = e && e.stderr ? String(e.stderr).trim() : '';
+        const stdoutText = e && e.stdout ? String(e.stdout).trim() : '';
+        const hasDiagnostics = Boolean(stderrText || stdoutText);
+        const capabilityError = isBuildCapabilityError(e);
+
+        if (!capabilityError && hasDiagnostics) {
+            ctx.error(`${RED}错误: 镜像构建失败${NC}`);
+            ctx.exit(1);
             return;
-        } catch (e) {
-            ctx.log(`${YELLOW}⚠️  BuildKit 构建失败，回退到 podman build...${NC}`);
-            if (e && e.message) {
-                ctx.log(`${YELLOW}原因: ${e.message}${NC}`);
-            }
-            ctx.log('');
-            ctx.log(`${BLUE}回退命令:${NC}`);
-            ctx.log(`${ctx.dockerCmd} ${buildArgs.map(quoteShellArg).join(' ')}\n`);
         }
+        if (!capabilityError && !hasDiagnostics) {
+            ctx.log(`${YELLOW}⚠️  未捕获到构建器错误详情，尝试回退到 BuildKit...${NC}`);
+        }
+        ctx.log(`${YELLOW}⚠️  直接 build 失败，回退到 BuildKit...${NC}`);
+        if (e && e.message) {
+            ctx.log(`${YELLOW}原因: ${e.message}${NC}`);
+        }
+        ctx.log('');
+        ctx.log(`${BLUE}回退命令:${NC}`);
+        ctx.log(`${ctx.dockerCmd} ${buildkitRunArgs.map(quoteShellArg).join(' ')} | ${ctx.dockerCmd} load\n`);
     }
 
     try {
-        ctx.runCmd(ctx.dockerCmd, buildArgs, { stdio: 'inherit' });
-        ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
-        ctx.log(`${BLUE}使用镜像:${NC}`);
-        ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
-        ctx.pruneDanglingImages();
+        await ctx.runCmdPipeline(ctx.dockerCmd, buildkitRunArgs, ctx.dockerCmd, ['load'], { stdio: 'inherit' });
+        logBuildSuccess();
     } catch (e) {
         ctx.error(`${RED}错误: 镜像构建失败${NC}`);
         ctx.exit(1);

package/package.json

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