@becrafter/prompt-manager 0.1.21 → 0.1.31

package/packages/server/services/optimization.service.js

@@ -27,7 +27,7 @@ class OptimizationService {
         // 尝试获取第一个系统优化模板
         template = templateManager.getTemplates().find(t => (t.type || 'optimize') === 'optimize');
       }
-      
+
       if (!template) {
         throw new Error(`未找到可用模板: ${templateId}`);
       }
@@ -132,15 +132,17 @@ class OptimizationService {
 
       // 3. 构建迭代优化消息列表
       const messages = this.buildIterationMessages(
-        currentResult, 
+        currentResult,
         session.lastResult,
-        template, 
-        session.count, 
+        template,
+        session.count,
         guideText,
         session.originalPrompt // 传入原始提示词
       );
 
-      logger.info(`开始迭代优化（第 ${session.count + 1} 次），使用模板: ${template.name}，模型: ${model.name}${guideText ? '，有优化指导' : ''}`);
+      logger.info(
+        `开始迭代优化（第 ${session.count + 1} 次），使用模板: ${template.name}，模型: ${model.name}${guideText ? '，有优化指导' : ''}`
+      );
 
       // 4. 调用 AI API（流式）
       const result = await this.callAIModel(messages, model, onChunk);
@@ -186,10 +188,10 @@ class OptimizationService {
    */
   buildMessages(prompt, template) {
     if (template.format === 'advanced' && Array.isArray(template.content)) {
-      const variables = { 
+      const variables = {
         originalPrompt: prompt,
-        prompt: prompt, // 兼容旧模板
-        input: prompt   // 兼容旧模板
+        prompt, // 兼容旧模板
+        input: prompt // 兼容旧模板
       };
       return template.content.map(msg => ({
         role: msg.role,
@@ -239,7 +241,7 @@ class OptimizationService {
         iterationCount: iterationCount + 1,
         guideText: guideText || ''
       };
-      
+
       return template.content.map(msg => ({
         role: msg.role,
         content: this.replaceVariables(msg.content, variables)
@@ -261,21 +263,20 @@ class OptimizationService {
 
     // 构建默认迭代上下文（如果模板是简单的且没有包含占位符）
     let finalContent = '';
-    
+
     // 如果没有使用任何变量占位符，执行默认拼接逻辑
-    const hasVariables = ['{{prompt}}', '{{previousResult}}', '{{guideText}}']
-      .some(v => content.includes(v));
+    const hasVariables = ['{{prompt}}', '{{previousResult}}', '{{guideText}}'].some(v => content.includes(v));
 
     if (!hasVariables) {
       if (!content.includes('{{previousResult}}')) {
         finalContent += `这是第 ${variables.iterationCount} 次优化。上一次的优化结果如下：\n\n${variables.previousResult}\n\n`;
       }
-      
+
       if (guideText && !content.includes('{{guideText}}')) {
         finalContent += `本次优化的具体要求：\n${guideText}\n\n`;
       }
 
-      finalContent += `请基于以上上下文，继续优化以下内容：\n\n{{prompt}}`;
+      finalContent += '请基于以上上下文，继续优化以下内容：\n\n{{prompt}}';
     } else {
       finalContent = content;
     }
@@ -300,9 +301,11 @@ class OptimizationService {
       // 记录请求日志
       logger.info(`[AI Request] 模型: ${model.name}, 消息数: ${messages.length}`);
       messages.forEach((msg, i) => {
-        logger.debug(`[Message ${i}] Role: ${msg.role}, Content: ${msg.content.substring(0, 1000)}${msg.content.length > 1000 ? '...' : ''}`);
+        logger.debug(
+          `[Message ${i}] Role: ${msg.role}, Content: ${msg.content.substring(0, 1000)}${msg.content.length > 1000 ? '...' : ''}`
+        );
       });
-      
+
       // 构建 API 请求
       const requestBody = {
         model: model.model,
@@ -311,8 +314,8 @@ class OptimizationService {
       };
 
       const headers = {
-        'Content-Type': 'application/json',
-      }
+        'Content-Type': 'application/json'
+      };
       if (model.apiKey) {
         headers['Authorization'] = `Bearer ${model.apiKey}`;
       }
@@ -320,7 +323,7 @@ class OptimizationService {
       // 发起请求
       const response = await fetch(model.apiEndpoint, {
         method: 'POST',
-        headers: headers,
+        headers,
         body: JSON.stringify(requestBody)
       });
 
@@ -337,7 +340,7 @@ class OptimizationService {
         } catch (e) {
           // 如果不是 JSON，限制长度
           if (errorDetail.length > 200) {
-            errorDetail = errorDetail.substring(0, 200) + '...';
+            errorDetail = `${errorDetail.substring(0, 200)}...`;
           }
         }
         throw new Error(`API 请求失败 (${response.status} ${response.statusText}): ${errorDetail}`);
@@ -348,7 +351,7 @@ class OptimizationService {
       const decoder = new TextDecoder();
       let fullContent = '';
 
-      while (true) {
+      for (;;) {
         const { done, value } = await reader.read();
 
         if (done) {
@@ -454,4 +457,4 @@ class OptimizationService {
 export const optimizationService = new OptimizationService();
 
 // 导出OptimizationService类供测试使用
-export { OptimizationService };
+export { OptimizationService };

package/packages/server/services/template.service.js

@@ -1,16 +1,11 @@
 import fs from 'fs-extra';
 import path from 'path';
-import { fileURLToPath } from 'url';
 import YAML from 'yaml';
 import { z } from 'zod';
 import crypto from 'crypto';
-import os from 'os';
 import { logger } from '../utils/logger.js';
-import { config } from '../utils/config.js';
 import { util } from '../utils/util.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { config } from '../utils/config.js';
 
 /**
  * 模板数据结构验证schema
@@ -32,7 +27,7 @@ const TemplateSchema = z.object({
 class TemplateManager {
   constructor() {
     this.builtInDir = path.join(util.getBuiltInConfigsDir(), 'templates/built-in');
-    this.customDir = path.join(os.homedir(), '.prompt-manager/configs/templates');
+    this.customDir = config.getTemplatesDir();
     this.loadedTemplates = new Map();
     this.idToPathMap = new Map();
   }
@@ -330,4 +325,4 @@ class TemplateManager {
 export const templateManager = new TemplateManager();
 
 // 导出TemplateManager类供测试使用
-export { TemplateManager };
+export { TemplateManager };

package/packages/server/toolm/author-sync.service.js

@@ -0,0 +1,97 @@
+/**
+ * 作者配置同步服务
+ *
+ * 职责：
+ * 1. 将作者配置从 packages/server/configs/ 同步到 ~/.prompt-manager/configs/
+ * 2. 确保配置文件在工作目录可用
+ */
+
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { logger } from '../utils/logger.js';
+import { pathExists } from './tool-utils.js';
+import { config } from '../utils/config.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+/**
+ * 同步作者配置到沙箱环境
+ */
+export async function syncAuthorConfig() {
+  logger.info('开始同步作者配置到沙箱环境...');
+
+  let sourceDir;
+
+  const isElectronPackaged = process.resourcesPath != null;
+
+  const isNpmPackage = __dirname.includes('node_modules');
+
+  if (isElectronPackaged) {
+    sourceDir = path.join(process.resourcesPath, 'runtime', 'configs');
+    logger.debug('Electron 打包环境，使用配置目录:', { sourceDir });
+  } else if (isNpmPackage) {
+    sourceDir = path.join(__dirname, '..', 'configs');
+    logger.debug('NPM 包环境，使用配置目录:', { sourceDir });
+  } else {
+    sourceDir = path.join(__dirname, '..', '..', 'server', 'configs');
+    logger.debug('开发环境，使用配置目录:', { sourceDir });
+  }
+
+  const sourceConfigPath = path.join(sourceDir, 'authors.json');
+  const targetConfigPath = config.getConfigsDir();
+  const targetConfigFile = path.join(targetConfigPath, 'authors.json');
+
+  try {
+    if (!(await pathExists(sourceConfigPath))) {
+      logger.warn(`作者配置源文件不存在，跳过同步: ${sourceConfigPath}`);
+      return;
+    }
+
+    await fs.ensureDir(targetConfigPath);
+
+    const configExists = await pathExists(targetConfigFile);
+
+    if (!configExists) {
+      logger.info('首次同步，复制作者配置文件');
+      await fs.copyFile(sourceConfigPath, targetConfigFile);
+      logger.info('作者配置同步成功', { source: sourceConfigPath, target: targetConfigFile });
+    } else {
+      const sourceMtime = (await fs.stat(sourceConfigPath)).mtimeMs;
+      const targetMtime = (await fs.stat(targetConfigFile)).mtimeMs;
+
+      if (sourceMtime > targetMtime) {
+        logger.info('源配置更新，同步作者配置文件');
+        await fs.copyFile(sourceConfigPath, targetConfigFile);
+        logger.info('作者配置同步成功', { source: sourceConfigPath, target: targetConfigFile });
+      } else {
+        logger.debug('作者配置已是最新，无需同步');
+      }
+    }
+
+    const configData = await fs.readJson(targetConfigFile);
+    const authorCount = Object.keys(configData.authors || {}).length;
+    logger.info('作者配置同步完成', {
+      author_count: authorCount,
+      default_author: configData.settings?.default_author
+    });
+  } catch (error) {
+    logger.error('同步作者配置失败:', error);
+
+    if (error.code === 'ENOENT' && !(await pathExists(sourceConfigPath))) {
+      logger.warn('源配置目录不存在，使用默认配置');
+      const defaultConfig = {
+        version: '1.0.0',
+        last_updated: new Date().toISOString(),
+        authors: {},
+        settings: {
+          default_author: 'default'
+        }
+      };
+      await fs.ensureDir(targetConfigPath);
+      await fs.writeJson(targetConfigFile, defaultConfig);
+      logger.info('创建默认作者配置文件');
+    }
+  }
+}

package/packages/server/toolm/index.js

@@ -1,9 +1,8 @@
 /**
  * 工具系统入口
- * 
+ *
  * 提供工具系统的统一入口，导出所有工具系统组件
  */
 
 export { toolLoaderService } from './tool-loader.service.js';
 export { handleToolM } from './tool-manager.handler.js';
-

package/packages/server/toolm/package-installer.service.js

@@ -1,6 +1,6 @@
 /**
  * PackageInstaller - 基于 Arborist 的完整依赖管理器
- * 
+ *
  * 使用 npm 官方的 @npmcli/arborist，提供与 npm install 完全一致的行为
  * 自动处理所有传递依赖、版本冲突、循环依赖等复杂场景
  * 不依赖系统 npm，可在 Electron 环境中直接使用
@@ -8,7 +8,6 @@
 
 import path from 'path';
 import fs from 'fs-extra';
-import os from 'os';
 import { logger } from '../utils/logger.js';
 
 class PackageInstaller {
@@ -27,11 +26,12 @@ class PackageInstaller {
 
       // 2. 检测是否在中国地区（基于时区）
       const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-      const isChina = timezone?.includes('Shanghai') || 
-                     timezone?.includes('Hong_Kong') ||
-                     timezone?.includes('Beijing') ||
-                     timezone?.includes('Chongqing');
-      
+      const isChina =
+        timezone?.includes('Shanghai') ||
+        timezone?.includes('Hong_Kong') ||
+        timezone?.includes('Beijing') ||
+        timezone?.includes('Chongqing');
+
       if (isChina) {
         // 中国地区使用淘宝镜像
         const chinaRegistry = 'https://registry.npmmirror.com';
@@ -43,7 +43,6 @@ class PackageInstaller {
       const defaultRegistry = 'https://registry.npmjs.org/';
       logger.debug(`[PackageInstaller] Using default registry: ${defaultRegistry}`);
       return defaultRegistry;
-      
     } catch (error) {
       logger.warn(`[PackageInstaller] Failed to detect optimal registry: ${error.message}`);
       return 'https://registry.npmjs.org/';
@@ -58,27 +57,27 @@ class PackageInstaller {
    * @param {number} options.timeout - 超时时间（毫秒）
    * @returns {Promise<Object>} 安装结果
    */
-  static async install({ workingDir, dependencies, timeout = 300000 }) {
+  static async install({ workingDir, dependencies }) {
     const startTime = Date.now();
-    
+
     // 构建依赖列表字符串用于日志
     const depsList = this.buildDependenciesList(dependencies);
-    
+
     logger.info(`[PackageInstaller] Starting installation via Arborist: [${depsList}]`);
     logger.debug(`[PackageInstaller] Working directory: ${workingDir}`);
-    
+
     try {
       // 确保工作目录存在
       await fs.ensureDir(workingDir);
-      
+
       // 读取或创建package.json
       const packageJsonPath = path.join(workingDir, 'package.json');
       let manifest;
-      
+
       try {
         const content = await fs.readFile(packageJsonPath, 'utf8');
         manifest = JSON.parse(content);
-        logger.debug(`[PackageInstaller] Found existing package.json`);
+        logger.debug('[PackageInstaller] Found existing package.json');
       } catch (error) {
         // package.json不存在，创建默认的
         manifest = {
@@ -88,49 +87,49 @@ class PackageInstaller {
           private: true,
           dependencies: {}
         };
-        logger.debug(`[PackageInstaller] Creating new package.json`);
+        logger.debug('[PackageInstaller] Creating new package.json');
       }
-      
+
       // 规范化依赖格式
       const normalizedDeps = this.normalizeDependencies(dependencies);
-      
+
       // 更新 manifest 的 dependencies
       manifest.dependencies = { ...manifest.dependencies, ...normalizedDeps };
       await fs.writeFile(packageJsonPath, JSON.stringify(manifest, null, 2));
-      
+
       logger.debug(`[PackageInstaller] Installing ${Object.keys(normalizedDeps).length} dependencies using Arborist`);
-      
+
       // 使用 Arborist 安装所有依赖（包括传递依赖）
       // @npmcli/arborist 是 CommonJS 模块，使用 createRequire 导入
       const { createRequire } = await import('module');
       const require = createRequire(import.meta.url);
       const { Arborist } = require('@npmcli/arborist');
-      
+
       // 获取最优的registry
       const registry = await this.getOptimalRegistry();
-      
+
       const arb = new Arborist({
         path: workingDir,
-        registry: registry,
-        cache: path.join(os.homedir(), '.npm', '_cacache'),
-        save: false,  // 不需要再次更新 package.json
-        omit: [],     // 安装所有依赖
+        registry,
+        cache: path.join(process.env.HOME, '.npm', '_cacache'),
+        save: false, // 不需要再次更新 package.json
+        omit: [], // 安装所有依赖
         force: false,
         fund: false,
         audit: false,
-        legacyPeerDeps: true  // 兼容旧包
+        legacyPeerDeps: true // 兼容旧包
       });
-      
+
       // 执行安装 - Arborist 会自动处理所有传递依赖
       await arb.reify({
         add: Object.entries(normalizedDeps).map(([name, version]) => `${name}@${version}`)
       });
-      
+
       // 加载实际安装的包信息
       const tree = await arb.loadActual();
       const installedPackages = [];
       const installResults = {};
-      
+
       // 收集安装的包信息
       for (const [name, node] of tree.children) {
         if (node && node.package) {
@@ -143,28 +142,27 @@ class PackageInstaller {
           logger.debug(`[PackageInstaller] ✓ ${name}@${node.package.version} installed`);
         }
       }
-      
+
       const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
       logger.info(`[PackageInstaller] Installation completed successfully in ${elapsed}s`);
       logger.info(`[PackageInstaller] Installed ${installedPackages.length} packages with all transitive dependencies`);
-      
+
       return {
         success: true,
-        elapsed: elapsed,
-        manifest: manifest,
+        elapsed,
+        manifest,
         environment: 'arborist',
-        installedPackages: installedPackages,
+        installedPackages,
         results: installResults
       };
-      
     } catch (error) {
       const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
       logger.error(`[PackageInstaller] Installation failed after ${elapsed}s: ${error.message}`);
-      
+
       throw new Error(`Arborist installation failed: ${error.message}`);
     }
   }
-  
+
   /**
    * 构建依赖列表字符串用于日志
    * @param {Object|Array} dependencies - 依赖
@@ -172,7 +170,7 @@ class PackageInstaller {
    */
   static buildDependenciesList(dependencies) {
     if (!dependencies) return '';
-    
+
     if (typeof dependencies === 'object' && !Array.isArray(dependencies)) {
       // 对象格式：{"package": "version"}
       return Object.keys(dependencies)
@@ -182,10 +180,10 @@ class PackageInstaller {
       // 数组格式：["package@version"]
       return dependencies.join(', ');
     }
-    
+
     return String(dependencies);
   }
-  
+
   /**
    * 规范化依赖格式为对象
    * @param {Object|Array} dependencies - 原始依赖
@@ -193,12 +191,12 @@ class PackageInstaller {
    */
   static normalizeDependencies(dependencies) {
     if (!dependencies) return {};
-    
+
     if (typeof dependencies === 'object' && !Array.isArray(dependencies)) {
       // 已经是对象格式
       return dependencies;
     }
-    
+
     if (Array.isArray(dependencies)) {
       // 数组格式转对象
       const normalized = {};
@@ -218,10 +216,10 @@ class PackageInstaller {
       }
       return normalized;
     }
-    
+
     return {};
   }
-  
+
   /**
    * 检查包是否已安装
    * @param {string} workingDir - 工作目录
@@ -230,10 +228,10 @@ class PackageInstaller {
    */
   static async isPackageInstalled(workingDir, packageName) {
     try {
-      const packagePath = packageName.startsWith('@') 
+      const packagePath = packageName.startsWith('@')
         ? path.join(workingDir, 'node_modules', ...packageName.split('/'))
         : path.join(workingDir, 'node_modules', packageName);
-        
+
       const packageJsonPath = path.join(packagePath, 'package.json');
       await fs.access(packageJsonPath);
       return true;
@@ -241,7 +239,7 @@ class PackageInstaller {
       return false;
     }
   }
-  
+
   /**
    * 获取已安装包的信息
    * @param {string} workingDir - 工作目录
@@ -253,7 +251,7 @@ class PackageInstaller {
       const packagePath = packageName.startsWith('@')
         ? path.join(workingDir, 'node_modules', ...packageName.split('/'))
         : path.join(workingDir, 'node_modules', packageName);
-        
+
       const packageJsonPath = path.join(packagePath, 'package.json');
       const content = await fs.readFile(packageJsonPath, 'utf8');
       return JSON.parse(content);
@@ -264,4 +262,3 @@ class PackageInstaller {
 }
 
 export default PackageInstaller;
-