speccore 8.3.349 → 8.3.363

package/dist/core/ai-verify/visual-judge.d.ts

@@ -0,0 +1,33 @@
+/**
+ * visual-judge — AI 验证视觉判定兜底（v8.3.350+）
+ *
+ * 三级执行通道的末级兜底：宿主 AI 无多模态能力时，只操作页面截图、不判定，
+ * 在 results.json 中写 judged:false + screenshots。本模块用视觉模型（qwen-vl 默认）
+ * 对「截图 + 预期结果原文」做业务断言，回写判定结果。
+ *
+ * 判定原则：业务断言为主——截图是否符合 plan.json 中该场景的预期结果。
+ */
+import type { VisualModelConfig } from '../ui-verify/visual-model-client';
+import type { AiVerifyPlan, AiVerifyResult, AiVerifyResults } from './types';
+/** 待判定场景（judged:false 且有截图） */
+export interface PendingJudgement {
+    result: AiVerifyResult;
+    screenshotPaths: string[];
+}
+/** 找出 results 中待视觉判定的场景（judged 不为 true 且有截图） */
+export declare function findPendingJudgements(results: AiVerifyResults): PendingJudgement[];
+/**
+ * 用视觉模型判定单个待判定场景。
+ * @param result 待判定结果（会被改写）
+ * @param screenshotPaths 截图相对路径（相对 outDir）
+ * @param outDir 剧本输出目录
+ * @param plan 剧本（取场景标题与预期结果）
+ * @param config 视觉模型配置
+ */
+export declare function judgeScenario(result: AiVerifyResult, screenshotPaths: string[], outDir: string, plan: AiVerifyPlan, config: VisualModelConfig): Promise<void>;
+/**
+ * 兜底判定入口：对 results 中所有待判定场景逐个判定并回写。
+ * 返回判定数量；无待判定场景返回 0。
+ */
+export declare function runAiJudge(resultsPath: string, plan: AiVerifyPlan, config?: VisualModelConfig): Promise<number>;
+//# sourceMappingURL=visual-judge.d.ts.map

package/dist/core/ai-verify/visual-judge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"visual-judge.d.ts","sourceRoot":"","sources":["../../../src/core/ai-verify/visual-judge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,kCAAkC,CAAC;AAG7F,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE7E,+BAA+B;AAC/B,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,gDAAgD;AAChD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,gBAAgB,EAAE,CAIlF;AAiBD;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,CA8BjB"}

package/dist/core/ai-verify/visual-judge.js

