@xcanwin/manyoyo 4.1.10 → 4.2.3

package/README.md

@@ -46,7 +46,7 @@
 ```bash
 npm install -g @xcanwin/manyoyo    # 安装
 podman pull ubuntu:24.04           # 仅 Podman 需要
-manyoyo --ib --iv 1.7.4-common     # 构建镜像
+manyoyo --ib --iv 1.8.0-common     # 构建镜像
 manyoyo --init-config all          # 从本机 Agent 配置迁移到 ~/.manyoyo
 manyoyo -r claude                  # 使用 manyoyo.json 的 runs.claude 启动
 ```
@@ -97,10 +97,10 @@ npm install -g @xcanwin/manyoyo
 
 ```bash
 # 构建 common 版本（推荐）
-manyoyo --ib --iv 1.7.4-common
+manyoyo --ib --iv 1.8.0-common
 
 # 构建 full 版本
-manyoyo --ib --iv 1.7.4-full
+manyoyo --ib --iv 1.8.0-full
 
 # 构建自定义版本
 manyoyo --ib --iba TOOL=go,codex,java,gemini

package/bin/manyoyo.js

@@ -13,7 +13,7 @@ const { startWebServer } = require('../lib/web/server');
 const { buildContainerRunArgs, buildContainerRunCommand } = require('../lib/container-run');
 const { initAgentConfigs } = require('../lib/init-config');
 const { buildImage } = require('../lib/image-build');
-const { resolveAgentResumeArg } = require('../lib/agent-resume');
+const { resolveAgentResumeArg, buildAgentResumeCommand } = require('../lib/agent-resume');
 const { version: BIN_VERSION, imageVersion: IMAGE_VERSION_DEFAULT } = require('../package.json');
 const IMAGE_VERSION_BASE = String(IMAGE_VERSION_DEFAULT || '1.0.0').split('-')[0];
 const IMAGE_VERSION_HELP_EXAMPLE = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
@@ -1210,8 +1210,12 @@ async function handlePostExit(runtime, defaultCommand) {
 
     getHelloTip(runtime.containerName, defaultCommand, runtime.execCommand);
 
-    let tipAskKeep = `❔ 会话已结束。是否保留此后台容器 ${runtime.containerName}? [ y=默认保留, n=删除, 1=首次命令进入, x=执行命令, i=交互式SHELL ]: `;
-    if (runtime.quiet.askkeep || runtime.quiet.full) tipAskKeep = `保留容器吗? [y n 1 x i] `;
+    const resumeCommand = buildAgentResumeCommand(defaultCommand);
+    const hasResumeAction = Boolean(resumeCommand);
+    const menuResume = hasResumeAction ? ', r=恢复首次命令会话' : '';
+    const quietResume = hasResumeAction ? ' r' : '';
+    let tipAskKeep = `❔ 会话已结束。是否保留此后台容器 ${runtime.containerName}? [ y=默认保留, n=删除, 1=首次命令进入${menuResume}, x=执行命令, i=交互式SHELL ]: `;
+    if (runtime.quiet.askkeep || runtime.quiet.full) tipAskKeep = `保留容器吗? [y n 1${quietResume} x i] `;
     const reply = await askQuestion(tipAskKeep);
 
     const firstChar = reply.trim().toLowerCase()[0];
@@ -1225,6 +1229,12 @@ async function handlePostExit(runtime, defaultCommand) {
         runtime.execCommandSuffix = "";
         runtime.execCommand = defaultCommand;
         return true;
+    } else if (firstChar === 'r' && hasResumeAction) {
+        if (!(runtime.quiet.full)) console.log(`${GREEN}✅ 离开当前连接，恢复首次命令会话。${NC}`);
+        runtime.execCommandPrefix = "";
+        runtime.execCommandSuffix = "";
+        runtime.execCommand = resumeCommand;
+        return true;
     } else if (firstChar === 'x') {
         const command = await askQuestion('❔ 输入要执行的命令: ');
         if (!(runtime.quiet.cmd || runtime.quiet.full)) console.log(`${GREEN}✅ 离开当前连接，执行命令。${NC}`);

package/config.example.json

@@ -6,7 +6,7 @@
     "hostPath": "/path/to/your/project",
     "containerPath": "/path/to/your/project",
     "imageName": "localhost/xcanwin/manyoyo",
-    "imageVersion": "1.7.0-full",
+    "imageVersion": "1.8.0-common",
     "containerMode": "common",
     "shellPrefix": "",
     "shell": "",

package/lib/agent-resume.js

@@ -67,6 +67,19 @@ function resolveAgentResumeArg(commandText) {
     return AGENT_RESUME_ARG_MAP[program] || '';
 }
 
+function buildAgentResumeCommand(commandText) {
+    const baseCommand = String(commandText || '').trim();
+    if (!baseCommand) {
+        return '';
+    }
+    const resumeArg = resolveAgentResumeArg(baseCommand);
+    if (!resumeArg) {
+        return '';
+    }
+    return `${baseCommand} ${resumeArg}`;
+}
+
 module.exports = {
-    resolveAgentResumeArg
+    resolveAgentResumeArg,
+    buildAgentResumeCommand
 };

package/lib/image-build.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
+const { spawn } = require('child_process');
 
 function getFileSha256(filePath) {
     return crypto.createHash('sha256').update(fs.readFileSync(filePath)).digest('hex');
@@ -233,6 +234,135 @@ function resolveToolFromBuildArgs(args) {
     return '';
 }
 
+function extractBuildArgValues(args) {
+    const values = [];
+    for (let i = 0; i < args.length; i += 1) {
+        const current = args[i];
+        if (current === '--build-arg') {
+            const next = args[i + 1];
+            if (typeof next === 'string' && next.length > 0) {
+                values.push(next);
+                i += 1;
+            }
+            continue;
+        }
+        if (typeof current === 'string' && current.startsWith('--build-arg=')) {
+            values.push(current.slice('--build-arg='.length));
+        }
+    }
+    return values;
+}
+
+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',
+        'docker.io/moby/buildkit:latest',
+        'build',
+        '--frontend', 'dockerfile.v0',
+        '--local', 'context=/workspace',
+        '--local', 'dockerfile=/workspace',
+        '--opt', `filename=${dockerfileRelativePath}`,
+        '--opt', `build-arg:HTTPS_PROXY=$HTTPS_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) {
+        args.push('--opt', `build-arg:${value}`);
+    }
+
+    args.push('--output', `type=docker,name=${fullImageTag},dest=-`);
+    return args;
+}
+
+function runCmdPipeline(leftCmd, leftArgs, rightCmd, rightArgs, options = {}) {
+    const stdio = options.stdio || 'inherit';
+
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const left = spawn(leftCmd, leftArgs, { stdio: ['ignore', 'pipe', 'pipe'] });
+        const right = spawn(rightCmd, rightArgs, { stdio: ['pipe', 'pipe', 'pipe'] });
+        right.stdin.on('error', () => {});
+        left.stdout.pipe(right.stdin);
+
+        if (stdio === 'inherit') {
+            left.stderr.pipe(process.stderr);
+            right.stdout.pipe(process.stdout);
+            right.stderr.pipe(process.stderr);
+        }
+
+        let leftExited = false;
+        let rightExited = false;
+        let leftCode = 1;
+        let rightCode = 1;
+
+        const finish = (error) => {
+            if (settled) return;
+            settled = true;
+            if (error) {
+                try { left.kill(); } catch (e) {}
+                try { right.kill(); } catch (e) {}
+                reject(error);
+                return;
+            }
+            if (leftCode === 0 && rightCode === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(`Command pipeline failed: ${leftCmd}(${leftCode}) | ${rightCmd}(${rightCode})`));
+        };
+
+        const onClose = () => {
+            if (leftExited && rightExited) finish();
+        };
+
+        left.on('error', finish);
+        right.on('error', finish);
+        left.on('close', (code) => {
+            leftExited = true;
+            leftCode = typeof code === 'number' ? code : 1;
+            onClose();
+        });
+        right.on('close', (code) => {
+            rightExited = true;
+            rightCode = typeof code === 'number' ? code : 1;
+            onClose();
+        });
+    });
+}
+
 async function buildImage(options = {}) {
     const ctx = {
         imageBuildArgs: Array.isArray(options.imageBuildArgs) ? [...options.imageBuildArgs] : [],
@@ -247,6 +377,7 @@ async function buildImage(options = {}) {
         rootDir: options.rootDir || process.cwd(),
         loadConfig: options.loadConfig || (() => ({})),
         runCmd: options.runCmd,
+        runCmdPipeline: options.runCmdPipeline || runCmdPipeline,
         askQuestion: options.askQuestion || (async () => ''),
         pruneDanglingImages: options.pruneDanglingImages || (() => {}),
         cacheTtlDays: options.cacheTtlDays || 2,
@@ -297,6 +428,14 @@ async function buildImage(options = {}) {
         '--progress=plain',
         '--no-cache'
     ];
+    const buildkitRunArgs = buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs);
+
+    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`);
@@ -308,10 +447,34 @@ async function buildImage(options = {}) {
 
     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();
+        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;
+        }
+        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 {
+        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.1.10",
+    "version": "4.2.3",
     "imageVersion": "1.8.0-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [