@xcanwin/manyoyo 4.2.6 → 4.2.8

package/bin/manyoyo.js

@@ -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() {

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/package.json

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