@xcanwin/manyoyo 4.2.6 → 5.0.0

package/README.md

@@ -46,9 +46,9 @@
 ```bash
 npm install -g @xcanwin/manyoyo    # 安装
 podman pull ubuntu:24.04           # 仅 Podman 需要
-manyoyo --ib --iv 1.8.0-common     # 构建镜像
-manyoyo --init-config all          # 从本机 Agent 配置迁移到 ~/.manyoyo
-manyoyo -r claude                  # 使用 manyoyo.json 的 runs.claude 启动
+manyoyo build --iv 1.8.0-common     # 构建镜像
+manyoyo init all          # 从本机 Agent 配置迁移到 ~/.manyoyo
+manyoyo run -r claude                  # 使用 manyoyo.json 的 runs.claude 启动
 ```
 
 注意：YOLO/SOLO 会跳过权限确认，请确保在可控环境中使用。
@@ -97,13 +97,13 @@ npm install -g @xcanwin/manyoyo
 
 ```bash
 # 构建 common 版本（推荐）
-manyoyo --ib --iv 1.8.0-common
+manyoyo build --iv 1.8.0-common
 
 # 构建 full 版本
-manyoyo --ib --iv 1.8.0-full
+manyoyo build --iv 1.8.0-full
 
 # 构建自定义版本
-manyoyo --ib --iba TOOL=go,codex,java,gemini
+manyoyo build --iba TOOL=go,codex,java,gemini
 ```
 
 - 首次构建会自动下载依赖到 `docker/cache/`，2天内再次构建会使用缓存，速度提升约 **5 倍**
@@ -112,25 +112,25 @@ manyoyo --ib --iba TOOL=go,codex,java,gemini
 
 ```bash
 # 配置迁移（推荐首步）
-manyoyo --init-config all
+manyoyo init all
 
 # 启动常见智能体
-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 run -y c          # Claude Code（或 claude / cc）
+manyoyo run -y gm         # Gemini（或 gemini / g）
+manyoyo run -y cx         # Codex（或 codex）
+manyoyo run -y oc         # OpenCode（或 opencode）
+manyoyo update      # 更新 MANYOYO（全局 npm 安装场景）
 
 # 容器管理
-manyoyo -l
-manyoyo -n my-dev -x /bin/bash
-manyoyo -n my-dev --crm
-manyoyo --server 3000
-manyoyo --server 3000 --server-user admin --server-pass 123456
+manyoyo ls
+manyoyo run -n my-dev -x /bin/bash
+manyoyo rm my-dev
+manyoyo serve 3000
+manyoyo serve 3000 -u admin -P 123456
 
 # 调试配置与命令拼装
-manyoyo --show-config
-manyoyo --show-command
+manyoyo config show
+manyoyo config command
 ```
 
 ## 配置

package/bin/manyoyo.js

@@ -55,18 +55,14 @@ let IMAGE_VERSION = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
 let EXEC_COMMAND = "";
 let EXEC_COMMAND_PREFIX = "";
 let EXEC_COMMAND_SUFFIX = "";
-let SHOULD_REMOVE = false;
-let IMAGE_BUILD_NEED = false;
 let IMAGE_BUILD_ARGS = [];
 let CONTAINER_ENVS = [];
 let CONTAINER_VOLUMES = [];
-let MANYOYO_NAME = detectCommandName();
+let CONTAINER_PORTS = [];
+const MANYOYO_NAME = detectCommandName();
 let CONT_MODE_ARGS = [];
 let QUIET = {};
-let SHOW_COMMAND = false;
-let YES_MODE = false;
 let RM_ON_EXIT = false;
-let SERVER_MODE = false;
 let SERVER_HOST = '127.0.0.1';
 let SERVER_PORT = 3000;
 let SERVER_AUTH_USER = "";
@@ -127,7 +123,7 @@ function validateServerHost(host, rawServer) {
         return value;
     }
 
-    console.error(`${RED}⚠️  错误: --server 地址格式应为 端口 或 host:port (例如 3000 / 0.0.0.0:3000): ${rawServer}${NC}`);
+    console.error(`${RED}⚠️  错误: serve 地址格式应为 端口 或 host:port (例如 3000 / 0.0.0.0:3000): ${rawServer}${NC}`);
     process.exit(1);
 }
 
@@ -160,13 +156,13 @@ function parseServerListen(rawServer) {
     }
 
     if (!/^\d+$/.test(portText)) {
-        console.error(`${RED}⚠️  错误: --server 端口必须是 1-65535 的整数: ${rawServer}${NC}`);
+        console.error(`${RED}⚠️  错误: serve 端口必须是 1-65535 的整数: ${rawServer}${NC}`);
         process.exit(1);
     }
 
     const port = Number(portText);
     if (port < 1 || port > 65535) {
-        console.error(`${RED}⚠️  错误: --server 端口超出范围 (1-65535): ${rawServer}${NC}`);
+        console.error(`${RED}⚠️  错误: serve 端口超出范围 (1-65535): ${rawServer}${NC}`);
         process.exit(1);
     }
 
