autosnippet 3.2.3 → 3.2.6

package/lib/cli/deploy/FileManifest.js

@@ -0,0 +1,272 @@
+/**
+ * FileManifest — 所有可部署文件的单一真实来源
+ *
+ * Setup 和 Upgrade 共享同一份清单，由 FileDeployer 按策略执行。
+ *
+ * 字段说明：
+ *   id        — 唯一标识（用于日志和结果报告）
+ *   src       — 模板相对路径（相对于 templates/），null 表示需要 generate 函数
+ *   dest      — 目标相对路径（相对于 projectRoot）
+ *   strategy  — 部署策略（见 FileDeployer.STRATEGIES）
+ *   on        — 适用场景：'both' | 'setup' | 'upgrade'
+ *   chmod     — 是否需要 chmod +x（.sh 文件）
+ *   generate  — 自定义生成函数名（strategy 为 'generate' 时使用）
+ *   category  — 分组标签（用于 stepIDE 结果汇报）
+ */
+
+/**
+ * 部署策略：
+ *   'overwrite'         — AutoSnippet 完全拥有，始终覆盖
+ *   'overwrite-dir'     — 递归覆盖整个目录（只覆盖 AutoSnippet 的文件）
+ *   'signature-safe'    — 检查 AutoSnippet 签名再覆盖（保护用户自建文件）
+ *   'create-only'       — 仅在文件不存在时创建（不更新）
+ *   'merge-json'        — JSON 深度合并（只写入 autosnippet 键）
+ *   'merge-gitignore'   — 增量追加缺失的 gitignore 规则
+ *   'backup-overwrite'  — 备份旧文件后覆盖
+ *   'generate'          — 自定义生成逻辑（由 generate 函数处理）
+ *   'inject-marker'     — 在 <!-- autosnippet:begin/end --> 标记间注入/替换
+ */
+
+export const MANIFEST = [
+  // ═══ MCP Config ═══════════════════════════════════════
+  {
+    id: 'cursor-mcp',
+    dest: '.cursor/mcp.json',
+    strategy: 'merge-json',
+    on: 'both',
+    category: 'mcp',
+    jsonKey: 'mcpServers',
+  },
+  {
+    id: 'vscode-mcp',
+    dest: '.vscode/mcp.json',
+    strategy: 'merge-json',
+    on: 'both',
+    category: 'mcp',
+    jsonKey: 'servers',
+  },
+
+  // ═══ Cursor Rules（AutoSnippet 完全拥有） ═══════════
+  {
+    id: 'cursor-conventions',
+    src: 'cursor-rules/autosnippet-conventions.mdc',
+    dest: '.cursor/rules/autosnippet-conventions.mdc',
+    strategy: 'overwrite',
+    on: 'both',
+    category: 'cursor-rules',
+  },
+  {
+    id: 'cursor-skills-template',
+    src: 'cursor-rules/autosnippet-skills.mdc',
+    dest: '.cursor/rules/autosnippet-skills.mdc',
+    strategy: 'overwrite',
+    on: 'both',
+    category: 'cursor-rules',
+  },
+  {
+    id: 'cursor-workflow',
+    src: 'cursor-rules/autosnippet-workflow.mdc',
+    dest: '.cursor/rules/autosnippet-workflow.mdc',
+    strategy: 'overwrite',
+    on: 'both',
+    category: 'cursor-rules',
+  },
+
+  // ═══ Cursor Hooks ═════════════════════════════════════
+  {
+    id: 'cursor-hooks-json',
+    src: 'cursor-hooks/hooks.json',
+    dest: '.cursor/hooks.json',
+    strategy: 'overwrite',
+    on: 'both',
+    category: 'cursor-hooks',
+  },
+  {
+    id: 'cursor-hooks-dir',
+    src: 'cursor-hooks/hooks/',
+    dest: '.cursor/hooks/',
+    strategy: 'overwrite-dir',
+    on: 'both',
+    category: 'cursor-hooks',
+    chmod: true,
+  },
+
+  // ═══ Cursor Commands ══════════════════════════════════
+  {
+    id: 'cursor-commands',
+    src: 'cursor-hooks/commands/',
+    dest: '.cursor/commands/',
+    strategy: 'overwrite-dir',
+    on: 'both',
+    category: 'cursor-commands',
+  },
+
+  // ═══ Claude Code ══════════════════════════════════════
+  {
+    id: 'claude-code',
+    src: 'claude-code/',
+    dest: '.claude/',
+    strategy: 'overwrite-dir',
+    on: 'both',
+    category: 'claude-hooks',
+    chmod: true,
+    cleanup: ['.claude/hooks.yaml'],  // 清理旧格式文件
+  },
+
+  // ═══ Agent Instructions（签名保护）════════════════════
+  {
+    id: 'copilot-instructions',
+    src: 'copilot-instructions.md',
+    dest: '.github/copilot-instructions.md',
+    strategy: 'signature-safe',
+    on: 'both',
+    category: 'copilot-instructions',
+    fallback: 'inject-marker',  // 签名保护失败时，用标记注入
+  },
+  {
+    id: 'agents-md',
+    strategy: 'generate',
+    generate: 'generateAgentsMd',
+    dest: 'AGENTS.md',
+    on: 'setup',
+    category: 'agent-instructions',
+  },
+
+  // ═══ CI/CD ════════════════════════════════════════════
+  {
+    id: 'guard-ci',
+    src: 'guard-ci.yml',
+    dest: '.github/workflows/autosnippet-guard.yml',
+    strategy: 'signature-safe',
+    on: 'both',
+    category: 'guard-ci',
+  },
+  {
+    id: 'pre-commit',
+    src: 'pre-commit-guard.sh',
+    dest: null,  // 动态决定：.husky/pre-commit 或 .git/hooks/pre-commit
+    strategy: 'create-only',
+    on: 'setup',
+    category: 'pre-commit-hook',
+    chmod: true,
+    resolveDest: 'resolvePreCommitDest',
+  },
+
+  // ═══ Constitution ═════════════════════════════════════
+  // setup 由 stepCoreRepo 处理（create-only 语义）
+  // upgrade 时备份旧文件后覆盖
+  {
+    id: 'constitution',
+    src: 'constitution.yaml',
+    dest: 'AutoSnippet/constitution.yaml',
+    strategy: 'backup-overwrite',
+    on: 'upgrade',
+    category: 'constitution',
+    requireDir: 'AutoSnippet',
+  },
+
+  // ═══ Gitignore ════════════════════════════════════════
+  {
+    id: 'gitignore',
+    strategy: 'merge-gitignore',
+    dest: '.gitignore',
+    on: 'both',
+    category: 'gitignore',
+  },
+
+  // ═══ Skills ═══════════════════════════════════════════
+  {
+    id: 'skills-install',
+    strategy: 'generate',
+    generate: 'installSkills',
+    on: 'both',
+    category: 'skills',
+  },
+  {
+    id: 'skills-ensure-dir',
+    strategy: 'generate',
+    generate: 'ensureSkillsDir',
+    on: 'both',
+    category: 'skills',
+  },
+
+  // ═══ Dynamic Agent Instructions (requires DB) ════════
+  {
+    id: 'cursor-delivery',
+    strategy: 'generate',
+    generate: 'triggerCursorDelivery',
+    on: 'upgrade',
+    category: 'agent-instructions',
+  },
+
+  // ═══ Auto-approve injection ═══════════════════════════
+  // setup 不注入 autoApprove — 让用户首次使用时亲眼授权每个工具
+  // bootstrap 成功后由 bootstrap-external.js 自动注入
+  {
+    id: 'auto-approve',
+    strategy: 'generate',
+    generate: 'injectAutoApprove',
+    on: 'upgrade',
+    category: 'mcp',
+  },
+
+  // ═══ VSCode Extension ═════════════════════════════════
+  {
+    id: 'vscode-extension',
+    strategy: 'generate',
+    generate: 'installVSCodeExtension',
+    on: 'setup',
+    category: 'vscode-extension',
+  },
+];
+
+/**
+ * .gitignore 规则清单 — Setup 和 Upgrade 共用
+ * 每条规则：{ pattern, comment, negation? }
+ */
+export const GITIGNORE_RULES = [
+  // 核心运行时
+  { pattern: '.autosnippet/*', comment: 'AutoSnippet 运行时缓存（不入库）' },
+  { pattern: '!.autosnippet/config.json', negation: true },
+
+  // 环境变量
+  { pattern: '.env', comment: 'AutoSnippet 环境变量（含 API Key，不入库）' },
+
+  // 日志
+  { pattern: 'logs/', comment: 'AutoSnippet 运行日志' },
+
+  // AI 草稿
+  { pattern: '.autosnippet-drafts/', comment: 'AutoSnippet AI 草稿（临时）' },
+  { pattern: '_draft_*.md', comment: 'AutoSnippet AI 草稿文件（项目根目录临时文件）' },
+
+  // 系统 / 编辑器临时文件
+  { pattern: '.DS_Store', comment: 'macOS 元数据' },
+  { pattern: 'nohup.out' },
+  { pattern: '*.sw[a-p]' },
+];
+
+/**
+ * .gitignore 迁移规则 — 升级时清理旧格式
+ */
+export const GITIGNORE_MIGRATIONS = [
+  // v2.4.0: ".autosnippet/" → ".autosnippet/*"
+  { find: /^\.autosnippet\/$/m, replace: '.autosnippet/*' },
+  // Skills 已迁移到 AutoSnippet/skills/，清理旧 negation
+  { find: /^!?\.autosnippet\/skills\/.*\n?/gm, replace: '' },
+];
+
+/**
+ * MCP Server 配置生成器
+ * @param {string} projectRoot
+ * @param {'cursor'|'vscode'} ide
+ */
+export function buildMcpServerEntry(projectRoot, ide) {
+  const base = {
+    command: 'asd-mcp',
+    env: { ASD_PROJECT_DIR: projectRoot },
+  };
+  if (ide === 'vscode') {
+    return { type: 'stdio', ...base };
+  }
+  return base;
+}

