@xcanwin/manyoyo 5.11.3 → 5.11.6

package/docker/manyoyo.Dockerfile

@@ -11,6 +11,7 @@ COPY ./docker/cache/ /cache/
 
 RUN <<EOX
     # 确定架构
+    set -eu
     case "$TARGETARCH" in
         amd64) ARCH_NODE="x64"; ARCH_GO="amd64" ;;
         arm64) ARCH_NODE="arm64"; ARCH_GO="arm64" ;;
@@ -81,6 +82,7 @@ ENV LANG=C.UTF-8 \
 # 合并系统依赖与 Python 安装为单层，减少镜像体积
 RUN <<EOX
     # 配置 APT 镜像源
+    set -eu
     sed -i "s|http://[^/]*\.ubuntu\.com|${APT_MIRROR}|g" /etc/apt/sources.list.d/ubuntu.sources
     ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
@@ -135,6 +137,7 @@ ARG GIT_SSL_NO_VERIFY=false
 
 RUN <<EOX
     # 配置 node.js
+    set -eu
     npm config set registry=${NPM_REGISTRY}
 
     export GIT_SSL_NO_VERIFY=$GIT_SSL_NO_VERIFY
@@ -143,6 +146,7 @@ RUN <<EOX
     npm install -g pyright typescript-language-server typescript
 
     # 安装 Claude CLI
+    # npm install -g @anthropic-ai/claude-code @openai/codex @google/gemini-cli opencode-ai
     npm install -g @anthropic-ai/claude-code
     mkdir -p ~/.claude/plugins/marketplaces/
     cp /tmp/docker-res/claude/claude.json ~/.claude.json
@@ -172,13 +176,13 @@ RUN <<EOX
     rm -rf /tmp/openai-skills
     CODEX_INSTALLER="$HOME/.codex/skills/.system/skill-installer/scripts/install-skill-from-github.py"
     python3 "$CODEX_INSTALLER" --repo openai/skills --path \
-        skills/.curated/doc \
-        skills/.curated/spreadsheet \
-        skills/.curated/pdf \
         skills/.curated/security-best-practices \
         skills/.curated/security-threat-model
     python3 "$CODEX_INSTALLER" --repo anthropics/skills --path \
+        skills/docx \
+        skills/xlsx \
         skills/pptx \
+        skills/pdf \
         skills/theme-factory \
         skills/frontend-design \
         skills/canvas-design \
@@ -205,11 +209,10 @@ RUN <<EOX
     # 安装 Playwright CLI skills（不在镜像构建阶段下载浏览器）
     PLAYWRIGHT_CLI_INSTALL_DIR=/tmp/playwright-cli-install
     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"
     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
+    playwright-cli install --skills
     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"
@@ -225,14 +228,12 @@ RUN <<EOX
     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 /root/.local/share/jdtls
 
 RUN <<EOX
     # 安装 java
+    set -eu
     case ",$TOOL," in *,full,*|*,java,*)
         apt-get update -y
         apt-get install -y --no-install-recommends openjdk-21-jdk maven
@@ -251,6 +252,7 @@ COPY --from=cache-stage /opt/gopls /usr/local/share/manyoyo-gopls
 
 RUN <<EOX
     # 安装 go
+    set -eu
     case ",$TOOL," in *,full,*|*,go,*)
         apt-get update -y
         apt-get install -y --no-install-recommends golang gcc
@@ -279,6 +281,7 @@ COPY ./docker/res/supervisor/s.conf /etc/supervisor/conf.d/s.conf
 
 RUN <<EOX
     # 清理
