autosnippet 2.7.0 → 2.8.0

package/lib/service/chat/AnalystAgent.js

@@ -19,8 +19,17 @@ import Logger from '../../infrastructure/logging/Logger.js';
 // System Prompt — Analyst 专用 (~100 tokens)
 // ──────────────────────────────────────────────────────────────────
 
-const ANALYST_SYSTEM_PROMPT = `你是一名高级软件架构师，正在分析一个代码项目。
-使用提供的工具深入探索代码结构，理解设计决策背后的原因。
+const ANALYST_SYSTEM_PROMPT = `你是一位高级软件架构师，正在深度分析一个真实项目。
+
+## 工具使用优先级
+1. **结构化查询优先** — get_project_overview → get_class_hierarchy → get_class_info
+   这些工具返回精确的类继承、协议实现、方法签名信息，比文本搜索更高效。
+2. **文本搜索补充** — search_project_code 用于查找特定模式/关键字
+3. **文件阅读验证** — read_project_file 用于确认具体实现细节
+
+> ⚠️ 避免反复调用 search_project_code 搜索不同关键词。
+> 如果需要了解类结构，直接用 get_class_info 查询。
+
 输出你的分析发现，包括具体的文件路径和代码位置。
 不需要任何特定格式，用自然语言描述你的理解即可。
 尽可能多地使用工具来获取准确信息，不要猜测。`;
@@ -52,12 +61,12 @@ const ANALYST_TOOLS = [
 // ──────────────────────────────────────────────────────────────────
 
 const ANALYST_BUDGET = {
-  maxIterations: 20,
-  searchBudget: 15,       // 探索为主，给更多搜索预算
-  searchBudgetGrace: 10,
+  maxIterations: 12,      // was 20 — 多数维度 5-9 轮完成
+  searchBudget: 10,       // was 15 — 探索为主，精简预算
+  searchBudgetGrace: 6,   // was 10
   maxSubmits: 0,          // Analyst 不提交候选
   softSubmitLimit: 0,
-  idleRoundsToExit: 3,
+  idleRoundsToExit: 2,    // was 3 — 减少空转
 };
 
 // ──────────────────────────────────────────────────────────────────
@@ -68,9 +77,10 @@ const ANALYST_BUDGET = {
  * 构建 Analyst Prompt
  * @param {object} dimConfig — 维度配置 { id, label, guide, focusAreas }
  * @param {object} projectInfo — { name, lang, fileCount }
+ * @param {object} [dimensionContext] — DimensionContext 实例 (跨维度上下文)
  * @returns {string}
  */
-function buildAnalystPrompt(dimConfig, projectInfo) {
+function buildAnalystPrompt(dimConfig, projectInfo, dimensionContext) {
   const parts = [];
 
   // §1 任务描述
@@ -106,6 +116,24 @@ ${depthHint}
   // §5 前序上下文提示
   parts.push('可以调用 get_previous_analysis 获取前序维度的分析结果，避免重复分析。');
 
+  // §6 前序维度分析摘要 (Tier 2+ 才有)
+  if (dimensionContext) {
+    const snapshot = dimensionContext.buildContextForDimension(dimConfig.id);
+    const prevDims = Object.entries(snapshot.previousDimensions);
+    if (prevDims.length > 0) {
+      parts.push(`## 前序维度分析摘要（避免重复探索）`);
+      for (const [dimId, digest] of prevDims) {
+        parts.push(`### ${dimId}\n${digest.summary || '(无摘要)'}`);
+        if (digest.keyFindings?.length > 0) {
+          parts.push(`关键发现: ${digest.keyFindings.join('; ')}`);
+        }
+        if (digest.crossRefs?.[dimConfig.id]) {
+          parts.push(`💡 对本维度的建议: ${digest.crossRefs[dimConfig.id]}`);
+        }
+      }
+    }
+  }
+
   return parts.join('\n\n');
 }
 
