@eoasmxd/freya 0.4.4 → 0.5.1

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 { APP_ROOT, PROJECT_ROOT } from '../utils/paths.js';
+import { FREYA_APP, FREYA_HOME, FREYA_WORKSPACE } from '../utils/paths.js';
 
 export interface FreyaSkill {
   id: string;
@@ -9,7 +9,7 @@ export interface FreyaSkill {
   description: string;
   content: string;
   enabled: boolean;
-  source: 'builtin' | 'runtime';
+  source: 'builtin' | 'workspace' | 'runtime';
 }
 
 /** 技能注册表，从 skills/ 目录加载 Markdown 格式技能并管理软开关状态 */
@@ -19,13 +19,23 @@ export class FreyaSkillRegistry {
 
   async loadSkills(context: FreyaContext): Promise<void> {
     this.context = context;
-    const runtimeSkillsDir = path.join(PROJECT_ROOT, 'skills');
-    const defaultSkillsDir = path.join(APP_ROOT, 'skills');
-    const configSkillsPath = path.join(PROJECT_ROOT, 'config', 'skills.json');
+    const defaultSkillsDir = path.join(FREYA_APP, 'skills');
+    const workspaceSkillsDir = path.join(FREYA_WORKSPACE, 'skills');
+    const runtimeSkillsDir = path.join(FREYA_HOME, 'skills');
+    const configSkillsPath = path.join(FREYA_HOME, 'config', 'skills.json');
 
     try {
       await fs.mkdir(runtimeSkillsDir, { recursive: true });
       await this.loadSkillsFromDirectory(defaultSkillsDir, 'builtin', context);
+
+      const resolvedDefault = path.resolve(defaultSkillsDir);
+      const resolvedWorkspace = path.resolve(workspaceSkillsDir);
+      const resolvedRuntime = path.resolve(runtimeSkillsDir);
+
+      if (resolvedWorkspace !== resolvedDefault && resolvedWorkspace !== resolvedRuntime) {
+        await this.loadSkillsFromDirectory(workspaceSkillsDir, 'workspace', context);
+      }
+
       await this.loadSkillsFromDirectory(runtimeSkillsDir, 'runtime', context);
 
       let configList: Array<{ id: string; enabled: boolean }> = [];
@@ -67,7 +77,7 @@ export class FreyaSkillRegistry {
   }
 
   /** 从指定目录加载技能到内存注册表中 */
-  private async loadSkillsFromDirectory(dirPath: string, source: 'builtin' | 'runtime', context: FreyaContext): Promise<void> {
+  private async loadSkillsFromDirectory(dirPath: string, source: 'builtin' | 'workspace' | 'runtime', context: FreyaContext): Promise<void> {
     try {
       const files = await fs.readdir(dirPath);
       for (const file of files) {
@@ -77,15 +87,19 @@ export class FreyaSkillRegistry {
           if (metadata.id) {
             const defaultEnabled = metadata.defaultEnabled !== undefined
               ? metadata.defaultEnabled !== 'false'
-              : source === 'builtin';
+              : source !== 'runtime';
+
+            const existing = this.skills.get(metadata.id);
+            const finalSource = existing?.source === 'builtin' ? 'builtin' : source;
+            const finalEnabled = existing !== undefined ? existing.enabled : defaultEnabled;
 
             this.skills.set(metadata.id, {
               id: metadata.id,
               name: metadata.name || file.replace('.md', ''),
               description: metadata.description || '',
               content: content.trim(),
-              enabled: defaultEnabled,
-              source
+              enabled: finalEnabled,
+              source: finalSource
             });
           }
         }
@@ -126,7 +140,7 @@ export class FreyaSkillRegistry {
     }
 
     skill.enabled = enabled;
-    const configSkillsPath = path.join(PROJECT_ROOT, 'config', 'skills.json');
+    const configSkillsPath = path.join(FREYA_HOME, 'config', 'skills.json');
     try {
       await this.persistSkillsConfig(configSkillsPath);
       this.context?.logger.info(`技能 "${skill.name || skillId}" 已切换为: ${enabled ? '启用' : '禁用'}`);

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

@@ -5,13 +5,10 @@ import { fileURLToPath } from 'node:url';
 import fs from 'node:fs';
 
 const customHome = process.env.FREYA_HOME;
+const customApp = process.env.FREYA_APP;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function resolveAppRoot(): string {
-  if (process.env.FREYA_APP_ROOT) {
-    return path.resolve(process.env.FREYA_APP_ROOT);
-  }
-
   let current = __dirname;
   let coreDir = current;
 
@@ -36,10 +33,17 @@ function resolveAppRoot(): string {
   return coreDir;
 }
 
-/** 运行态下的项目根目录（数据与配置存放区） */
-export const PROJECT_ROOT = customHome
+/** 运行态持久化主目录（数据与配置存放区） */
+export const FREYA_HOME = customHome
   ? path.resolve(customHome)
   : path.join(os.homedir(), '.freya');
 
 /** 程序代码物理安装根目录（只读代码与包内默认资源区） */
-export const APP_ROOT = resolveAppRoot();
+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();

package/src/packages/core/src/web/web-container.ts

@@ -5,7 +5,7 @@ import fsSync from 'node:fs';
 import fs from 'node:fs/promises';
 import http from 'node:http';
 import path from 'node:path';
-import { APP_ROOT } from '../utils/paths.js';
+import { FREYA_APP } from '../utils/paths.js';
 
 const mimeTypes: Record<string, string> = {
     '.html': 'text/html; charset=utf-8',
@@ -43,7 +43,7 @@ export class FreyaWebContainer {
     async start(ctx: FreyaContext, configManager: FreyaConfigManager): Promise<void> {
         this.port = (ctx.config as any)?.server?.port ?? 3000;
         this.configApi = new FreyaConfigApi(configManager);
-        const uiDist = this.getUiDistPath(APP_ROOT);
+        const uiDist = this.getUiDistPath(FREYA_APP);
         const safePrefix = uiDist.endsWith(path.sep) ? uiDist : uiDist + path.sep;
 
         this.httpServer = http.createServer(async (req, res) => {
@@ -113,9 +113,9 @@ export class FreyaWebContainer {
         });
     }
 
-    private getUiDistPath(projectRoot: string): string {
-        const devPath = path.join(projectRoot, 'packages', 'ui', 'dist');
-        const prodPath = path.join(projectRoot, 'ui');
+    private getUiDistPath(appRoot: string): string {
+        const devPath = path.join(appRoot, 'packages', 'ui', 'dist');
+        const prodPath = path.join(appRoot, 'ui');
         if (fsSync.existsSync(devPath)) return devPath;
         return prodPath;
     }

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

@@ -16,8 +16,10 @@ export interface Logger {
 export interface FreyaPaths {
   /** 程序物理安装根目录（只读代码与程序级静态资源区） */
   appRoot: string;
-  /** 运行态主目录（用户个性化配置与持久化数据区，默认 ~/.freya） */
-  projectRoot: string;
+  /** 运行态持久化主目录（用户个性化配置与持久化数据区，默认 ~/.freya） */
+  homeDir: string;
+  /** 宿主工程根目录（默认为启动执行路径 process.cwd()） */
+  workspaceRoot: string;
   /** 运行时数据持久化目录（~/.freya/data） */
   dataDir: string;
   /** 宿主与大模型交互隔离的文件读写沙箱（~/.freya/workspace） */

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

@@ -5,6 +5,7 @@ interface PluginEntry {
   name: string;
   description: string;
   enabled: boolean;
+  source?: 'builtin' | 'workspace' | 'runtime' | 'npm';
 }
 
 interface PluginConfigPanelProps {
@@ -65,12 +66,27 @@ export const PluginConfigPanel: React.FC<PluginConfigPanelProps> = ({ getApiUrl
     }
   };
 
+  const getSourceTagMeta = (source?: string) => {
+    switch (source) {
+      case 'builtin':
+        return { label: '内置', bg: 'rgba(59, 130, 246, 0.15)', color: '#60a5fa' };
+      case 'workspace':
+        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' };
+      case 'runtime':
+      default:
+        return { label: '自定义', bg: 'rgba(16, 185, 129, 0.15)', color: '#34d399' };
+    }
+  };
+
   return (
     <div className="plugins-list">
       {plugins.map((plugin) => {
         const displayName = plugin.name || plugin.id;
         const displayDesc = plugin.description || '未提供描述信息';
         const shouldShowIdTag = displayName !== plugin.id;
+        const tagMeta = getSourceTagMeta(plugin.source);
 
         return (
           <div key={plugin.id} className="plugin-card">
@@ -82,6 +98,20 @@ export const PluginConfigPanel: React.FC<PluginConfigPanelProps> = ({ getApiUrl
                     ({plugin.id})
                   </span>
                 )}
+                {plugin.source && (
+                  <span
+                    style={{
+                      fontSize: '0.68rem',
+                      marginLeft: '0.5rem',
+                      padding: '0.1rem 0.4rem',
+                      borderRadius: '4px',
+                      background: tagMeta.bg,
+                      color: tagMeta.color
+                    }}
+                  >
+                    {tagMeta.label}
+                  </span>
+                )}
               </div>
               <div className="plugin-desc">{displayDesc}</div>
             </div>

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

@@ -5,7 +5,7 @@ interface SkillEntry {
   name: string;
   description: string;
   enabled: boolean;
-  source: 'builtin' | 'runtime';
+  source: 'builtin' | 'workspace' | 'runtime';
 }
 
 interface SkillConfigPanelProps {
@@ -79,12 +79,24 @@ export const SkillConfigPanel: React.FC<SkillConfigPanelProps> = ({ getApiUrl })
     );
   }
 
+  const getSourceTagMeta = (source?: string) => {
+    switch (source) {
+      case 'builtin':
+        return { label: '内置', bg: 'rgba(59, 130, 246, 0.15)', color: '#60a5fa' };
+      case 'workspace':
+        return { label: '集成', bg: 'rgba(168, 85, 247, 0.15)', color: '#c084fc' };
+      case 'runtime':
+      default:
+        return { label: '自定义', bg: 'rgba(16, 185, 129, 0.15)', color: '#34d399' };
+    }
+  };
+
   return (
     <div className="plugins-list">
       {skills.map((skill) => {
         const displayName = skill.name || skill.id;
         const displayDesc = skill.description || '未提供描述信息';
-        const isBuiltin = skill.source === 'builtin';
+        const tagMeta = getSourceTagMeta(skill.source);
 
         return (
           <div key={skill.id} className="plugin-card">
@@ -100,11 +112,11 @@ export const SkillConfigPanel: React.FC<SkillConfigPanelProps> = ({ getApiUrl })
                     marginLeft: '0.5rem',
                     padding: '0.1rem 0.4rem',
                     borderRadius: '4px',
-                    background: isBuiltin ? 'rgba(59, 130, 246, 0.15)' : 'rgba(16, 185, 129, 0.15)',
-                    color: isBuiltin ? '#60a5fa' : '#34d399'
+                    background: tagMeta.bg,
+                    color: tagMeta.color
                   }}
                 >
-                  {isBuiltin ? '内置' : '自定义'}
+                  {tagMeta.label}
                 </span>
               </div>
               <div className="plugin-desc">{displayDesc}</div>

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

@@ -101,8 +101,8 @@ function getFormattedDateTime(): { date: string; time: string } {
 
 function cleanPathFromError(err: any, ctx: FreyaContext): string {
   const rawMessage = err?.message || String(err);
-  const projectRoot = ctx.paths.projectRoot;
-  const escapedPath = projectRoot.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const homeDir = ctx.paths.homeDir;
+  const escapedPath = homeDir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
   const regex = new RegExp(escapedPath + '[\\\\/]?', 'g');
   return rawMessage.replace(regex, '');
 }

package/src/plugins/plugin-tool-mysql/src/audit.ts

@@ -19,7 +19,7 @@ export class SqlAuditService {
     }
 
     const promptFileName = 'plugin.prompt.mysql.select.audit.md';
-    const runtimeOverridePath = path.join(ctx.paths.projectRoot, 'config', 'prompts', promptFileName);
+    const runtimeOverridePath = path.join(ctx.paths.homeDir, 'config', 'prompts', promptFileName);
 
     try {
       const content = await fs.readFile(runtimeOverridePath, 'utf-8');