+    set -eu
     rm -rf /tmp/* /var/tmp/* /var/log/apt /var/log/*.log /var/lib/apt/lists/* ~/.npm ~/go/pkg/mod/cache
 EOX
 

package/lib/image-build.js

@@ -138,7 +138,7 @@ function prepareJdtlsBuildCache(ctx, cache, imageTool, arch) {
         const alpineArch = arch === 'arm64' ? 'aarch64' : 'x86_64';
         ctx.runCmd('curl', ['-fsSL', `https://mirrors.tencent.com/alpine/latest-stable/community/${alpineArch}/jdtls-1.58.0-r0.apk`, '-o', apkPath], { stdio: 'inherit' });
         ctx.runCmd('tar', ['-xzf', apkPath, '-C', tmpDir], { stdio: 'inherit' });
-        ctx.runCmd('tar', ['-czf', jdtlsPath, '-C', path.join(tmpDir, 'usr', 'share', 'jdtls'), '.'], { stdio: 'inherit' });
+        ctx.runCmd('tar', ['-czf', jdtlsPath, '--no-xattrs', '-C', path.join(tmpDir, 'usr', 'share', 'jdtls'), '.'], { stdio: 'inherit' });
         touchBuildCache(cache, jdtlsKey);
         ctx.log(`${GREEN}✓ JDT LSP 下载完成${NC}`);
     } catch (e) {

package/lib/plugin/playwright.js

@@ -1585,7 +1585,6 @@ class PlaywrightPlugin {
         const lines = [
             'PLAYWRIGHT_CLI_INSTALL_DIR="${TMPDIR:-/tmp}/manyoyo-playwright-cli-install-$$"',
             '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"',
             `npm install -g @playwright/cli@${PLAYWRIGHT_CLI_VERSION}`,
             'playwright-cli install --skills',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.11.3",
+    "version": "5.11.6",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.14",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",

package/docker/res/playwright/playwright-cli-wrapper.sh

@@ -1,82 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-PLAYWRIGHT_NODE_BIN="${PLAYWRIGHT_NODE_BIN:-node}"
-PLAYWRIGHT_CLI_ROOT="/usr/local/lib/node_modules/@playwright/cli/node_modules/playwright"
-PLAYWRIGHT_CLI_PROGRAM="${PLAYWRIGHT_CLI_ROOT}/lib/cli/client/program.js"
-PLAYWRIGHT_REAL_CLI="${PLAYWRIGHT_CLI_ROOT}/cli.js"
-
-resolve_browser() {
-    browser=""
-
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            --browser=*)
-                browser="${1#--browser=}"
-                ;;
-            --browser)
-                shift
-                if [ "$#" -gt 0 ]; then
-                    browser="$1"
-                    shift
-                fi
-                continue
-                ;;
-            --)
-                break
-                ;;
-            -*)
-                ;;
-            *)
-                if [ -z "$browser" ]; then
-                    browser="$1"
-                fi
-                ;;
-        esac
-        shift
-    done
-
-    if [ -n "$browser" ]; then
-        printf '%s\n' "$browser"
-        return 0
-    fi
-
-    "$PLAYWRIGHT_NODE_BIN" <<'NODE'
-const fs = require('fs');
-const path = require('path');
-
-const candidates = [
-    process.env.PLAYWRIGHT_MCP_CONFIG,
-    path.resolve('.playwright/cli.config.json')
-].filter(Boolean);
-
-for (const filePath of candidates) {
-    try {
-        const config = JSON.parse(fs.readFileSync(filePath, 'utf8'));
-        const browser = config && config.browser ? config.browser : {};
-        const launchOptions = browser.launchOptions || {};
-        const channel = String(launchOptions.channel || browser.browserName || '').trim();
-        if (channel) {
-            process.stdout.write(channel);
-            process.exit(0);
-        }
-    } catch (_) {}
-}
-
-process.stdout.write('chromium');
-NODE
-}
-
-if [ "${1-}" = "install-browser" ]; then
-    shift
-    for arg in "$@"; do
-        if [ "$arg" = "--help" ] || [ "$arg" = "-h" ]; then
-            exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_CLI_PROGRAM" install-browser "$@"
-        fi
-    done
-
-    BROWSER="$(resolve_browser "$@")"
-    exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_REAL_CLI" install "$BROWSER"
-fi
-
-exec "$PLAYWRIGHT_NODE_BIN" "$PLAYWRIGHT_CLI_PROGRAM" "$@"