package/lib/external/mcp/McpServer.js

@@ -38,9 +38,7 @@ import * as systemHandlers from './handlers/system.js';
 // ─── External Agent Bootstrap 新 handler ──────────────────────
 
 import { bootstrapExternal } from './handlers/bootstrap-external.js';
-import { decideHandler } from './handlers/decide.js';
 import { dimensionComplete } from './handlers/dimension-complete-external.js';
-import { readyHandler } from './handlers/ready.js';
 import { taskHandler } from './handlers/task.js';
 import { wikiFinalize, wikiPlan } from './handlers/wiki-external.js';
 
@@ -185,6 +183,12 @@ export class McpServer {
     }
 
     const wrapped = wrapHandler(name, handler);
+
+    // Track task operation for _injectDecisions
+    if (name === 'autosnippet_task') {
+      this._lastTaskOperation = args.operation || '';
+    }
+
     const result = await wrapped(ctx, args);
 
     // ── P0+P3: Decision 注入 + Session 追踪 ──
@@ -211,10 +215,10 @@ export class McpServer {
    * 在工具返回结果中注入 decisions 摘要 + 更新 session 统计
    *
    * 策略：
-   *   - ready: 刷新缓存，不额外注入（response 本身含 decisions）
-   *   - decide 写操作: invalidate 缓存（下次查询拉最新）
+   *   - prime: 刷新缓存，不额外注入（response 本身含 decisions）
+   *   - decision 写操作 (record/revise/unpin): invalidate 缓存（下次查询拉最新）
    *   - 其他工具: 注入 _activeDecisions 摘要
-   *   - 首次未调 ready 的工具: 注入更强提醒
+   *   - 首次未调 prime 的工具: 注入更强提醒
    *
    * @param {string} toolName
    * @param {object} result — handler 返回的 envelope 对象
@@ -225,26 +229,20 @@ export class McpServer {
     this._session.toolsUsed.add(toolName);
     this._session.lastActivityAt = Date.now();
 
-    // 1) ready 工具：刷新缓存 + 标记 session
-    if (toolName === 'autosnippet_ready') {
-      this._session.readyCalled = true;
-      this._refreshCacheFromReady(result);
-      return result;
-    }
-
-    // 2) decide 写操作：invalidate 缓存（record/revise/unpin 改变了 decisions）
-    if (toolName === 'autosnippet_decide') {
-      this._decisionCache.fetchedAt = 0;
-      this._decisionCache._pending = null;
-      return result;
-    }
-
-    // 3) autosnippet_task 也不注入（task 操作返回值已足够，避免 token 膨胀）
+    // 1) autosnippet_task: prime 刷新缓存，decision 写操作 invalidate 缓存
     if (toolName === 'autosnippet_task') {
+      const op = this._lastTaskOperation;
+      if (op === 'prime') {
+        this._session.readyCalled = true;
+        this._refreshCacheFromReady(result);
+      } else if (['record_decision', 'revise_decision', 'unpin_decision'].includes(op)) {
+        this._decisionCache.fetchedAt = 0;
+        this._decisionCache._pending = null;
+      }
       return result;
     }
 
-    // 4) 对非 ready/decide 工具：注入 decisions 摘要
+    // 4) 对非 task 操作工具：注入 decisions 摘要
     const decisions = await this._getDecisionsSummary();
     if (decisions.length > 0 && typeof result === 'object' && result !== null) {
       result._activeDecisions = decisions;
@@ -252,11 +250,11 @@ export class McpServer {
       // P3: 如果 ready 从未被调用，注入更强提醒
       if (!this._session.readyCalled) {
         result._decisionReminder =
-          '⚠️ You have NOT called autosnippet_ready() yet this session. ' +
-          'These decisions may affect your work. Call autosnippet_ready() for full context.';
+          '⚠️ You have NOT called autosnippet_task({ operation: "prime" }) yet this session. ' +
+          'These decisions may affect your work. Call autosnippet_task({ operation: "prime" }) for full context.';
       } else {
         result._decisionReminder =
-          'Respect these team decisions. Call autosnippet_decide({ operation: "list" }) for full details.';
+          'Respect these team decisions. Call autosnippet_task({ operation: "list_decisions" }) for full details.';
       }
     }
 
@@ -362,8 +360,6 @@ export class McpServer {
         knowledgeHandlers.submitKnowledgeBatch(ctx, args),
       autosnippet_save_document: (ctx, args) => knowledgeHandlers.saveDocument(ctx, args),
       autosnippet_skill: (ctx, args) => consolidated.consolidatedSkill(ctx, args),
-      autosnippet_ready: (ctx, args) => readyHandler(ctx, args),
-      autosnippet_decide: (ctx, args) => decideHandler(ctx, args),
       autosnippet_task: (ctx, args) => taskHandler(ctx, args),
       // ── External Agent Bootstrap (v3.1) ──
       autosnippet_bootstrap: (ctx, _args) => bootstrapExternal(ctx),

package/lib/external/mcp/autoApproveInjector.js

@@ -36,6 +36,7 @@ const AUTO_APPROVE_TOOLS = [
   'autosnippet_submit_knowledge_batch',
   'autosnippet_save_document',
   'autosnippet_skill',
+  'autosnippet_task',
   'autosnippet_bootstrap',
   'autosnippet_dimension_complete',
   'autosnippet_wiki_plan',

package/lib/external/mcp/handlers/bootstrap/BootstrapSession.js

@@ -16,7 +16,7 @@
  */
 
 import crypto from 'node:crypto';
-import { EpisodicMemory } from './pipeline/EpisodicMemory.js';
+import { SessionStore } from '../../../../service/chat/memory/SessionStore.js';
 import { ExternalSubmissionTracker } from './ExternalSubmissionTracker.js';
 
 // ── 常量 ────────────────────────────────────────────────────
@@ -37,7 +37,7 @@ export class BootstrapSession {
     this.projectRoot = projectRoot;
     this.dimensions = dimensions;
     this.completedDimensions = new Map(); // dimId → { report, completedAt, recipeIds }
-    this.episodicMemory = new EpisodicMemory(projectContext);
+    this.sessionStore = new SessionStore(projectContext);
 
     /** 外部 Agent 提交追踪 (v2: 对标内部 Agent 的 EvidenceCollector) */
     this.submissionTracker = new ExternalSubmissionTracker();
@@ -98,9 +98,9 @@ export class BootstrapSession {
       completedAt: Date.now(),
     });
 
-    // 写入 EpisodicMemory
-    // keyFindings 是字符串数组，需转换为 EpisodicMemory 期望的 { finding, importance } 格式
-    this.episodicMemory.storeDimensionReport(dimId, {
+    // 写入 SessionStore
+    // keyFindings 是字符串数组，需转换为 SessionStore 期望的 { finding, importance } 格式
+    this.sessionStore.storeDimensionReport(dimId, {
       analysisText: report.analysisText,
       findings: (report.keyFindings || []).map((f) => ({ finding: f, importance: 7 })),
       referencedFiles: report.referencedFiles || [],

package/lib/external/mcp/handlers/bootstrap/pipeline/EpisodicMemory.js

@@ -1,6 +1,10 @@
 /**
  * EpisodicMemory — Bootstrap 会话级情景记忆
  *
+ * @deprecated Phase 4: 已合并入 SessionStore (lib/service/chat/memory/SessionStore.js)
+ *   - 全部维度报告/证据/反思逻辑已迁入 SessionStore
+ *   - 本文件保留做向后兼容，新代码请使用 SessionStore
+ *
  * 内部 Agent 和外部 Agent 共享此模块。
  *
  * 提供跨维度上下文:
@@ -128,11 +132,19 @@ export class EpisodicMemory {
    * @param {object} [report.digest] — DimensionDigest (兼容)
    */
   storeDimensionReport(dimId, report) {
+    // findings 统一形状: { finding: string, evidence: string, importance: number }
+    // 源头 buildAnalysisArtifact() 和 ActiveContext.distill() 已保证一致
+    const findings = (report.findings || []).map((f) => ({
+      finding: f.finding || '',
+      evidence: f.evidence || '',
+      importance: f.importance || 5,
+    }));
+
     this.#dimensionReports.set(dimId, {
       dimId,
       completedAt: Date.now(),
       analysisText: report.analysisText || '',
-      findings: report.findings || [],
+      findings,
       referencedFiles: report.referencedFiles || [],
       candidatesSummary: report.candidatesSummary || [],
       workingMemoryDistilled: report.workingMemoryDistilled || null,
@@ -140,7 +152,7 @@ export class EpisodicMemory {
     });
 
     // 自动提取文件级 Evidence
-    for (const f of report.findings || []) {
+    for (const f of findings) {
       if (f.evidence) {
         const filePath = f.evidence.split(':')[0]; // "file.m:123" → "file.m"
         this.addEvidence(filePath, {
@@ -401,8 +413,18 @@ export class EpisodicMemory {
         parts.push(`${report.analysisText.substring(0, 300)}…`);
       }
 
+      // P0 Fix (B1): 优先使用 report.findings，为空时从 workingMemoryDistilled.keyFindings 补充
+      let findings = report.findings;
+      if ((!findings || findings.length === 0) && report.workingMemoryDistilled?.keyFindings) {
+        findings = report.workingMemoryDistilled.keyFindings.map((f) => ({
+          finding: f.finding || '',
+          evidence: f.evidence || '',
+          importance: f.importance || 5,
+        }));
+      }
+
       // 选择与当前维度相关的 findings
-      const relevantFindings = this.#selectRelevantFindings(report.findings, focusKeywords, 5);
+      const relevantFindings = this.#selectRelevantFindings(findings, focusKeywords, 5);
       if (relevantFindings.length > 0) {
         parts.push('**具体发现**:');
         for (const f of relevantFindings) {

package/lib/external/mcp/handlers/bootstrap/pipeline/IncrementalBootstrap.js

@@ -16,7 +16,7 @@
  */
 
 import { BootstrapSnapshot } from './BootstrapSnapshot.js';
-import { EpisodicMemory } from './EpisodicMemory.js';
+import { SessionStore } from '../../../../../service/chat/memory/SessionStore.js';
 
 // ──────────────────────────────────────────────────────────────
 // IncrementalBootstrap 类
@@ -106,16 +106,16 @@ export class IncrementalBootstrap {
         };
       }
 
-      // 4. 增量可行 → 尝试恢复 EpisodicMemory
+      // 4. 增量可行 → 尝试恢复 SessionStore
       let restoredEpisodic = null;
       if (previousSnapshot.episodicData) {
         try {
-          restoredEpisodic = EpisodicMemory.fromJSON(previousSnapshot.episodicData);
+          restoredEpisodic = SessionStore.fromJSON(previousSnapshot.episodicData);
           this.#log(
-            `Restored EpisodicMemory: ${restoredEpisodic.getCompletedDimensions().length} dimensions`
+            `Restored SessionStore: ${restoredEpisodic.getCompletedDimensions().length} dimensions`
           );
         } catch (err) {
-          this.#log(`Failed to restore EpisodicMemory: ${err.message}`, 'warn');
+          this.#log(`Failed to restore SessionStore: ${err.message}`, 'warn');
         }
       }
 
@@ -156,7 +156,7 @@ export class IncrementalBootstrap {
    * @param {string} params.sessionId
    * @param {Array} params.allFiles
    * @param {object} params.dimensionStats
-   * @param {EpisodicMemory} [params.episodicMemory]
+   * @param {SessionStore} [params.episodicMemory]
    * @param {object} [params.meta] — { durationMs, candidateCount, primaryLang }
    * @param {IncrementalPlan} [params.plan] — evaluate() 返回的计划 (增量时)
    * @returns {string} 快照 ID

package/lib/external/mcp/handlers/bootstrap/pipeline/ToolResultCache.js

@@ -1,6 +1,10 @@
 /**
  * ToolResultCache — 跨维度工具结果缓存
  *
+ * @deprecated Phase 4: 已合并入 SessionStore (lib/service/chat/memory/SessionStore.js)
+ *   - LRU 缓存逻辑 (仅只读工具) 已迁入 SessionStore
+ *   - 本文件保留做向后兼容，新代码请使用 SessionStore
+ *
  * 缓存 search_project_code 和 read_project_file 的调用结果，
  * 避免后续维度重复执行已知搜索/读取操作。
  *

package/lib/external/mcp/handlers/bootstrap/pipeline/dimension-configs.js

@@ -86,16 +86,16 @@ export function getFullDimensionConfig(dimId) {
  *
  * @param {number} tierIndex — Tier 索引 (0-based)
  * @param {Map<string, object>} tierResults — 本 Tier 的维度结果
- * @param {import('./EpisodicMemory.js').EpisodicMemory} episodicMemory
+ * @param {import('../../../../../service/chat/memory/SessionStore.js').SessionStore} sessionStore
  * @returns {object} TierReflection
  */
-export function buildTierReflection(tierIndex, tierResults, episodicMemory) {
+export function buildTierReflection(tierIndex, tierResults, sessionStore) {
   const completedDimensions = [...tierResults.keys()];
 
   // 收集本 Tier 所有维度的 findings
   const allFindings = [];
   for (const dimId of completedDimensions) {
-    const report = episodicMemory.getDimensionReport(dimId);
+    const report = sessionStore.getDimensionReport(dimId);
     if (report?.findings) {
       for (const f of report.findings) {
         allFindings.push({ dimId, ...f });
@@ -148,7 +148,7 @@ export function buildTierReflection(tierIndex, tierResults, episodicMemory) {
 
   // 找出 gaps (各维度报告的未覆盖方面)
   for (const dimId of completedDimensions) {
-    const report = episodicMemory.getDimensionReport(dimId);
+    const report = sessionStore.getDimensionReport(dimId);
     const gaps = report?.digest?.gaps || [];
     for (const gap of gaps) {
       if (gap && typeof gap === 'string' && gap.length > 5) {
@@ -159,7 +159,7 @@ export function buildTierReflection(tierIndex, tierResults, episodicMemory) {
 
   // remainingTasks
   for (const dimId of completedDimensions) {
-    const report = episodicMemory.getDimensionReport(dimId);
+    const report = sessionStore.getDimensionReport(dimId);
     const remaining = report?.digest?.remainingTasks || [];
     for (const task of remaining) {
       if (task?.signal) {