feat: Add skill size limits and improve package handling

Author: ctlaltlaltc

packages/service/core/agentSkills/controller.ts

@@ -1,12 +1,13 @@
 import { MongoAgentSkills } from './schema';
+import { MongoAgentSkillsVersion } from './versionSchema';
 import { AgentSkillSourceEnum } from '@fastgpt/global/core/agentSkills/constants';
 import type {
   AgentSkillSchemaType,
   AgentSkillListItemType,
   SkillPackageType
 } from '@fastgpt/global/core/agentSkills/type';
 import type { ClientSession } from '../../common/mongo';
-import { uploadSkillPackage } from './storage';
+import { uploadSkillPackage, deleteSkillAllPackages } from './storage';
 import { createVersion } from './versionController';
 
 // Types for service operations
@@ -115,11 +116,20 @@ export async function deleteSkill(skillId: string, session?: ClientSession): Pro
     throw new Error('Cannot delete system skill');
   }
 
+  // Soft delete the skill record
   await MongoAgentSkills.updateOne(
     { _id: skillId },
     { $set: { deleteTime: new Date() } },
     { session }
   );
+
+  // Soft delete all version records for this skill
+  await MongoAgentSkillsVersion.updateMany({ skillId }, { $set: { isDeleted: true } }, { session });
+
+  // Queue Minio file deletion after DB changes — runs outside the session (S3 is not transactional)
+  if (skill.teamId) {
+    deleteSkillAllPackages(skill.teamId.toString(), skillId);
+  }
 }
 
 /**

packages/service/core/agentSkills/sandboxConfig.ts

@@ -64,6 +64,31 @@ export function getSandboxDefaults(): SandboxDefaults {
   };
 }
 
+export type SkillSizeLimits = {
+  maxUploadBytes: number; // Compressed upload size limit
+  maxUncompressedBytes: number; // Uncompressed size after extraction (Zip Bomb guard)
+  maxDownloadBytes: number; // Download from MinIO/S3
+  maxSandboxPackageBytes: number; // Sandbox directory size before zip
+};
+
+/**
+ * Get skill size limits from environment variables
+ */
+export function getSkillSizeLimits(): SkillSizeLimits {
+  return {
+    maxUploadBytes: safeParseInt(process.env.AGENT_SKILL_MAX_UPLOAD_SIZE, 50 * 1024 * 1024),
+    maxUncompressedBytes: safeParseInt(
+      process.env.AGENT_SKILL_MAX_UNCOMPRESSED_SIZE,
+      200 * 1024 * 1024
+    ),
+    maxDownloadBytes: safeParseInt(process.env.AGENT_SKILL_MAX_DOWNLOAD_SIZE, 200 * 1024 * 1024),
+    maxSandboxPackageBytes: safeParseInt(
+      process.env.AGENT_SKILL_MAX_SANDBOX_SIZE,
+      200 * 1024 * 1024
+    )
+  };
+}
+
 /**
  * Validate sandbox configuration
  */

packages/service/core/agentSkills/sandboxController.ts