@@ -146,11 +174,12 @@ export class AnalystAgent {
    * @param {object} projectInfo — { name, lang, fileCount }
    * @param {object} [options]
    * @param {string} [options.sessionId] — Bootstrap session ID
+   * @param {object} [options.dimensionContext] — DimensionContext 实例
    * @returns {Promise<import('./HandoffProtocol.js').AnalysisReport>}
    */
   async analyze(dimConfig, projectInfo, options = {}) {
     const dimId = dimConfig.id;
-    const prompt = buildAnalystPrompt(dimConfig, projectInfo);
+    const prompt = buildAnalystPrompt(dimConfig, projectInfo, options.dimensionContext);
 
     this.#logger.info(`[AnalystAgent] ▶ analyzing dimension "${dimId}" — prompt ${prompt.length} chars`);
 

package/lib/service/chat/CandidateGuardrail.js

@@ -45,11 +45,11 @@ export class CandidateGuardrail {
       return { valid: false, error: `内容过短 (${content.length} 字符, 最少 200)。请包含代码片段和项目上下文描述，而非一句话概括。` };
     }
 
-    // knowledgeType 约束
+    // knowledgeType 约束 — 自动修正为允许列表中第一个类型
     const allowed = this.#dimensionConfig.allowedKnowledgeTypes;
     if (allowed?.length > 0 && candidate.knowledgeType) {
       if (!allowed.includes(candidate.knowledgeType)) {
-        return { valid: false, error: `knowledgeType "${candidate.knowledgeType}" 不在允许列表: [${allowed}]` };
+        candidate.knowledgeType = allowed[0];
       }
     }
 
@@ -79,7 +79,7 @@ export class CandidateGuardrail {
 
     // 检查是否包含代码引用或文件路径
     const hasCodeBlock = /```[\s\S]*?```/.test(content) || /\.(m|h|swift|js|ts)(:\d+)?/.test(content);
-    const hasSourceRef = /\(来源[:：]/.test(content) || /\bFileName\b/.test(content) === false && /[A-Z]\w+\.(m|h|swift|java|kt|js|ts)/.test(content);
+    const hasSourceRef = /来源[:：]|[Ss]ource[:：]|\(\w+\.\w+:\d+\)/.test(content) || /[A-Z]\w+\.(m|h|swift|java|kt|js|ts)/.test(content);
 
     if (!hasCodeBlock && !hasSourceRef) {
       return { valid: false, error: '内容缺少代码片段或文件引用 — 请用 read_project_file 获取代码后再提交，「项目特写」必须包含真实代码' };

package/lib/service/chat/ChatAgent.js

@@ -128,6 +128,8 @@ export class ChatAgent {
   #fileCache = null;
   /** @type {Set<string>} 跨维度已提交候选标题（bootstrap 全局去重） */
   #globalSubmittedTitles = new Set();
+  /** @type {{ input: number, output: number }} 当前 execute() 累计 token 用量 */
+  #currentTokenUsage = { input: 0, output: 0 };
 
   /**
    * @param {object} opts
@@ -199,6 +201,7 @@ export class ChatAgent {
     temperature: temperatureOverride, // 覆盖默认温度
   } = {}) {
     this.#currentSource = source;
+    this.#currentTokenUsage = { input: 0, output: 0 };
     const execStartTime = Date.now();
     const promptPreview = prompt.length > 80 ? prompt.substring(0, 80) + '…' : prompt;
     this.#logger.info(`[ChatAgent] ▶ execute — source=${source}${dimensionMeta?.id ? ', dim=' + dimensionMeta.id + '(' + dimensionMeta.outputType + ')' : (dimensionId ? ', dim=' + dimensionId : '')}, prompt="${promptPreview}", historyLen=${history.length}${conversationId ? ', convId=' + conversationId.substring(0, 8) : ''}`);
@@ -247,6 +250,9 @@ export class ChatAgent {
 
     this.#extractMemory(prompt, result.reply);
 
+    // 附加 token 用量统计
+    result.tokenUsage = { ...this.#currentTokenUsage };
+
     return { ...result, conversationId };
   }
 
@@ -320,6 +326,7 @@ export class ChatAgent {
     let consecutiveEmptyResponses = 0;
     let iterationCount = 0;  // v3: 独立迭代计数器
     const submittedTitles = new Set(this.#globalSubmittedTitles);
+    const sharedState = {}; // P2.2: 跨工具调用共享状态（搜索计数器等）
 
     // ── 主循环 ──
     while (true) {
@@ -382,6 +389,13 @@ export class ChatAgent {
         });
 
         const aiDuration = Date.now() - iterStartTime;
+
+        // 累计 token 用量
+        if (aiResult.usage) {
+          this.#currentTokenUsage.input += aiResult.usage.inputTokens || 0;
+          this.#currentTokenUsage.output += aiResult.usage.outputTokens || 0;
+        }
+
         if (aiResult.functionCalls?.length > 0) {
           this.#logger.info(`[ChatAgent] ✓ AI returned ${aiResult.functionCalls.length} function calls in ${aiDuration}ms: [${aiResult.functionCalls.map(fc => fc.name).join(', ')}]`);
         } else {
@@ -446,7 +460,7 @@ export class ChatAgent {
             toolResult = await this.#toolRegistry.execute(
               fc.name,
               fc.args,
-              this.#getToolContext({ _sessionToolCalls: toolCalls, _dimensionMeta: dimensionMeta, _submittedTitles: submittedTitles }),
+              this.#getToolContext({ _sessionToolCalls: toolCalls, _dimensionMeta: dimensionMeta, _submittedTitles: submittedTitles, _sharedState: sharedState }),
             );
             const toolDuration = Date.now() - toolStartTime;
             const resultSize = typeof toolResult === 'string' ? toolResult.length : JSON.stringify(toolResult).length;
@@ -662,6 +676,11 @@ ${submitSummary ? `已提交候选:\n${submitSummary}\n` : ''}
           maxTokens: 8192,
         },
       );
+      // 累计 token 用量
+      if (summaryResult.usage) {
+        this.#currentTokenUsage.input += summaryResult.usage.inputTokens || 0;
+        this.#currentTokenUsage.output += summaryResult.usage.outputTokens || 0;
+      }
       finalReply = this.#cleanFinalAnswer(summaryResult.text || '');
     } catch (err) {
       this.#logger.warn(`[ChatAgent] forced summary AI call failed: ${err.message}`);

package/lib/service/chat/ConversationStore.js

@@ -22,6 +22,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import Logger from '../../infrastructure/logging/Logger.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 const DEFAULT_TOKEN_BUDGET = 12000;     // ~12K tokens 留给历史, 其余给系统提示词和当前消息
 const CHARS_PER_TOKEN = 3.5;            // 近似: 中文 ~3.5 / 英文 ~4 / 取偏保守值
@@ -40,6 +41,8 @@ export class ConversationStore {
     this.#dir = path.join(projectRoot, '.autosnippet', 'conversations');
     this.#indexPath = path.join(this.#dir, 'index.json');
     this.#logger = Logger.getInstance();
+    // 路径安全检查
+    pathGuard.assertProjectWriteSafe(this.#dir);
   }
 
   // ═══════════════════════════════════════════════════════

package/lib/service/chat/HandoffProtocol.js

@@ -92,6 +92,7 @@ export function buildAnalysisReport(analystResult, dimensionId, projectGraph = n
     metadata: {
       iterations: analystResult.toolCalls?.length || 0,
       toolCallCount: analystResult.toolCalls?.length || 0,
+      tokenUsage: analystResult.tokenUsage || null,
     },
   };
 }

package/lib/service/chat/Memory.js

@@ -24,6 +24,7 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
+import pathGuard from '../../shared/PathGuard.js';
 
 export class Memory {
   #filePath;
@@ -37,6 +38,8 @@ export class Memory {
   constructor(projectRoot, { maxEntries = 50 } = {}) {
     this.#filePath = path.join(projectRoot, '.autosnippet', 'memory.jsonl');
     this.#maxEntries = maxEntries;
+    // 路径安全检查
+    pathGuard.assertProjectWriteSafe(this.#filePath);
   }
 
   /**

package/lib/service/chat/ProducerAgent.js

@@ -215,6 +215,58 @@ export class ProducerAgent {
       }).length;
       const rejectedCount = submitCalls.length - successCount;
 
+      // ── 拒绝率过高时追加一轮修正尝试 ──
+      if (rejectedCount > successCount && rejectedCount >= 2 && options.retryOnRejection !== false) {
+        this.#logger.info(`[ProducerAgent] 高拒绝率 (${rejectedCount}/${submitCalls.length}) — 尝试修正`);
+        try {
+          const retryPrompt = `你的 ${rejectedCount} 个提交被拒绝了。请根据拒绝原因改进后重新提交，确保:\n1. code 字段 ≥ 200 字符\n2. 包含代码块 (\`\`\`)\n3. 包含来源标注 (来源: FileName.m:行号)\n4. 标题使用项目真实类名`;
+          const retryResult = await this.#chatAgent.execute(retryPrompt, {
+            source: 'system',
+            conversationId: options.sessionId ? `producer-retry-${options.sessionId}-${dimId}` : undefined,
+            budget: { ...budget, maxIterations: 5, maxSubmits: rejectedCount },
+            systemPromptOverride: PRODUCER_SYSTEM_PROMPT,
+            allowedTools: PRODUCER_TOOLS,
+            disablePhaseRouter: true,
+            temperature: 0.3,
+            dimensionMeta: {
+              id: dimId,
+              outputType: dimConfig.outputType || 'candidate',
+              allowedKnowledgeTypes: dimConfig.allowedKnowledgeTypes || [],
+            },
+          });
+
+          const retrySubmits = (retryResult.toolCalls || []).filter(
+            tc => (tc.tool || tc.name) === 'submit_candidate' || (tc.tool || tc.name) === 'submit_with_check'
+          );
+          const retrySuccess = retrySubmits.filter(tc => {
+            const res = tc.result;
+            if (!res) return true;
+            if (typeof res === 'string') return !res.includes('rejected') && !res.includes('error');
+            return res.status !== 'rejected' && res.status !== 'error';
+          }).length;
+
+          this.#logger.info(`[ProducerAgent] 修正轮: +${retrySuccess} candidates for "${dimId}"`);
+
+          // 合并两轮 token 用量
+          const baseTokens = result.tokenUsage || { input: 0, output: 0 };
+          const retryTokens = retryResult.tokenUsage || { input: 0, output: 0 };
+          const mergedTokenUsage = {
+            input: (baseTokens.input || 0) + (retryTokens.input || 0),
+            output: (baseTokens.output || 0) + (retryTokens.output || 0),
+          };
+
+          return {
+            candidateCount: successCount + retrySuccess,
+            rejectedCount: rejectedCount - retrySuccess,
+            toolCalls: [...(result.toolCalls || []), ...(retryResult.toolCalls || [])],
+            reply: retryResult.reply || result.reply || '',
+            tokenUsage: mergedTokenUsage,
+          };
+        } catch (retryErr) {
+          this.#logger.warn(`[ProducerAgent] 修正轮失败 "${dimId}": ${retryErr.message}`);
+        }
+      }
+
       this.#logger.info(`[ProducerAgent] ✅ dimension "${dimId}" — ${successCount} candidates created (${rejectedCount} rejected), ${result.toolCalls?.length || 0} total tool calls`);
 
       return {
@@ -222,6 +274,7 @@ export class ProducerAgent {
         rejectedCount,
         toolCalls: result.toolCalls || [],
         reply: result.reply || '',
+        tokenUsage: result.tokenUsage || null,
       };
     } catch (err) {
       this.#logger.error(`[ProducerAgent] ❌ dimension "${dimId}" error: ${err.message}`);

package/lib/service/chat/tools.js

@@ -258,6 +258,15 @@ const searchProjectCode = {
       total,
       searchedFiles: files.length,
       skippedThirdParty,
+      ...((() => {
+        // P2.2: 搜索超限提示 — 引导使用 AST 工具
+        const state = ctx._sharedState || ctx;
+        state._searchCallCount = (state._searchCallCount || 0) + 1;
+        if (state._searchCallCount > 8 && ctx.source === 'system') {
+          return { hint: `💡 你已搜索 ${state._searchCallCount} 次。考虑使用 get_class_info / get_class_hierarchy / get_project_overview 获取结构化信息，效率更高。` };
+        }
+        return {};
+      })()),
     };
   },
 };
@@ -1547,15 +1556,13 @@ function _checkDimensionType(dimensionMeta, params, logger) {
     };
   }
 
-  // 2. knowledgeType 校验 — 必须是维度允许的类型之一
+  // 2. knowledgeType 校验 — 不在允许列表时自动修正为第一个允许类型
   const allowed = dimensionMeta.allowedKnowledgeTypes || [];
   if (allowed.length > 0 && params.knowledgeType) {
     if (!allowed.includes(params.knowledgeType)) {
-      logger?.info(`[submit_candidate] ✗ rejected — knowledgeType "${params.knowledgeType}" not in allowed [${allowed}] for dimension "${dimensionMeta.id}"`);
-      return {
-        status: 'rejected',
-        reason: `knowledgeType "${params.knowledgeType}" 不在维度 "${dimensionMeta.id}" 允许的类型列表中。允许的类型: ${allowed.join(', ')}`,
-      };
+      const corrected = allowed[0];
+      logger?.warn(`[submit_candidate] knowledgeType "${params.knowledgeType}" → "${corrected}" (auto-corrected for dimension "${dimensionMeta.id}")`);
+      params.knowledgeType = corrected;
     }
   }
 

package/lib/service/guard/ExclusionManager.js

@@ -7,6 +7,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs';
 import { join, dirname, relative } from 'node:path';
 import Logger from '../../infrastructure/logging/Logger.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 export class ExclusionManager {
   #exclusionsPath;
@@ -15,6 +16,7 @@ export class ExclusionManager {
   constructor(projectRoot, options = {}) {
     const kbDir = options.knowledgeBaseDir || 'AutoSnippet';
     this.#exclusionsPath = join(projectRoot, kbDir, 'guard-exclusions.json');
+    pathGuard.assertProjectWriteSafe(this.#exclusionsPath);
     // 迁移旧路径
     this.#migrateOldPath(projectRoot, options.internalDir || '.autosnippet');
     this.#data = this.#load();

package/lib/service/guard/RuleLearner.js

@@ -7,6 +7,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import Logger from '../../infrastructure/logging/Logger.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 const PROBLEMATIC_THRESHOLD = { falsePositiveRate: 0.3, minTriggers: 5 };
 
@@ -17,6 +18,7 @@ export class RuleLearner {
   constructor(projectRoot, options = {}) {
     const kbDir = options.knowledgeBaseDir || 'AutoSnippet';
     this.#learnerPath = join(projectRoot, kbDir, 'guard-learner.json');
+    pathGuard.assertProjectWriteSafe(this.#learnerPath);
     this.#migrateOldPath(projectRoot, options.internalDir || '.autosnippet');
     this.#data = this.#load();
   }

package/lib/service/quality/FeedbackCollector.js

@@ -6,6 +6,7 @@
 
 import { readFileSync, writeFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs';
 import { join, dirname } from 'node:path';
+import pathGuard from '../../shared/PathGuard.js';
 
 export class FeedbackCollector {
   #feedbackPath;
@@ -15,6 +16,7 @@ export class FeedbackCollector {
   constructor(projectRoot, options = {}) {
     const kbDir = options.knowledgeBaseDir || 'AutoSnippet';
     this.#feedbackPath = join(projectRoot, kbDir, 'feedback.json');
+    pathGuard.assertProjectWriteSafe(this.#feedbackPath);
     this.#maxEvents = options.maxEvents || 1000;
     this.#migrateOldPath(projectRoot, options.internalDir || '.autosnippet');
     this.#events = this.#load();

package/lib/service/recipe/RecipeFileWriter.js

@@ -19,6 +19,7 @@ import path from 'node:path';
 import { createHash } from 'node:crypto';
 import { RECIPES_DIR } from '../../infrastructure/config/Defaults.js';
 import Logger from '../../infrastructure/logging/Logger.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 export class RecipeFileWriter {
   /**
@@ -160,6 +161,9 @@ export class RecipeFileWriter {
       const category = (recipe.category || 'general').toLowerCase();
       const categoryDir = path.join(this.recipesDir, category);
 
+      // 路径安全检查 — 阻止 category 含 ../ 导致路径逃逸
+      pathGuard.assertProjectWriteSafe(categoryDir);
+
       if (!fs.existsSync(categoryDir)) {
         fs.mkdirSync(categoryDir, { recursive: true });
       }

package/lib/service/recipe/RecipeStatsTracker.js

@@ -7,6 +7,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import Logger from '../../infrastructure/logging/Logger.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 const SCHEMA_VERSION = 1;
 const DEFAULT_HEAT_WEIGHTS = { guard: 1.0, human: 2.0, ai: 1.5 };
@@ -19,6 +20,7 @@ export class RecipeStatsTracker {
   constructor(projectRoot, options = {}) {
     const kbDir = options.knowledgeBaseDir || 'AutoSnippet';
     this.#statsPath = join(projectRoot, kbDir, 'recipe-stats.json');
+    pathGuard.assertProjectWriteSafe(this.#statsPath);
     this.#migrateOldPath(projectRoot, options.internalDir || '.autosnippet');
     this.#data = this.#load();
   }

package/lib/service/skills/SignalCollector.js

@@ -42,6 +42,7 @@ import path from 'node:path';
 import { execSync } from 'node:child_process';
 import Logger from '../../infrastructure/logging/Logger.js';
 import { EventAggregator } from './EventAggregator.js';
+import pathGuard from '../../shared/PathGuard.js';
 
 const DEFAULT_INTERVAL_MS = 60 * 60 * 1000;  // 1 小时（初始值，AI 可动态调整）
 const MIN_INTERVAL_MS = 5 * 60 * 1000;       // 最短 5 分钟
@@ -525,6 +526,7 @@ ${JSON.stringify(signals.codeChanges, null, 2)}
       }
 
       const dir = path.dirname(this.#snapshotPath);
+      pathGuard.assertProjectWriteSafe(dir);
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
       }