@@ -0,0 +1,123 @@
+"use strict";
+/**
+ * visual-judge — AI 验证视觉判定兜底（v8.3.350+）
+ *
+ * 三级执行通道的末级兜底：宿主 AI 无多模态能力时，只操作页面截图、不判定，
+ * 在 results.json 中写 judged:false + screenshots。本模块用视觉模型（qwen-vl 默认）
+ * 对「截图 + 预期结果原文」做业务断言，回写判定结果。
+ *
+ * 判定原则：业务断言为主——截图是否符合 plan.json 中该场景的预期结果。
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPendingJudgements = findPendingJudgements;
+exports.judgeScenario = judgeScenario;
+exports.runAiJudge = runAiJudge;
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const visual_model_client_1 = require("../ui-verify/visual-model-client");
+const logger_1 = require("../../utils/logger");
+/** 找出 results 中待视觉判定的场景（judged 不为 true 且有截图） */
+function findPendingJudgements(results) {
+    return results.results
+        .filter((r) => r.judged !== true && Array.isArray(r.screenshots) && r.screenshots.length > 0)
+        .map((r) => ({ result: r, screenshotPaths: r.screenshots || [] }));
+}
+/** 业务断言 prompt：预期结果 + 截图 → passed/analysis */
+function buildJudgementPrompt(scenarioTitle, expected) {
+    const expectLines = expected.length > 0 ? expected.map((e) => `- ${e}`).join('\n') : '（无明确预期，请判断页面是否正常渲染、无明显错误）';
+    return `你是一个 Web 功能验收测试员。请判断「${scenarioTitle}」的页面截图是否符合以下预期结果：
+
+预期结果：
+${expectLines}
+
+请仅依据截图内容判定（无法从截图确认的事项视为不符合预期），并按以下 JSON 格式输出，不要输出其他内容：
+{
+  "passed": true/false,
+  "analysis": "判定理由（中文，200字以内）：截图中的哪些可见内容支持或否定预期"
+}`;
+}
+/**
+ * 用视觉模型判定单个待判定场景。
+ * @param result 待判定结果（会被改写）
+ * @param screenshotPaths 截图相对路径（相对 outDir）
+ * @param outDir 剧本输出目录
+ * @param plan 剧本（取场景标题与预期结果）
+ * @param config 视觉模型配置
+ */
+async function judgeScenario(result, screenshotPaths, outDir, plan, config) {
+    const scenario = plan.scenarios.find((s) => s.id === result.scenarioId);
+    const title = scenario?.title || result.scenarioId;
+    const expected = scenario?.expected || [];
+    // 依次尝试截图，取第一张可读的
+    let currentImageBase64 = null;
+    for (const shot of screenshotPaths) {
+        const abs = (0, path_1.isAbsolute)(shot) ? shot : (0, path_1.join)(outDir, shot);
+        try {
+            currentImageBase64 = (await (0, fs_extra_1.readFile)(abs)).toString('base64');
+            break;
+        }
+        catch {
+            continue;
+        }
+    }
+    if (!currentImageBase64) {
+        result.judged = true;
+        result.executor = 'visual-judge';
+        result.passed = false;
+        result.reason = '视觉判定失败：截图文件缺失或无法读取';
+        return;
+    }
+    let verdict;
+    try {
+        // 业务断言：用自定义 prompt 替代内置 UI 质量扫描（预期结果 + 截图 → passed/analysis）
+        verdict = await (0, visual_model_client_1.callVisualModel)(config, {
+            scenarioName: title,
+            currentImageBase64,
+            threshold: 'normal',
+            customPrompt: buildJudgementPrompt(title, expected),
+        });
+    }
+    catch (error) {
+        result.judged = true;
+        result.executor = 'visual-judge';
+        result.passed = false;
+        result.reason = `视觉模型调用失败: ${error.message || String(error)}`;
+        return;
+    }
+    result.executor = 'visual-judge';
+    result.judged = true;
+    result.passed = verdict.passed;
+    result.reason = verdict.analysis || (verdict.passed ? '截图符合预期' : '截图不符合预期');
+}
+/**
+ * 兜底判定入口：对 results 中所有待判定场景逐个判定并回写。
+ * 返回判定数量；无待判定场景返回 0。
+ */
+async function runAiJudge(resultsPath, plan, config) {
+    const outDir = (0, path_1.dirname)(resultsPath);
+    const results = JSON.parse(await (0, fs_extra_1.readFile)(resultsPath, 'utf-8'));
+    const pending = findPendingJudgements(results);
+    if (pending.length === 0) {
+        logger_1.logger.info('ℹ️ 没有待视觉判定的场景（所有场景均已判定或缺少截图）');
+        return 0;
+    }
+    if (!config) {
+        logger_1.logger.error('❌ 未配置视觉模型（.speccore.yml 的 quality_gates.verify_ui.visual_model 或环境变量 DASHSCOPE_API_KEY）');
+        throw new Error('视觉模型不可用，无法执行 --ai-judge 兜底判定');
+    }
+    if (!(await (0, visual_model_client_1.isVisualModelAvailable)(config))) {
+        logger_1.logger.error('❌ 视觉模型不可用：未配置 API Key（DASHSCOPE_API_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY）');
+        throw new Error('视觉模型不可用，无法执行 --ai-judge 兜底判定');
+    }
+    logger_1.logger.info(`🤖 视觉判定兜底：${pending.length} 个场景待判定（provider: ${config.provider}）`);
+    for (const item of pending) {
+        const before = item.result.passed;
+        await judgeScenario(item.result, item.screenshotPaths, outDir, plan, config);
+        const mark = item.result.passed ? '✅' : '❌';
+        logger_1.logger.info(`   ${mark} ${item.result.scenarioId}（判定前 passed=${before}）`);
+    }
+    // 判定结果回写 results.json（executor/judged/passed/reason 已被改写）
+    await (0, fs_extra_1.writeFile)(resultsPath, JSON.stringify(results, null, 2), 'utf-8');
+    return pending.length;
+}
+//# sourceMappingURL=visual-judge.js.map

