autosnippet 3.0.1 → 3.0.2

package/lib/domain/snippet/Snippet.js

@@ -5,22 +5,27 @@ import { v4 as uuidv4 } from 'uuid';
  *
  * 与 Recipe 的区别:
  * - Recipe: 抽象的知识模式 / 最佳实践
- * - Snippet: 具体的、可安装的代码片段（如 Xcode Snippet）
+ * - Snippet: 具体的、可安装的代码片段（支持多 IDE: Xcode / VSCode / Cursor）
  */
 export class Snippet {
   constructor(props) {
     this.id = props.id || uuidv4();
-    this.identifier = props.identifier;   // 唯一标识符（如 swift_guard_let）
+    this.identifier = props.identifier; // 唯一标识符（如 com.autosnippet.guard-let）
     this.title = props.title;
-    this.language = props.language || 'swift';
+    this.language = props.language || 'unknown';
     this.category = props.category;
-    this.completion = props.completion;     // 自动补全触发词
+    this.completion = props.completion; // 自动补全触发词
     this.summary = props.summary || '';
-    this.code = Array.isArray(props.code) ? props.code.join('\n') : (props.code || '');
+    this.code = Array.isArray(props.code) ? props.code.join('\n') : props.code || '';
 
-    // Xcode integration
-    this.installed = !!props.installed;
-    this.installedPath = props.installedPath || null;
+    // 多 IDE 安装状态
+    // targets = { xcode: { installed, path }, vscode: { installed, path } }
+    this.targets = props.targets || {};
+
+    // 向后兼容: 旧数据的 installed/installedPath 迁移到 targets.xcode
+    if (props.installed && !this.targets.xcode) {
+      this.targets.xcode = { installed: true, path: props.installedPath || null };
+    }
 
     // Source tracking
     this.sourceRecipeId = props.sourceRecipeId || null;
@@ -33,6 +38,25 @@ export class Snippet {
     this.updatedAt = props.updatedAt || Math.floor(Date.now() / 1000);
   }
 
+  /**
+   * 是否已安装到指定 IDE (不传则检查任意)
+   * @param {string} [target] — 'xcode' | 'vscode'
+   */
+  isInstalled(target) {
+    if (target) {
+      return !!this.targets[target]?.installed;
+    }
+    return Object.values(this.targets).some((t) => t?.installed);
+  }
+
+  /**
+   * 获取指定 IDE 的安装路径
+   * @param {string} target
+   */
+  getInstalledPath(target) {
+    return this.targets[target]?.path || null;
+  }
+
   /**
    * 验证 Snippet 完整性
    */
@@ -60,8 +84,9 @@ export class Snippet {
       completion: this.completion,
       summary: this.summary,
       code: this.code,
-      installed: this.installed,
-      installedPath: this.installedPath,
+      targets: this.targets,
+      // 向后兼容: 保留 installed 字段 (任意 IDE 已安装即为 true)
+      installed: this.isInstalled(),
       sourceRecipeId: this.sourceRecipeId,
       sourceCandidateId: this.sourceCandidateId,
       metadata: this.metadata,

package/lib/external/ai/AiFactory.js

@@ -1,15 +1,15 @@
 /**
  * AiFactory - AI 提供商工厂
- * 
+ *
  * 根据配置/环境变量创建对应的 AI Provider 实例
  * 支持: google-gemini, openai, deepseek, claude, ollama, mock
  */
 
-import { GoogleGeminiProvider } from './providers/GoogleGeminiProvider.js';
-import { OpenAiProvider } from './providers/OpenAiProvider.js';
+import Logger from '../../infrastructure/logging/Logger.js';
 import { ClaudeProvider } from './providers/ClaudeProvider.js';
+import { GoogleGeminiProvider } from './providers/GoogleGeminiProvider.js';
 import { MockProvider } from './providers/MockProvider.js';
-import Logger from '../../infrastructure/logging/Logger.js';
+import { OpenAiProvider } from './providers/OpenAiProvider.js';
 
 const PROVIDER_MAP = {
   google: GoogleGeminiProvider,
@@ -35,7 +35,9 @@ export function createProvider(options = {}) {
   const ProviderClass = PROVIDER_MAP[provider.toLowerCase()];
 
   if (!ProviderClass) {
-    throw new Error(`Unknown AI provider: ${provider}. Supported: ${Object.keys(PROVIDER_MAP).join(', ')}`);
+    throw new Error(
+      `Unknown AI provider: ${provider}. Supported: ${Object.keys(PROVIDER_MAP).join(', ')}`
+    );
   }
 
   const config = { ...options };
@@ -69,9 +71,29 @@ export function autoDetectProvider() {
   const logger = Logger.getInstance();
   const explicit = process.env.ASD_AI_PROVIDER;
 
-  if (explicit) {
-    logger.debug(`AI provider explicitly set: ${explicit}`);
-    return createProvider({ provider: explicit });
+  if (explicit && explicit.toLowerCase() !== 'auto') {
+    // 验证显式指定的 provider 是否有对应 API Key
+    const keyEnvMap = {
+      google: 'ASD_GOOGLE_API_KEY',
+      'google-gemini': 'ASD_GOOGLE_API_KEY',
+      gemini: 'ASD_GOOGLE_API_KEY',
+      openai: 'ASD_OPENAI_API_KEY',
+      deepseek: 'ASD_DEEPSEEK_API_KEY',
+      claude: 'ASD_CLAUDE_API_KEY',
+      anthropic: 'ASD_CLAUDE_API_KEY',
+      ollama: null, // Ollama 不需要 key
+      mock: null,
+    };
+    const requiredKeyEnv = keyEnvMap[explicit.toLowerCase()];
+    if (requiredKeyEnv && !process.env[requiredKeyEnv]) {
+      logger.warn(
+        `[AiFactory] ASD_AI_PROVIDER=${explicit} 但 ${requiredKeyEnv} 未配置，尝试自动探测其他可用 provider…`
+      );
+      // 降级到自动探测，不直接 return
+    } else {
+      logger.debug(`AI provider explicitly set: ${explicit}`);
+      return createProvider({ provider: explicit });
+    }
   }
 
   // 按优先级探测
@@ -92,7 +114,7 @@ export function autoDetectProvider() {
     return createProvider({ provider: 'deepseek' });
   }
 
-  logger.warn('No AI API key found, using mock provider');
+  logger.info('[AiFactory] 未找到任何 AI API Key，AI 功能已跳过。请在 .env 中配置 ASD_GOOGLE_API_KEY 等。');
   return createProvider({ provider: 'mock' });
 }
 
@@ -113,9 +135,13 @@ const PROVIDER_KEY_MAP = {
 export function getAvailableFallbacks(currentProvider) {
   const fallbacks = [];
   for (const [name, envKey] of Object.entries(PROVIDER_KEY_MAP)) {
-    if (name === currentProvider) continue;
+    if (name === currentProvider) {
+      continue;
+    }
     const key = process.env[envKey];
-    if (key && key.length > 0) fallbacks.push(name);
+    if (key && key.length > 0) {
+      fallbacks.push(name);
+    }
   }
   return fallbacks;
 }
@@ -125,8 +151,12 @@ export function getAvailableFallbacks(currentProvider) {
  */
 export function isGeoOrProviderError(err) {
   const msg = (err.message || '').toLowerCase();
-  return /user location is not supported|failed_precondition|unsupported.*(region|country|location)|geo|blocked/i.test(msg)
-    || (/permission.*denied|forbidden/i.test(msg) && !/rate.?limit|quota|429/i.test(msg));
+  return (
+    /user location is not supported|failed_precondition|unsupported.*(region|country|location)|geo|blocked/i.test(
+      msg
+    ) ||
+    (/permission.*denied|forbidden/i.test(msg) && !/rate.?limit|quota|429/i.test(msg))
+  );
 }
 
 /**
@@ -137,7 +167,9 @@ export function isGeoOrProviderError(err) {
 export async function getProviderWithFallback() {
   const logger = Logger.getInstance();
   const primary = autoDetectProvider();
-  if (!primary) return null;
+  if (!primary) {
+    return null;
+  }
 
   const currentProvider = (process.env.ASD_AI_PROVIDER || 'google').toLowerCase();
 
@@ -202,10 +234,10 @@ export function getAiConfigInfo() {
 
 // 所有提供商的集中导出
 export { AiProvider } from './AiProvider.js';
-export { GoogleGeminiProvider } from './providers/GoogleGeminiProvider.js';
-export { OpenAiProvider } from './providers/OpenAiProvider.js';
 export { ClaudeProvider } from './providers/ClaudeProvider.js';
+export { GoogleGeminiProvider } from './providers/GoogleGeminiProvider.js';
 export { MockProvider } from './providers/MockProvider.js';
+export { OpenAiProvider } from './providers/OpenAiProvider.js';
 
 export default {
   createProvider,