autosnippet 3.2.7 → 3.2.8

package/lib/service/knowledge/CodeEntityGraph.js

@@ -664,19 +664,281 @@ export class CodeEntityGraph {
       lines.push('');
     }
 
+    // 调用图热路径 (Phase 5)
+    try {
+      const hotCallees = this.db
+        .prepare(
+          `SELECT to_id, COUNT(*) as call_count
+           FROM knowledge_edges
+           WHERE relation = 'calls'
+           GROUP BY to_id
+           ORDER BY call_count DESC
+           LIMIT 15`
+        )
+        .all();
+
+      if (hotCallees.length > 0) {
+        lines.push('### 调用图热路径 (Call Graph Hot Paths)');
+        for (const row of hotCallees) {
+          // 查找前几个调用者
+          const topCallers = this.db
+            .prepare(
+              `SELECT from_id FROM knowledge_edges
+               WHERE relation = 'calls' AND to_id = ?
+               LIMIT 3`
+            )
+            .all(row.to_id);
+          const callerNames = topCallers.map((c) => `\`${c.from_id}\``).join(', ');
+          lines.push(
+            `- \`${row.to_id}\` ← ${row.call_count} 次调用 (${callerNames}${topCallers.length < row.call_count ? '...' : ''})`
+          );
+        }
+        lines.push('');
+      }
+
+      // 数据流边摘要
+      const dataFlowCount = this.db
+        .prepare(
+          `SELECT COUNT(*) as cnt FROM knowledge_edges WHERE relation = 'data_flow'`
+        )
+        .get();
+
+      if (dataFlowCount?.cnt > 0) {
+        lines.push(`### 数据流`);
+        lines.push(`- 数据流边: ${dataFlowCount.cnt} 条`);
+        lines.push('');
+      }
+    } catch (_e) {
+      // 调用图数据可能尚未填充, 静默跳过
+    }
+
     return lines.join('\n');
   }
 