@@ -188,7 +184,7 @@ function ensureWebServerAuthCredentials() {
 }
 
 /**
- * 敏感信息脱敏（用于 --show-config 输出）
+ * 敏感信息脱敏（用于 config show 输出）
  * @param {Object} obj - 配置对象
  * @returns {Object} 脱敏后的配置对象
  */
@@ -298,12 +294,12 @@ function getHelloTip(containerName, defaultCommand, runningCommand) {
         console.log(`${BLUE}----------------------------------------${NC}`);
         console.log(`📦 首次命令        : ${defaultCommand}`);
         if (resumeArg) {
-            console.log(`⚫ 恢复首次命令会话: ${CYAN}${MANYOYO_NAME} -n ${containerName} -- ${resumeArg}${NC}`);
+            console.log(`⚫ 恢复首次命令会话: ${CYAN}${MANYOYO_NAME} run -n ${containerName} -- ${resumeArg}${NC}`);
         }
-        console.log(`⚫ 执行首次命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName}${NC}`);
-        console.log(`⚫ 执行指定命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName} -x /bin/bash${NC}`);
+        console.log(`⚫ 执行首次命令    : ${GREEN}${MANYOYO_NAME} run -n ${containerName}${NC}`);
+        console.log(`⚫ 执行指定命令    : ${GREEN}${MANYOYO_NAME} run -n ${containerName} -x /bin/bash${NC}`);
         console.log(`⚫ 执行指定命令    : ${GREEN}docker exec -it ${containerName} /bin/bash${NC}`);
-        console.log(`⚫ 删除容器        : ${MANYOYO_NAME} -n ${containerName} --crm`);
+        console.log(`⚫ 删除容器        : ${MANYOYO_NAME} rm ${containerName}`);
         console.log("");
     }
 }
@@ -488,6 +484,10 @@ function addVolume(volume) {
     CONTAINER_VOLUMES.push("--volume", volume);
 }
 
+function addPort(port) {
+    CONTAINER_PORTS.push("--publish", String(port));
+}
+
 function addImageBuildArg(value) {
     IMAGE_BUILD_ARGS.push("--build-arg", value);
 }
@@ -567,7 +567,7 @@ function showImagePullHint(err) {
     }
     const image = `${IMAGE_NAME}:${IMAGE_VERSION}`;
     console.log(`${YELLOW}💡 提示: 本地未找到镜像 ${image}，并且从 localhost 注册表拉取失败。${NC}`);
