autosnippet 3.3.7 → 3.3.8

package/dist/lib/external/mcp/handlers/bootstrap/pipeline/BootstrapSnapshot.js

@@ -8,12 +8,16 @@
  * 4. 提供增量 diff 计算
  *
  * 存储: SQLite bootstrap_snapshots + bootstrap_dim_files 表
+ * 所有操作使用 Drizzle 类型安全 API。
  *
  * @module pipeline/BootstrapSnapshot
  */
 import { createHash, randomUUID } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { relative } from 'node:path';
+import { and, desc, eq, sql } from 'drizzle-orm';
+import { getDrizzle } from '../../../../../infrastructure/database/drizzle/index.js';
+import { bootstrapDimFiles, bootstrapSnapshots, } from '../../../../../infrastructure/database/drizzle/schema.js';
 // ──────────────────────────────────────────────────────────────
 // 常量
 // ──────────────────────────────────────────────────────────────
@@ -25,21 +29,18 @@ const FULL_REBUILD_THRESHOLD = 0.5;
 // BootstrapSnapshot 类
 // ──────────────────────────────────────────────────────────────
 export class BootstrapSnapshot {
-    #db;
+    #drizzle;
     #logger;
-    #stmts;
-    /** @param db better-sqlite3 实例 */
+    /** @param db DatabaseConnection 或 better-sqlite3 实例 */
     constructor(db, { logger } = {}) {
         if (!db) {
             throw new Error('BootstrapSnapshot requires a database instance');
         }
-        this.#db =
-            typeof db?.getDb === 'function'
-                ? db.getDb()
-                : db;
+        this.#drizzle =
+            typeof db?.getDrizzle === 'function'
+                ? db.getDrizzle()
+                : getDrizzle();
         this.#logger = logger || null;
-        this.#ensureTable();
-        this.#prepareStatements();
     }
     // ─── 快照保存 ─────────────────────────────────────────
     /**
@@ -77,28 +78,30 @@ export class BootstrapSnapshot {
                 durationMs: stat.durationMs || 0,
             };
         }
-        // 事务保存
-        const saveTransaction = this.#db.transaction(() => {
+        // 事务保存（Drizzle 类型安全）
+        this.#drizzle.transaction((tx) => {
             // 主记录
-            this.#stmts.insertSnapshot.run({
+            tx.insert(bootstrapSnapshots)
+                .values({
                 id,
-                session_id: sessionId || null,
-                project_root: projectRoot,
-                created_at: now,
-                duration_ms: meta.durationMs || 0,
-                file_count: allFiles.length,
-                dimension_count: Object.keys(dimensionStats || {}).length,
-                candidate_count: meta.candidateCount || 0,
-                primary_lang: meta.primaryLang || null,
-                file_hashes: JSON.stringify(fileHashes),
-                dimension_meta: JSON.stringify(dimensionMeta),
-                episodic_data: episodicData ? JSON.stringify(episodicData) : null,
-                is_incremental: isIncremental ? 1 : 0,
-                parent_id: parentId,
-                changed_files: JSON.stringify(changedFiles),
-                affected_dims: JSON.stringify(affectedDims),
+                sessionId: sessionId || null,
+                projectRoot,
+                createdAt: now,
+                durationMs: meta.durationMs || 0,
+                fileCount: allFiles.length,
+                dimensionCount: Object.keys(dimensionStats || {}).length,
+                candidateCount: meta.candidateCount || 0,
+                primaryLang: meta.primaryLang || null,
+                fileHashes: JSON.stringify(fileHashes),
+                dimensionMeta: JSON.stringify(dimensionMeta),
+                episodicData: episodicData ? JSON.stringify(episodicData) : null,
+                isIncremental: isIncremental ? 1 : 0,
+                parentId: parentId,
+                changedFiles: JSON.stringify(changedFiles),
+                affectedDims: JSON.stringify(affectedDims),
                 status: 'complete',
-            });
+            })
+                .run();
             // 维度-文件关联
             for (const [dimId, stat] of Object.entries(dimensionStats || {})) {
                 const refFiles = stat.referencedFilesList || [];
@@ -108,18 +111,20 @@ export class BootstrapSnapshot {
                             ? relative(projectRoot, filePath)
                             : filePath
                         : filePath;
-                    this.#stmts.insertDimFile.run({
-                        snapshot_id: id,
-                        dim_id: dimId,
-                        file_path: rel,
+                    tx.insert(bootstrapDimFiles)
+                        .values({
+                        snapshotId: id,
+                        dimId,
+                        filePath: rel,
                         role: 'referenced',
-                    });
+                    })
+                        .onConflictDoNothing()
+                        .run();
                 }
             }
             // 容量控制: 保留最新 N 个
-            this.#enforceCapacity(projectRoot);
+            this.#enforceCapacity(projectRoot, tx);
         });
-        saveTransaction();
         this.#log(`Snapshot saved: ${id} (${allFiles.length} files, ${Object.keys(dimensionStats || {}).length} dims)`);
         return id;
     }
@@ -127,9 +132,13 @@ export class BootstrapSnapshot {
     /** 清除项目的所有快照 — 用于手动重新冷启动时强制全量 */
     clearProject(projectRoot) {
         try {
-            const rows = this.#stmts.listByProject.all(projectRoot, 9999);
+            const rows = this.#drizzle
+                .select({ id: bootstrapSnapshots.id })
+                .from(bootstrapSnapshots)
+                .where(eq(bootstrapSnapshots.projectRoot, projectRoot))
+                .all();
             for (const row of rows) {
-                this.#stmts.deleteById.run(row.id);
+                this.#drizzle.delete(bootstrapSnapshots).where(eq(bootstrapSnapshots.id, row.id)).run();
             }
             this.#log(`Cleared ${rows.length} snapshots for project`);
         }
@@ -144,7 +153,13 @@ export class BootstrapSnapshot {
      * @returns 快照数据
      */
     getLatest(projectRoot) {
-        const row = this.#stmts.getLatest.get(projectRoot);
+        const row = this.#drizzle
+            .select()
+            .from(bootstrapSnapshots)
+            .where(and(eq(bootstrapSnapshots.projectRoot, projectRoot), eq(bootstrapSnapshots.status, 'complete')))
+            .orderBy(desc(bootstrapSnapshots.createdAt))
+            .limit(1)
+            .get();
         if (!row) {
             return null;
         }
@@ -152,7 +167,11 @@ export class BootstrapSnapshot {
     }
     /** 根据 ID 加载快照 */
     getById(id) {
-        const row = this.#stmts.getById.get(id);
+        const row = this.#drizzle
+            .select()
+            .from(bootstrapSnapshots)
+            .where(eq(bootstrapSnapshots.id, id))
+            .get();
         if (!row) {
             return null;
         }
@@ -160,8 +179,13 @@ export class BootstrapSnapshot {
     }
     /** 获取项目的所有快照 (按时间降序) */
     list(projectRoot, limit = 10) {
-        return this.#stmts.listByProject
-            .all(projectRoot, limit)
+        return this.#drizzle
+            .select()
+            .from(bootstrapSnapshots)
+            .where(eq(bootstrapSnapshots.projectRoot, projectRoot))
+            .orderBy(desc(bootstrapSnapshots.createdAt))
+            .limit(limit)
+            .all()
             .map((r) => this.#deserialize(r));
     }
     // ─── 增量 Diff 计算 ──────────────────────────────────
@@ -277,13 +301,20 @@ export class BootstrapSnapshot {
     // ─── 维度-文件映射查询 ──────────────────────────────
     /** 获取某个快照中每个维度引用的文件集合 */
     #getDimFileMap(snapshotId) {
-        const rows = this.#stmts.getDimFiles.all(snapshotId);
+        const rows = this.#drizzle
+            .select({
+            dimId: bootstrapDimFiles.dimId,
+            filePath: bootstrapDimFiles.filePath,
+        })
+            .from(bootstrapDimFiles)
+            .where(eq(bootstrapDimFiles.snapshotId, snapshotId))
+            .all();
         const map = {};
         for (const row of rows) {
-            if (!map[row.dim_id]) {
-                map[row.dim_id] = new Set();
+            if (!map[row.dimId]) {
+                map[row.dimId] = new Set();
             }
-            map[row.dim_id].add(row.file_path);
+            map[row.dimId].add(row.filePath);
         }
         return map;
     }
@@ -367,9 +398,17 @@ export class BootstrapSnapshot {
             return '';
         }
     }
-    #enforceCapacity(projectRoot) {
+    #enforceCapacity(projectRoot, db = this.#drizzle) {
         try {
-            this.#stmts.enforceCapacity.run(projectRoot, projectRoot, MAX_SNAPSHOTS);
+            db.delete(bootstrapSnapshots)
+                .where(sql `${bootstrapSnapshots.projectRoot} = ${projectRoot}
+          AND ${bootstrapSnapshots.id} NOT IN (
+            SELECT ${bootstrapSnapshots.id} FROM ${bootstrapSnapshots}
+            WHERE ${bootstrapSnapshots.projectRoot} = ${projectRoot}
+            ORDER BY ${bootstrapSnapshots.createdAt} DESC
+            LIMIT ${MAX_SNAPSHOTS}
+          )`)
+                .run();
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -379,22 +418,22 @@ export class BootstrapSnapshot {
     #deserialize(row) {
         return {
             id: row.id,
-            sessionId: row.session_id ?? null,
-            projectRoot: row.project_root,
-            createdAt: row.created_at,
-            durationMs: row.duration_ms,
-            fileCount: row.file_count,
-            dimensionCount: row.dimension_count,
-            candidateCount: row.candidate_count,
-            primaryLang: row.primary_lang ?? null,
-            fileHashes: this.#safeParseJSON(row.file_hashes, {}),
-            dimensionMeta: this.#safeParseJSON(row.dimension_meta, {}),
-            episodicData: this.#safeParseJSON(row.episodic_data, null),
-            isIncremental: !!row.is_incremental,
-            parentId: row.parent_id ?? null,
-            changedFiles: this.#safeParseJSON(row.changed_files, []),
-            affectedDims: this.#safeParseJSON(row.affected_dims, []),
-            status: row.status,
+            sessionId: row.sessionId ?? null,
+            projectRoot: row.projectRoot,
+            createdAt: row.createdAt,
+            durationMs: row.durationMs ?? 0,
+            fileCount: row.fileCount ?? 0,
+            dimensionCount: row.dimensionCount ?? 0,
+            candidateCount: row.candidateCount ?? 0,
+            primaryLang: row.primaryLang ?? null,
+            fileHashes: this.#safeParseJSON(row.fileHashes, {}),
+            dimensionMeta: this.#safeParseJSON(row.dimensionMeta, {}),
+            episodicData: this.#safeParseJSON(row.episodicData, null),
+            isIncremental: !!row.isIncremental,
+            parentId: row.parentId ?? null,
+            changedFiles: this.#safeParseJSON(row.changedFiles, []),
+            affectedDims: this.#safeParseJSON(row.affectedDims, []),
+            status: row.status ?? 'complete',
         };
     }
     #safeParseJSON(str, fallback) {
@@ -410,95 +449,5 @@ export class BootstrapSnapshot {
             this.#logger[level](`[BootstrapSnapshot] ${msg}`);
         }
     }
-    // ─── 初始化 ───────────────────────────────────────────
-    #ensureTable() {
-        this.#db.exec(`
-      CREATE TABLE IF NOT EXISTS bootstrap_snapshots (
-        id               TEXT PRIMARY KEY,
-        session_id       TEXT,
-        project_root     TEXT NOT NULL,
-        created_at       TEXT NOT NULL,
-        duration_ms      INTEGER DEFAULT 0,
-        file_count       INTEGER DEFAULT 0,
-        dimension_count  INTEGER DEFAULT 0,
-        candidate_count  INTEGER DEFAULT 0,
-        primary_lang     TEXT,
-        file_hashes      TEXT NOT NULL DEFAULT '{}',
-        dimension_meta   TEXT NOT NULL DEFAULT '{}',
-        episodic_data    TEXT,
-        is_incremental   INTEGER DEFAULT 0,
-        parent_id        TEXT,
-        changed_files    TEXT DEFAULT '[]',
-        affected_dims    TEXT DEFAULT '[]',
-        status           TEXT DEFAULT 'complete'
-      );
-
-      CREATE TABLE IF NOT EXISTS bootstrap_dim_files (
-        snapshot_id      TEXT NOT NULL,
-        dim_id           TEXT NOT NULL,
-        file_path        TEXT NOT NULL,
-        role             TEXT DEFAULT 'referenced',
-        PRIMARY KEY (snapshot_id, dim_id, file_path),
-        FOREIGN KEY (snapshot_id) REFERENCES bootstrap_snapshots(id) ON DELETE CASCADE
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_snapshots_project
-        ON bootstrap_snapshots(project_root, created_at DESC);
-      CREATE INDEX IF NOT EXISTS idx_dim_files_file
-        ON bootstrap_dim_files(file_path);
-    `);
-    }
-    #prepareStatements() {
-        this.#stmts = {
-            insertSnapshot: this.#db.prepare(`
-        INSERT INTO bootstrap_snapshots
-          (id, session_id, project_root, created_at, duration_ms,
-           file_count, dimension_count, candidate_count, primary_lang,
-           file_hashes, dimension_meta, episodic_data,
-           is_incremental, parent_id, changed_files, affected_dims, status)
-        VALUES
-          (@id, @session_id, @project_root, @created_at, @duration_ms,
-           @file_count, @dimension_count, @candidate_count, @primary_lang,
-           @file_hashes, @dimension_meta, @episodic_data,
-           @is_incremental, @parent_id, @changed_files, @affected_dims, @status)
-      `),
-            insertDimFile: this.#db.prepare(`
-        INSERT OR IGNORE INTO bootstrap_dim_files (snapshot_id, dim_id, file_path, role)
-        VALUES (@snapshot_id, @dim_id, @file_path, @role)
-      `),
-            getLatest: this.#db.prepare(`
-        SELECT * FROM bootstrap_snapshots
-        WHERE project_root = ? AND status = 'complete'
-        ORDER BY created_at DESC
-        LIMIT 1
-      `),
-            getById: this.#db.prepare(`
-        SELECT * FROM bootstrap_snapshots WHERE id = ?
-      `),
-            listByProject: this.#db.prepare(`
-        SELECT * FROM bootstrap_snapshots
-        WHERE project_root = ?
-        ORDER BY created_at DESC
-        LIMIT ?
-      `),
-            getDimFiles: this.#db.prepare(`
-        SELECT dim_id, file_path FROM bootstrap_dim_files
-        WHERE snapshot_id = ?
-      `),
-            enforceCapacity: this.#db.prepare(`
-        DELETE FROM bootstrap_snapshots
-        WHERE project_root = ?
-        AND id NOT IN (
-          SELECT id FROM bootstrap_snapshots
-          WHERE project_root = ?
-          ORDER BY created_at DESC
-          LIMIT ?
-        )
-      `),
-            deleteById: this.#db.prepare(`
-        DELETE FROM bootstrap_snapshots WHERE id = ?
-      `),
-        };
-    }
 }
 export default BootstrapSnapshot;

package/dist/lib/external/mcp/handlers/bootstrap/pipeline/orchestrator.js

@@ -20,6 +20,7 @@ import { ExplorationTracker } from '#agent/context/ExplorationTracker.js';
 import { EpisodicConsolidator } from '#agent/domain/EpisodicConsolidator.js';
 import { ANALYST_BUDGET } from '#agent/domain/insight-analyst.js';
 import { MemoryCoordinator } from '#agent/memory/MemoryCoordinator.js';
+import { MemoryEmbeddingStore } from '#agent/memory/MemoryEmbeddingStore.js';
 import { PersistentMemory } from '#agent/memory/PersistentMemory.js';
 import { SessionStore } from '#agent/memory/SessionStore.js';
 import { PRESETS } from '#agent/presets.js';
@@ -159,7 +160,7 @@ export async function fillDimensionsV3(view, dimensions) {
                 timeoutMs: 15_000,
             })) ?? null;
         if (projectGraph) {
-            const overview = projectGraph.getOverview();
+            const overview = await projectGraph.getOverview();
             logger.info(`[Insight-v3] ProjectGraph: ${overview.totalClasses} classes, ${overview.totalProtocols} protocols (${overview.buildTimeMs}ms)`);
         }
     }
@@ -233,7 +234,11 @@ export async function fillDimensionsV3(view, dimensions) {
             catch {
                 // EmbedProvider 不可用时 fallback 到无向量模式
             }
-            semanticMemory = new PersistentMemory(db, { logger, embeddingFn });
+            semanticMemory = new PersistentMemory(db, {
+                logger,
+                embeddingFn,
+                embeddingStore: new MemoryEmbeddingStore(projectRoot),
+            });
             const smStats = semanticMemory.getStats();
             if (smStats.total > 0) {
                 logger.info(`[Insight-v3] Loaded ${smStats.total} semantic memories from previous bootstrap ` +
@@ -248,10 +253,11 @@ export async function fillDimensionsV3(view, dimensions) {
     let codeEntityGraphInst = null;
     try {
         const { CodeEntityGraph } = await import('#service/knowledge/CodeEntityGraph.js');
-        const db = ctx.container.get('database');
-        if (db) {
-            codeEntityGraphInst = new CodeEntityGraph(db, { projectRoot, logger });
-            const topo = codeEntityGraphInst.getTopology();
+        const entityRepo = ctx.container.get('codeEntityRepository');
+        const edgeRepo = ctx.container.get('knowledgeEdgeRepository');
+        if (entityRepo && edgeRepo) {
+            codeEntityGraphInst = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot, logger });
+            const topo = await codeEntityGraphInst.getTopology();
             if (topo.totalEntities > 0) {
                 logger.info(`[Insight-v3] CodeEntityGraph: ${topo.totalEntities} entities, ${topo.totalEdges} edges`);
             }
@@ -319,6 +325,7 @@ export async function fillDimensionsV3(view, dimensions) {
     // ── 跨维度去重集合 (实例级持久化，等效旧 ChatAgent.#globalSubmittedTitles/Patterns) ──
     const globalSubmittedTitles = new Set();
     const globalSubmittedPatterns = new Set();
+    const globalSubmittedTriggers = new Set();
     // ── Rescan 模式: 预种已有 recipe 标题到去重集合，防止重复创建 ──
     const existingRecipesList = existingRecipes;
     if (existingRecipesList && existingRecipesList.length > 0) {
@@ -327,8 +334,12 @@ export async function fillDimensionsV3(view, dimensions) {
             if (r.title && r.status !== 'decaying') {
                 globalSubmittedTitles.add(r.title.toLowerCase().trim());
             }
+            // ★ trigger 全部预种（含 decaying），防止 trigger 冲突
+            if (r.trigger) {
+                globalSubmittedTriggers.add(r.trigger.toLowerCase().trim());
+            }
         }
-        logger.info(`[Insight-v3] Rescan mode: seeded ${globalSubmittedTitles.size} existing recipe titles into dedup set`);
+        logger.info(`[Insight-v3] Rescan mode: seeded ${globalSubmittedTitles.size} titles + ${globalSubmittedTriggers.size} triggers into dedup set`);
     }
     // 构建 rescanContext 供 Analyst/Producer prompt 使用（区分 healthy/decaying）
     const rescanContext = existingRecipesList
@@ -597,6 +608,7 @@ export async function fillDimensionsV3(view, dimensions) {
                 sharedState: {
                     submittedTitles: globalSubmittedTitles,
                     submittedPatterns: globalSubmittedPatterns,
+                    submittedTriggers: globalSubmittedTriggers,
                     _dimensionMeta: {
                         id: dimId,
                         outputType: dimConfig.outputType || 'candidate',
@@ -994,9 +1006,10 @@ export async function fillDimensionsV3(view, dimensions) {
     // ═══════════════════════════════════════════════════════════
     try {
         const { CodeEntityGraph } = await import('#service/knowledge/CodeEntityGraph.js');
-        const db = ctx.container.get('database');
-        if (db) {
-            const ceg = new CodeEntityGraph(db, { projectRoot, logger });
+        const entityRepo = ctx.container.get('codeEntityRepository');
+        const edgeRepo = ctx.container.get('knowledgeEdgeRepository');
+        if (entityRepo && edgeRepo) {
+            const ceg = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot, logger });
             // 收集所有维度产出的候选 (从 Producer toolCalls 中提取)
             const allCandidates = [];
             for (const dimData of Object.values(dimensionCandidates)) {
@@ -1015,7 +1028,7 @@ export async function fillDimensionsV3(view, dimensions) {
                 }
             }
             if (allCandidates.length > 0) {
-                const relResult = ceg.populateFromCandidateRelations(allCandidates);
+                const relResult = await ceg.populateFromCandidateRelations(allCandidates);
                 logger.info(`[Insight-v3] Code Entity Graph relations: ${relResult.edgesCreated} edges from ${allCandidates.length} candidates (${relResult.durationMs}ms)`);
             }
         }
@@ -1033,7 +1046,10 @@ export async function fillDimensionsV3(view, dimensions) {
     try {
         const db = ctx.container.get('database');
         if (db) {
-            const semanticMemory = new PersistentMemory(db, { logger });
+            const semanticMemory = new PersistentMemory(db, {
+                logger,
+                embeddingStore: new MemoryEmbeddingStore(projectRoot),
+            });
             const consolidator = new EpisodicConsolidator(semanticMemory, { logger });
             consolidationResult = consolidator.consolidate(sessionStore, {
                 bootstrapSession: sessionId,
@@ -1152,10 +1168,11 @@ export async function fillDimensionsV3(view, dimensions) {
         // Phase E: 附加 Code Entity Graph 拓扑到报告
         try {
             const { CodeEntityGraph } = await import('#service/knowledge/CodeEntityGraph.js');
-            const db = ctx.container.get('database');
-            if (db) {
-                const ceg = new CodeEntityGraph(db, { projectRoot, logger });
-                const topo = ceg.getTopology();
+            const entityRepo = ctx.container.get('codeEntityRepository');
+            const edgeRepo = ctx.container.get('knowledgeEdgeRepository');
+            if (entityRepo && edgeRepo) {
+                const ceg = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot, logger });
+                const topo = await ceg.getTopology();
                 report.codeEntityGraph = {
                     entities: topo.entities,
                     edges: topo.edges,

package/dist/lib/external/mcp/handlers/bootstrap/shared/bootstrap-phases.d.ts

@@ -9,7 +9,7 @@
  *   Phase 1   → 文件收集（DiscovererRegistry → 多语言项目类型检测）
  *   Phase 1.5 → AST 代码结构分析（tree-sitter + SFC 预处理）
  *   Phase 1.6 → Code Entity Graph（代码实体关系图谱）
- *   Phase 1.8 → Panorama 全景汇总（RoleRefiner + CouplingAnalyzer + LayerInferrer）
+ *   Phase 2.2 → Panorama 全景汇总（RoleRefiner + CouplingAnalyzer + LayerInferrer）
  *   Phase 2   → 依赖关系 → knowledge_edges
  *   Phase 2.1 → Module 实体写入 Entity Graph
  *   Phase 3   → Guard 规则审计

package/dist/lib/external/mcp/handlers/bootstrap/shared/bootstrap-phases.js

@@ -9,7 +9,7 @@
  *   Phase 1   → 文件收集（DiscovererRegistry → 多语言项目类型检测）
  *   Phase 1.5 → AST 代码结构分析（tree-sitter + SFC 预处理）
  *   Phase 1.6 → Code Entity Graph（代码实体关系图谱）
- *   Phase 1.8 → Panorama 全景汇总（RoleRefiner + CouplingAnalyzer + LayerInferrer）
+ *   Phase 2.2 → Panorama 全景汇总（RoleRefiner + CouplingAnalyzer + LayerInferrer）
  *   Phase 2   → 依赖关系 → knowledge_edges
  *   Phase 2.1 → Module 实体写入 Entity Graph
  *   Phase 3   → Guard 规则审计
@@ -218,12 +218,13 @@ export async function runPhase1_6_EntityGraph(astProjectSummary, projectRoot, co
     if (astProjectSummary) {
         try {
             const { CodeEntityGraph } = await import('#service/knowledge/CodeEntityGraph.js');
-            const db = container.get('database');
-            if (db) {
-                const ceg = new CodeEntityGraph(db, { projectRoot });
-                ceg.clearProject();
+            const entityRepo = container.get('codeEntityRepository');
+            const edgeRepo = container.get('knowledgeEdgeRepository');
+            if (entityRepo && edgeRepo) {
+                const ceg = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot });
+                await ceg.clearProject();
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- ProjectAnalysisResult structurally compatible at runtime
-                codeEntityResult = ceg.populateFromAst(astProjectSummary);
+                codeEntityResult = await ceg.populateFromAst(astProjectSummary);
                 logger.info(`[Bootstrap] Entity Graph: ${codeEntityResult.entitiesUpserted} entities, ${codeEntityResult.edgesCreated} edges`);
             }
         }
@@ -279,14 +280,15 @@ export async function runPhase1_7_CallGraph(astProjectSummary, projectRoot, cont
                     minConfidence: 0.5,
                 });
         // 写入 CodeEntityGraph
-        const db = container.get('database');
-        if (db && result && result.callEdges.length > 0) {
-            const ceg = new CodeEntityGraph(db, { projectRoot });
+        const entityRepo = container.get('codeEntityRepository');
+        const edgeRepo = container.get('knowledgeEdgeRepository');
+        if (entityRepo && edgeRepo && result && result.callEdges.length > 0) {
+            const ceg = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot });
             // 增量模式: 先删除变更文件的旧边
             if (isIncremental) {
-                ceg.clearCallGraphForFiles(changedFiles ?? null);
+                await ceg.clearCallGraphForFiles(changedFiles ?? null);
             }
-            callGraphResult = ceg.populateCallGraph(result.callEdges, result.dataFlowEdges);
+            callGraphResult = await ceg.populateCallGraph(result.callEdges, result.dataFlowEdges);
             const partialTag = result.stats.partial ? ' [partial]' : '';
             const incrTag = isIncremental ? ' [incremental]' : '';
             logger.info(`[Bootstrap] Call Graph${incrTag}${partialTag}: ${result.callEdges.length} call edges, ` +
@@ -321,7 +323,7 @@ export async function runPhase2_DependencyGraph(discoverer, container, logger, s
         depGraphData = await discoverer.getDependencyGraph();
         if (knowledgeGraphService) {
             for (const edge of depGraphData.edges || []) {
-                const result = knowledgeGraphService.addEdge(edge.from, 'module', edge.to, 'module', 'depends_on', { weight: 1.0, source: `${discoverer.id}-${sourceTag}` });
+                const result = await knowledgeGraphService.addEdge(edge.from, 'module', edge.to, 'module', 'depends_on', { weight: 1.0, source: `${discoverer.id}-${sourceTag}` });
                 if (result?.success) {
                     depEdgesWritten++;
                 }
@@ -346,10 +348,11 @@ export async function runPhase2_1_ModuleEntities(depGraphData, projectRoot, cont
     }
     try {
         const { CodeEntityGraph } = await import('#service/knowledge/CodeEntityGraph.js');
-        const db = container.get('database');
-        if (db) {
-            const ceg = new CodeEntityGraph(db, { projectRoot });
-            const result = ceg.populateFromSpm(depGraphData);
+        const entityRepo = container.get('codeEntityRepository');
+        const edgeRepo = container.get('knowledgeEdgeRepository');
+        if (entityRepo && edgeRepo) {
+            const ceg = new CodeEntityGraph(entityRepo, edgeRepo, { projectRoot });
+            const result = await ceg.populateFromSpm(depGraphData);
             logger.info(`[Bootstrap] Entity Graph modules: ${result.entitiesUpserted} entities`);
         }
     }
@@ -637,42 +640,43 @@ export async function runAllPhases(projectRoot, ctx, options = {}) {
     if (report) {
         report.phases.callGraph = { result: phase1_7.callGraphResult, ms: Date.now() - p17Start };
     }
-    // ── Phase 1.8: Panorama 全景汇总 ──
+    // ── Phase 2: 依赖图 ──
+    const p2Start = Date.now();
+    const phase2 = await runPhase2_DependencyGraph(discoverer, ctx.container, ctx.logger, options.sourceTag || 'bootstrap');
+    warnings.push(...phase2.warnings);
+    if (report) {
+        report.phases.depGraph = {
+            edgesWritten: phase2.depEdgesWritten || 0,
+            ms: Date.now() - p2Start,
+        };
+    }
+    // ── Phase 2.1: Module 实体 ──
+    await runPhase2_1_ModuleEntities(phase2.depGraphData, projectRoot, ctx.container, ctx.logger);
+    // ── Phase 2.2: Panorama 全景汇总 ──
+    // 必须在 Phase 2.1 之后：此时 code_entities 中已有 module 记录
     let panoramaResult = null;
     try {
-        const panoramaService = ctx.container?.resolve?.('panoramaService');
+        const panoramaService = ctx.container.get('panoramaService');
         if (panoramaService &&
             typeof panoramaService.invalidate === 'function') {
-            const p18Start = Date.now();
+            const pPanoStart = Date.now();
             panoramaService.invalidate();
-            const result = panoramaService.getResult();
+            const result = await panoramaService.getResult();
             panoramaResult = result;
-            ctx.logger.info(`[Bootstrap] Phase 1.8: Panorama computed in ${Date.now() - p18Start}ms`);
+            ctx.logger.info(`[Bootstrap] Phase 2.2: Panorama computed in ${Date.now() - pPanoStart}ms`);
             if (report) {
-                const overview = panoramaService.getOverview();
+                const overview = await panoramaService.getOverview();
                 report.phases.panorama = {
                     moduleCount: overview.moduleCount ?? 0,
                     layerCount: overview.layerCount ?? 0,
-                    ms: Date.now() - p18Start,
+                    ms: Date.now() - pPanoStart,
                 };
             }
         }
     }
     catch (err) {
-        warnings.push(`Phase 1.8 panorama failed (non-blocking): ${err instanceof Error ? err.message : String(err)}`);
+        warnings.push(`Phase 2.2 panorama failed (non-blocking): ${err instanceof Error ? err.message : String(err)}`);
     }
-    // ── Phase 2: 依赖图 ──
-    const p2Start = Date.now();
-    const phase2 = await runPhase2_DependencyGraph(discoverer, ctx.container, ctx.logger, options.sourceTag || 'bootstrap');
-    warnings.push(...phase2.warnings);
-    if (report) {
-        report.phases.depGraph = {
-            edgesWritten: phase2.depEdgesWritten || 0,
-            ms: Date.now() - p2Start,
-        };
-    }
-    // ── Phase 2.1: Module 实体 ──
-    await runPhase2_1_ModuleEntities(phase2.depGraphData, projectRoot, ctx.container, ctx.logger);
     // ── Phase 3: Guard 审计 ──
     const p3Start = Date.now();
     const phase3 = await runPhase3_GuardAudit(allFiles, ctx.container, ctx.logger, {
@@ -766,7 +770,7 @@ export async function runAllPhases(projectRoot, ctx, options = {}) {
         warnings,
         report, // NEW: Phase 级报告 (null if generateReport=false)
         incrementalPlan, // NEW: 增量评估结果 (null if incremental=false)
-        panoramaResult, // Phase 1.8: 全景汇总 (null if panoramaService unavailable)
+        panoramaResult, // Phase 2.2: 全景汇总 (null if panoramaService unavailable)
         isEmpty: false,
     };
 }

package/dist/lib/external/mcp/handlers/bootstrap-external.js

@@ -115,7 +115,7 @@ export async function bootstrapExternal(ctx) {
         session,
         languageExtension: buildLanguageExtension(primaryLang), // §7.1
         languageStats: langStats,
-        panoramaResult: snapshot.panorama, // §M1: Phase 1.8 全景数据
+        panoramaResult: snapshot.panorama, // §M1: Phase 2.2 全景数据
         localPackageModules, // 本地子包模块信息
     });
     // 附加 warnings