+  // ────────────────────────────────────────────
+  // Public API — Phase 5: 调用图
+  // ────────────────────────────────────────────
+
+  /**
+   * 从解析后的调用边填充图谱 (Phase 5)
+   *
+   * @param {Array<{ caller: string, callee: string, callType: string, resolveMethod: string, line: number, file: string, isAwait: boolean }>} callEdges
+   * @param {Array<{ from: string, to: string, flowType: string, direction: string }>} dataFlowEdges
+   * @returns {GraphPopulateResult}
+   */
+  populateCallGraph(callEdges, dataFlowEdges) {
+    const t0 = Date.now();
+    let edges = 0;
+    let entities = 0;
+
+    const run = this.db.transaction(() => {
+      // ── 注册方法实体 (确保 from/to 的 entity 存在) ──
+      const registeredMethods = new Set();
+      for (const edge of callEdges) {
+        for (const fqn of [edge.caller, edge.callee]) {
+          if (registeredMethods.has(fqn)) continue;
+          registeredMethods.add(fqn);
+
+          const entityId = this._extractEntityId(fqn);
+          const entityName = entityId; // 短名
+          const filePath = fqn.includes('::') ? fqn.split('::')[0] : null;
+
+          this.#upsertEntity({
+            entityId,
+            entityType: 'method',
+            name: entityName,
+            filePath,
+            metadata: { fqn, source: 'phase5-call-graph' },
+          });
+          entities++;
+        }
+      }
+
+      // ── 调用边 (聚合同一 caller-callee 对的多次调用，解决 Issue #4) ──
+      const aggregated = new Map(); // key = "callerId|calleeId" → aggregated metadata
+      for (const edge of callEdges) {
+        const callerId = this._extractEntityId(edge.caller);
+        const calleeId = this._extractEntityId(edge.callee);
+        const key = `${callerId}|${calleeId}`;
+
+        if (aggregated.has(key)) {
+          const agg = aggregated.get(key);
+          agg.callCount++;
+          agg.callSites.push({ line: edge.line, isAwait: edge.isAwait });
+          // 提升权重: direct 优先
+          if (edge.resolveMethod === 'direct') agg.resolveMethod = 'direct';
+          if (edge.isAwait) agg.hasAwait = true;
+        } else {
+          aggregated.set(key, {
+            callerId,
+            calleeId,
+            callType: edge.callType,
+            resolveMethod: edge.resolveMethod,
+            file: edge.file,
+            hasAwait: edge.isAwait,
+            callCount: 1,
+            callSites: [{ line: edge.line, isAwait: edge.isAwait }],
+          });
+        }
+      }
+
+      for (const agg of aggregated.values()) {
+        this.#addEdge(agg.callerId, 'method', agg.calleeId, 'method', 'calls', {
+          weight: agg.resolveMethod === 'direct' ? 1.0 : 0.6,
+          source: 'phase5-call-graph',
+          callType: agg.callType,
+          resolveMethod: agg.resolveMethod,
+          file: agg.file,
+          isAwait: agg.hasAwait,
+          callCount: agg.callCount,
+          callSites: agg.callSites.slice(0, 10), // 最多保留 10 个调用点
+        });
+        edges++;
+      }
+
+      // ── 数据流边 ──
+      for (const flow of dataFlowEdges) {
+        const fromId = this._extractEntityId(flow.from);
+        const toId = this._extractEntityId(flow.to);
+
+        this.#addEdge(fromId, 'method', toId, 'method', 'data_flow', {
+          weight: 0.5,
+          source: 'phase5-data-flow',
+          flowType: flow.flowType,
+          direction: flow.direction,
+        });
+        edges++;
+      }
+    });
+
+    run();
+
+    const result = { entitiesUpserted: entities, edgesCreated: edges, durationMs: Date.now() - t0 };
+    this.log.info(
+      `[CodeEntityGraph] Call graph: ${callEdges.length} call edges, ${dataFlowEdges.length} data flow edges, ${entities} method entities (${result.durationMs}ms)`
+    );
+    return result;
+  }
+
+  /**
+   * 获取调用者 — 谁调用了这个方法？
+   *
+   * @param {string} methodId — "ClassName.methodName" 或 FQN
+   * @param {number} [maxDepth=2]
+   * @returns {Array<{ caller: string, depth: number, callType: string }>}
+   */
+  getCallers(methodId, maxDepth = 2) {
+    const results = [];
+    const visited = new Set();
+    const queue = [{ id: methodId, depth: 0 }];
+
+    while (queue.length > 0) {
+      const { id, depth } = queue.shift();
+      if (depth >= maxDepth || visited.has(id)) continue;
+      visited.add(id);
+
+      const callers = this.stmts.getCallers.all(id);
+
+      for (const row of callers) {
+        const meta = JSON.parse(row.metadata_json || '{}');
+        results.push({
+          caller: row.from_id,
+          depth: depth + 1,
+          callType: meta.callType || 'unknown',
+        });
+        if (depth + 1 < maxDepth) {
+          queue.push({ id: row.from_id, depth: depth + 1 });
+        }
+      }
+    }
+
+    return results;
+  }
+
+  /**
+   * 获取被调用者 — 这个方法调用了谁？
+   *
+   * @param {string} methodId — "ClassName.methodName" 或 FQN
+   * @param {number} [maxDepth=2]
+   * @returns {Array<{ callee: string, depth: number, callType: string }>}
+   */
+  getCallees(methodId, maxDepth = 2) {
+    const results = [];
+    const visited = new Set();
+    const queue = [{ id: methodId, depth: 0 }];
+
+    while (queue.length > 0) {
+      const { id, depth } = queue.shift();
+      if (depth >= maxDepth || visited.has(id)) continue;
+      visited.add(id);
+
+      const callees = this.stmts.getCallees.all(id);
+
+      for (const row of callees) {
+        const meta = JSON.parse(row.metadata_json || '{}');
+        results.push({
+          callee: row.to_id,
+          depth: depth + 1,
+          callType: meta.callType || 'unknown',
+        });
+        if (depth + 1 < maxDepth) {
+          queue.push({ id: row.to_id, depth: depth + 1 });
+        }
+      }
+    }
+
+    return results;
+  }
+
+  /**
+   * 获取方法的 Impact Radius (基于调用图)
+   * — 修改此方法可能影响哪些上游方法？
+   *
+   * @param {string} methodId — "ClassName.methodName"
+   * @returns {{ directCallers: number, transitiveCallers: number, affectedFiles: string[] }}
+   */
+  getCallImpactRadius(methodId) {
+    const callers = this.getCallers(methodId, 3);
+    const affectedFiles = new Set();
+
+    for (const c of callers) {
+      const entity = this.getEntity(c.caller, 'method');
+      if (entity?.filePath) affectedFiles.add(entity.filePath);
+    }
+
+    return {
+      directCallers: callers.filter((c) => c.depth === 1).length,
+      transitiveCallers: callers.length,
+      affectedFiles: [...affectedFiles],
+    };
+  }
+
+  /**
+   * 从 FQN 中提取短 Entity ID
+   *
+   * "src/service/UserService.ts::UserService.getUser" → "UserService.getUser"
+   * "src/utils/helpers.ts::formatDate" → "formatDate"
+   *
+   * @param {string} fqn
+   * @returns {string}
+   */
+  _extractEntityId(fqn) {
+    if (fqn.includes('::')) {
+      return fqn.split('::')[1];
+    }
+    return fqn;
+  }
+
   /**
    * 清除项目的所有代码实体 (重新 populate 前调用)
    */
   clearProject() {
     const run = this.db.transaction(() => {
       this.stmts.clearEntities.run(this.projectRoot);
-      // 只清除 AST 产出的边 (保留 recipe/module 边)
+      // 清除 AST 产出的边 + Phase 5 调用图边 (保留 recipe/module 边)
       this.db
         .prepare(
-          `DELETE FROM knowledge_edges WHERE metadata_json LIKE '%ast-bootstrap%' OR metadata_json LIKE '%ast-pattern-detection%'`
+          `DELETE FROM knowledge_edges WHERE metadata_json LIKE '%ast-bootstrap%' OR metadata_json LIKE '%ast-pattern-detection%' OR metadata_json LIKE '%phase5-%'`
         )
         .run();
     });
@@ -684,6 +946,55 @@ export class CodeEntityGraph {
     this.log.info(`[CodeEntityGraph] Cleared entities for project: ${this.projectRoot}`);
   }
 
+  /**
+   * 增量清除 — 仅删除指定文件的 call graph 边和 method 实体
+   *
+   * @param {string[]} filePaths — 变更文件的相对路径列表
+   * @returns {{ deletedEdges: number, deletedEntities: number }}
+   */
+  clearCallGraphForFiles(filePaths) {
+    if (!filePaths?.length) return { deletedEdges: 0, deletedEntities: 0 };
+
+    let deletedEdges = 0;
+    let deletedEntities = 0;
+
+    const run = this.db.transaction(() => {
+      // 1. 删除相关 call edges (metadata_json 包含 file 字段)
+      const deleteEdgesStmt = this.db.prepare(
+        `DELETE FROM knowledge_edges 
+         WHERE metadata_json LIKE ? 
+         AND (relation = 'calls' OR relation = 'data_flow')
+         AND metadata_json LIKE '%phase5-%'`
+      );
+
+      for (const filePath of filePaths) {
+        // 匹配 metadata 中 "file":"xxx" 字段
+        const result = deleteEdgesStmt.run(`%"file":"${filePath}"%`);
+        deletedEdges += result.changes;
+      }
+
+      // 2. 删除相关 method 实体
+      const deleteEntitiesStmt = this.db.prepare(
+        `DELETE FROM code_entities 
+         WHERE file_path = ? AND entity_type = 'method' AND project_root = ?`
+      );
+
+      for (const filePath of filePaths) {
+        const result = deleteEntitiesStmt.run(filePath, this.projectRoot);
+        deletedEntities += result.changes;
+      }
+    });
+
+    run();
+
+    this.log.info(
+      `[CodeEntityGraph] Incremental clear: ${deletedEdges} edges, ${deletedEntities} entities ` +
+      `for ${filePaths.length} files`
+    );
+
+    return { deletedEdges, deletedEntities };
+  }
+
   // ────────────────────────────────────────────
   // Private — Schema & Statements
   // ────────────────────────────────────────────
@@ -738,6 +1049,19 @@ export class CodeEntityGraph {
         INSERT OR REPLACE INTO knowledge_edges (from_id, from_type, to_id, to_type, relation, weight, metadata_json, created_at, updated_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
       `),
+      // Phase 5: 调用图查询 (pre-prepared 避免每次调用都创建)
+      getCallers: this.db.prepare(
+        `SELECT from_id, from_type, metadata_json FROM knowledge_edges
+         WHERE to_id = ? AND relation = 'calls'`
+      ),
+      getCallees: this.db.prepare(
+        `SELECT to_id, to_type, metadata_json FROM knowledge_edges
+         WHERE from_id = ? AND relation = 'calls'`
+      ),
+      getEdge: this.db.prepare(
+        `SELECT metadata_json FROM knowledge_edges
+         WHERE from_id = ? AND from_type = ? AND to_id = ? AND to_type = ? AND relation = ?`
+      ),
     };
   }
 
@@ -788,6 +1112,7 @@ export class CodeEntityGraph {
    * 从 AST 数据推断实体类型
    */
   #inferEntityType(name, astSummary) {
+    if (!name) return 'class'; // guard against undefined
     if (astSummary.protocols?.some((p) => p.name === name)) {
       return 'protocol';
     }

package/lib/service/knowledge/KnowledgeService.js

@@ -75,7 +75,7 @@ export class KnowledgeService {
         }
       }
 
-      // ── ConfidenceRouter — 仅标记 auto_approvable，不改变 lifecycle ──
+      // ── ConfidenceRouter — 标记 auto_approvable ──
       if (this._confidenceRouter) {
         const route = await this._confidenceRouter.route(entry);
         if (route.action === 'auto_approve') {
@@ -84,6 +84,10 @@ export class KnowledgeService {
         // reject / pending 都保持 pending 状态，等待人工审核
       }
 
+      // 注意: Bootstrap 候选保持 pending 状态，由 Dashboard 审核后发布。
+      // autoApprovable 标记保留，供前端显示「推荐批准」徽章。
+      // CursorDelivery 已支持高置信度 pending 条目的交付。
+
       const saved = await this.repository.create(entry);
 
       // 同步 relations → knowledge_edges

package/lib/service/module/ModuleService.js

@@ -314,7 +314,16 @@ export class ModuleService {
     const allNodes = [];
     const allEdges = [];
 
+    // 如果有专业 Discoverer（非 generic），则跳过 GenericDiscoverer 的依赖图
+    // 避免 generic fallback 生成的冗余根节点（如项目名本身）干扰图结构
+    const hasSpecializedDiscoverer = this.#activeDiscoverers.some(
+      ({ discoverer }) => discoverer.id !== 'generic'
+    );
+
     for (const { discoverer } of this.#activeDiscoverers) {
+      if (hasSpecializedDiscoverer && discoverer.id === 'generic') {
+        continue;
+      }
       try {
         const graph = await discoverer.getDependencyGraph();
         for (const n of graph.nodes || []) {

package/lib/service/wiki/WikiGenerator.js

@@ -82,7 +82,7 @@ export class WikiGenerator {
    * @param {object} deps
    * @param {string} deps.projectRoot
    * @param {import('../../service/module/ModuleService.js').ModuleService} [deps.moduleService]
-   * @param {import('../../platform/ios/spm/SpmService.js').SpmService} [deps.spmService] — 向后兼容
+   * @param {import('../../platform/ios/spm/SpmHelper.js').SpmHelper} [deps.spmService] — 向后兼容
    * @param {import('../../service/knowledge/KnowledgeService.js').KnowledgeService} [deps.knowledgeService]
    * @param {import('../../core/ast/ProjectGraph.js').default} [deps.projectGraph]
    * @param {import('../../service/knowledge/CodeEntityGraph.js').CodeEntityGraph} [deps.codeEntityGraph]

package/lib/shared/PathGuard.js

@@ -141,7 +141,7 @@ class PathGuard {
 
   /**
    * Layer 1: 断言路径在允许的边界范围内
-   * 用于修改已有文件的场景（如 XcodeIntegration 插入 header、SpmService 修改 Package.swift）
+   * 用于修改已有文件的场景（如 XcodeIntegration 插入 header、SpmHelper 修改 Package.swift）
    * @param {string} targetPath - 要写入的绝对路径
    * @throws {PathGuardError}
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosnippet",
-  "version": "3.2.7",
+  "version": "3.2.8",
   "description": "Extract code patterns into a knowledge base for AI coding assistants",
   "type": "module",
   "main": "lib/bootstrap.js",