@@ -16,7 +16,8 @@ import {
   getSandboxProviderConfig,
   getSandboxDefaults,
   validateSandboxConfig,
-  buildDockerSyncEnv
+  buildDockerSyncEnv,
+  getSkillSizeLimits
 } from './sandboxConfig';
 import type {
   SkillSandboxSchemaType,
@@ -470,13 +471,14 @@ export async function renewSandboxExpiration(
  * @param params.workDirectory - Working directory (defaults to homeDirectory)
  * @returns Buffer containing the package.zip file
  *
- * @throws Error if packaging fails or file cannot be read
+ * @throws Error if packaging fails, file cannot be read, or directory exceeds size limit
  */
 export async function packageSkillInSandbox(params: {
   providerSandboxId: string;
   workDirectory?: string;
 }): Promise<Buffer> {
   const { providerSandboxId, workDirectory } = params;
+  const { maxSandboxPackageBytes: maxBytes } = getSkillSizeLimits();
 
   const providerConfig = getSandboxProviderConfig();
   const defaults = getSandboxDefaults();
@@ -503,6 +505,28 @@ export async function packageSkillInSandbox(params: {
     // Connect to existing sandbox
     await sandbox.connect(providerSandboxId);
 
+    // Fast path: check directory size before expensive zip operation
+    // Use 'find -ls | awk' instead of 'du' for better portability:
+    // 'du' reports disk-block usage and its flags (-sb, --bytes) differ across GNU coreutils,
+    // busybox (Alpine), and BSD; 'find -ls' is POSIX and outputs per-file byte sizes in $7
+    // uniformly across all those environments.
+    const sizeCheckCmd = `find ${targetDir} -type f ! -name 'package.zip' -ls | awk '{s+=$7} END {print s+0}'`;
+    addLog.info('[Sandbox] Checking directory size before packaging');
+    const sizeResult = await sandbox.execute(sizeCheckCmd);
+
+    if (sizeResult.exitCode === 0 && sizeResult.stdout.trim()) {
+      const dirBytes = parseInt(sizeResult.stdout.trim(), 10);
+      if (!isNaN(dirBytes) && dirBytes > maxBytes) {
+        throw new Error(
+          `Skill directory size (${(dirBytes / 1024 / 1024).toFixed(2)}MB) exceeds maximum allowed size (${maxBytes / 1024 / 1024}MB)`
+        );
+      }
+      addLog.info('[Sandbox] Directory size check passed', {
+        dirBytes,
+        maxBytes
+      });
+    }
+
     // Execute zip command to package the directory
     // -r: recursive, -x: exclude pattern (exclude package.zip itself)
     const zipCommand = `cd ${targetDir} && zip -r package.zip . -x 'package.zip'`;

packages/service/core/agentSkills/storage.ts

@@ -7,6 +7,7 @@
 
 import { S3PrivateBucket } from '../../common/s3/buckets/private';
 import type { ClientSession } from '../../common/mongo';
+import { getSkillSizeLimits } from './sandboxConfig';
 
 export type SkillStorageInfo = {
   bucket: string;
@@ -93,11 +94,9 @@ export async function uploadSkillPackage(
 /**
  * Download skill package from MinIO/S3 storage
  */
-export async function downloadSkillPackage(
-  params: DownloadSkillPackageParams,
-  maxBytes = 200 * 1024 * 1024
-): Promise<Buffer> {
+export async function downloadSkillPackage(params: DownloadSkillPackageParams): Promise<Buffer> {
   const { storageInfo } = params;
+  const { maxDownloadBytes } = getSkillSizeLimits();
 
   const bucket = new S3PrivateBucket();
 
@@ -115,8 +114,10 @@ export async function downloadSkillPackage(
   for await (const chunk of response.body) {
     const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
     totalSize += buf.length;
-    if (totalSize > maxBytes) {
-      throw new Error(`Skill package exceeds maximum allowed size (${maxBytes / 1024 / 1024}MB)`);
+    if (totalSize > maxDownloadBytes) {
+      throw new Error(
+        `Skill package exceeds maximum allowed size (${maxDownloadBytes / 1024 / 1024}MB)`
+      );
     }
     chunks.push(buf);
   }
@@ -135,6 +136,17 @@ export async function deleteSkillPackage(storageInfo: SkillStorageInfo): Promise
   });
 }
 
+/**
+ * Delete all packages for a skill across all versions using prefix deletion.
+ * Fire-and-forget: enqueues to BullMQ and returns immediately.
+ * Prefix covers: agent-skills/{teamId}/{skillId}/ (all versions)
+ */
+export function deleteSkillAllPackages(teamId: string, skillId: string): void {
+  const prefix = `agent-skills/${teamId}/${skillId}/`;
+  const bucket = new S3PrivateBucket();
+  bucket.addDeleteJob({ prefix });
+}
+
 /**
  * Check if skill package exists in storage
  */

projects/app/src/pages/api/core/app/agent/skills/import.ts

@@ -11,6 +11,7 @@ import {
 import type { ImportSkillBody, ImportSkillResponse } from '@fastgpt/global/core/agentSkills/api';
 import type { SkillPackageType } from '@fastgpt/global/core/agentSkills/type';
 import { multer } from '@fastgpt/service/common/file/multer';
+import { getSkillSizeLimits } from '@fastgpt/service/core/agentSkills/sandboxConfig';
 import fs from 'fs/promises';
 
 export const config = {
@@ -28,8 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     // Read env limit before multer so both use the same value
-    const maxSizeEnv = process.env.MAX_SKILL_ZIP_SIZE;
-    const maxArchiveSize = maxSizeEnv ? parseInt(maxSizeEnv, 10) : 50 * 1024 * 1024;
+    const { maxUploadBytes: maxArchiveSize, maxUncompressedBytes } = getSkillSizeLimits();
     // Convert bytes to MB for multer (multer expects MB)
     const maxArchiveSizeMB = Math.ceil(maxArchiveSize / 1024 / 1024);
 
@@ -74,7 +74,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     // Extract archive to file map
     let fileMap: Record<string, Buffer>;
     try {
-      fileMap = await extractToFileMap(file.path);
+      fileMap = await extractToFileMap(file.path, maxUncompressedBytes);
     } catch (err: any) {
       return jsonRes(res, {
         code: 400,

projects/sandbox-sync-agent/base/Dockerfile

@@ -15,9 +15,10 @@ RUN apt-get update && apt-get install -y \
     unzip \
     curl \
     ca-certificates \
-    sudo \
-    python3 \
-    && rm -rf /var/lib/apt/lists/*
+    sudo
+RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt install -y python3 nodejs
+RUN rm -rf /var/lib/apt/lists/*
 
 # Install code-server using the official script
 RUN curl -fsSL https://code-server.dev/install.sh | sh