yuangs 5.45.0 → 5.48.0

package/dist/commands/git/plan.js

@@ -10,14 +10,11 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const GitService_1 = require("../../core/git/GitService");
 const llm_1 = require("../../agent/llm");
-const CostProfile_1 = require("../../core/capability/CostProfile");
-const constants_1 = require("./constants");
+const workflows_1 = require("../../core/workflows");
+const CapabilityLevel_1 = require("../../core/capability/CapabilityLevel");
 const utils_1 = require("./utils");
 const DEFAULT_PLAN_PROMPT = '分析项目现状并规划下一步开发任务';
 const METADATA_PREFIX = '>';
-/**
- * 解析用户指令（优先级：命令行 > todo.md > 默认值）
- */
 async function resolveUserPrompt(cliPrompt, todoPath) {
     if (cliPrompt) {
         return { prompt: cliPrompt, fromFile: false };
@@ -25,14 +22,11 @@ async function resolveUserPrompt(cliPrompt, todoPath) {
     try {
         await fs_1.default.promises.access(todoPath, fs_1.default.constants.F_OK);
         const content = await fs_1.default.promises.readFile(todoPath, 'utf8');
-        // 过滤掉文件开头由 yuangs 生成的元数据行（连续的 > 开头的行）
         const lines = content.split('\n');
         let startIndex = 0;
-        // 跳过开头连续的元数据行
         while (startIndex < lines.length && lines[startIndex].trim().startsWith(METADATA_PREFIX)) {
             startIndex++;
         }
-        // 跳过元数据后的空行
         while (startIndex < lines.length && lines[startIndex].trim() === '') {
             startIndex++;
         }
@@ -48,9 +42,6 @@ async function resolveUserPrompt(cliPrompt, todoPath) {
     }
     return { prompt: DEFAULT_PLAN_PROMPT, fromFile: false };
 }
-/**
- * 注册 git plan 命令
- */
 function registerPlanCommand(gitCmd) {
     gitCmd
         .command('plan [prompt...]')
@@ -63,7 +54,6 @@ function registerPlanCommand(gitCmd) {
         const maxRounds = parseInt(options.rounds) || 2;
         const todoPath = path_1.default.join(process.cwd(), 'todo.md');
         const { prompt: userPrompt, fromFile } = await resolveUserPrompt(cliPrompt, todoPath);
-        // 使用主 spinner 管理整体状态
         const spinner = (0, ora_1.default)(fromFile ? '正在从 todo.md 读取并初始化分析规划...' : '正在初始化分析规划...').start();
         try {
             const gitService = new GitService_1.GitService();
@@ -71,186 +61,69 @@ function registerPlanCommand(gitCmd) {
                 spinner.fail('当前目录不是 Git 仓库');
                 return;
             }
-            // 1. 获取最近 10 次提交
-            spinner.text = '正在读取 Git 历史记录...';
-            const commits = await gitService.getRecentCommits(10);
-            const commitContext = commits.length > 0
-                ? commits.map(c => `- ${c.date} [${c.hash.substring(0, 7)}] ${c.message}`).join('\n')
-                : '暂无提交记录';
-            spinner.succeed('已获取 Git 上下文');
-            // 定义两个角色的配置
-            const ARCHITECT_MODEL = options.model || 'Assistant'; // 负责写方案
-            const REVIEWER_MODEL = options.reviewerModel || 'gemini-2.5-flash-lite'; // 负责挑刺
-            // 共享的项目上下文
-            const projectContext = `
-[项目背景 - 最近 Git 提交]
-${commitContext}
-
-[用户需求]
-${userPrompt}
-`;
-            let currentPlan = ""; // 用于存储当前的方案草稿
-            let reviewComments = ""; // 用于存储审查意见
-            console.log(chalk_1.default.bold.cyan('\n🚀 启动双智能体协作引擎...\n'));
-            // --- 阶段 1: 架构师起草初稿 ---
-            spinner.start(`[架构师] ${ARCHITECT_MODEL} 正在起草初步方案...`);
-            const draftPrompt = [
-                {
-                    role: 'system',
-                    content: `你是一个资深软件架构师。请根据 Git 历史确保新功能与现有代码风格一致。
-请基于用户需求输出一份初步的开发计划 (Draft Plan)。
-包含：核心目标、修改文件列表、关键步骤。`
-                },
-                { role: 'user', content: projectContext }
-            ];
-            const draftRes = await (0, llm_1.runLLM)({
-                prompt: { messages: draftPrompt },
-                model: ARCHITECT_MODEL,
-                stream: false,
-                bypassRouter: true
+            spinner.succeed('Git 仓库验证通过');
+            const workflowConfig = {
+                sessionId: Date.now().toString(36) + Math.random().toString(36).substring(2, 11),
+                model: options.model || 'Assistant',
+                capability: CapabilityLevel_1.CapabilityLevel.SEMANTIC
+            };
+            const session = new workflows_1.GitWorkflowSession(workflowConfig);
+            const planWorkflow = new workflows_1.PlanWorkflow(gitService);
+            console.log(chalk_1.default.bold.cyan('\n🚀 启动工作流会话...\n'));
+            spinner.start('[工作流] 正在执行计划阶段...');
+            const result = await session.runPlan(async (input) => planWorkflow.run(input, session.getConfig()), {
+                userPrompt,
+                maxRounds,
+                architectModel: options.model,
+                reviewerModel: options.reviewerModel
             });
-            currentPlan = draftRes.rawText;
-            spinner.succeed(chalk_1.default.blue(`[架构师] 初稿已完成`));
-            // console.log(chalk.gray(currentPlan.substring(0, 100) + '...'));
-            // --- 阶段 2: 循环打磨 ---
-            for (let i = 1; i <= maxRounds; i++) {
-                console.log(chalk_1.default.gray(`\n--- Round ${i}/${maxRounds} ---`));
-                // Step A: 审查员 (Gemini) 评审
-                spinner.start(`[审查员] ${REVIEWER_MODEL} 正在评审方案...`);
-                const reviewPrompt = [
-                    {
-                        role: 'system',
-                        content: `你是一个严格的代码审查员和产品经理。
-你的任务是找出架构师方案中的漏洞、遗漏、安全风险或逻辑错误。
-请简明扼要地列出修改建议。不要重写计划，只给建议。`
-                    },
-                    {
-                        role: 'user',
-                        content: `
-${projectContext}
-
-[待评审的方案]
-${currentPlan}
-`
-                    }
+            if (result.success && result.data) {
+                spinner.succeed('计划执行成功');
+                const filePath = path_1.default.join(process.cwd(), 'todo.md');
+                const metadataLines = [
+                    `> 📅 Generated by Yuangs Git Plan at ${new Date().toLocaleString()}`,
+                    `> 🎯 Context: ${userPrompt}`,
+                    `> 🔧 Capability Level: ${(0, utils_1.getCapabilityLevelDisplay)(result.data.capability.minCapability)}`,
+                    `> ⚙️  Estimated Time: ${result.data.estimatedTime}ms`,
+                    `> 📊 Estimated Tokens: ${result.data.estimatedTokens}`,
+                    '',
                 ];
-                const reviewRes = await (0, llm_1.runLLM)({
-                    prompt: { messages: reviewPrompt },
-                    model: REVIEWER_MODEL,
-                    stream: false,
-                    bypassRouter: true
-                });
-                reviewComments = reviewRes.rawText;
-                spinner.succeed(chalk_1.default.magenta(`[审查员] 已提出修改意见`));
-                console.log(chalk_1.default.gray(`   💬 "${reviewComments.replace(/\n/g, ' ').substring(0, 80)}..."`));
-                // Step B: 架构师 (Assistant) 修正
-                spinner.start(`[架构师] ${ARCHITECT_MODEL} 正在根据意见修订方案...`);
-                const refinePrompt = [
-                    {
-                        role: 'system',
-                        content: `你是一个资深软件架构师。请根据审查员的意见优化你的开发计划。`
-                    },
-                    {
-                        role: 'user',
-                        content: `
-这是你之前的方案：
-${currentPlan}
-
-审查员给出的意见：
-${reviewComments}
-
-请输出修正后的完整方案。`
-                    }
-                ];
-                const refineRes = await (0, llm_1.runLLM)({
-                    prompt: { messages: refinePrompt },
-                    model: ARCHITECT_MODEL,
-                    stream: false,
-                    bypassRouter: true
-                });
-                currentPlan = refineRes.rawText;
-                spinner.succeed(chalk_1.default.blue(`[架构师] 方案已修订`));
+                const fileOutput = metadataLines.join('\n') + result.data.todoMarkdown;
+                fs_1.default.writeFileSync(filePath, fileOutput);
+                console.log('');
+                console.log(chalk_1.default.green(`✅ 规划完成！文件已生成: ${chalk_1.default.bold('todo.md')}`));
+                console.log(chalk_1.default.gray(`👉 你可以使用 'code todo.md' 打开查看`));
+                console.log('');
+                console.log(chalk_1.default.bold.cyan('📊 会话摘要:'));
+                console.log(chalk_1.default.gray(session.getSummary()));
+                session.complete();
             }
-            // 4. 生成最终 todo.md
-            spinner.start('正在生成最终 todo.md 文件...');
-            // 计算任务复杂度和能力需求
-            const diff = await gitService.getDiff();
-            // 对文件列表去重，避免 staged 和 unstaged 中的重复文件被重复计数
-            const allFiles = (0, utils_1.deduplicateFiles)([...diff.files.staged, ...diff.files.unstaged]);
-            // 使用 git diff --numstat 获取准确的行数统计
-            let estimatedTotalLines = 0;
-            try {
-                const numstat = await gitService.getDiffNumstat();
-                // numstat 直接提供准确的 added 和 deleted 行数
-                estimatedTotalLines = numstat.added + numstat.deleted;
-                // 如果 numstat 没有数据（如没有变更），使用文件数估算
-                if (estimatedTotalLines === 0 && allFiles.length > 0) {
-                    estimatedTotalLines = allFiles.length * constants_1.DIFF_ESTIMATION.LINES_PER_FILE_DEFAULT;
+            else {
+                spinner.fail('计划执行失败');
+                if (result.errors && result.errors.length > 0) {
+                    console.log('');
+                    console.log(chalk_1.default.bold.red('❌ 错误详情:'));
+                    result.errors.forEach((error, index) => {
+                        console.log(chalk_1.default.red(`  ${index + 1}. [${error.kind}] ${error.message}`));
+                        if (error.suggestions && error.suggestions.length > 0) {
+                            error.suggestions.forEach(suggestion => {
+                                console.log(chalk_1.default.yellow(`     💡 ${suggestion}`));
+                            });
+                        }
+                    });
                 }
-            }
-            catch (e) {
-                // numstat 失败，使用更保守的估算值作为后备
-                estimatedTotalLines = allFiles.length * constants_1.DIFF_ESTIMATION.LINES_PER_FILE_FALLBACK;
-            }
-            const costProfile = CostProfile_1.defaultCostProfileCalculator.calculate(allFiles, estimatedTotalLines);
-            const finalPrompt = [
-                {
-                    role: 'system',
-                    content: `你是一个技术文档专家。请将以下开发方案整理为一份标准的 todo.md 文档。
-
-重要要求：
-1. 格式清晰，使用 Markdown Checkbox (- [ ] )。
-2. 包含 [目标]、[文件变更]、[详细步骤]。
-3. 直接输出 Markdown 内容，不要使用 Markdown 代码块 (\`\`\`) 包裹。
-4. 不要包含任何对话式前缀（如"好的"、"这是"）或后缀（如"希望这对你有帮助"）。
-5. 开头直接输出内容，不要有任何问候语或开场白。
-
-能力等级标注：
-- SEMANTIC: 语义理解，需要理解代码意图和设计
-- STRUCTURAL: 结构分析，需要理解代码结构和依赖关系
-- LINE: 行级分析，需要理解具体代码行
-- TEXT: 文本分析，只需要处理文本内容
-- NONE: 无需智能分析
-
-格式示例：
-- [ ] 实现用户认证 [SEMANTIC]
-  - capability: SEMANTIC
-  - fallbackChain: [STRUCTURAL, LINE, TEXT, NONE]`
-                },
-                {
-                    role: 'user',
-                    content: currentPlan
+                if (result.summary) {
+                    console.log('');
+                    console.log(chalk_1.default.gray(`📝 ${result.summary}`));
                 }
-            ];
-            const finalResponse = await (0, llm_1.runLLM)({
-                prompt: { messages: finalPrompt },
-                model: 'Assistant',
-                stream: false,
-                bypassRouter: true
-            });
-            const todoContent = finalResponse.rawText;
-            const filePath = path_1.default.join(process.cwd(), 'todo.md');
-            // 使用工具函数清理 LLM 输出
-            const cleanedContent = (0, utils_1.cleanLLMOutput)(todoContent);
-            // 添加能力元数据到文件头
-            const metadataLines = [
-                `> 📅 Generated by Yuangs Git Plan at ${new Date().toLocaleString()}`,
-                `> 🎯 Context: ${userPrompt}`,
-                `> 🔧 Capability Level: ${(0, utils_1.getCapabilityLevelDisplay)(costProfile.requiredCapability)}`,
-                `> ⚙️  Estimated Time: ${costProfile.estimatedTime}ms`,
-                `> 📊 Estimated Tokens: ${costProfile.estimatedTokens}`,
-                '',
-            ];
-            const fileOutput = metadataLines.join('\n') + cleanedContent;
-            fs_1.default.writeFileSync(filePath, fileOutput);
-            spinner.succeed(chalk_1.default.green(`\n✅ 规划完成！文件已生成: ${chalk_1.default.bold('todo.md')}`));
-            console.log(chalk_1.default.gray(`👉 你可以使用 'code todo.md' 打开查看`));
+            }
         }
         catch (error) {
-            spinner.fail(chalk_1.default.red(`规划过程中出错: ${error.message}`));
+            spinner.fail(chalk_1.default.red(`执行过程中出错: ${error.message}`));
             if (error instanceof llm_1.AIError) {
                 console.error(chalk_1.default.red(`Status: ${error.statusCode}`));
             }
+            process.exit(1);
         }
     });
 }

package/dist/commands/git/plan.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/commands/git/plan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/commands/git/plan.ts"],"names":[],"mappings":"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"}

package/dist/core/kernel/ASTParser.d.ts

@@ -1,10 +1,14 @@
 /**
- * Enhanced AST Parser for X-Resolver
+ * Enhanced AST Parser for Auditable Execution Kernel
  *
- * 增强版 AST 解析器，支持：
- * 1. 提取导出符号（函数、类、接口、类型别名）
+ * 增强版 AST 解析器，作为内核的 "事实提取器"，支持：
+ * 1. 提取导出符号（函数、类、接口、类型别名、变量等）
  * 2. 提取 JSDoc 注释和标签
- * 3. 提供符号的完整元数据（名称、类型、JSDoc、行号等）
+ * 3. 提供符号的完整元数据（名称、类型、JSDoc、行号、符号哈希等）
+ * 4. 支持嵌套结构（类中的方法、函数中的函数等）
+ * 5. 处理匿名函数和箭头函数
+ * 6. 生成符号哈希用于审计验证
+ * 7. 集成 TypeChecker 以支持跨文件类型解析
  *
  * 使用 TypeScript Compiler API 实现精确解析
  */
@@ -20,8 +24,36 @@ export interface SymbolMetadata {
     jsDoc: string;
     /** 起始行号（从1开始） */
     startLine: number;
+    /** 结束行号（从1开始） */
+    endLine: number;
     /** 是否已导出 */
     isExported: boolean;
+    /** 符号内容的哈希值（用于审计验证） */
+    hash: string;
+    /** 符号的完整源码内容 */
+    content: string;
+    /** 访问修饰符（public, private, protected） */
+    accessibility?: 'public' | 'private' | 'protected';
+    /** 参数列表（如果是函数/方法） */
+    parameters?: ParameterInfo[];
+    /** 返回类型（如果是函数） */
+    returnType?: string;
+    /** 泛型参数（如果有） */
+    typeParameters?: string[];
+    /** 父级符号名称（用于嵌套结构） */
+    parentName?: string;
+    /** 是否是匿名函数 */
+    isAnonymous?: boolean;
+    /** 符号的完整路径（如：ClassName.methodName） */
+    fullPath?: string;
+}
+/**
+ * 参数信息接口
+ */
+export interface ParameterInfo {
+    name: string;
+    type: string;
+    optional: boolean;
 }
 /**
  * AST 解析结果
@@ -37,7 +69,7 @@ export interface ASTParseResult {
 /**
  * 增强版 AST 解析器
  *
- * 为 X-Resolver 提供精确的符号提取能力
+ * 作为可审计执行内核的 "事实提取器"，提供精确的符号提取能力
  */
 export declare class EnhancedASTParser {
     /**
@@ -60,8 +92,34 @@ export declare class EnhancedASTParser {
      *
      * @param node - AST 节点
      * @param symbols - 符号列表（输出参数）
+     * @param parentStack - 父级符号栈（用于嵌套结构）
+     * @param typeChecker - TypeScript 类型检查器
      */
     private visitAndExtractSymbols;
+    /**
+     * Extract modifier information (export, access modifiers) from a node
+     */
+    private extractModifiers;
+    /**
+     * Extract symbol information from a node
+     */
+    private extractSymbolInfo;
+    /**
+     * 判断是否应将符号推入父级栈
+     */
+    private shouldPushToParentStack;
+    /**
+     * 生成匿名函数的唯一名称
+     */
+    private generateAnonymousName;
+    /**
+     * 提取函数参数信息
+     */
+    private extractParameters;
+    /**
+     * 提取类型信息
+     */
+    private extractType;
     /**
      * 从节点提取 JSDoc 注释
      *
@@ -69,6 +127,14 @@ export declare class EnhancedASTParser {
      * @returns 提取的 JSDoc 文档字符串
      */
     private extractJSDoc;
+    /**
+     * 计算内容的哈希值（用于审计验证）
+     */
+    private calculateHash;
+    /**
+     * 规范化代码（移除空格和注释） using AST-based approach to avoid issues with string literals
+     */
+    private normalizeCode;
     /**
      * 将 TypeScript 节点类型映射为可读字符串
      *
@@ -83,4 +149,12 @@ export declare class EnhancedASTParser {
      * @returns 导出符号名称数组
      */
     getExportedSymbolNames(filePath: string): Promise<string[]>;
+    /**
+     * 比较两个解析结果，找出差异（用于审计目的）
+     */
+    compareResults(oldResult: ASTParseResult, newResult: ASTParseResult): {
+        added: SymbolMetadata[];
+        removed: SymbolMetadata[];
+        modified: SymbolMetadata[];
+    };
 }