@xcanwin/manyoyo 5.4.12 → 5.5.2

package/README.md

@@ -53,7 +53,7 @@ AI Agent CLI 往往需要：
 ```bash
 npm install -g @xcanwin/manyoyo
 podman pull ubuntu:24.04           # 仅 Podman 需要
-manyoyo build --iv 1.8.12-common
+manyoyo build --iv 1.9.0-common
 manyoyo init all
 manyoyo run -r claude
 ```
@@ -137,10 +137,10 @@ manyoyo config command
 
 ```bash
 # common 版本
-manyoyo build --iv 1.8.12-common
+manyoyo build --iv 1.9.0-common
 
 # full 版本
-manyoyo build --iv 1.8.12-full
+manyoyo build --iv 1.9.0-full
 
 # 自定义工具集
 manyoyo build --iba TOOL=go,codex,java,gemini

package/bin/manyoyo.js

@@ -570,6 +570,42 @@ function addEnvFile(envFile) {
     return addEnvFileTo(CONTAINER_ENVS, envFile);
 }
 
+function expandHomeAliasPath(filePath) {
+    const text = String(filePath || '').trim();
+    const homeDir = process.env.HOME || os.homedir();
+
+    if (text === '~') {
+        return homeDir;
+    }
+    if (text.startsWith('~/')) {
+        return path.join(homeDir, text.slice(2));
+    }
+    if (text === '$HOME') {
+        return homeDir;
+    }
+    if (text.startsWith('$HOME/')) {
+        return path.join(homeDir, text.slice('$HOME/'.length));
+    }
+
+    return text;
+}
+
+function normalizeVolume(volume) {
+    const text = String(volume || '').trim();
+    if (!text.startsWith('~') && !text.startsWith('$HOME')) {
+        return text;
+    }
+
+    const separatorIndex = text.indexOf(':');
+    if (separatorIndex === -1) {
+        return expandHomeAliasPath(text);
+    }
+
+    const hostPath = text.slice(0, separatorIndex);
+    const rest = text.slice(separatorIndex);
+    return `${expandHomeAliasPath(hostPath)}${rest}`;
+}
+
 function hasEnvKey(targetEnvs, key) {
     for (let i = 0; i < targetEnvs.length; i += 2) {
         if (targetEnvs[i] !== '--env') {
@@ -1380,7 +1416,8 @@ Notes:
 
     applyPlaywrightCliSessionIntegration(config, runConfig);
 
-    const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume);
+    const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume)
+        .map(normalizeVolume);
     volumeList.forEach(v => addVolume(v));
 
     const portList = mergeArrayConfig(config.ports, runConfig.ports, options.port);

package/docker/manyoyo.Dockerfile

@@ -203,31 +203,33 @@ RUN <<EOX
     ;; esac
 
     # 安装 Playwright CLI skills（不在镜像构建阶段下载浏览器）
-    PLAYWRIGHT_CLI_VERSION=$(node -p "const pkg = require('/tmp/manyoyo-package.json'); const value = String(pkg.playwrightCliVersion || '').trim(); if (!value) { throw new Error('package.json.playwrightCliVersion is required'); } value")
-    npm install -g "@playwright/cli@${PLAYWRIGHT_CLI_VERSION}"
     PLAYWRIGHT_CLI_INSTALL_DIR=/tmp/playwright-cli-install
-    mkdir -p "${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright"
+    mkdir -p "$PLAYWRIGHT_CLI_INSTALL_DIR/.playwright"
     echo '{"browser":{"browserName":"chromium","launchOptions":{"channel":"chromium"}}}' > "${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright/cli.config.json"
-    cd "${PLAYWRIGHT_CLI_INSTALL_DIR}"
+    cd "$PLAYWRIGHT_CLI_INSTALL_DIR"
+    PLAYWRIGHT_CLI_VERSION=$(node -p "const pkg = require('/tmp/manyoyo-package.json'); const value = String(pkg.playwrightCliVersion || '').trim(); if (!value) { throw new Error('package.json.playwrightCliVersion is required'); } value")
+    npm install -g "@playwright/cli@${PLAYWRIGHT_CLI_VERSION}"
     playwright-cli --config="${PLAYWRIGHT_CLI_INSTALL_DIR}/.playwright/cli.config.json" install --skills
-    mkdir -p "$HOME/.codex/skills/playwright-cli" ~/.gemini/skills/playwright-cli
-    cp -R "${PLAYWRIGHT_CLI_INSTALL_DIR}/.claude/skills/playwright-cli/." "$HOME/.claude/skills/playwright-cli/"
-    cp -R "${PLAYWRIGHT_CLI_INSTALL_DIR}/.claude/skills/playwright-cli/." "$HOME/.codex/skills/playwright-cli/"
-    cp -R "${PLAYWRIGHT_CLI_INSTALL_DIR}/.claude/skills/playwright-cli/." "$HOME/.gemini/skills/playwright-cli/"
-    cd $OLDPWD
-    rm -rf "${PLAYWRIGHT_CLI_INSTALL_DIR}"
+    PLAYWRIGHT_CLI_SKILL_SOURCE="$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli"
+    for target in ~/.claude/skills/playwright-cli ~/.codex/skills/playwright-cli ~/.gemini/skills/playwright-cli; do
+        mkdir -p "$target"
+        cp -R "$PLAYWRIGHT_CLI_SKILL_SOURCE/." "$target/"
+    done
+    cd "$OLDPWD"
+    rm -rf "$PLAYWRIGHT_CLI_INSTALL_DIR"
 
     # 清理
     npm cache clean --force
     rm -f /tmp/manyoyo-package.json
-    rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
+    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
 EOX
 
 COPY ./docker/res/playwright/playwright-cli-wrapper.sh /usr/local/bin/playwright-cli
 RUN chmod +x /usr/local/bin/playwright-cli
 
-# 从 cache-stage 复制 JDT LSP（缓存或下载）
-COPY --from=cache-stage /opt/jdtls /tmp/jdtls-cache
+# 从 cache-stage 复制 JDT LSP 到最终位置，避免中转层残留
+COPY --from=cache-stage /opt/jdtls /root/.local/share/jdtls
 
 RUN <<EOX
     # 安装 java
@@ -236,19 +238,16 @@ RUN <<EOX
         apt-get install -y --no-install-recommends openjdk-21-jdk maven
 
         # 配置 LSP服务（java）
-        mkdir -p ~/.local/share/
-        cp -a /tmp/jdtls-cache ~/.local/share/jdtls
         ln -sf ~/.local/share/jdtls/bin/jdtls /usr/local/bin/jdtls
 
         # 清理
         apt-get clean
         rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
     ;; esac
-    rm -rf /tmp/jdtls-cache
 EOX
 
-# 从 cache-stage 复制 gopls（缓存或下载）
-COPY --from=cache-stage /opt/gopls /tmp/gopls-cache
+# 从 cache-stage 复制 gopls 到最终位置，避免中转层残留
+COPY --from=cache-stage /opt/gopls /usr/local/share/manyoyo-gopls
 
 RUN <<EOX
     # 安装 go
@@ -258,21 +257,21 @@ RUN <<EOX
         go env -w GOPROXY=https://mirrors.tencent.com/go
 
         # 安装 LSP服务（go）
-        if [ -f /tmp/gopls-cache/gopls ] && [ ! -f /tmp/gopls-cache/.no-cache ]; then
+        if [ -f /usr/local/share/manyoyo-gopls/gopls ] && [ ! -f /usr/local/share/manyoyo-gopls/.no-cache ]; then
             # 使用缓存
-            cp /tmp/gopls-cache/gopls /usr/local/bin/gopls
-            chmod +x /usr/local/bin/gopls
+            chmod +x /usr/local/share/manyoyo-gopls/gopls
+            ln -sf /usr/local/share/manyoyo-gopls/gopls /usr/local/bin/gopls
         else
             # 下载编译
             go install golang.org/x/tools/gopls@latest
             ln -sf ~/go/bin/gopls /usr/local/bin/gopls
+            rm -rf /usr/local/share/manyoyo-gopls
         fi
         # 清理
         apt-get clean
         go clean -modcache -cache
         rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
     ;; esac
-    rm -rf /tmp/gopls-cache
 EOX
 
 # 配置 supervisor

package/lib/plugin/playwright.js

@@ -291,6 +291,7 @@ class PlaywrightPlugin {
         const homeDir = os.homedir();
         const pluginRootDir = path.join(homeDir, '.manyoyo', 'plugin', 'playwright');
         const defaultConfig = {
+            homeDir,
             runtime: 'mixed',
             enabledScenes: [...SCENE_ORDER],
             cliSessionScene: 'cli-host-headless',
@@ -391,11 +392,16 @@ class PlaywrightPlugin {
             return;
         }
         this.writeStdout('[tip] 如果希望容器内 manyoyo run 自动附着到当前 CLI 宿主场景，请在 ~/.manyoyo/manyoyo.json 中设置:');
+        this.writeStdout('{');
+        this.writeStdout('    "volumes": [');
+        this.writeStdout('        "~/.manyoyo/.cache/ms-playwright:/root/.cache/ms-playwright"');
+        this.writeStdout('    ],');
         this.writeStdout('    "plugins": {');
         this.writeStdout('        "playwright": {');
         this.writeStdout('            "cliSessionScene": "cli-host-headed"');
         this.writeStdout('        }');
         this.writeStdout('    }');
+        this.writeStdout('}');
     }
 
     randomAlnum(length = 16) {
@@ -624,11 +630,22 @@ class PlaywrightPlugin {
     }
 
     extensionDirPath() {
-        return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'extensions');
+        return path.join(this.config.homeDir, '.manyoyo', 'plugin', 'playwright', 'extensions');
     }
 
     extensionTmpDirPath() {
-        return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'tmp-crx');
+        return path.join(this.config.homeDir, '.manyoyo', 'plugin', 'playwright', 'tmp-crx');
+    }
+
+    cliBrowserCacheDirPath() {
+        return path.join(this.config.homeDir, '.manyoyo', '.cache', 'ms-playwright');
+    }
+
+    ensureCliHostHeadedCacheDir(sceneName) {
+        if (sceneName !== 'cli-host-headed') {
+            return;
+        }
+        fs.mkdirSync(this.cliBrowserCacheDirPath(), { recursive: true });
     }
 
     resolveTargets(sceneName = 'all') {
@@ -1223,6 +1240,7 @@ class PlaywrightPlugin {
 
     async startHost(sceneName, options = {}) {
         try {
+            this.ensureCliHostHeadedCacheDir(sceneName);
             this.ensureHostScenePrerequisites(sceneName);
         } catch (error) {
             this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
@@ -1567,11 +1585,12 @@ class PlaywrightPlugin {
             'cd "$PLAYWRIGHT_CLI_INSTALL_DIR"',
             `npm install -g @playwright/cli@${PLAYWRIGHT_CLI_VERSION}`,
             'playwright-cli install --skills',
-            'mkdir -p ~/.codex/skills/playwright-cli ~/.gemini/skills/playwright-cli',
-            'cp -R "$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli/." ~/.claude/skills/playwright-cli/',
-            'cp -R "$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli/." ~/.codex/skills/playwright-cli/',
-            'cp -R "$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli/." ~/.gemini/skills/playwright-cli/',
-            'cd $OLDPWD',
+            'PLAYWRIGHT_CLI_SKILL_SOURCE="$PLAYWRIGHT_CLI_INSTALL_DIR/.claude/skills/playwright-cli"',
+            'for target in ~/.claude/skills/playwright-cli ~/.codex/skills/playwright-cli ~/.gemini/skills/playwright-cli; do',
+            '    mkdir -p "$target"',
+            '    cp -R "$PLAYWRIGHT_CLI_SKILL_SOURCE/." "$target/"',
+            'done',
+            'cd "$OLDPWD"',
             'rm -rf "$PLAYWRIGHT_CLI_INSTALL_DIR"'
         ];
         this.writeStdout(lines.join('\n'));

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.4.12",
-    "imageVersion": "1.8.12-common",
+    "version": "5.5.2",
+    "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [