autosnippet 2.9.0 → 2.11.0

package/lib/service/recipe/RecipeParser.js

@@ -69,16 +69,13 @@ export class RecipeParser {
     return {
       title,
       summary: frontmatter.summary || frontmatter.description || '',
-      summary_cn: frontmatter.summary_cn || '',
-      summary_en: frontmatter.summary_en || '',
+      description: frontmatter.description || frontmatter.summary || '',
       trigger: frontmatter.trigger || this.#generateTrigger(title),
       category: frontmatter.category || 'general',
       language: frontmatter.language || (codeBlocks[0]?.language !== 'text' ? codeBlocks[0]?.language : 'swift'),
       code: codeBlocks.map(b => b.code).join('\n\n'),
       codeBlocks,
       usageGuide,
-      usageGuide_cn: frontmatter.usageGuide_cn || '',
-      usageGuide_en: frontmatter.usageGuide_en || '',
       headers,
       includeHeaders: headers.length > 0,
       frontmatter,
@@ -169,16 +166,13 @@ export class RecipeParser {
       items: [{
         title,
         summary: '',
-        summary_cn: '',
-        summary_en: '',
+        description: '',
         trigger: this.#generateTrigger(title),
         category: 'Utility',
         language,
         code: content,
         codeBlocks: [{ language, code: content }],
         usageGuide: '',
-        usageGuide_cn: '',
-        usageGuide_en: '',
         headers: this.#extractHeaders(content),
         includeHeaders: false,
         frontmatter: {},
@@ -252,16 +246,13 @@ export class RecipeParser {
     return {
       title,
       summary: '',
-      summary_cn: '',
-      summary_en: '',
+      description: '',
       trigger: this.#generateTrigger(title),
       category: 'Utility',
       language,
       code,
       codeBlocks: codeBlocks.length > 0 ? codeBlocks : [{ language, code }],
       usageGuide: '',
-      usageGuide_cn: '',
-      usageGuide_en: '',
       headers: this.#extractHeaders(code),
       includeHeaders: false,
       frontmatter: {},

package/lib/service/search/SearchEngine.js

@@ -15,6 +15,8 @@ const BM25_B = 0.75;
 
 /**
  * 分词: 中英文混合分词
+ * 英文: camelCase / PascalCase 拆分 + 小写化
+ * 中文: 单字 + 二元组（bigram）— 无需分词词典即可支持子串匹配
  */
 export function tokenize(text) {
   if (!text) return [];
@@ -23,7 +25,35 @@ export function tokenize(text) {
   // 拆全大写前缀：URLSession → URL Session, UITableView → UI Table View
   expanded = expanded.replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2');
   const normalized = expanded.toLowerCase().replace(/[^\p{L}\p{N}\s_-]/gu, ' ');
-  const tokens = normalized.split(/[\s_-]+/).filter(t => t.length >= 2);
+  const rawTokens = normalized.split(/[\s_-]+/).filter(t => t.length >= 1);
+
+  const tokens = [];
+  // CJK 正则（中日韩统一表意文字 + 扩展区）
+  const cjkRe = /[\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff]/;
+
+  for (const raw of rawTokens) {
+    if (cjkRe.test(raw)) {
+      // 中文片段：提取所有 CJK 连续子串，生成单字 + bigram 覆盖
+      const cjkChars = raw.match(/[\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff]+/g) || [];
+      for (const seg of cjkChars) {
+        // 单字
+        for (const ch of seg) tokens.push(ch);
+        // bigram
+        for (let i = 0; i < seg.length - 1; i++) tokens.push(seg[i] + seg[i + 1]);
+        // 完整片段（≥3 字时额外保留，提升精确匹配权重）
+        if (seg.length >= 3) tokens.push(seg);
+      }
+      // 非 CJK 部分（英文/数字）也保留
+      const nonCjk = raw.replace(/[\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff]+/g, ' ').trim();
+      if (nonCjk) {
+        for (const t of nonCjk.split(/\s+/)) {
+          if (t.length >= 2) tokens.push(t);
+        }
+      }
+    } else if (raw.length >= 2) {
+      tokens.push(raw);
+    }
+  }
   return [...new Set(tokens)];
 }
 
@@ -126,13 +156,21 @@ export class SearchEngine {
     this._cache.clear();
 
     try {
-      // 索引 Recipes（统一模型，包含所有知识类型）
-      const recipes = this.db.prepare(
-        `SELECT id, title, description, language, category, knowledge_type, kind, content_json, status, tags_json, "trigger"
-         FROM recipes WHERE status != 'deprecated'`
-      ).all();
+      let entries = [];
+
+      try {
+        entries = this.db.prepare(
+          `SELECT id, title, description, language, category, knowledgeType, kind,
+                  content AS content_json, lifecycle, tags AS tags_json, trigger
+           FROM knowledge_entries WHERE lifecycle != 'deprecated'`
+        ).all();
+        entries = entries.map(e => ({
+          ...e,
+          status: e.lifecycle,
+        }));
+      } catch { /* table may not exist */ }
 
-      for (const r of recipes) {
+      for (const r of entries) {
         let contentText = '';
         try {
           const content = JSON.parse(r.content_json || '{}');
@@ -141,14 +179,14 @@ export class SearchEngine {
         // 包含 tags + trigger 提升召回率
         let tagText = '';
         try { tagText = JSON.parse(r.tags_json || '[]').join(' '); } catch { /* ignore */ }
-        const text = [r.title, r.description, r.trigger, r.language, r.category, r.knowledge_type, tagText, contentText]
+        const text = [r.title, r.description, r.trigger, r.language, r.category, r.knowledgeType, tagText, contentText]
           .filter(Boolean).join(' ');
-        this.scorer.addDocument(r.id, text, { type: 'recipe', title: r.title, trigger: r.trigger || '', status: r.status, knowledgeType: r.knowledge_type, kind: r.kind || 'pattern', language: r.language || '', category: r.category || '' });
+        this.scorer.addDocument(r.id, text, { type: 'knowledge', title: r.title, trigger: r.trigger || '', status: r.status, knowledgeType: r.knowledgeType, kind: r.kind || 'pattern', language: r.language || '', category: r.category || '' });
       }
 
       this._indexed = true;
       this.logger.info('Search index built', {
-        recipes: recipes.length,
+        entries: entries.length,
         total: this.scorer.totalDocs,
       });
     } catch (err) {
@@ -229,14 +267,17 @@ export class SearchEngine {
     const escaped = query.replace(/[%_\\]/g, ch => `\\${ch}`);
     const pattern = `%${escaped}%`;
 
-    if (type === 'all' || type === 'recipe' || type === 'rule' || type === 'solution') {
+    if (type === 'all' || type === 'recipe' || type === 'knowledge' || type === 'rule' || type === 'solution') {
       try {
-        const rows = this.db.prepare(
-          `SELECT id, title, description, language, category, knowledge_type, kind, status, content_json, dimensions_json, "trigger", 'recipe' as type
-           FROM recipes
-           WHERE status != 'deprecated' AND (title LIKE ? ESCAPE '\\' OR description LIKE ? ESCAPE '\\' OR "trigger" LIKE ? ESCAPE '\\' OR content_json LIKE ? ESCAPE '\\')
-           LIMIT ?`
-        ).all(pattern, pattern, pattern, pattern, limit);
+        let rows = [];
+        try {
+          rows = this.db.prepare(
+            `SELECT id, title, description, language, category, knowledgeType, kind, lifecycle as status, content AS content_json, trigger, headers, moduleName, 'knowledge' as type
+             FROM knowledge_entries
+             WHERE lifecycle != 'deprecated' AND (title LIKE ? ESCAPE '\\' OR description LIKE ? ESCAPE '\\' OR trigger LIKE ? ESCAPE '\\' OR content LIKE ? ESCAPE '\\')
+             LIMIT ?`
+          ).all(pattern, pattern, pattern, pattern, limit);
+        } catch { /* table may not exist */ }
         // 基础相关性排序：trigger 精确 > 标题匹配 > 描述匹配 > 内容匹配
         const lowerQ = query.toLowerCase();
         results.push(...rows.map(r => {
@@ -341,7 +382,7 @@ export class SearchEngine {
   }
 
   /**
-   * 补充详细字段（content_json / dimensions_json / description / trigger）— 批量 IN 查询
+   * 补充详细字段（content / description / trigger）— 批量 IN 查询
    * 用于向量搜索结果与 BM25 结果的一致性
    */
   _supplementDetails(items) {
@@ -349,17 +390,21 @@ export class SearchEngine {
     try {
       const ids = items.map(it => it.id);
       const placeholders = ids.map(() => '?').join(',');
-      const rows = this.db.prepare(
-        `SELECT id, content_json, dimensions_json, description, "trigger" FROM recipes WHERE id IN (${placeholders})`
-      ).all(...ids);
+      let rows = [];
+      try {
+        rows = this.db.prepare(
+          `SELECT id, content AS content_json, description, trigger, headers, moduleName FROM knowledge_entries WHERE id IN (${placeholders})`
+        ).all(...ids);
+      } catch { /* table may not exist */ }
       const rowMap = new Map(rows.map(r => [r.id, r]));
       for (const item of items) {
         const row = rowMap.get(item.id);
         if (row) {
           item.content_json = row.content_json || null;
-          item.dimensions_json = row.dimensions_json || null;
           item.description = item.description || row.description || '';
           item.trigger = item.trigger || row.trigger || '';
+          if (row.headers) item.headers = row.headers;
+          if (row.moduleName) item.moduleName = row.moduleName;
         }
       }
     } catch { /* DB may not be available */ }

package/lib/service/skills/SignalCollector.js

@@ -336,11 +336,16 @@ export class SignalCollector {
   #collectRecipeSignals() {
     try {
       if (!this.#db) return [];
+      // V3: knowledge_entries 统一表，统计字段在 stats/quality JSON 中
       const rows = this.#db.prepare(
-        `SELECT id, title, knowledge_type, category, language,
-                adoption_count, application_count, success_count,
-                quality_overall, updated_at
-         FROM recipes ORDER BY updated_at DESC LIMIT 30`
+        `SELECT id, title, knowledgeType, category, language,
+                json_extract(stats, '$.adoptions') as adoption_count,
+                json_extract(stats, '$.applications') as application_count,
+                json_extract(quality, '$.overall') as quality_overall,
+                updatedAt
+         FROM knowledge_entries
+         WHERE lifecycle = 'active'
+         ORDER BY updatedAt DESC LIMIT 30`
       ).all();
       return rows;
     } catch { return []; }
@@ -349,12 +354,12 @@ export class SignalCollector {
   #collectCandidateSignals() {
     try {
       if (!this.#db) return [];
+      // V3: candidates 已合并到 knowledge_entries，lifecycle='pending' 即为候选
       const rows = this.#db.prepare(
-        `SELECT id, source, status, language, category,
-                json_extract(metadata_json, '$.title') as title,
-                created_at
-         FROM candidates WHERE status = 'pending'
-         ORDER BY created_at DESC LIMIT 30`
+        `SELECT id, source, lifecycle as status, language, category,
+                title, createdAt
+         FROM knowledge_entries WHERE lifecycle = 'pending'
+         ORDER BY createdAt DESC LIMIT 30`
       ).all();
       return rows;
     } catch { return []; }

package/lib/service/skills/SkillAdvisor.js

@@ -202,8 +202,8 @@ export class SkillAdvisor {
       // 按 category 分布
       const categories = this.#db.prepare(`
         SELECT category, COUNT(*) as cnt
-        FROM recipes
-        WHERE category IS NOT NULL AND category != ''
+        FROM knowledge_entries
+        WHERE lifecycle = 'active' AND category IS NOT NULL AND category != ''
         GROUP BY category
         ORDER BY cnt DESC
       `).all();
@@ -211,8 +211,8 @@ export class SkillAdvisor {
       // 按 language 分布
       const languages = this.#db.prepare(`
         SELECT language, COUNT(*) as cnt
-        FROM recipes
-        WHERE language IS NOT NULL AND language != ''
+        FROM knowledge_entries
+        WHERE lifecycle = 'active' AND language IS NOT NULL AND language != ''
         GROUP BY language
         ORDER BY cnt DESC
       `).all();
@@ -231,14 +231,15 @@ export class SkillAdvisor {
         });
       }
 
-      // 高使用量 Recipe 统计（adoption_count + application_count >= 5）
+      // 高使用量 Recipe 统计（V3: stats JSON 中的 adoptions + applications）
       let hotRecipes = [];
       try {
         hotRecipes = this.#db.prepare(`
           SELECT title, category,
-                 (adoption_count + application_count) as total_usage
-          FROM recipes
-          WHERE (adoption_count + application_count) >= 5
+                 (COALESCE(json_extract(stats, '$.adoptions'), 0) + COALESCE(json_extract(stats, '$.applications'), 0)) as total_usage
+          FROM knowledge_entries
+          WHERE lifecycle = 'active'
+            AND (COALESCE(json_extract(stats, '$.adoptions'), 0) + COALESCE(json_extract(stats, '$.applications'), 0)) >= 5
           ORDER BY total_usage DESC
           LIMIT 10
         `).all();
@@ -262,12 +263,13 @@ export class SkillAdvisor {
     if (!this.#db) return { summary: 'DB 不可用', suggestions };
 
     try {
+      // V3: candidates 已合并到 knowledge_entries，ifecycle='pending' 即为候选
       const stats = this.#db.prepare(`
         SELECT
           COUNT(*) as total,
-          SUM(CASE WHEN status='pending' THEN 1 ELSE 0 END) as pending,
-          SUM(CASE WHEN status='rejected' THEN 1 ELSE 0 END) as rejected
-        FROM candidates
+          SUM(CASE WHEN lifecycle='pending' THEN 1 ELSE 0 END) as pending,
+          SUM(CASE WHEN lifecycle='deprecated' THEN 1 ELSE 0 END) as rejected
+        FROM knowledge_entries
       `).get();
 
       // 大量被拒绝 → 提示候选质量 Skill

package/lib/service/snippet/SnippetFactory.js

@@ -45,16 +45,16 @@ const SNIPPET_TEMPLATE = `<?xml version="1.0" encoding="UTF-8"?>
 
 export class SnippetFactory {
   /**
-   * @param {object} [recipeRepository] — RecipeRepositoryImpl (可选，用于列表查询)
+   * @param {object} [knowledgeRepository] — KnowledgeRepositoryImpl（可选，用于列表查询）
    */
-  constructor(recipeRepository) {
-    this._recipeRepo = recipeRepository || null;
+  constructor(knowledgeRepository) {
+    this._recipeRepo = knowledgeRepository || null;
   }
 
   /**
-   * 运行时注入 recipeRepository（用于延迟绑定场景）
+   * 运行时注入 knowledgeRepository（用于延迟绑定场景）
    */
-  setRecipeRepository(repo) {
+  setKnowledgeRepository(repo) {
     this._recipeRepo = repo;
   }
 

package/lib/service/spm/SpmService.js

@@ -777,33 +777,25 @@ export class SpmService {
   }
 
   /**
-   * 共用增强管线：语义字段标准化 + RecipeExtractor 标签 + QualityScorer 评分
+   * 共用增强管线：补充 extract_recipes handler 未覆盖的增量增强。
+   * extract_recipes handler 已负责：normalizeSemanticFields + RecipeExtractor + QualityScorer + V3 结构化。
+   * 此方法仅做以下增量处理：
+   *   - 确保 normalizeSemanticFields 已执行（幂等，防止非 ChatAgent 路径跳过）
+   *   - 若 handler 未注入质量评分，由 SpmService 补充
    */
   _enrichRecipes(recipes) {
     for (const recipe of recipes) {
-      SpmService.normalizeSemanticFields(recipe);
-
-      if (this.#recipeExtractor && recipe.code) {
-        try {
-          const extracted = this.#recipeExtractor.extractFromContent(
-            recipe.code, `${recipe.title || 'unknown'}.${recipe.language || 'swift'}`, ''
-          );
-          if (extracted.semanticTags?.length > 0) {
-            recipe.tags = [...new Set([...(recipe.tags || []), ...extracted.semanticTags])];
-          }
-          if ((!recipe.category || recipe.category === 'Utility') && extracted.category && extracted.category !== 'general') {
-            recipe.category = extracted.category;
-          }
-        } catch (e) {
-          this.#logger.debug(`[SpmService] RecipeExtractor enrichment failed: ${e.message}`);
-        }
-      }
-
-      if (this.#qualityScorer) {
+      // QualityScorer 评分（程序化，仅在未评分时补充）
+      if (!recipe.quality && this.#qualityScorer) {
         try {
           const scoreResult = this.#qualityScorer.score(recipe);
-          recipe.qualityScore = scoreResult.score;
-          recipe.qualityGrade = scoreResult.grade;
+          recipe.quality = {
+            completeness: 0,
+            adaptation: 0,
+            documentation: 0,
+            overall: scoreResult.score ?? 0,
+            grade: scoreResult.grade || '',
+          };
         } catch (e) {
           this.#logger.debug(`[SpmService] QualityScorer failed: ${e.message}`);
         }
@@ -1157,32 +1149,7 @@ export class SpmService {
    * - 确保 rationale / knowledgeType / complexity / scope 就位
    */
   static normalizeSemanticFields(recipe) {
-    // preconditions → constraints.preconditions
-    if (Array.isArray(recipe.preconditions) && recipe.preconditions.length > 0) {
-      if (!recipe.constraints) recipe.constraints = {};
-      if (!recipe.constraints.preconditions) {
-        recipe.constraints.preconditions = recipe.preconditions;
-      }
-      delete recipe.preconditions;
-    }
-
-    // steps: string[] → [{title, description}]
-    if (Array.isArray(recipe.steps)) {
-      recipe.steps = recipe.steps.map((s, i) => {
-        if (typeof s === 'string') {
-          return { title: `Step ${i + 1}`, description: s, code: '' };
-        }
-        return s; // already structured
-      });
-    }
-
-    // knowledgeType 默认值
-    if (!recipe.knowledgeType) recipe.knowledgeType = 'code-pattern';
-    // complexity 默认值
-    if (!recipe.complexity) recipe.complexity = 'intermediate';
-    // scope 默认值
-    if (!recipe.scope) recipe.scope = 'project-specific';
-
+    // V3: AI 已输出完整结构，不再填充默认值
     return recipe;
   }
 

package/lib/shared/RecipeReadinessChecker.js

@@ -19,7 +19,7 @@ const WHITELISTED_CATEGORIES = ['bootstrap', 'knowledge', 'general'];
 /**
  * 检查候选是否具备直接提升为 Recipe 的所有必要字段。
  *
- * @param {object} item  扁平字段对象（title, trigger, summary_cn …）
+ * @param {object} item  扁平字段对象（title, trigger, description …）
  *                       —— MCP handler 传入 tool params；
  *                       ChatAgent / bootstrap 需先从 metadata 展开。
  * @returns {{ ready: boolean, missing: string[], suggestions: string[] }}
@@ -43,15 +43,10 @@ export function checkRecipeReadiness(item) {
     suggestions.push(`trigger "${item.trigger}" 应以 @ 开头`);
   }
 
-  const summaryCn = item.summary_cn || item.summary;
-  if (!summaryCn) {
-    missing.push('summary_cn');
-    suggestions.push('请提供中文摘要（≤100字）');
-  }
-
-  if (!item.summary_en) {
-    missing.push('summary_en');
-    suggestions.push('请提供英文摘要（≤100 words），提升检索与 AI 理解');
+  const description = item.description || item.summary;
+  if (!description) {
+    missing.push('description');
+    suggestions.push('请提供描述（≤100字）');
   }
 
   if (!Array.isArray(item.headers) || item.headers.length === 0) {
@@ -60,7 +55,7 @@ export function checkRecipeReadiness(item) {
   }
 
   // ── 建议 ──
-  if (!item.usageGuide && !item.usageGuide_cn) {
+  if (!item.usageGuide) {
     missing.push('usageGuide');
     suggestions.push('请提供使用指南（Markdown ### 章节格式）');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosnippet",
-  "version": "2.9.0",
+  "version": "2.11.0",
   "description": "AutoSnippet - 连接开发者、AI 与项目知识库的工具",
   "type": "module",
   "main": "lib/bootstrap.js",

package/scripts/install-cursor-skill.js

@@ -22,7 +22,6 @@ const require = createRequire(import.meta.url);
 import fs from 'node:fs';
 import path from 'node:path';
 import * as defaults from '../lib/infrastructure/config/Defaults.js';
-import { RecipeStatsTracker } from '../lib/service/recipe/RecipeStatsTracker.js';
 
 const autoSnippetRoot = path.join(__dirname, '..');
 const skillsSource = path.join(autoSnippetRoot, 'skills');
@@ -156,11 +155,6 @@ function buildProjectRecipesContext(projectRoot) {
   if (!fs.existsSync(recipesDir)) return null;
   const mdFiles = collectMdFiles(recipesDir, recipesDir).sort();
   if (mdFiles.length === 0) return null;
-  let stats = { byFile: {} };
-  try {
-    const tracker = new RecipeStatsTracker(projectRoot);
-    stats = tracker.getStats();
-  } catch (_) {}
 
   const lines = [
     '# Project Recipes Index\n\n',