autosnippet 3.3.5 → 3.3.7

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

@@ -15,42 +15,15 @@
  * @module handlers/bootstrap-external
  */
 import path from 'node:path';
+import { CleanupService } from '#service/cleanup/CleanupService.js';
 import { resolveProjectRoot } from '#shared/resolveProjectRoot.js';
+import { buildProjectSnapshot } from '#types/project-snapshot-builder.js';
+import { toSessionCache } from '#types/snapshot-views.js';
 import { envelope } from '../envelope.js';
-import { BootstrapSessionManager } from './bootstrap/BootstrapSession.js';
 import { buildMissionBriefing } from './bootstrap/MissionBriefingBuilder.js';
 import { runAllPhases } from './bootstrap/shared/bootstrap-phases.js';
+import { getOrCreateSessionManager } from './bootstrap/shared/session-helpers.js';
 import { buildLanguageExtension } from './LanguageExtensions.js';
-// ── 进程级 Session 管理器 ─────────────────────────────────
-let _sessionManager = null;
-/**
- * 获取或创建 BootstrapSessionManager
- * @param container ServiceContainer
- */
-function getSessionManager(container) {
-    // 优先使用容器注册的 (如果已注册)
-    try {
-        const mgr = container.get('bootstrapSessionManager');
-        if (mgr) {
-            return mgr;
-        }
-    }
-    catch {
-        /* not registered yet */
-    }
-    // 降级为模块级单例
-    if (!_sessionManager) {
-        _sessionManager = new BootstrapSessionManager();
-    }
-    // 注册到容器，让 submitKnowledgeBatch / consolidated 等 handler 也能访问
-    try {
-        container.register('bootstrapSessionManager', () => _sessionManager);
-    }
-    catch {
-        /* already registered or container doesn't support register */
-    }
-    return _sessionManager;
-}
 // ── 主入口 ─────────────────────────────────────────────────────
 /**
  * bootstrapExternal — 外部 Agent 驱动的一键冷启动
@@ -65,7 +38,17 @@ export async function bootstrapExternal(ctx) {
     const t0 = Date.now();
     const projectRoot = resolveProjectRoot(ctx.container);
     // ═══════════════════════════════════════════════════════════
-    // Phase 1-4: 共享数据收集管线
+    // Step 1: 全量清理 (CleanupService.fullReset)
+    // ═══════════════════════════════════════════════════════════
+    const db = ctx.container.get('database');
+    const cleanupService = new CleanupService({
+        projectRoot,
+        db,
+        logger: ctx.logger,
+    });
+    const cleanupResult = await cleanupService.fullReset();
+    // ═══════════════════════════════════════════════════════════
+    // Phase 1-4: 共享数据收集管线（永远全量，无增量检测）
     // ═══════════════════════════════════════════════════════════
     const phaseResults = await runAllPhases(projectRoot, ctx, {
         maxFiles: 500,
@@ -74,7 +57,7 @@ export async function bootstrapExternal(ctx) {
         summaryPrefix: 'Bootstrap-external scan',
         clearOldData: true,
         generateReport: true,
-        incremental: true,
+        incremental: false,
     });
     // 空项目 fast-path
     if (phaseResults.isEmpty) {
@@ -84,12 +67,19 @@ export async function bootstrapExternal(ctx) {
             meta: { tool: 'autosnippet_bootstrap', responseTimeMs: Date.now() - t0 },
         });
     }
-    const { allFiles, primaryLang, depGraphData, langStats, astProjectSummary, codeEntityResult, callGraphResult, guardAudit, activeDimensions: dimensions, targetsSummary, langProfile, incrementalPlan, } = phaseResults;
+    const { allFiles, primaryLang, depGraphData, langStats, astProjectSummary, codeEntityResult, callGraphResult, guardAudit, activeDimensions: dimensions, targetsSummary, localPackageModules, langProfile, } = phaseResults;
+    // ── Build immutable ProjectSnapshot ──
+    const snapshot = buildProjectSnapshot({
+        projectRoot,
+        sourceTag: 'bootstrap-external',
+        ...phaseResults,
+        report: phaseResults.report,
+    });
     // ═══════════════════════════════════════════════════════════
     // Phase 4: 构建 Mission Briefing
     // ═══════════════════════════════════════════════════════════
     // 创建 BootstrapSession
-    const sessionManager = getSessionManager(ctx.container);
+    const sessionManager = getOrCreateSessionManager(ctx.container);
     const session = sessionManager.createSession({
         projectRoot,
         dimensions,
@@ -101,17 +91,7 @@ export async function bootstrapExternal(ctx) {
         },
     });
     // 缓存 Phase 结果供 wiki_plan 复用
-    session.setPhaseCache({
-        allFiles,
-        astProjectSummary,
-        codeEntityResult,
-        callGraphResult,
-        depGraphData,
-        guardAudit,
-        langStats,
-        primaryLang,
-        targetsSummary,
-    });
+    session.setSnapshotCache(toSessionCache(snapshot));
     // 构建 projectMeta
     const projectMeta = {
         name: path.basename(projectRoot),
@@ -119,7 +99,7 @@ export async function bootstrapExternal(ctx) {
         secondaryLanguages: langProfile.secondary || [],
         isMultiLang: langProfile.isMultiLang || false,
         fileCount: allFiles.length,
-        projectType: phaseResults.discoverer.id,
+        projectType: snapshot.discoverer.id,
         projectRoot,
     };
     // 构建 Mission Briefing
@@ -134,9 +114,9 @@ export async function bootstrapExternal(ctx) {
         activeDimensions: dimensions,
         session,
         languageExtension: buildLanguageExtension(primaryLang), // §7.1
-        incrementalPlan,
         languageStats: langStats,
-        panoramaResult: phaseResults.panoramaResult, // §M1: Phase 1.8 全景数据
+        panoramaResult: snapshot.panorama, // §M1: Phase 1.8 全景数据
+        localPackageModules, // 本地子包模块信息
     });
     // 附加 warnings
     if (phaseResults.warnings.length > 0) {
@@ -147,7 +127,17 @@ export async function bootstrapExternal(ctx) {
         `${briefing.meta?.responseSizeKB || '?'}KB — session ${session.id}`);
     return envelope({
         success: true,
-        data: briefing,
+        data: {
+            cleanup: {
+                deletedRecipes: cleanupResult.deletedFiles,
+                clearedTables: cleanupResult.clearedTables.length,
+                dbCleared: true,
+                errors: cleanupResult.errors,
+                trash: cleanupResult.trash ?? null,
+                purgedTrash: cleanupResult.purgedTrash ?? null,
+            },
+            ...briefing,
+        },
         message: `⚠️ Bootstrap 仅完成第一步（项目扫描），你必须继续完成全部 ${dimensions.length} 个维度的分析。` +
             `请立即按 executionPlan.tiers 的顺序，对每个维度执行：` +
             `(1) 用你的代码阅读能力分析该维度相关文件 → ` +
@@ -164,7 +154,7 @@ export async function bootstrapExternal(ctx) {
  * 仍然返回该 session（支持新 bootstrap 创建后旧 session 的 dimension_complete 继续工作）。
  */
 export function getActiveSession(container, sessionId) {
-    const mgr = getSessionManager(container);
+    const mgr = getOrCreateSessionManager(container);
     const session = mgr.getSession(sessionId);
     if (session) {
         return session;

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

@@ -64,6 +64,8 @@ interface BootstrapKnowledgeArgs {
     incremental?: boolean;
     skipAsyncFill?: boolean;
     loadSkills?: boolean;
+    /** 仅运行指定维度（传维度 id 数组），不传则运行全部活跃维度 */
+    dimensions?: string[];
     [key: string]: unknown;
 }
 /**

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

@@ -46,15 +46,23 @@
  *   bootstrap/dimensions.js   ← 7 维度知识提取器（内部 Agent 专用）
  *   bootstrap/projectSkills.js ← Phase 5.5 Project Skill 生成（内部 Agent 专用）
  */
+import path from 'node:path';
 import { getInternalAgentRequiredFields } from '#domain/knowledge/FieldSpec.js';
+import { CleanupService } from '#service/cleanup/CleanupService.js';
 import { resolveProjectRoot } from '#shared/resolveProjectRoot.js';
+import { buildProjectSnapshot } from '#types/project-snapshot-builder.js';
+import { toSessionCache } from '#types/snapshot-views.js';
 import { envelope } from '../envelope.js';
 import { fillDimensionsV3 } from './bootstrap/pipeline/orchestrator.js';
 import { bootstrapRefine } from './bootstrap/refine.js';
+import { buildTaskDefs, dispatchPipelineFill, startTaskManagerSession, } from './bootstrap/shared/async-fill-helpers.js';
 import { runAllPhases } from './bootstrap/shared/bootstrap-phases.js';
 import { buildInternalNextSteps } from './bootstrap/shared/dimension-text.js';
-import { buildLanguageExtension, inferLang } from './LanguageExtensions.js';
-import { inferFilePriority, inferTargetRole } from './TargetClassifier.js';
+import { summarizePanorama } from './bootstrap/shared/panorama-utils.js';
+import { getOrCreateSessionManager } from './bootstrap/shared/session-helpers.js';
+import { buildTargetFileMap } from './bootstrap/shared/target-file-map.js';
+import { buildLanguageExtension } from './LanguageExtensions.js';
+import { inferTargetRole } from './TargetClassifier.js';
 export { bootstrapRefine };
 /**
  * bootstrapKnowledge — 一键初始化知识库 (Skill-aware)
@@ -81,6 +89,22 @@ export async function bootstrapKnowledge(ctx, args) {
     const contentMaxLines = args.contentMaxLines || 120;
     const skipAsyncFill = args.skipAsyncFill || false;
     // ═══════════════════════════════════════════════════════════
+    // Step 0: 全量清理 (与 bootstrap-external 对齐)
+    // 冷启动需要干净的初始状态：清除 DB + 文件系统缓存
+    // ═══════════════════════════════════════════════════════════
+    const db = ctx.container.get('database');
+    const cleanupService = new CleanupService({
+        projectRoot,
+        db,
+        logger: ctx.logger,
+    });
+    const cleanupResult = await cleanupService.fullReset();
+    ctx.logger.info('[Bootstrap-Internal] fullReset complete', {
+        tables: cleanupResult.clearedTables.length,
+        files: cleanupResult.deletedFiles,
+        errors: cleanupResult.errors.length,
+    });
+    // ═══════════════════════════════════════════════════════════
     // Phase 1-4: 共享管线（文件收集→AST→依赖→Guard→维度解析）
     // ═══════════════════════════════════════════════════════════
     const phaseResults = await runAllPhases(projectRoot, ctx, {
@@ -99,7 +123,20 @@ export async function bootstrapKnowledge(ctx, args) {
             meta: { tool: 'autosnippet_bootstrap', responseTimeMs: Date.now() - t0 },
         });
     }
-    const { allFiles, allTargets, discoverer, langStats, primaryLang, astProjectSummary, astContext, depGraphData, depEdgesWritten, guardAudit, guardEngine: _guardEngine, activeDimensions, enhancementPackInfo, enhancementPatterns, enhancementGuardRules, langProfile, targetsSummary, incrementalPlan, detectedFrameworks: _detectedFrameworks, warnings: _phaseWarnings, report: phaseReport, } = phaseResults;
+    // ═══════════════════════════════════════════════════════════
+    // 构建 ProjectSnapshot — 统一数据来源
+    // ═══════════════════════════════════════════════════════════
+    const snapshot = buildProjectSnapshot({
+        projectRoot,
+        sourceTag: 'bootstrap',
+        ...phaseResults,
+        report: phaseResults.report,
+    });
+    // 从 snapshot 派生局部别名（兼容既有 responseData 构建逻辑）
+    const { allFiles, allTargets, discoverer, ast: astProjectSummary, astContext, dependencyGraph: depGraphData, depEdgesWritten, guardAudit, activeDimensions, enhancementPackInfo, enhancementPatterns, enhancementGuardRules, language, targetsSummary, incrementalPlan, codeEntityGraph: codeEntityResult, callGraph: callGraphResult, localPackageModules, warnings: phaseWarnings, phaseReport, } = snapshot;
+    const langStats = language.stats;
+    const primaryLang = language.primaryLang;
+    const langProfile = language;
     // 构建兼容的 report 对象（保持原有 API 格式）
     const report = {
         phases: {
@@ -141,8 +178,10 @@ export async function bootstrapKnowledge(ctx, args) {
             },
             callGraph: phaseReport?.phases?.callGraph
                 ? {
-                    entities: phaseReport.phases.callGraph.result?.entitiesUpserted || 0,
-                    edges: phaseReport.phases.callGraph.result?.edgesCreated || 0,
+                    entities: phaseReport.phases.callGraph.result
+                        ?.entitiesUpserted || 0,
+                    edges: phaseReport.phases.callGraph.result
+                        ?.edgesCreated || 0,
                     ms: phaseReport.phases.callGraph.ms || 0,
                 }
                 : { entities: 0, edges: 0, ms: 0 },
@@ -169,32 +208,24 @@ export async function bootstrapKnowledge(ctx, args) {
     // ═══════════════════════════════════════════════════════════
     // Phase 4.5: 构建响应 — filesByTarget + analysisFramework
     // ═══════════════════════════════════════════════════════════
-    const targetFileMap = {};
-    for (const f of allFiles) {
-        if (!targetFileMap[f.targetName]) {
-            targetFileMap[f.targetName] = [];
-        }
-        const lines = f.content.split('\n');
-        targetFileMap[f.targetName].push({
-            name: f.name,
-            relativePath: f.relativePath,
-            language: inferLang(f.name),
-            totalLines: lines.length,
-            priority: inferFilePriority(f.name),
-            // content 仅保留在内存中供 Phase 5 异步 pipeline 使用
-            // MCP 响应不包含文件内容（避免 1MB+ 响应导致 Cursor 无法处理）
-            content: lines.slice(0, contentMaxLines).join('\n'),
-            truncated: lines.length > contentMaxLines,
-        });
-    }
-    // 每个 target 内按 priority 排序
-    for (const tName of Object.keys(targetFileMap)) {
-        const prio = { high: 0, medium: 1, low: 2 };
-        targetFileMap[tName].sort((a, b) => (prio[a.priority] || 1) -
-            (prio[b.priority] || 1));
+    const targetFileMap = buildTargetFileMap(allFiles, contentMaxLines, true);
+    let dimensions = activeDimensions;
+    // 如果调用方指定了维度子集，只保留匹配的维度
+    if (args.dimensions?.length) {
+        const requestedIds = new Set(args.dimensions);
+        dimensions = dimensions.filter((d) => requestedIds.has(d.id));
+        ctx.logger.info(`[Bootstrap] Dimension filter: ${dimensions.map((d) => d.id).join(', ')}`);
     }
-    const dimensions = activeDimensions;
     const responseData = {
+        // Step 0 清理信息（与 bootstrap-external 对齐）
+        cleanup: {
+            deletedRecipes: cleanupResult.deletedFiles,
+            clearedTables: cleanupResult.clearedTables.length,
+            dbCleared: true,
+            errors: cleanupResult.errors,
+            trash: cleanupResult.trash ?? null,
+            purgedTrash: cleanupResult.purgedTrash ?? null,
+        },
         report,
         targets: targetsSummary ||
             allTargets.map((t) => {
@@ -269,9 +300,9 @@ export async function bootstrapKnowledge(ctx, args) {
         astContext: astContext || null,
         astSummary: astProjectSummary
             ? {
-                classes: astProjectSummary.classes.length,
-                protocols: astProjectSummary.protocols.length,
-                categories: astProjectSummary.categories.length,
+                classes: astProjectSummary.classes?.length || 0,
+                protocols: astProjectSummary.protocols?.length || 0,
+                categories: astProjectSummary.categories?.length || 0,
                 patterns: Object.keys(astProjectSummary.patternStats || {}),
                 metrics: astProjectSummary.projectMetrics
                     ? {
@@ -292,10 +323,55 @@ export async function bootstrapKnowledge(ctx, args) {
                 guardRules: enhancementGuardRules.length,
             }
             : null,
+        // 代码实体图谱摘要（与 bootstrap-external 对齐）
+        codeEntityGraph: codeEntityResult
+            ? {
+                totalEntities: codeEntityResult.entityCount || 0,
+                totalEdges: codeEntityResult.edgeCount || 0,
+            }
+            : null,
+        // 调用图谱摘要（与 bootstrap-external 对齐）
+        callGraph: callGraphResult
+            ? {
+                entitiesUpserted: callGraphResult.entitiesUpserted || 0,
+                edgesCreated: callGraphResult.edgesCreated || 0,
+            }
+            : null,
+        // 全景分析摘要（与 bootstrap-external 对齐）
+        panorama: snapshot.panorama ? summarizePanorama(snapshot.panorama) : null,
+        // 本地子包模块（与 bootstrap-external mustCoverModules 对齐）
+        localPackageModules: localPackageModules.length > 0 ? localPackageModules : null,
+        // Phase 1-4 警告（与 bootstrap-external 对齐）
+        warnings: phaseWarnings.length > 0 ? phaseWarnings : undefined,
         // 引导 Agent 下一步操作（共享文本层）
         nextSteps: buildInternalNextSteps(dimensions),
     };
     // ═══════════════════════════════════════════════════════════
+    // Phase 4.6: BootstrapSessionManager — 缓存 Phase 结果供 wiki_plan 复用
+    // （与 bootstrap-external 对齐）
+    // ═══════════════════════════════════════════════════════════
+    try {
+        const sessionManager = getOrCreateSessionManager(ctx.container);
+        const bsSession = sessionManager.createSession({
+            projectRoot,
+            dimensions: dimensions.map((d) => ({
+                ...d,
+                skillMeta: d.skillMeta ?? undefined,
+            })),
+            projectContext: {
+                projectName: path.basename(projectRoot),
+                primaryLang,
+                fileCount: allFiles.length,
+                modules: depGraphData?.nodes?.length || 0,
+            },
+        });
+        bsSession.setSnapshotCache(toSessionCache(snapshot));
+        responseData.sessionId = bsSession.id;
+    }
+    catch (e) {
+        ctx.logger.warn(`[Bootstrap-Internal] BootstrapSessionManager setup failed (non-blocking): ${e instanceof Error ? e.message : String(e)}`);
+    }
+    // ═══════════════════════════════════════════════════════════
     // Phase 5: 创建异步任务 — 骨架先返回，内容后填充
     //
     // 策略变更（v5）：
@@ -304,65 +380,24 @@ export async function bootstrapKnowledge(ctx, args) {
     //       前端通过 Socket.io 接收进度更新，卡片 loading → 完成
     // ═══════════════════════════════════════════════════════════
     // 构建任务定义列表
-    const taskDefs = dimensions.map((dim) => ({
-        id: dim.id,
-        meta: {
-            type: dim.skillWorthy ? 'skill' : 'candidate',
-            dimId: dim.id,
-            label: dim.label,
-            skillWorthy: !!dim.skillWorthy,
-            skillMeta: dim.skillMeta || null,
-        },
-    }));
+    const taskDefs = buildTaskDefs(dimensions);
     // 启动 BootstrapTaskManager 会话（通过正式 DI 获取单例）
-    let bootstrapSession = null;
-    try {
-        const taskManager = ctx.container.get('bootstrapTaskManager');
-        bootstrapSession = taskManager.startSession(taskDefs);
-    }
-    catch (e) {
-        ctx.logger.warn(`[Bootstrap] BootstrapTaskManager init failed (graceful degradation): ${e instanceof Error ? e.message : String(e)}`);
-    }
+    const bootstrapSession = startTaskManagerSession(ctx.container, taskDefs, ctx.logger, 'Bootstrap');
     // 立即构建骨架响应
     responseData.bootstrapSession = bootstrapSession ? bootstrapSession.toJSON() : null;
     responseData.bootstrapCandidates = { created: 0, failed: 0, errors: [], status: 'filling' };
     responseData.autoSkills = { created: 0, failed: 0, skills: [], errors: [], status: 'filling' };
     responseData.message = `Bootstrap 骨架已创建: ${allFiles.length} files, ${allTargets.length} targets, ${taskDefs.length} 个维度任务已排队，正在后台逐一填充...`;
     // ── 异步后台填充（fire-and-forget）──
-    const fillContext = {
-        ctx,
-        dimensions,
-        allFiles,
-        targetFileMap,
-        depGraphData,
-        guardAudit,
-        langStats,
-        primaryLang,
-        astProjectSummary,
-        taskManager: (() => {
-            try {
-                return ctx.container.get('bootstrapTaskManager');
-            }
-            catch {
-                return null;
-            }
-        })(),
-        sessionId: bootstrapSession?.id || null,
-        projectRoot,
-        // v5.0: 增量 Bootstrap 计划
-        incrementalPlan,
-        // M1: Phase 1.8 全景数据 → strategyContext.panorama
-        panoramaResult: phaseResults.panoramaResult,
-    };
-    // 使用 setImmediate 避免阻塞 HTTP 响应
     // skipAsyncFill: CLI 非 --wait 模式跳过异步填充，避免进程退出后 DB 断连
     if (!skipAsyncFill) {
-        setImmediate(() => {
-            ctx.logger.info(`[Bootstrap] Dispatching v3 AI-First pipeline`);
-            fillDimensionsV3(fillContext).catch((e) => {
-                ctx.logger.error(`[Bootstrap] Async fill (v3) failed: ${e.message}`);
-            });
-        });
+        dispatchPipelineFill({
+            snapshot,
+            ctx: ctx,
+            bootstrapSession,
+            targetFileMap,
+            projectRoot,
+        }, dimensions, fillDimensionsV3, 'Bootstrap');
     }
     else {
         ctx.logger.info(`[Bootstrap] Async fill skipped (skipAsyncFill=true)`);

package/dist/lib/external/mcp/handlers/consolidated.d.ts

@@ -526,10 +526,10 @@ export declare function consolidatedSkill(ctx: McpContext, args: ConsolidatedSki
  * 统一提交管线：单条与批量走同一代码路径。
  *
  * 流程:
- *   1. 解析 items[] → 限流
- *   2. 严格校验所有条目（UnifiedValidator）→ valid[] + rejected[]
- *   3. 融合分析（ConsolidationAdvisor.analyzeBatch）→ submittable[] + blocked[]
- *   4. 提交 submittable → enrich + service.create()
+ *   1. 限流
+ *   2. V3 字段增强（MCP 特有预处理）
+ *   3. RecipeProductionGateway.create() — 统一管道
+ *   4. Bootstrap session 追踪
  *   5. 返回统一结果
  *
  * 设计原则：