package/dist/core/ai-verify/visual-judge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"visual-judge.js","sourceRoot":"","sources":["../../../src/core/ai-verify/visual-judge.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AAgBH,sDAIC;AAyBD,sCAmDC;AAMD,gCAkCC;AAtID,+BAAiD;AACjD,uCAA+C;AAE/C,0EAA2F;AAC3F,+CAA4C;AAS5C,gDAAgD;AAChD,SAAgB,qBAAqB,CAAC,OAAwB;IAC5D,OAAO,OAAO,CAAC,OAAO;SACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;SAC5F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,8CAA8C;AAC9C,SAAS,oBAAoB,CAAC,aAAqB,EAAE,QAAkB;IACrE,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC;IACjH,OAAO,wBAAwB,aAAa;;;EAG5C,WAAW;;;;;;EAMX,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,aAAa,CACjC,MAAsB,EACtB,eAAyB,EACzB,MAAc,EACd,IAAkB,EAClB,MAAyB;IAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,QAAQ,EAAE,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC;IACnD,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC;IAE1C,iBAAiB;IACjB,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,IAAA,iBAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC;YACH,kBAAkB,GAAG,CAAC,MAAM,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM;QACR,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;QACjC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,MAAM,GAAG,oBAAoB,CAAC;QACrC,OAAO;IACT,CAAC;IAED,IAAI,OAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,6DAA6D;QAC7D,OAAO,GAAG,MAAM,IAAA,qCAAe,EAAC,MAAM,EAAE;YACtC,YAAY,EAAE,KAAK;YACnB,kBAAkB;YAClB,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;QACjC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,MAAM,GAAG,aAAa,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,OAAO;IACT,CAAC;IAED,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;IACjC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC9E,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU,CAC9B,WAAmB,EACnB,IAAkB,EAClB,MAA0B;IAE1B,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;IAEpC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,WAAW,EAAE,OAAO,CAAC,CAAoB,CAAC;IACpF,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,eAAM,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;QACxG,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,IAAA,4CAAsB,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAC5C,eAAM,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;QAC9F,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,eAAM,CAAC,IAAI,CAAC,aAAa,OAAO,CAAC,MAAM,qBAAqB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;IAChF,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,MAAM,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5C,eAAM,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,eAAe,MAAM,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,0DAA0D;IAC1D,MAAM,IAAA,oBAAS,EAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC"}

package/dist/core/ask-engine.d.ts