-    console.log(`${YELLOW}   你可以: (1) 更新 ~/.manyoyo/manyoyo.json 的 imageVersion。 (2) 或先执行 ${MANYOYO_NAME} --ib --iv <x.y.z-后缀> 构建镜像。${NC}`);
+    console.log(`${YELLOW}   你可以: (1) 更新 ~/.manyoyo/manyoyo.json 的 imageVersion。 (2) 或先执行 ${MANYOYO_NAME} build --iv <x.y.z-后缀> 构建镜像。${NC}`);
 }
 
 function runCmd(cmd, args, options = {}) {
@@ -642,10 +642,18 @@ function installManyoyo(name) {
 
 function updateManyoyo() {
     let isLocalFileInstall = false;
+    let currentVersion = 'unknown';
+
     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'];
+
+        // 获取当前版本
+        if (dep && dep.version) {
+            currentVersion = dep.version;
+        }
+
         const resolved = dep && typeof dep.resolved === 'string' ? dep.resolved : '';
         const depPath = dep && typeof dep.path === 'string' ? dep.path : '';
 
@@ -664,9 +672,28 @@ function updateManyoyo() {
         return;
     }
 
+    console.log(`${CYAN}🔄 当前版本: ${currentVersion}${NC}`);
     console.log(`${CYAN}🔄 正在更新 ${MANYOYO_NAME} 到最新版本...${NC}`);
     runCmd('npm', ['update', '-g', '@xcanwin/manyoyo'], { stdio: 'inherit' });
-    console.log(`${GREEN}✅ 更新完成，请重新执行 ${MANYOYO_NAME} --version 确认版本。${NC}`);
+
+    // 升级后获取新版本
+    let newVersion = 'unknown';
+    try {
+        const listOutput = runCmd('npm', ['ls', '-g', '@xcanwin/manyoyo', '--json'], { stdio: 'pipe' });
+        const listJson = JSON.parse(listOutput || '{}');
+        const dep = listJson && listJson.dependencies && listJson.dependencies['@xcanwin/manyoyo'];
+        if (dep && dep.version) {
+            newVersion = dep.version;
+        }
+    } catch (e) {
+        // ignore
+    }
+
+    if (currentVersion === newVersion) {
+        console.log(`${GREEN}✅ 已是最新版本 ${newVersion}${NC}`);
+    } else {
+        console.log(`${GREEN}✅ 更新完成: ${currentVersion} → ${newVersion}${NC}`);
+    }
 }
 
 function getContList() {
@@ -731,11 +758,74 @@ function normalizeShellFullArgv(argv) {
     }
 }
 
+function appendArrayOption(command, flags, description) {
+    return command.option(
+        flags,
+        description,
+        (value, previous) => [...(previous || []), value],
+        []
+    );
+}
+
+function applyRunStyleOptions(command, options = {}) {
+    const includeRmOnExit = options.includeRmOnExit !== false;
+    const includeServePreview = options.includeServePreview === true;
+    const includeWebAuthOptions = options.includeWebAuthOptions === true;
+
+    command
+        .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+        .option('--hp, --host-path <path>', '设置宿主机工作目录 (默认当前路径)')
+        .option('-n, --cont-name <name>', '设置容器名称')
+        .option('--cp, --cont-path <path>', '设置容器工作目录')
+        .option('-m, --cont-mode <mode>', '设置容器嵌套容器模式 (common, dind, sock)')
+        .option('--in, --image-name <name>', '指定镜像名称')
+        .option('--iv, --image-ver <version>', '指定镜像版本 (格式: x.y.z-后缀，如 1.7.4-common)');
+
+    appendArrayOption(command, '-e, --env <env>', '设置环境变量 XXX=YYY (可多次使用)');
+    appendArrayOption(command, '--ef, --env-file <file>', '设置环境变量通过文件 (仅支持绝对路径，如 /abs/path.env)');
+    appendArrayOption(command, '-v, --volume <volume>', '绑定挂载卷 XXX:YYY (可多次使用)');
+    appendArrayOption(command, '-p, --port <port>', '设置端口映射 XXX:YYY (可多次使用)');
+
+    command
+        .option('--sp, --shell-prefix <command>', '临时环境变量 (作为-s前缀)')
+        .option('-s, --shell <command>', '指定命令执行')
+        .option('--ss, --shell-suffix <command>', '指定命令后缀 (追加到-s之后，等价于 -- <args>)')
+        .option('-x, --shell-full <command...>', '指定完整命令执行 (代替--sp和-s和--命令)')
+        .option('-y, --yolo <cli>', '使AGENT无需确认 (claude/c, gemini/gm, codex/cx, opencode/oc)');
+
+    if (includeRmOnExit) {
+        command.option('--rm-on-exit', '退出后自动删除容器 (一次性模式)');
+    }
+
+    appendArrayOption(command, '-q, --quiet <item>', '静默显示 (可多次使用: cnew,crm,tip,cmd,full)');
+
+    if (includeServePreview) {
+        command
+            .option('--serve [listen]', '按 serve 模式解析配置 (支持 port 或 host:port)')
+            .option('-u, --user <username>', '网页服务登录用户名 (默认 admin)')
+            .option('-P, --pass <password>', '网页服务登录密码 (默认自动生成随机密码)');
+    }
+
+    if (includeWebAuthOptions) {
+        command
+            .option('-u, --user <username>', '网页服务登录用户名 (默认 admin)')
+            .option('-P, --pass <password>', '网页服务登录密码 (默认自动生成随机密码)');
+    }
+
+    return command;
+}
+
 async function setupCommander() {
     // Load config file
     const config = loadConfig();
 
     const program = new Command();
+    let selectedAction = '';
+    let selectedOptions = {};
+    const selectAction = (action, options = {}) => {
+        selectedAction = action;
+        selectedOptions = options;
+    };
 
     program
         .name(MANYOYO_NAME)
@@ -747,59 +837,94 @@ async function setupCommander() {
   ~/.manyoyo/run/c.json      运行配置示例
 
 路径规则:
-  -r name       → ~/.manyoyo/manyoyo.json 的 runs.name
-  --ef /abs/path.env → 绝对路径环境文件
-  --ss "<args>" → 显式设置命令后缀
-  -- <args...>  → 直接透传命令后缀（优先级最高）
+  run -r name         → ~/.manyoyo/manyoyo.json 的 runs.name
+  run --ef /abs/path.env → 绝对路径环境文件
+  run --ss "<args>"   → 显式设置命令后缀
+  run -- <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 快速启动
-  ${MANYOYO_NAME} -r codex --ss "resume --last"       使用命令后缀
-  ${MANYOYO_NAME} -n test --ef /abs/path/myenv.env -y c  使用绝对路径环境变量文件
-  ${MANYOYO_NAME} -n test -- -c                       恢复之前会话
-  ${MANYOYO_NAME} -x echo 123                         指定命令执行
-  ${MANYOYO_NAME} --server --server-user admin --server-pass 123456   启动带登录认证的网页服务
-  ${MANYOYO_NAME} --server 3000                       启动网页交互服务
-  ${MANYOYO_NAME} --server 0.0.0.0:3000               监听全部网卡，便于局域网访问
-  ${MANYOYO_NAME} -n test -q tip -q cmd               多次使用静默选项
+  ${MANYOYO_NAME} update                              更新 MANYOYO 到最新版本
+  ${MANYOYO_NAME} build --iv ${IMAGE_VERSION_HELP_EXAMPLE}             构建镜像
+  ${MANYOYO_NAME} init all                            从本机 Agent 配置初始化 ~/.manyoyo
+  ${MANYOYO_NAME} run -r claude                       使用 manyoyo.json 的 runs.claude 快速启动
+  ${MANYOYO_NAME} run -r codex --ss "resume --last"   使用命令后缀
+  ${MANYOYO_NAME} run -n test --ef /abs/path/myenv.env -y c  使用绝对路径环境变量文件
+  ${MANYOYO_NAME} run -n test -- -c                   恢复之前会话
+  ${MANYOYO_NAME} run -x "echo 123"                   指定命令执行
+  ${MANYOYO_NAME} serve 3000 -u admin -P 123456       启动带登录认证的网页服务
+  ${MANYOYO_NAME} serve 0.0.0.0:3000                  监听全部网卡，便于局域网访问
+  ${MANYOYO_NAME} run -n test -q tip -q cmd           多次使用静默选项
         `);
 
-    // Options
-    program
+    const runCommand = program.command('run').description('启动或连接容器并执行命令');
+    applyRunStyleOptions(runCommand);
+    runCommand.action(options => selectAction('run', options));
+
+    const buildCommand = program.command('build').description('构建 manyoyo 沙箱镜像');
+    buildCommand
         .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
-        .option('--hp, --host-path <path>', '设置宿主机工作目录 (默认当前路径)')
-        .option('-n, --cont-name <name>', '设置容器名称')
-        .option('--cp, --cont-path <path>', '设置容器工作目录')
-        .option('-l, --cont-list', '列举容器')
-        .option('--crm, --cont-remove', '删除-n指定容器')
-        .option('-m, --cont-mode <mode>', '设置容器嵌套容器模式 (common, dind, sock)')
         .option('--in, --image-name <name>', '指定镜像名称')
         .option('--iv, --image-ver <version>', '指定镜像版本 (格式: x.y.z-后缀，如 1.7.4-common)')
-        .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], [])
-        .option('-v, --volume <volume>', '绑定挂载卷 XXX:YYY (可多次使用)', (value, previous) => [...(previous || []), value], [])
-        .option('--sp, --shell-prefix <command>', '临时环境变量 (作为-s前缀)')
-        .option('-s, --shell <command>', '指定命令执行')
-        .option('--ss, --shell-suffix <command>', '指定命令后缀 (追加到-s之后，等价于 -- <args>)')
-        .option('-x, --shell-full <command...>', '指定完整命令执行 (代替--sp和-s和--命令)')
-        .option('-y, --yolo <cli>', '使AGENT无需确认 (claude/c, gemini/gm, codex/cx, opencode/oc)')
-        .option('--install <name>', `安装${MANYOYO_NAME}命令 (docker-cli-plugin)`)
-        .option('--show-config', '显示最终生效配置并退出')
-        .option('--show-command', '显示将执行的 docker run 命令并退出')
-        .option('--server [port]', '启动网页交互服务 (默认 127.0.0.1:3000，支持 host:port)')
-        .option('--server-user <username>', '网页服务登录用户名 (默认 admin)')
-        .option('--server-pass <password>', '网页服务登录密码 (默认自动生成随机密码)')
+        .option('--yes', '所有提示自动确认 (用于CI/脚本)');
+    appendArrayOption(buildCommand, '--iba, --image-build-arg <arg>', '构建镜像时传参给dockerfile (可多次使用)');
+    buildCommand.action(options => selectAction('build', options));
+
+    const removeCommand = program.command('rm <name>').description('删除指定容器');
+    removeCommand
+        .option('-r, --run <name>', '加载运行配置 (从 ~/.manyoyo/manyoyo.json 的 runs.<name> 读取)')
+        .action((name, options) => selectAction('rm', { ...options, contName: name }));
+
+    program.command('ls')
+        .description('列举容器')
+        .action(() => selectAction('ls', { contList: true }));
+
+    const serveCommand = program.command('serve [listen]').description('启动网页交互服务 (默认 127.0.0.1:3000)');
+    applyRunStyleOptions(serveCommand, { includeRmOnExit: false, includeWebAuthOptions: true });
+    serveCommand.action((listen, options) => {
+        selectAction('serve', {
+            ...options,
+            server: listen === undefined ? true : listen,
+            serverUser: options.user,
+            serverPass: options.pass
+        });
+    });
+
+    const configCommand = program.command('config').description('查看解析后的配置或命令');
+    const configShowCommand = configCommand.command('show').description('显示最终生效配置并退出');
+    applyRunStyleOptions(configShowCommand, { includeRmOnExit: false, includeServePreview: true });
+    configShowCommand.action(options => {
+        const finalOptions = {
+            ...options,
+            showConfig: true
+        };
+        if (options.serve !== undefined) {
+            finalOptions.server = options.serve;
+            finalOptions.serverUser = options.user;
+            finalOptions.serverPass = options.pass;
+        }
+        selectAction('config-show', finalOptions);
+    });
+
+    const configRunCommand = configCommand.command('command').description('显示将执行的 docker run 命令并退出');
+    applyRunStyleOptions(configRunCommand, { includeRmOnExit: false });
+    configRunCommand.action(options => selectAction('config-command', options));
+
+    const initCommand = program.command('init [agents]').description('初始化 Agent 配置到 ~/.manyoyo');
+    initCommand
         .option('--yes', '所有提示自动确认 (用于CI/脚本)')
-        .option('--rm-on-exit', '退出后自动删除容器 (一次性模式)')
-        .option('-q, --quiet <item>', '静默显示 (可多次使用: cnew,crm,tip,cmd,full)', (value, previous) => [...(previous || []), value], []);
+        .action((agents, options) => selectAction('init', { ...options, initConfig: agents === undefined ? 'all' : agents }));
+
+    program.command('update')
+        .description('更新 MANYOYO（若检测为本地 file 安装则跳过）')
+        .action(() => selectAction('update', { update: true }));
+
+    program.command('install <name>')
+        .description(`安装${MANYOYO_NAME}命令 (docker-cli-plugin)`)
+        .action(name => selectAction('install', { install: name }));
+
+    program.command('prune')
+        .description('清理悬空镜像和 <none> 镜像')
+        .action(() => selectAction('prune', { imageRemove: true }));
 
     // Docker CLI plugin metadata check
     if (maybeHandleDockerPluginMetadata(process.argv)) {
@@ -814,25 +939,30 @@ async function setupCommander() {
         program.help();
     }
 
-    const isInitConfigMode = process.argv.some(arg => arg === '--init-config' || arg.startsWith('--init-config='));
-    const isUpdateMode = process.argv.includes('--update');
-    // init-config/update 只处理本地文件或 npm，不依赖 docker/podman
-    if (!isInitConfigMode && !isUpdateMode) {
-        // Ensure docker/podman is available
-        ensureDocker();
-    }
-
     // Pre-handle -x/--shell-full: treat all following args as a single command
     normalizeShellFullArgv(process.argv);
 
     // Parse arguments
     program.allowUnknownOption(false);
-    program.parse(process.argv);
+    await program.parseAsync(process.argv);
+
+    if (!selectedAction) {
+        program.help();
+    }
 
-    const options = program.opts();
+    const options = selectedOptions;
+    const yesMode = Boolean(options.yes);
+    const isBuildMode = selectedAction === 'build';
+    const isRemoveMode = selectedAction === 'rm';
+    const isListMode = selectedAction === 'ls';
+    const isPruneMode = selectedAction === 'prune';
+    const isShowConfigMode = selectedAction === 'config-show';
+    const isShowCommandMode = selectedAction === 'config-command';
+    const isServerMode = options.server !== undefined;
 
-    if (options.yes) {
-        YES_MODE = true;
+    const noDockerActions = new Set(['init', 'update', 'install', 'config-show']);
+    if (!noDockerActions.has(selectedAction)) {
+        ensureDocker();
     }
 
     if (options.update) {
@@ -842,7 +972,7 @@ async function setupCommander() {
 
     if (options.initConfig !== undefined) {
         await initAgentConfigs(options.initConfig, {
-            yesMode: YES_MODE,
+            yesMode,
             askQuestion,
             loadConfig,
             supportedAgents: SUPPORTED_INIT_AGENTS,
@@ -909,6 +1039,9 @@ async function setupCommander() {
     const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume);
     volumeList.forEach(v => addVolume(v));
 
+    const portList = mergeArrayConfig(config.ports, runConfig.ports, options.port);
+    portList.forEach(p => addPort(p));
+
     const buildArgList = mergeArrayConfig(config.imageBuildArgs, runConfig.imageBuildArgs, options.imageBuildArg);
     buildArgList.forEach(arg => addImageBuildArg(arg));
 
@@ -941,8 +1074,7 @@ async function setupCommander() {
         RM_ON_EXIT = true;
     }
 
-    if (options.server !== undefined) {
-        SERVER_MODE = true;
+    if (isServerMode) {
         const serverListen = parseServerListen(options.server);
         SERVER_HOST = serverListen.host;
         SERVER_PORT = serverListen.port;
@@ -959,11 +1091,11 @@ async function setupCommander() {
         SERVER_AUTH_PASS_AUTO = false;
     }
 
-    if (SERVER_MODE) {
+    if (isServerMode) {
         ensureWebServerAuthCredentials();
     }
 
-    if (options.showConfig) {
+    if (isShowConfigMode) {
         const finalConfig = {
             hostPath: HOST_PATH,
             containerName: CONTAINER_NAME,
@@ -973,6 +1105,7 @@ async function setupCommander() {
             envFile: envFileList,
             env: envMap,
             volumes: volumeList,
+            ports: portList,
             imageBuildArgs: buildArgList,
             containerMode: contModeValue || "",
             shellPrefix: EXEC_COMMAND_PREFIX.trim(),
@@ -980,9 +1113,9 @@ async function setupCommander() {
             shellSuffix: EXEC_COMMAND_SUFFIX || "",
             yolo: yoloValue || "",
             quiet: quietValue || [],
-            server: SERVER_MODE,
-            serverHost: SERVER_MODE ? SERVER_HOST : null,
-            serverPort: SERVER_MODE ? SERVER_PORT : null,
+            server: isServerMode,
+            serverHost: isServerMode ? SERVER_HOST : null,
+            serverPort: isServerMode ? SERVER_PORT : null,
             serverUser: SERVER_AUTH_USER || "",
             serverPass: SERVER_AUTH_PASS || "",
             exec: {
@@ -997,20 +1130,20 @@ async function setupCommander() {
         process.exit(0);
     }
 
-    if (options.showCommand) {
-        SHOW_COMMAND = true;
-    }
+    if (isListMode) { getContList(); process.exit(0); }
+    if (isPruneMode) { pruneDanglingImages(); process.exit(0); }
+    if (selectedAction === 'install') { installManyoyo(options.install); process.exit(0); }
 
-    if (options.contList) { getContList(); process.exit(0); }
-    if (options.contRemove) SHOULD_REMOVE = true;
-    if (options.imageBuild) IMAGE_BUILD_NEED = true;
-    if (options.imageRemove) { pruneDanglingImages(); process.exit(0); }
-    if (options.install) { installManyoyo(options.install); process.exit(0); }
-
-    return program;
+    return {
+        yesMode,
+        isBuildMode,
+        isRemoveMode,
+        isShowCommandMode,
+        isServerMode
+    };
 }
 
-function createRuntimeContext() {
+function createRuntimeContext(modeState = {}) {
     return {
         containerName: CONTAINER_NAME,
         hostPath: HOST_PATH,
@@ -1023,10 +1156,11 @@ function createRuntimeContext() {
         contModeArgs: CONT_MODE_ARGS,
         containerEnvs: CONTAINER_ENVS,
         containerVolumes: CONTAINER_VOLUMES,
+        containerPorts: CONTAINER_PORTS,
         quiet: QUIET,
-        showCommand: SHOW_COMMAND,
+        showCommand: Boolean(modeState.isShowCommandMode),
         rmOnExit: RM_ON_EXIT,
-        serverMode: SERVER_MODE,
+        serverMode: Boolean(modeState.isServerMode),
         serverHost: SERVER_HOST,
         serverPort: SERVER_PORT,
         serverAuthUser: SERVER_AUTH_USER,
@@ -1036,10 +1170,6 @@ function createRuntimeContext() {
 }
 
 function handleRemoveContainer(runtime) {
-    if (!SHOULD_REMOVE) {
-        return false;
-    }
-
     try {
         if (containerExists(runtime.containerName)) {
             removeContainer(runtime.containerName);
@@ -1049,7 +1179,6 @@ function handleRemoveContainer(runtime) {
     } catch (e) {
         console.log(`${RED}⚠️  错误: 未找到名为 ${runtime.containerName} 的容器。${NC}`);
     }
-    return true;
 }
 
 function validateHostPath(runtime) {
@@ -1153,6 +1282,7 @@ function buildDockerRunArgs(runtime) {
         contModeArgs: runtime.contModeArgs,
         containerEnvs: runtime.containerEnvs,
         containerVolumes: runtime.containerVolumes,
+        containerPorts: runtime.containerPorts,
         defaultCommand: runtime.execCommand
     });
 }
@@ -1316,6 +1446,7 @@ async function runWebServerMode(runtime) {
         contModeArgs: runtime.contModeArgs,
         containerEnvs: runtime.containerEnvs,
         containerVolumes: runtime.containerVolumes,
+        containerPorts: runtime.containerPorts,
         validateHostPath: () => validateHostPath(runtime),
         formatDate,
         isValidContainerName,
@@ -1340,8 +1471,8 @@ async function runWebServerMode(runtime) {
 async function main() {
     try {
         // 1. Setup commander and parse arguments
-        await setupCommander();
-        const runtime = createRuntimeContext();
+        const modeState = await setupCommander();
+        const runtime = createRuntimeContext(modeState);
 
         // 2. Start web server mode
         if (runtime.serverMode) {
@@ -1350,7 +1481,7 @@ async function main() {
         }
 
         // 3. Handle image build operation
-        if (IMAGE_BUILD_NEED) {
+        if (modeState.isBuildMode) {
             await buildImage({
                 imageBuildArgs: IMAGE_BUILD_ARGS,
                 imageName: runtime.imageName,
@@ -1359,7 +1490,7 @@ async function main() {
                 imageVersionBase: IMAGE_VERSION_BASE,
                 parseImageVersionTag,
                 manyoyoName: MANYOYO_NAME,
-                yesMode: YES_MODE,
+                yesMode: Boolean(modeState.yesMode),
                 dockerCmd: DOCKER_CMD,
                 rootDir: path.join(__dirname, '..'),
                 loadConfig,
@@ -1372,7 +1503,8 @@ async function main() {
         }
 
         // 4. Handle remove container operation
-        if (handleRemoveContainer(runtime)) {
+        if (modeState.isRemoveMode) {
+            handleRemoveContainer(runtime);
             return;
         }
 

package/config.example.json

@@ -21,6 +21,7 @@
     },
     "envFile": [],
     "volumes": [],
+    "ports": ["8888:8888"],
     "imageBuildArgs": [],
     "quiet": ["tip", "cmd"],
 

package/lib/container-run.js

@@ -12,6 +12,7 @@ function buildContainerRunArgs(options) {
         ...(options.contModeArgs || []),
         ...(options.containerEnvs || []),
         ...(options.containerVolumes || []),
+        ...(options.containerPorts || []),
         '--volume', `${options.hostPath}:${options.containerPath}`,
         '--workdir', options.containerPath,
         '--label', `manyoyo.default_cmd=${sanitizeDefaultCommand(options.defaultCommand)}`,

package/lib/image-build.js

@@ -301,10 +301,6 @@ function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
     const args = [
         'run', '--rm', '--privileged',
         '--network', `host`,
-        '-e', `HTTP_PROXY=$HTTP_PROXY`,
-        '-e', `HTTPS_PROXY=$HTTPS_PROXY`,
-        '-e', `ALL_PROXY=$ALL_PROXY`,
-        '-e', `NO_PROXY=$NO_PROXY`,
         '--volume', `${ctx.rootDir}:/workspace`,
         '--entrypoint', 'buildctl-daemonless.sh',
         'docker.io/moby/buildkit:latest',
@@ -314,10 +310,10 @@ function buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs)
         '--local', 'dockerfile=/workspace',
         '--opt', `filename=${dockerfileRelativePath}`,
         '--opt', 'network=host',
-        '--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`
+        '--opt', `build-arg:HTTP_PROXY=${process.env.HTTP_PROXY}`,
+        '--opt', `build-arg:HTTPS_PROXY=${process.env.HTTPS_PROXY}`,
+        '--opt', `build-arg:ALL_PROXY=${process.env.ALL_PROXY}`,
+        '--opt', `build-arg:NO_PROXY=${process.env.NO_PROXY}`
     ];
 
     for (const value of buildArgs) {
@@ -433,6 +429,9 @@ async function buildImage(options = {}) {
 
     await prepareBuildCache(ctx, imageTool);
 
+    // 记录构建开始时间
+    const buildStartTime = Date.now();
+
     const dockerfilePath = path.join(ctx.rootDir, 'docker', 'manyoyo.Dockerfile');
     if (!fs.existsSync(dockerfilePath)) {
         ctx.error(`${RED}错误: 找不到 Dockerfile: ${dockerfilePath}${NC}`);
@@ -452,7 +451,9 @@ async function buildImage(options = {}) {
     const buildkitRunArgs = buildBuildkitRunArgs(ctx, dockerfilePath, fullImageTag, imageBuildArgs);
 
     function logBuildSuccess() {
+        const buildDuration = ((Date.now() - buildStartTime) / 1000).toFixed(1);
         ctx.log(`\n${GREEN}✅ 镜像构建成功: ${fullImageTag}${NC}`);
+        ctx.log(`${GREEN}⏱️  构建耗时: ${buildDuration} 秒${NC}`);
         ctx.log(`${BLUE}使用镜像:${NC}`);
         ctx.log(`  ${ctx.manyoyoName} -n test --in ${ctx.imageName} --iv ${version}-${imageTool} -y c`);
         ctx.pruneDanglingImages();

package/lib/init-config.js

@@ -126,7 +126,7 @@ function normalizeInitConfigAgents(rawAgents, ctx) {
         const mapped = aliasMap[token];
         if (!mapped) {
             const { RED, YELLOW, NC } = ctx.colors;
-            ctx.error(`${RED}⚠️  错误: --init-config 不支持的 Agent: ${token}${NC}`);
+            ctx.error(`${RED}⚠️  错误: init 不支持的 Agent: ${token}${NC}`);
             ctx.error(`${YELLOW}支持: ${ctx.supportedAgents.join(', ')} 或 all${NC}`);
             ctx.exit(1);
             return [];

package/lib/web/server.js

@@ -51,7 +51,8 @@ const DEFAULT_WEB_CONFIG_TEMPLATE = `{
     "yolo": "",
     "env": {},
     "envFile": [],
-    "volumes": []
+    "volumes": [],
+    "ports": []
 }
 `;
 
@@ -474,6 +475,9 @@ function validateWebConfigShape(configObject) {
     if (hasOwn(config, 'volumes')) {
         normalizeStringArray(config.volumes, 'volumes');
     }
+    if (hasOwn(config, 'ports')) {
+        normalizeStringArray(config.ports, 'ports');
+    }
     if (hasOwn(config, 'runs')) {
         const runs = config.runs;
         if (runs !== undefined && (typeof runs !== 'object' || runs === null || Array.isArray(runs))) {
@@ -555,7 +559,8 @@ function buildConfigDefaults(ctx, config) {
         yolo: hasOwn(parsed, 'yolo') ? String(parsed.yolo || '') : '',
         env: {},
         envFile: [],
-        volumes: []
+        volumes: [],
+        ports: []
     };
 
     try {
@@ -573,6 +578,11 @@ function buildConfigDefaults(ctx, config) {
     } catch (e) {
         defaults.volumes = [];
     }
+    try {
+        defaults.ports = normalizeStringArray(parsed.ports, 'ports');
+    } catch (e) {
+        defaults.ports = [];
+    }
 
     return defaults;
 }
@@ -587,6 +597,7 @@ function buildStaticContainerRuntime(ctx, containerName) {
         contModeArgs: Array.isArray(ctx.contModeArgs) ? ctx.contModeArgs.slice() : [],
         containerEnvs: Array.isArray(ctx.containerEnvs) ? ctx.containerEnvs.slice() : [],
         containerVolumes: Array.isArray(ctx.containerVolumes) ? ctx.containerVolumes.slice() : [],
+        containerPorts: Array.isArray(ctx.containerPorts) ? ctx.containerPorts.slice() : [],
         defaultCommand: buildDefaultCommand(ctx.execCommandPrefix, ctx.execCommand, ctx.execCommandSuffix) || '/bin/bash'
     };
 }
@@ -600,9 +611,11 @@ function buildCreateRuntime(ctx, state, payload) {
     const hasRequestEnv = hasOwn(requestOptions, 'env');
     const hasRequestEnvFile = hasOwn(requestOptions, 'envFile');
     const hasRequestVolumes = hasOwn(requestOptions, 'volumes');
+    const hasRequestPorts = hasOwn(requestOptions, 'ports');
     const hasConfigEnv = hasOwn(config, 'env');
     const hasConfigEnvFile = hasOwn(config, 'envFile');
     const hasConfigVolumes = hasOwn(config, 'volumes');
+    const hasConfigPorts = hasOwn(config, 'ports');
 
     const requestName = pickFirstString(requestOptions.containerName, body.name);
     let containerName = pickFirstString(requestName, config.containerName);
@@ -683,6 +696,17 @@ function buildCreateRuntime(ctx, state, payload) {
         });
     }
 
+    let containerPorts = Array.isArray(ctx.containerPorts) ? ctx.containerPorts.slice() : [];
+    if (hasRequestPorts || hasConfigPorts) {
+        const portList = hasRequestPorts
+            ? normalizeStringArray(requestOptions.ports, 'createOptions.ports')
+            : normalizeStringArray(config.ports, 'config.ports');
+        containerPorts = [];
+        portList.forEach(port => {
+            containerPorts.push('--publish', port);
+        });
+    }
+
     return {
         containerName,
         hostPath,
@@ -692,6 +716,7 @@ function buildCreateRuntime(ctx, state, payload) {
         contModeArgs,
         containerEnvs,
         containerVolumes,
+        containerPorts,
         defaultCommand: buildDefaultCommand(shellPrefix, shell, shellSuffix) || '/bin/bash',
         applied: {
             containerName,
@@ -705,7 +730,8 @@ function buildCreateRuntime(ctx, state, payload) {
             shellSuffix: shellSuffix || '',
             yolo: yolo || '',
             envCount: Math.floor(containerEnvs.length / 2),
-            volumeCount: Math.floor(containerVolumes.length / 2)
+            volumeCount: Math.floor(containerVolumes.length / 2),
+            portCount: Math.floor(containerPorts.length / 2)
         }
     };
 }
@@ -755,6 +781,7 @@ async function ensureWebContainer(ctx, state, containerInput) {
             contModeArgs: runtime.contModeArgs,
             containerEnvs: runtime.containerEnvs,
             containerVolumes: runtime.containerVolumes,
+            containerPorts: runtime.containerPorts,
             defaultCommand: runtime.defaultCommand
         });
 
@@ -1407,6 +1434,7 @@ async function startWebServer(options) {
         contModeArgs: options.contModeArgs,
         containerEnvs: options.containerEnvs,
         containerVolumes: options.containerVolumes,
+        containerPorts: options.containerPorts,
         validateHostPath: options.validateHostPath,
         formatDate: options.formatDate,
         isValidContainerName: options.isValidContainerName,
@@ -1425,7 +1453,7 @@ async function startWebServer(options) {
     };
 
     if (!ctx.authUser || !ctx.authPass) {
-        throw new Error('Web 认证配置缺失，请设置 --server-user / --server-pass');
+        throw new Error('Web 认证配置缺失，请设置 serve -u / serve -P');
     }
 
     const state = {
@@ -1593,7 +1621,7 @@ async function startWebServer(options) {
             if (ctx.authPassAuto) {
                 console.log(`${CYAN}🔐 登录密码(本次随机): ${YELLOW}${ctx.authPass}${NC}`);
             } else {
-                console.log(`${CYAN}🔐 登录密码: 使用你配置的 --server-pass / serverPass / MANYOYO_SERVER_PASS${NC}`);
+                console.log(`${CYAN}🔐 登录密码: 使用你配置的 serve -P / serverPass / MANYOYO_SERVER_PASS${NC}`);
             }
             resolve();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "4.2.6",
+    "version": "5.0.0",
     "imageVersion": "1.8.0-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
@@ -60,9 +60,14 @@
         "ws": "^8.19.0"
     },
     "devDependencies": {
-        "jest": "^29.7.0",
+        "jest": "^30.2.0",
         "vitepress": "^2.0.0-alpha.16"
     },
+    "overrides": {
+        "glob": "^13.0.6",
+        "minimatch": "^10.2.2",
+        "test-exclude": "^8.0.0"
+    },
     "jest": {
         "testMatch": [
             "**/test/**/*.test.js"