@eoasmxd/freya 0.5.0 → 0.5.2

package/src/packages/core/src/prompt/prompt-registry.ts

@@ -1,39 +1,63 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { FREYA_APP, FREYA_HOME } from '../utils/paths.js';
+import { FREYA_APP, FREYA_HOME, FREYA_LAUNCH } from '../utils/paths.js';
 
 export interface FreyaPrompt {
   key: string;
   content: string;
   defaultPath: string;
-  runPath?: string;
+  configFileName?: string;
 }
 
 /** 提示词内存注册表，管理所有系统及插件级提示词的分类检索 */
 export class FreyaPromptRegistry {
   private prompts = new Map<string, FreyaPrompt>();
 
-  private getRunFilePath(prompt: Omit<FreyaPrompt, 'content'>): string {
-    return prompt.runPath || path.join(FREYA_HOME, 'config', 'prompts', path.basename(prompt.defaultPath));
+  private resolveProbePaths(prompt: Omit<FreyaPrompt, 'content'>): string[] {
+    const baseName = path.basename(prompt.defaultPath);
+    const rawPaths: string[] = [];
+
+    if (prompt.configFileName) {
+      rawPaths.push(path.join(FREYA_HOME, 'config', prompt.configFileName));
+      rawPaths.push(path.join(FREYA_LAUNCH, 'config', prompt.configFileName));
+    }
+
+    rawPaths.push(path.join(FREYA_HOME, 'config', 'prompts', baseName));
+    rawPaths.push(path.join(FREYA_LAUNCH, 'config', 'prompts', baseName));
+    rawPaths.push(prompt.defaultPath);
+
+    const candidates: string[] = [];
+    const seen = new Set<string>();
+    for (const rawPath of rawPaths) {
+      const normalized = path.resolve(rawPath);
+      if (!seen.has(normalized)) {
+        seen.add(normalized);
+        candidates.push(normalized);
+      }
+    }
+    return candidates;
   }
 
-  /** 注册提示词元数据声明并执行异步双读载入 */
+  /** 注册提示词元数据声明并执行三层级联探针载入 */
   async register(prompt: Omit<FreyaPrompt, 'content'>): Promise<void> {
-    const runFilePath = this.getRunFilePath(prompt);
+    const probePaths = this.resolveProbePaths(prompt);
     let content = '';
-    try {
+
+    for (const filePath of probePaths) {
       try {
-        content = await fs.readFile(runFilePath, 'utf-8');
-      } catch {
-        content = await fs.readFile(prompt.defaultPath, 'utf-8');
-      }
-    } catch {}
+        const text = await fs.readFile(filePath, 'utf-8');
+        if (text.trim().length > 0) {
+          content = text;
+          break;
+        }
+      } catch {}
+    }
 
     this.prompts.set(prompt.key, {
       key: prompt.key,
       content: content.trim(),
       defaultPath: prompt.defaultPath,
-      runPath: prompt.runPath
+      configFileName: prompt.configFileName
     });
   }
 
@@ -58,7 +82,7 @@ export class FreyaPromptRegistry {
     return this.prompts;
   }
 
-  /** 扫描并装载所有内核提示词，支持运行时提示词覆盖默认提示词 */
+  /** 扫描并装载所有内核提示词 */
   async loadKernelPrompts(): Promise<void> {
     const defaultDirPath = path.join(FREYA_APP, 'config', 'prompts');
     try {
@@ -67,7 +91,7 @@ export class FreyaPromptRegistry {
         await this.register({
           key: `core.prompt.${name}`,
           defaultPath: path.join(defaultDirPath, `core.prompt.${name}.md`),
-          runPath: path.join(FREYA_HOME, 'config', `${name.toUpperCase()}.md`)
+          configFileName: `${name.toUpperCase()}.md`
         });
       }
 

package/src/packages/core/src/skill/skill-registry.ts

@@ -1,7 +1,7 @@
 import type { FreyaContext } from '@eoasmxd/freya-sdk';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { FREYA_APP, FREYA_HOME, FREYA_WORKSPACE } from '../utils/paths.js';
+import { FREYA_APP, FREYA_HOME, FREYA_LAUNCH } from '../utils/paths.js';
 
 export interface FreyaSkill {
   id: string;
@@ -9,7 +9,7 @@ export interface FreyaSkill {
   description: string;
   content: string;
   enabled: boolean;
-  source: 'builtin' | 'workspace' | 'runtime';
+  source: 'builtin' | 'launch' | 'runtime';
 }
 
 /** 技能注册表，从 skills/ 目录加载 Markdown 格式技能并管理软开关状态 */
@@ -20,7 +20,7 @@ export class FreyaSkillRegistry {
   async loadSkills(context: FreyaContext): Promise<void> {
     this.context = context;
     const defaultSkillsDir = path.join(FREYA_APP, 'skills');
-    const workspaceSkillsDir = path.join(FREYA_WORKSPACE, 'skills');
+    const launchSkillsDir = path.join(FREYA_LAUNCH, 'skills');
     const runtimeSkillsDir = path.join(FREYA_HOME, 'skills');
     const configSkillsPath = path.join(FREYA_HOME, 'config', 'skills.json');
 
@@ -29,11 +29,11 @@ export class FreyaSkillRegistry {
       await this.loadSkillsFromDirectory(defaultSkillsDir, 'builtin', context);
 
       const resolvedDefault = path.resolve(defaultSkillsDir);
-      const resolvedWorkspace = path.resolve(workspaceSkillsDir);
+      const resolvedLaunch = path.resolve(launchSkillsDir);
       const resolvedRuntime = path.resolve(runtimeSkillsDir);
 
-      if (resolvedWorkspace !== resolvedDefault && resolvedWorkspace !== resolvedRuntime) {
-        await this.loadSkillsFromDirectory(workspaceSkillsDir, 'workspace', context);
+      if (resolvedLaunch !== resolvedDefault && resolvedLaunch !== resolvedRuntime) {
+        await this.loadSkillsFromDirectory(launchSkillsDir, 'launch', context);
       }
 
       await this.loadSkillsFromDirectory(runtimeSkillsDir, 'runtime', context);
@@ -77,7 +77,7 @@ export class FreyaSkillRegistry {
   }
 
   /** 从指定目录加载技能到内存注册表中 */
-  private async loadSkillsFromDirectory(dirPath: string, source: 'builtin' | 'workspace' | 'runtime', context: FreyaContext): Promise<void> {
+  private async loadSkillsFromDirectory(dirPath: string, source: 'builtin' | 'launch' | 'runtime', context: FreyaContext): Promise<void> {
     try {
       const files = await fs.readdir(dirPath);
       for (const file of files) {

package/src/packages/core/src/utils/paths.ts

@@ -6,6 +6,7 @@ import fs from 'node:fs';
 
 const customHome = process.env.FREYA_HOME;
 const customApp = process.env.FREYA_APP;
+const customLaunch = process.env.FREYA_LAUNCH;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function resolveAppRoot(): string {
@@ -24,7 +25,7 @@ function resolveAppRoot(): string {
         if (pkg.name === '@eoasmxd/freya' || fs.existsSync(path.join(current, 'plugins'))) {
           return current;
         }
-      } catch {}
+      } catch { }
     }
     const parent = path.dirname(current);
     if (parent === current) break;
@@ -43,7 +44,7 @@ export const FREYA_APP = customApp
   ? path.resolve(customApp)
   : resolveAppRoot();
 
-/** 宿主工程/工作区根目录（业务工程代码与定制资源区） */
-export const FREYA_WORKSPACE = process.env.FREYA_WORKSPACE
-  ? path.resolve(process.env.FREYA_WORKSPACE)
+/** 宿主命令启动执行根目录（默认当前工作目录 process.cwd()） */
+export const FREYA_LAUNCH = customLaunch
+  ? path.resolve(customLaunch)
   : process.cwd();

package/src/packages/sdk/src/types/context.ts

@@ -14,15 +14,15 @@ export interface Logger {
 }
 
 export interface FreyaPaths {
-  /** 程序物理安装根目录（只读代码与程序级静态资源区） */
+  /** 程序物理安装根目录（只读系统源码与内置资源区） */
   appRoot: string;
-  /** 运行态持久化主目录（用户个性化配置与持久化数据区，默认 ~/.freya） */
+  /** 运行态持久化主目录（用户配置与持久化存储入口，默认 ~/.freya） */
   homeDir: string;
-  /** 宿主工程根目录（默认为启动执行路径 process.cwd()） */
-  workspaceRoot: string;
+  /** 宿主命令启动执行目录（默认启动路径 process.cwd()） */
+  launchDir: string;
   /** 运行时数据持久化目录（~/.freya/data） */
   dataDir: string;
-  /** 宿主与大模型交互隔离的文件读写沙箱（~/.freya/workspace） */
+  /** 智能体专属文件读写工作区（默认为 ~/.freya/workspace，可由配置覆盖） */
   workspaceDir: string;
 }
 

package/src/packages/ui/src/features/config/panels/PluginConfigPanel.tsx

@@ -5,7 +5,7 @@ interface PluginEntry {
   name: string;
   description: string;
   enabled: boolean;
-  source?: 'builtin' | 'workspace' | 'runtime' | 'npm';
+  source?: 'builtin' | 'launch' | 'runtime' | 'npm';
 }
 
 interface PluginConfigPanelProps {
@@ -70,7 +70,7 @@ export const PluginConfigPanel: React.FC<PluginConfigPanelProps> = ({ getApiUrl
     switch (source) {
       case 'builtin':
         return { label: '内置', bg: 'rgba(59, 130, 246, 0.15)', color: '#60a5fa' };
-      case 'workspace':
+      case 'launch':
         return { label: '集成', bg: 'rgba(168, 85, 247, 0.15)', color: '#c084fc' };
       case 'npm':
         return { label: 'NPM', bg: 'rgba(245, 158, 11, 0.15)', color: '#fbbf24' };

package/src/packages/ui/src/features/config/panels/SkillConfigPanel.tsx

@@ -5,7 +5,7 @@ interface SkillEntry {
   name: string;
   description: string;
   enabled: boolean;
-  source: 'builtin' | 'workspace' | 'runtime';
+  source: 'builtin' | 'launch' | 'runtime';
 }
 
 interface SkillConfigPanelProps {
@@ -83,7 +83,7 @@ export const SkillConfigPanel: React.FC<SkillConfigPanelProps> = ({ getApiUrl })
     switch (source) {
       case 'builtin':
         return { label: '内置', bg: 'rgba(59, 130, 246, 0.15)', color: '#60a5fa' };
-      case 'workspace':
+      case 'launch':
         return { label: '集成', bg: 'rgba(168, 85, 247, 0.15)', color: '#c084fc' };
       case 'runtime':
       default:

package/src/plugins/plugin-tool-fs/src/tools.ts

@@ -2,13 +2,56 @@ import type { FreyaContext, ToolDefinition, FreyaTool } from '@eoasmxd/freya-sdk
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-/** 安全工作区路径获取 (支持指定 scope 作用域) */
+/** 解析作用域实际物理路径，返回 null 表示显式禁用 */
+function resolveScopeBase(envValue: string | undefined, defaultPath: string, launchDir: string): string | null {
+  if (envValue === undefined) {
+    return defaultPath;
+  }
+  const trimmed = envValue.trim();
+  if (trimmed === '' || trimmed.toLowerCase() === 'false') {
+    return null;
+  }
+  return path.isAbsolute(trimmed) ? trimmed : path.resolve(launchDir, trimmed);
+}
+
+/** 获取当前激活的作用域列表与描述文本 */
+function getActiveScopesInfo(): { scopes: string[]; description: string } {
+  const scopes = ['workspace'];
+  const descParts = ['默认为 "workspace" 沙箱'];
+
+  const srcVal = process.env.FREYA_FS_SRC;
+  const isSrcDisabled = srcVal !== undefined && (srcVal.trim() === '' || srcVal.trim().toLowerCase() === 'false');
+  if (!isSrcDisabled) {
+    scopes.push('src');
+    descParts.push('支持指定 "src" 源码区');
+  }
+
+  const docVal = process.env.FREYA_FS_DOC;
+  const isDocDisabled = docVal !== undefined && (docVal.trim() === '' || docVal.trim().toLowerCase() === 'false');
+  if (!isDocDisabled) {
+    scopes.push('doc');
+    descParts.push('指定 "doc" 文档区');
+  }
+
+  const description = `读取作用域（可选，${descParts.join('，')}）`;
+  return { scopes, description };
+}
+
+/** 获取经过安全边界校验的绝对路径 */
 export function getSafePath(ctx: FreyaContext, relativePath: string, scope?: string): { targetAbs: string; baseAbs: string } {
-  let baseAbs = ctx.paths.workspaceDir;
-  if (scope === 'src') {
-    baseAbs = path.join(ctx.paths.appRoot, 'src');
-  } else if (scope === 'doc') {
-    baseAbs = path.join(ctx.paths.appRoot, 'doc');
+  const targetScope = scope || 'workspace';
+  let baseAbs: string | null = null;
+
+  if (targetScope === 'workspace') {
+    baseAbs = ctx.paths.workspaceDir;
+  } else if (targetScope === 'src') {
+    baseAbs = resolveScopeBase(process.env.FREYA_FS_SRC, path.join(ctx.paths.appRoot, 'src'), ctx.paths.launchDir);
+  } else if (targetScope === 'doc') {
+    baseAbs = resolveScopeBase(process.env.FREYA_FS_DOC, path.join(ctx.paths.appRoot, 'doc'), ctx.paths.launchDir);
+  }
+
+  if (!baseAbs) {
+    throw new Error(`安全拒绝：作用域 "${targetScope}" 未开放或已被禁用。`);
   }
 
   if (relativePath && path.isAbsolute(relativePath)) {
@@ -51,6 +94,7 @@ function formatBytes(bytes: number): string {
 export class ListDirTool implements FreyaTool {
 
   getDefinition(): ToolDefinition {
+    const { scopes, description } = getActiveScopesInfo();
     return {
       name: 'list_dir',
       description: '列出指定目录下的文件和子文件夹列表。注意：仅允许访问相对路径，不可传绝对路径或向上越级 escape 路径。',
@@ -63,8 +107,8 @@ export class ListDirTool implements FreyaTool {
           },
           scope: {
             type: 'string',
-            enum: ['workspace', 'src', 'doc'],
-            description: '读取作用域（可选，默认为 "workspace" 沙箱，支持指定 "src" 源码区或 "doc" 文档区）'
+            enum: scopes,
+            description
           }
         }
       }
@@ -114,6 +158,7 @@ export class ListDirTool implements FreyaTool {
 export class ReadFileTool implements FreyaTool {
 
   getDefinition(): ToolDefinition {
+    const { scopes, description } = getActiveScopesInfo();
     return {
       name: 'read_file',
       description: '读取指定文件的文本内容。支持指定行号起止区间切片读取，防范大文件上下文超限。',
@@ -126,8 +171,8 @@ export class ReadFileTool implements FreyaTool {
           },
           scope: {
             type: 'string',
-            enum: ['workspace', 'src', 'doc'],
-            description: '读取作用域（可选，默认为 "workspace" 沙箱，支持指定 "src" 源码区或 "doc" 文档区）'
+            enum: scopes,
+            description
           },
           startLine: {
             type: 'integer',
@@ -215,7 +260,7 @@ export class WriteFileTool implements FreyaTool {
       return '❌ 参数错误：必须指定目标路径与写入内容。';
     }
     if (args.scope && args.scope !== 'workspace') {
-      return `❌ 安全拒绝：物理源码区 (src) 与文档区 (doc) 为只读保护区，严禁写入或修改。`;
+      return '❌ 安全拒绝：仅允许在工作区 (workspace) 进行写入操作，其它区域均为只读保护区。';
     }
     try {
       const { targetAbs, baseAbs } = getSafePath(ctx, args.path);
@@ -263,7 +308,7 @@ export class EditFileTool implements FreyaTool {
       return '❌ 参数错误：必须指定目标路径、查找目标与替换文本。';
     }
     if (args.scope && args.scope !== 'workspace') {
-      return `❌ 安全拒绝：物理源码区 (src) 与文档区 (doc) 为只读保护区，严禁写入或修改。`;
+      return '❌ 安全拒绝：仅允许在工作区 (workspace) 进行修改操作，其它区域均为只读保护区。';
     }
     try {
       const { targetAbs, baseAbs } = getSafePath(ctx, args.path);
@@ -273,12 +318,17 @@ export class EditFileTool implements FreyaTool {
       }
 
       const content = await fs.readFile(targetAbs, 'utf-8');
-      const index = content.indexOf(args.target);
-      if (index === -1) {
+      const firstIndex = content.indexOf(args.target);
+      if (firstIndex === -1) {
         return `❌ 修改失败：在文件 "${args.path}" 中未找到指定的 target 文本。请确保 target 在大小写、缩进和换行上与文件内完全一致。`;
       }
 
-      const newContent = content.slice(0, index) + args.replacement + content.slice(index + args.target.length);
+      const secondIndex = content.indexOf(args.target, firstIndex + args.target.length);
+      if (secondIndex !== -1) {
+        return `❌ 修改拒绝：在文件 "${args.path}" 中匹配到多处相同的目标文本。请扩大 target 文本段以包含更多上下文行确保唯一性。`;
+      }
+
+      const newContent = content.slice(0, firstIndex) + args.replacement + content.slice(firstIndex + args.target.length);
       await fs.writeFile(targetAbs, newContent, 'utf-8');
 
       return `ℹ️ 已成功修改文件 "${args.path}" 的指定部分。`;