@@ -14,6 +14,12 @@ export interface CommandKnowledge {
     examples: string[];
     related: string[];
     triggers: string[];
+    /**
+     * 同分 tie-break 显式优先级（缺省 0，值大者赢）。
+     * 歧义词条（如「验证」同挂 verify/validate）靠此裁决，不依赖数组声明顺序；
+     * 新增词条若与现有词条共享触发词，必须显式声明 priority。
+     */
+    priority?: number;
 }
 /** Pipeline 步骤 */
 export interface PipelineStep {

package/dist/core/ask-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ask-engine.d.ts","sourceRoot":"","sources":["../../src/core/ask-engine.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAQ1E,aAAa;AACb,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,WAAW,CAAC;AAE/E,aAAa;AACb,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,kBAAkB;AAClB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,kBAAkB;AAClB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,aAAa;AACb,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAChE,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAe;AACf,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAMD,QAAA,MAAM,UAAU,EAAE,gBAAgB,EAgEjC,CAAC;AA+EF,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,CAgD7C,CAAC;AAMF,iBAAiB;AACjB,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAiEnD;AAy8BD,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAkK7F;AAiQD,uCAAuC;AACvC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA4BjD;AAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAOjC;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,GAAG,IAAI,CAoB1G;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiB7C"}
+{"version":3,"file":"ask-engine.d.ts","sourceRoot":"","sources":["../../src/core/ask-engine.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAQ1E,aAAa;AACb,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,WAAW,CAAC;AAE/E,aAAa;AACb,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,kBAAkB;AAClB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,kBAAkB;AAClB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,aAAa;AACb,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAChE,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAe;AACf,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AASD,QAAA,MAAM,UAAU,EAAE,gBAAgB,EAkEjC,CAAC;AA+EF,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,CAgD7C,CAAC;AAMF,iBAAiB;AACjB,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAiEnD;AAshCD,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAkK7F;AAiQD,uCAAuC;AACvC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA4BjD;AAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAOjC;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,GAAG,IAAI,CAoB1G;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiB7C"}

package/dist/core/ask-engine.js

@@ -24,6 +24,9 @@ const project_cards_1 = require("./project-cards");
 // ============================================================
 // 命令知识库
 // ============================================================
+// ⚠️ 同分裁决规则（v8.3.351+ 显式化）：
+// 触发词总长度同分时按 priority 裁决（值大者赢，缺省 0）；priority 也相同才回退声明顺序。
+// 歧义词条必须显式设 priority（如 verify 与 validate 共享「验证」），禁止依赖声明顺序先到先得。
 const COMMAND_KB = [
     { name: 'init', aliases: ['in'], description: '初始化 SpecCore 项目，创建 .speccore 目录和配置',
         usage: 'speccore init [--interactive] [--name <name>]', examples: ['speccore init', 'speccore init --name my-project'], related: ['run', 'config'], triggers: ['初始化', 'init', '开始', '新建项目', '创建项目'] },
@@ -49,7 +52,9 @@ const COMMAND_KB = [
         usage: 'speccore pr [--task <id>] [--auto]', examples: ['speccore pr', 'speccore pr --task T-01 --auto'], related: ['done', 'execute'], triggers: ['pr', 'pull request', '提交', '合并', 'MR'] },
     // v8.3.95+: verify 命令
     { name: 'verify', aliases: ['vf'], description: '测试验证：冒烟测试 + 视觉检查 + API 契约 + 性能基线。支持 --headed 有头模式、--browser 多浏览器、--device 多设备',
-        usage: 'speccore verify [--ui] [--smoke-only] [--visual-only] [--headed] [--browser <b>] [--device <d>] [--config <file>]', examples: ['speccore verify --ui', 'speccore verify --ui --headed', 'speccore verify --config ./tests/smoke.yaml'], related: ['deploy', 'execute', 'dashboard'], triggers: ['verify', '测试', '冒烟', 'smoke', '视觉检查', 'ui验证', '验证', '跑测试', '测一下', '检查页面'] },
+        usage: 'speccore verify [--ui] [--smoke-only] [--visual-only] [--headed] [--browser <b>] [--device <d>] [--config <file>]', examples: ['speccore verify --ui', 'speccore verify --ui --headed', 'speccore verify --config ./tests/smoke.yaml'], related: ['deploy', 'execute', 'dashboard'], triggers: ['verify', '测试', '冒烟', 'smoke', '视觉检查', 'ui验证', '验证', '跑测试', '测一下', '检查页面'],
+        // v8.3.351+: 「验证」同挂 verify/validate，测试/验证动作词义优先（显式分层，不靠声明顺序）
+        priority: 1 },
     { name: 'validate', aliases: ['vl'], description: '合规验证：检查 Spec 完整性与一致性',
         usage: 'speccore validate [--iteration <name>]', examples: ['speccore validate', 'speccore validate --iteration Q2'], related: ['analyze'], triggers: ['验证', 'validate', '检查', '合规', '校验'] },
     { name: 'sync', aliases: ['sy'], description: '双向同步：代码↔Spec，--global 同步到全局层（原 sync-global）',
@@ -323,13 +328,17 @@ function matchCommandInKB(input) {
     // 触发词匹配（最不可靠，需诚实声明低置信度）
     let best = null;
     let bestScore = 0;
+    let bestPriority = -Infinity;
     for (const cmd of COMMAND_KB) {
         // v8.3.257: 用匹配触发词的总长度加权——长词（如「全局分析」4字）比短词（「分析」2字）更具体，
         // 避免「全局分析」被 analyze 的泛触发词「分析」抢占
+        // v8.3.351+: 同分 tie-break 显式化——priority 值大者赢，priority 相同回退声明顺序
         const score = cmd.triggers.filter(t => lower.includes(t)).reduce((s, t) => s + t.length, 0);
-        if (score > bestScore) {
+        const priority = cmd.priority ?? 0;
+        if (score > bestScore || (score === bestScore && priority > bestPriority)) {
             bestScore = score;
             best = cmd;
+            bestPriority = priority;
         }
     }
     if (bestScore > 0 && best) {
@@ -599,11 +608,59 @@ function formatCommandDisplay(r) {
         : r.command;
 }
 /** 模式3: 意图匹配（当前 ask 逻辑） */
+/**
+ * v8.3.351+: 提取「合并/提交到 {环境}」句式的目标环境名（归一化英文标识）供 pr 意图透传 --base；
+ * 识别与解析分离——分支解析在 pr 命令内走 resolveEnvBranchRef（与 pr_target 环境名引用同链路）。
+ * 无环境词时返回空串（普通 pr 意图不加 --base）。
+ */
+function extractMergeEnvTarget(input) {
+    const match = input.match(/(?:合并|merge|合到|合入|提交|commit)(?:到|至|入)?[^，。！？]{0,6}(local|dev|develop|test|staging|production|prod|预发布|预发|线上|生产|测试|开发|本地)(?:\s*环境)?/i);
+    if (!match)
+        return '';
+    const envMap = {
+        '预发布': 'staging', '预发': 'staging', '线上': 'production', '生产': 'production', 'prod': 'production',
+        '测试': 'test', '开发': 'dev', 'develop': 'dev', '本地': 'local',
+    };
+    return envMap[match[1].toLowerCase()] || match[1].toLowerCase();
+}
 async function handleMatch(input, isExplicit = false) {
     // 补充分析意图已在 askEngine 顶层检测（第零层），此处不再重复
     // 优先用 KB 精确匹配
     const kbMatch = matchCommandInKB(input);
     const config = await (0, ask_config_1.loadAskConfig)();
+    // v8.3.351+: 「合并/提交到 {环境}」确定性短路——无论 KB 词条（「开发」抢 pr 先手）
+    // 还是意图识别（execute 宽触发词）谁得先机，该句式一律路由 pr --base <环境>；
+    // 环境名是目标环境，不是开发/测试动作词。「合并需求」无「到」不短路（走 analyze）。
+    const mergeEnvTarget = extractMergeEnvTarget(input);
+    if (mergeEnvTarget && /(?:合并|merge|合到|合入|提交)(?:到|至|入)/i.test(input)) {
+        const mergeResult = {
+            mode: 'match',
+            summary: `✅ 推荐: speccore pr --base ${mergeEnvTarget}`,
+            detail: `🎯 推荐命令: speccore pr --base ${mergeEnvTarget}\n创建 Pull Request：目标分支指向 ${mergeEnvTarget} 环境分支（pr 内解析 environments/${mergeEnvTarget}.yaml 的 branch）\n\n⚠️  请确认后执行以上命令。`,
+            commands: ['pr'],
+        };
+        // 域检测（与 AMBIGUOUS_INTENTS 机制对齐）：「合并到测试环境」也是日常讨论高频句，
+        // 分不清是 speccore 操作还是普通对话时先确认，不直接执行
+        if (!isExplicit && !(0, intent_recognition_1.isSpeccoreOperation)(input)) {
+            return {
+                mode: 'ambiguous',
+                summary: `待确认: pr — 是 speccore 操作还是普通对话?`,
+                detail: [
+                    '🤔 我识别到你可能想执行 speccore 命令，但不确定这是调用 CLI 还是普通技术讨论：',
+                    '',
+                    `  你的输入: "${input}"`,
+                    `  匹配意图: pr → speccore pr --base ${mergeEnvTarget}（目标分支指向该环境分支）`,
+                    '',
+                    '如果是 speccore 操作（创建 PR 并指向该环境分支），请输入 y 确认；',
+                    '如果是普通技术讨论（如讨论代码流向/分支策略），请直接描述你的问题。',
+                    '',
+                    '或输入 y 确认执行: speccore pr --base ' + mergeEnvTarget,
+                ].join('\n'),
+                commands: ['pr'],
+            };
+        }
+        return mergeResult;
+    }
     const results = await (0, intent_recognition_1.recognizeIntent)(input);
     let best = results[0];
     // v8.3.191+: run 意图带 preset/起止点（extractParams 已精确识别编排）时优先 run 编排，
@@ -638,8 +695,11 @@ async function handleMatch(input, isExplicit = false) {
     }
     // 如果 KB 有匹配且置信度高于意图识别，用 KB（但要整合意图识别的参数）
     // v8.3.191+: run 意图有 preset/起止点时，优先 run 编排（避免被 KB 的 split/deploy 等抢占）
+    // v8.3.351+: KB 命中 pr 且句中提取到目标环境（「合并到开发环境」）时强制走 KB 分支——
+    // 「开发」是环境名不是开发动作，不得被 execute 的宽触发词抢占
     const runHasParams = best?.command === 'run' && (best.extractedParams?.preset || best.extractedParams?.from || best.extractedParams?.to || best.extractedParams?.gate);
-    if (kbMatch && (!best || best.confidence < 60) && !runHasParams) {
+    const prWithEnvTarget = kbMatch?.name === 'pr' && extractMergeEnvTarget(input) !== '';
+    if (kbMatch && (!best || best.confidence < 60 || prWithEnvTarget) && !runHasParams) {
         const params = best?.extractedParams || {};
         let fullCommand = `speccore ${kbMatch.name}`;
         // v8.3.301+: from-source 端名自动映射的备注，等 paramNotes 声明后再 append
@@ -723,6 +783,16 @@ async function handleMatch(input, isExplicit = false) {
             fullCommand += ` --prompt`;
             paramNotes.push(`🧠 模式: AI 智能拆分`);
         }
+        // v8.3.351+: KB trigger「合并」命中 pr 时，提取目标环境透传 --base——
+        // pr 命令内 resolveEnvBranchRef 解析为 environments/{env}.yaml 的 branch；
+        // 「合并到测试环境」在 COMMAND_MAPPINGS 无 pr 触发词（best 为空），必走本 KB 分支
+        if (kbMatch.name === 'pr') {
+            const mergeEnv = extractMergeEnvTarget(input);
+            if (mergeEnv) {
+                fullCommand += ` --base ${mergeEnv}`;
+                paramNotes.push(`🌿 目标环境: ${mergeEnv} → PR 目标分支指向该环境分支`);
+            }
+        }
         // 补充分析意图已在 askEngine 顶层检测，此处不再重复
         let detail = `🎯 推荐命令: ${fullCommand}\n${kbMatch.description}\n\n用法: ${kbMatch.usage}`;
         if (paramNotes.length > 0)
@@ -881,6 +951,16 @@ async function handleMatch(input, isExplicit = false) {
         // v8.3.257: search 用位置参数而非 -n（search 无 -n 选项，避免死参数）
         fullCommand = `speccore search "${params.name || input.slice(0, 40)}"`;
     }
+    else if (best.command === 'pr') {
+        fullCommand = `speccore pr`;
+        // v8.3.351+: 高置信度 pr 意图同样支持「合并到 {环境}」环境名透传（KB 分支的对称兜底）；
+        // 「需求合并」等语料由 SYNONYM_MAP 优先路由 analyze，不会落到此处
+        const mergeEnv = extractMergeEnvTarget(input);
+        if (mergeEnv) {
+            fullCommand += ` --base ${mergeEnv}`;
+            paramNotes.push(`🌿 目标环境: ${mergeEnv} → PR 目标分支指向该环境分支`);
+        }
+    }
     else {
         fullCommand = `speccore ${best.command}`;
         // v8.3.257: -n/--iter 不是通用选项——仅 task new/iteration create 注册了 -n，