@xcanwin/manyoyo 8.0.1 → 8.2.0

package/lib/web/server.js

@@ -87,7 +87,7 @@ const WEB_CONFIG_KEEP_SECRET_PLACEHOLDER = '***HIDDEN_SECRET***';
 const DEFAULT_AGENT_STREAM_HEARTBEAT_MS = 15 * 1000;
 // token 级增量的历史落盘节流：写盘只为断线/刷新后能对账恢复，不需要逐 token 持久化
 const AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS = 1000;
-const FRONTEND_DIR = path.join(__dirname, 'frontend');
+const INDEX_HTML_PATH = path.join(__dirname, 'index.html');
 const SAFE_CONTAINER_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/;
 const IMAGE_VERSION_TAG_PATTERN = /^(\d+\.\d+\.\d+)-([A-Za-z0-9][A-Za-z0-9_.-]*)$/;
 const SENSITIVE_CONFIG_KEY_PATTERN = /(pass(word)?|passwd|secret|token|api(?:_|-)?key|auth(?:_|-)?token|oauth(?:_|-)?token)$/i;
@@ -4487,24 +4487,11 @@ function buildSessionAudit(ctx, state, sessionRef) {
     };
 }
 
-function isSafeStaticAssetName(name) {
-    return /^[A-Za-z0-9._-]+$/.test(name);
-}
-
-function resolveStaticAsset(name) {
-    if (!isSafeStaticAssetName(name)) {
-        return null;
-    }
-    const fullPath = path.join(FRONTEND_DIR, name);
-    return fs.existsSync(fullPath) ? fullPath : null;
-}
-
-function loadTemplate(name) {
-    const filePath = resolveStaticAsset(name);
-    if (!filePath) {
+function loadIndexHtml() {
+    if (!fs.existsSync(INDEX_HTML_PATH)) {
         return '<h1>Template Not Found</h1>';
     }
-    return fs.readFileSync(filePath, 'utf-8');
+    return fs.readFileSync(INDEX_HTML_PATH, 'utf-8');
 }
 
 function escapeHtmlText(value) {
@@ -4522,13 +4509,13 @@ function applyServeTitle(html, ctx) {
     return html.replace(/<title>[^<]*<\/title>/, () => `<title>${escapeHtmlText(ctx.serveTitle)}</title>`);
 }
 
-function renderShadcnHtml(ctx) {
-    // shadcn.html 是 vite singlefile 打包产物，全部依赖内联成一个 <script>，
+function renderAppHtml(ctx) {
+    // index.html 是 vite singlefile 打包产物，全部依赖内联成一个 <script>，
     // 用 .replace('</head>', ...) 注入标记有极小概率命中某个库源码里字面量出现的
     // "</head>"，把注入内容插进内联脚本中间导致整页解析错乱；所以改成跟
     // applyServeTitle 同款更窄、更安全的 <title> 定位，插一个 meta 标记
     // 告知前端跳过动态改写 document.title
-    let html = applyServeTitle(loadTemplate('shadcn.html'), ctx);
+    let html = applyServeTitle(loadIndexHtml(), ctx);
     if (typeof ctx.serveTitle === 'string') {
         html = html.replace(
             /<\/title>/,
@@ -4787,15 +4774,9 @@ async function handleWebAuthRoutes(req, res, pathname, ctx, state) {
         return true;
     }
 
-    // 登录页：与 / 、/shadcn 复用同一份构建产物，由前端按 pathname 自行渲染
-    // 登录表单，登录逻辑走下面的 POST /auth/login 接口
-    if (req.method === 'GET' && pathname === '/shadcn/auth/login') {
-        sendHtml(res, 200, applyServeTitle(loadTemplate('shadcn.html'), ctx));
-        return true;
-    }
-
-    // GET /auth/login 曾经是独立的登录页面，现在只留一个跳转，接住老书签
-    // 带 ?token= 时是本机启动器的一次性登录：仅回环监听启用，令牌用后即删
+    // 登录页：与 / 复用同一份构建产物，由前端按 pathname 自行渲染登录表单，
+    // 登录逻辑走下面的 POST /auth/login 接口
+    // 带 ?token= 时是本机启动器的一次性登录：仅回环监听启用，令牌用后即删；令牌无效就落在登录页
     if (req.method === 'GET' && pathname === '/auth/login') {
         const token = new URL(req.url || '/', 'http://localhost').searchParams.get('token');
         if (token !== null && ctx.loginTokenDir && isLoopbackHost(ctx.serverHost) && consumeLoginToken(ctx.loginTokenDir, token)) {
@@ -4806,7 +4787,7 @@ async function handleWebAuthRoutes(req, res, pathname, ctx, state) {
             });
             return true;
         }
-        sendRedirect(res, 302, '/shadcn/auth/login', { 'Referrer-Policy': 'no-referrer' });
+        sendHtml(res, 200, applyServeTitle(loadIndexHtml(), ctx), { 'Referrer-Policy': 'no-referrer' });
         return true;
     }
 
@@ -4869,7 +4850,7 @@ function sendWebUnauthorized(res, pathname) {
     }
     // 其余都是页面请求：一律打回登录页。登录页本身在认证网关之前就被
     // handleWebAuthRoutes 放行，不会在这里形成重定向循环
-    sendRedirect(res, 302, '/shadcn/auth/login', { 'Set-Cookie': getWebAuthClearCookie() });
+    sendRedirect(res, 302, '/auth/login', { 'Set-Cookie': getWebAuthClearCookie() });
 }
 
 // 运行日志查看接口的支撑函数。日志目录以 serve 实际使用的 logger.path 为准，
@@ -6446,15 +6427,9 @@ async function startWebServer(options) {
                 return;
             }
 
-            // shadcn/ui 版前端现在是默认主题，构建产物见 frontend-shadcn/（npm run build:web-shadcn）
+            // 前端构建产物见 frontend/（npm run build:web），输出到 lib/web/index.html
             if (req.method === 'GET' && pathname === '/') {
-                sendHtml(res, 200, renderShadcnHtml(ctx));
-                return;
-            }
-
-            // /shadcn 保留为 / 的别名，兼容此前"试验性预览"阶段留下的书签/脚本
-            if (req.method === 'GET' && pathname === '/shadcn') {
-                sendHtml(res, 200, renderShadcnHtml(ctx));
+                sendHtml(res, 200, renderAppHtml(ctx));
                 return;
             }
 

package/manyoyo.example.json

@@ -68,7 +68,7 @@
     //     }
     // },
 
-    // 可选插件（manyoyo playwright / manyoyo plugin playwright）
+    // 可选插件（manyoyo playwright）
     "plugins": {
         "playwright": {
             // mixed: 支持容器+宿主机；container: 仅容器；host: 仅宿主机

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.0.1",
-    "imageVersion": "2.0.0-common",
+    "version": "8.2.0",
+    "imageVersion": "2.1.0-common",
     "playwrightCliVersion": "0.1.21",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
@@ -30,17 +30,22 @@
         "my": "bin/manyoyo.js"
     },
     "scripts": {
-        "dev:release": "node scripts/dev-release.js",
-        "build:web-shadcn": "node scripts/build-web-shadcn.js",
-        "dev:web-shadcn": "node scripts/dev-web-shadcn.js",
-        "test:web-shadcn": "node scripts/test-web-shadcn.js",
-        "prepack": "npm run build:web-shadcn",
-        "install-link": "npm link",
-        "test": "jest --coverage && npm run test:web-shadcn",
-        "test:unit": "jest test/ --testPathIgnorePatterns '<rootDir>/temp/' '<rootDir>/test/integration/' && npm run test:web-shadcn",
+        "start": "node bin/manyoyo.js",
+        "serve:dev": "node bin/manyoyo.js serve 127.0.0.1:3000",
+        "release": "node scripts/release/index.js",
+        "build:release": "node scripts/web.js build-release",
+        "build:web": "node scripts/web.js build",
+        "dev:web": "node scripts/web.js dev",
+        "test:web": "node scripts/web.js test",
+        "prepack": "npm run build:web",
+        "test": "jest --coverage && npm run test:web",
+        "test:unit": "jest test/ --testPathIgnorePatterns '<rootDir>/temp/' '<rootDir>/test/integration/' && npm run test:web",
         "test:integration": "jest test/integration/",
+        "test:installer": "jest test/installer.test.js",
+        "lint:sh": "command -v shellcheck >/dev/null 2>&1 || { echo '未安装 shellcheck：macOS 用 brew install shellcheck，Debian/Ubuntu 用 sudo apt install shellcheck，或用 docker run --rm -v \"$PWD:/mnt\" -w /mnt koalaman/shellcheck:stable scripts/install.sh scripts/offline/*.sh' >&2; exit 1; } && shellcheck -s sh -x -e SC1091 scripts/install.sh scripts/offline/*.sh",
         "docs:dev": "vitepress dev docs --host 127.0.0.1 --port 5173",
         "docs:build": "vitepress build docs",
+        "docs:check": "npm run docs:build && node scripts/check-docs-seo.js",
         "docs:preview": "vitepress preview docs --host 127.0.0.1 --port 4173"
     },
     "homepage": "https://xcanwin.github.io/manyoyo/",

package/lib/dev-release.js

@@ -1,142 +0,0 @@
-const { extractAgentMessageFromCodexJsonl } = require('./codex-output');
-
-function parseReleaseVersion(version) {
-    const match = String(version || '').trim().match(/^(\d+)\.(\d+)\.(\d+)$/);
-    if (!match) {
-        return null;
-    }
-    return {
-        major: Number(match[1]),
-        minor: Number(match[2]),
-        patch: Number(match[3])
-    };
-}
-
-function formatReleaseVersion(parts) {
-    return `${parts.major}.${parts.minor}.${parts.patch}`;
-}
-
-function compareReleaseVersions(left, right) {
-    const a = typeof left === 'string' ? parseReleaseVersion(left) : left;
-    const b = typeof right === 'string' ? parseReleaseVersion(right) : right;
-    if (!a || !b) {
-        return 0;
-    }
-    if (a.major !== b.major) return a.major - b.major;
-    if (a.minor !== b.minor) return a.minor - b.minor;
-    return a.patch - b.patch;
-}
-
-function buildVersionSuggestions(version) {
-    const parsed = parseReleaseVersion(version);
-    if (!parsed) {
-        return [];
-    }
-    return [
-        {
-            key: 'major',
-            label: '第1段 +1 (major)',
-            version: formatReleaseVersion({
-                major: parsed.major + 1,
-                minor: 0,
-                patch: 0
-            }),
-            recommended: false
-        },
-        {
-            key: 'minor',
-            label: '第2段 +1 (minor)',
-            version: formatReleaseVersion({
-                major: parsed.major,
-                minor: parsed.minor + 1,
-                patch: 0
-            }),
-            recommended: false
-        },
-        {
-            key: 'patch',
-            label: '第3段 +1 (patch)',
-            version: formatReleaseVersion({
-                major: parsed.major,
-                minor: parsed.minor,
-                patch: parsed.patch + 1
-            }),
-            recommended: true
-        }
-    ];
-}
-
-function findRecommendedChoiceIndex(options, fallbackIndex = 0) {
-    const list = Array.isArray(options) ? options : [];
-    const matchedIndex = list.findIndex(option => option && option.recommended === true);
-    return matchedIndex >= 0 ? matchedIndex : fallbackIndex;
-}
-
-function pickLatestVersionTag(tags) {
-    let latest = null;
-    for (const rawTag of (tags || [])) {
-        const tag = String(rawTag || '').trim();
-        if (!tag) {
-            continue;
-        }
-        const normalized = tag.startsWith('v') ? tag.slice(1) : tag;
-        const parsed = parseReleaseVersion(normalized);
-        if (!parsed) {
-            continue;
-        }
-        if (!latest || compareReleaseVersions(parsed, latest.parsed) > 0) {
-            latest = {
-                tag,
-                version: normalized,
-                parsed
-            };
-        }
-    }
-    return latest ? { tag: latest.tag, version: latest.version } : null;
-}
-
-function normalizeCommitMessage(text) {
-    const lines = String(text || '').replace(/\r/g, '').split('\n');
-    if (!lines.length) {
-        return '';
-    }
-
-    let start = 0;
-    let end = lines.length;
-
-    while (start < end && lines[start].trim() === '') {
-        start += 1;
-    }
-    while (end > start && lines[end - 1].trim() === '') {
-        end -= 1;
-    }
-
-    if (start < end && lines[start].trim().startsWith('```')) {
-        start += 1;
-        while (start < end && lines[start].trim() === '') {
-            start += 1;
-        }
-        if (end > start && lines[end - 1].trim() === '```') {
-            end -= 1;
-        }
-    }
-
-    while (start < end && lines[start].trim() === '') {
-        start += 1;
-    }
-    while (end > start && lines[end - 1].trim() === '') {
-        end -= 1;
-    }
-
-    return lines.slice(start, end).join('\n').trim();
-}
-
-module.exports = {
-    parseReleaseVersion,
-    compareReleaseVersions,
-    buildVersionSuggestions,
-    findRecommendedChoiceIndex,
-    pickLatestVersionTag,
-    normalizeCommitMessage,
-    extractAgentMessageFromCodexJsonl
-};