@lark-apaas/fullstack-rspack-preset 1.0.63 → 1.0.64-alpha.0

package/lib/rspack-plugins/mcp-skill.d.ts

@@ -1,2 +1,2 @@
-/** 仅交付固定层级的 SKILL.md；先完整校验，再逐文件原子替换。 */
+/** 交付 Skill 正文及全部附件；先完整校验，再逐文件原子替换。 */
 export declare function syncMcpSkill(rootDir: string): void;

package/lib/rspack-plugins/mcp-skill.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncMcpSkill = syncMcpSkill;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
-/** 仅交付固定层级的 SKILL.md；先完整校验，再逐文件原子替换。 */
+/** 交付 Skill 正文及全部附件；先完整校验，再逐文件原子替换。 */
 function syncMcpSkill(rootDir) {
     const root = fs.realpathSync(rootDir);
     const rootStat = fs.statSync(root);
@@ -49,7 +49,7 @@ function syncMcpSkill(rootDir) {
                 stat = fs.lstatSync(current);
             }
             catch (error) {
-                if (error.code === 'ENOENT')
+                if (['ENOENT', 'ENOTDIR'].includes(error.code ?? ''))
                     continue;
                 throw error;
             }
@@ -66,6 +66,19 @@ function syncMcpSkill(rootDir) {
     };
     const list = (base) => {
         const files = [];
+        const walk = (relative) => {
+            const file = checkedPath(relative);
+            const stat = fs.lstatSync(file);
+            if (stat.isDirectory()) {
+                for (const name of fs.readdirSync(file).sort())
+                    walk(`${relative}/${name}`);
+            }
+            else {
+                if (!stat.isFile())
+                    throw new Error(`MCP Skill 必须是普通文件：${relative}`);
+                files.push(relative);
+            }
+        };
         const skills = checkedPath(`${base}/skills`);
         if (!fs.existsSync(skills))
             return files;
@@ -74,24 +87,28 @@ function syncMcpSkill(rootDir) {
             if (!fs.statSync(directory).isDirectory())
                 continue;
             const relative = `${base}/skills/${name}/SKILL.md`;
-            if (fs.existsSync(checkedPath(relative))) {
+            if (base !== 'server/mcp' || fs.existsSync(checkedPath(relative))) {
+                if (fs.existsSync(checkedPath(relative)) &&
+                    !fs.statSync(checkedPath(relative)).isFile())
+                    throw new Error(`MCP Skill 必须是普通文件：${relative}`);
                 if (base === 'server/mcp' &&
                     (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(name) || name.length > 64))
                     throw new Error('MCP Skill 目录名须为1–64位小写字母、数字及单连字符，不能首尾连字符');
-                files.push(relative);
+                walk(`${base}/skills/${name}`);
             }
         }
         return files;
     };
     const sourceBase = 'server/mcp';
-    // 只同步 SKILL.md，不删除同目录的工具编译产物。
+    // skills 目录由原始资源完整覆盖；不删除相邻的工具编译产物。
     const targetBase = 'dist/server/mcp';
     const sources = list(sourceBase);
-    if (sources.length > 100)
+    if (sources.filter(file => file.split('/').length === 5 && file.endsWith('/SKILL.md')).length > 100)
         throw new Error('MCP Skills 不能超过 100 文件');
     const outputs = list(targetBase);
     const content = new Map();
     let total = 0;
+    const sizes = new Map();
     for (const relative of sources) {
         const file = checkedPath(relative);
         // 先拒绝 FIFO/设备，避免以只读方式打开时阻塞。打开后仍用 fstat 再检查。
@@ -124,11 +141,14 @@ function syncMcpSkill(rootDir) {
             if (!stat.isFile())
                 throw new Error(`MCP Skill 必须是普通文件：${relative}`);
             assertOpenedFile();
-            const limit = 1024 * 1024;
+            const isEntry = relative.split('/').length === 5 && relative.endsWith('/SKILL.md');
+            const limit = (isEntry ? 1 : 16) * 1024 * 1024;
             if (stat.size > limit)
-                throw new Error('MCP Skill 不能超过 1 MiB');
+                throw new Error(isEntry
+                    ? 'MCP Skill 不能超过 1 MiB'
+                    : 'MCP Skill 总大小不能超过 16 MiB');
             // 有界读取，也覆盖 stat 后文件继续增长的情况。
-            const buffer = Buffer.alloc(limit + 1);
+            const buffer = Buffer.alloc(isEntry ? limit + 1 : Math.min(limit + 1, stat.size + 1));
             let length = 0;
             while (length < buffer.length) {
                 const count = fs.readSync(fd, buffer, length, buffer.length - length, null);
@@ -138,12 +158,27 @@ function syncMcpSkill(rootDir) {
             }
             assertOpenedFile();
             if (length > limit)
-                throw new Error('MCP Skill 不能超过 1 MiB');
-            total += length;
-            if (total > 8 * limit)
+                throw new Error(isEntry
+                    ? 'MCP Skill 不能超过 1 MiB'
+                    : 'MCP Skill 总大小不能超过 16 MiB');
+            if (!isEntry && length > stat.size)
+                throw new Error('MCP Skill 附件读取期间发生变化，请重试');
+            const name = relative.split('/')[3];
+            const size = sizes.get(name) ?? { files: 0, bytes: 0 };
+            size.files++;
+            size.bytes += length;
+            if (size.files > 512)
+                throw new Error('MCP Skill 最多包含 512 个文件');
+            if (size.bytes > 16 * 1024 * 1024)
+                throw new Error('MCP Skill 总大小不能超过 16 MiB');
+            sizes.set(name, size);
+            if (isEntry)
+                total += length;
+            if (total > 8 * 1024 * 1024)
                 throw new Error('MCP Skills 总大小不能超过 8 MiB');
             const bytes = buffer.subarray(0, length);
-            new TextDecoder('utf-8', { fatal: true }).decode(bytes);
+            if (isEntry)
+                new TextDecoder('utf-8', { fatal: true }).decode(bytes);
             const target = relative.replace(sourceBase, targetBase);
             checkedPath(target);
             content.set(target, Buffer.from(bytes));
@@ -157,8 +192,24 @@ function syncMcpSkill(rootDir) {
         if (!fs.statSync(checkedPath(relative)).isFile())
             throw new Error(`MCP Skill 产物必须是普通文件：${relative}`);
     }
+    // 校验完成后先清理已移除文件，支持附件在文件和目录之间转换。
+    for (const relative of outputs) {
+        if (content.has(relative))
+            continue;
+        const target = checkedPath(relative);
+        fs.rmSync(target);
+        let directory = path.dirname(target);
+        const boundary = checkedPath(`${targetBase}/skills`);
+        while (directory.startsWith(`${boundary}${path.sep}`) &&
+            fs.readdirSync(directory).length === 0) {
+            fs.rmdirSync(directory);
+            directory = path.dirname(directory);
+        }
+    }
     for (const [relative, bytes] of content) {
         const target = checkedPath(relative);
+        if (fs.existsSync(target) && fs.statSync(target).isDirectory())
+            fs.rmSync(target, { recursive: true });
         fs.mkdirSync(path.dirname(target), { recursive: true });
         const temporary = fs.mkdtempSync(path.join(path.dirname(target), '.skill-'));
         try {
@@ -170,16 +221,6 @@ function syncMcpSkill(rootDir) {
             fs.rmSync(temporary, { recursive: true, force: true });
         }
     }
-    for (const relative of outputs) {
-        if (content.has(relative))
-            continue;
-        const target = checkedPath(relative);
-        fs.rmSync(target);
-        if (relative.startsWith(`${targetBase}/skills/`) &&
-            fs.readdirSync(path.dirname(target)).length === 0) {
-            fs.rmdirSync(path.dirname(target));
-        }
-    }
     const skills = checkedPath(`${targetBase}/skills`);
     if (fs.existsSync(skills) && fs.readdirSync(skills).length === 0)
         fs.rmdirSync(skills);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.63",
+  "version": "1.0.64-alpha.0",
   "files": [
     "lib",
     "patches",