diff --git a/.env.example b/.env.example index e9e0d6f4..1b79d583 100644 --- a/.env.example +++ b/.env.example @@ -177,14 +177,14 @@ COS_ENABLE_OLD_DOMAIN=true # MAX_FILE_SIZE_MB=50 # ========== Agent Skills Sandbox 配置 ========== -# Sandbox 模式: docker(推荐), local, disabled(默认) -# WEKNORA_SANDBOX_MODE=disabled +# Sandbox 模式: docker(默认), local, disabled +WEKNORA_SANDBOX_MODE=docker # 脚本执行超时时间(秒),默认60 -# WEKNORA_SANDBOX_TIMEOUT=60 +WEKNORA_SANDBOX_TIMEOUT=60 # 自定义 Sandbox Docker 镜像 -# WEKNORA_SANDBOX_DOCKER_IMAGE=wechatopenai/weknora-sandbox:latest +WEKNORA_SANDBOX_DOCKER_IMAGE=wechatopenai/weknora-sandbox:latest # APK 镜像源设置(可选) APK_MIRROR_ARG=mirrors.tencent.com diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 53571dd7..94ae914d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -94,6 +94,17 @@ services: - neo4j - full + # Sandbox 镜像:仅用于 build/pull,非常驻服务;本地 app 执行 Skills 时按需 docker run 该镜像,用毕即释 + sandbox: + image: wechatopenai/weknora-sandbox:${WEKNORA_VERSION:-latest} + build: + context: . + dockerfile: docker/Dockerfile.sandbox + profiles: + - sandbox + command: ["true"] + restart: "no" + docreader: image: wechatopenai/weknora-docreader:latest container_name: WeKnora-docreader-dev diff --git a/docker-compose.yml b/docker-compose.yml index 2c78b075..0f618f07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,19 +96,13 @@ services: - TENANT_AES_KEY=${TENANT_AES_KEY:-} - CONCURRENCY_POOL_SIZE=${CONCURRENCY_POOL_SIZE:-5} - JWT_SECRET=${JWT_SECRET:-} - - INIT_LLM_MODEL_NAME=${INIT_LLM_MODEL_NAME:-} - - INIT_LLM_MODEL_BASE_URL=${INIT_LLM_MODEL_BASE_URL:-} - - INIT_LLM_MODEL_API_KEY=${INIT_LLM_MODEL_API_KEY:-} - - INIT_EMBEDDING_MODEL_NAME=${INIT_EMBEDDING_MODEL_NAME:-} - - INIT_EMBEDDING_MODEL_BASE_URL=${INIT_EMBEDDING_MODEL_BASE_URL:-} - - INIT_EMBEDDING_MODEL_API_KEY=${INIT_EMBEDDING_MODEL_API_KEY:-} - - INIT_EMBEDDING_MODEL_DIMENSION=${INIT_EMBEDDING_MODEL_DIMENSION:-} - - INIT_EMBEDDING_MODEL_ID=${INIT_EMBEDDING_MODEL_ID:-} - - INIT_RERANK_MODEL_NAME=${INIT_RERANK_MODEL_NAME:-} - - INIT_RERANK_MODEL_BASE_URL=${INIT_RERANK_MODEL_BASE_URL:-} - - INIT_RERANK_MODEL_API_KEY=${INIT_RERANK_MODEL_API_KEY:-} # File size limit (in MB) - MAX_FILE_SIZE_MB=${MAX_FILE_SIZE_MB:-50} + # Agent Skills Sandbox + - WEKNORA_SANDBOX_MODE=${WEKNORA_SANDBOX_MODE:-docker} + - WEKNORA_SANDBOX_TIMEOUT=${WEKNORA_SANDBOX_TIMEOUT:-60} + - WEKNORA_SANDBOX_DOCKER_IMAGE=${WEKNORA_SANDBOX_DOCKER_IMAGE:-wechatopenai/weknora-sandbox:${WEKNORA_VERSION:-latest}} + - APK_MIRROR_ARG=${APK_MIRROR_ARG:-} depends_on: redis: condition: service_started @@ -122,6 +116,17 @@ services: extra_hosts: - "host.docker.internal:host-gateway" + # Sandbox 镜像:仅用于 build/pull,非常驻服务;app 执行 Skills 时按需 docker run 该镜像,用毕即释 + sandbox: + image: wechatopenai/weknora-sandbox:${WEKNORA_VERSION:-latest} + build: + context: . + dockerfile: docker/Dockerfile.sandbox + profiles: + - sandbox + command: ["true"] + restart: "no" + docreader: image: wechatopenai/weknora-docreader:${WEKNORA_VERSION:-latest} build: diff --git a/frontend/src/api/skill/index.ts b/frontend/src/api/skill/index.ts index 958b91ad..3edbc96b 100644 --- a/frontend/src/api/skill/index.ts +++ b/frontend/src/api/skill/index.ts @@ -6,7 +6,7 @@ export interface SkillInfo { description: string; } -// 获取预装Skills列表 +// 获取预装Skills列表;skills_available 为 false 表示沙箱未启用,前端应隐藏/禁用 Skills 配置 export function listSkills() { - return get<{ data: SkillInfo[] }>('/api/v1/skills'); + return get<{ data: SkillInfo[]; skills_available?: boolean }>('/api/v1/skills'); } diff --git a/frontend/src/views/agent/AgentEditorModal.vue b/frontend/src/views/agent/AgentEditorModal.vue index 2e8d1093..2a314775 100644 --- a/frontend/src/views/agent/AgentEditorModal.vue +++ b/frontend/src/views/agent/AgentEditorModal.vue @@ -1069,6 +1069,8 @@ const allModels = ref([]); const kbOptions = ref<{ label: string; value: string; type?: 'document' | 'faq'; count?: number }[]>([]); const mcpOptions = ref<{ label: string; value: string }[]>([]); const skillOptions = ref<{ name: string; description: string }[]>([]); +// 是否允许启用 Skills(取决于后端沙箱是否启用,disabled 时为 false;未请求前为 false 避免闪显) +const skillsAvailable = ref(false); // 系统默认配置(用于内置智能体显示默认提示词) const defaultAgentSystemPrompt = ref(''); // Agent 模式的默认系统提示词(来自 agent-config) @@ -1236,8 +1238,8 @@ const navItems = computed(() => { if (isAgentMode.value) { items.push({ key: 'tools', icon: 'tools', label: t('agent.editor.toolsConfig') || '工具配置' }); } - // Agent模式才显示Skills配置 - if (isAgentMode.value) { + // Agent 模式且沙箱已启用时才显示 Skills 配置(disabled 时无法启用 Skills) + if (isAgentMode.value && skillsAvailable.value) { items.push({ key: 'skills', icon: 'lightbulb', label: t('agent.editor.skillsConfig') }); } // 有知识库能力时才显示检索策略 @@ -1646,14 +1648,16 @@ const loadDependencies = async () => { console.warn('Failed to load MCP services', e); } - // 加载预装 Skills 列表 + // 加载预装 Skills 列表及沙箱可用性(skills_available=false 时前端不展示 Skills 配置) try { const skillsRes = await listSkills(); + skillsAvailable.value = skillsRes.skills_available !== false; if (skillsRes.data && skillsRes.data.length > 0) { skillOptions.value = skillsRes.data; } } catch (e) { console.warn('Failed to load skills', e); + skillsAvailable.value = false; } // 加载占位符定义(从统一 API) diff --git a/internal/application/service/session.go b/internal/application/service/session.go index 64143a27..cb64698b 100644 --- a/internal/application/service/session.go +++ b/internal/application/service/session.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "os" "strings" "github.com/Tencent/WeKnora/internal/agent/tools" @@ -856,6 +857,15 @@ func (s *sessionService) configureSkillsFromAgent( if customAgent == nil { return } + // When sandbox is disabled, skills cannot be enabled (no script execution environment) + sandboxMode := os.Getenv("WEKNORA_SANDBOX_MODE") + if sandboxMode == "" || sandboxMode == "disabled" { + agentConfig.SkillsEnabled = false + agentConfig.SkillDirs = nil + agentConfig.AllowedSkills = nil + logger.Infof(ctx, "Sandbox is disabled: skills are not available") + return + } switch customAgent.Config.SkillsSelectionMode { case "all": diff --git a/internal/handler/skill_handler.go b/internal/handler/skill_handler.go index 338c03ee..d854e0f9 100644 --- a/internal/handler/skill_handler.go +++ b/internal/handler/skill_handler.go @@ -2,6 +2,7 @@ package handler import ( "net/http" + "os" "github.com/Tencent/WeKnora/internal/errors" "github.com/Tencent/WeKnora/internal/logger" @@ -57,8 +58,13 @@ func (h *SkillHandler) ListSkills(c *gin.Context) { }) } + // skills_available: true only when sandbox is enabled (docker or local), so frontend can hide/disable Skills UI + sandboxMode := os.Getenv("WEKNORA_SANDBOX_MODE") + skillsAvailable := sandboxMode != "" && sandboxMode != "disabled" + c.JSON(http.StatusOK, gin.H{ - "success": true, - "data": response, + "success": true, + "data": response, + "skills_available": skillsAvailable, }) }