refactor: 正则阶段从 9 个细分简化为输入/输出两大类

- 9 个细粒度阶段 → 2 个:input(所有 prompt 阶段)、output(模型返回阶段)
- 默认值:enabled=true, input=true, output=true(全部打开)
- task-regex.js: shouldApplyRuleForStage 映射旧 stage 名到 input/output
- UI: 合并为单组「执行阶段」列表
This commit is contained in:
Youzini-afk
2026-03-26 00:02:08 +08:00
parent ec63267475
commit 71011400d2
2 changed files with 19 additions and 67 deletions

View File

@@ -108,15 +108,8 @@ const TASK_PROFILE_GENERATION_GROUPS = [
];
const TASK_PROFILE_REGEX_STAGES = [
{ key: "finalPrompt", label: "最终 Prompt", desc: "最终 system prompt" },
{ key: "input.userMessage", label: "用户消息", desc: "用户消息进入编排前" },
{ key: "input.recentMessages", label: "近期消息", desc: "最近消息进入编排前" },
{ key: "input.candidateText", label: "候选文本", desc: "候选节点文本进入编排前" },
{ key: "input.finalPrompt", label: "组装后 Prompt", desc: "最终 assembled prompt" },
{ key: "rawResponse", label: "原始返回", desc: "模型原始输出" },
{ key: "beforeParse", label: "解析前", desc: "解析 JSON 前" },
{ key: "output.rawResponse", label: "输出原始响应", desc: "输出阶段原始响应" },
{ key: "output.beforeParse", label: "输出解析前", desc: "输出阶段解析前" },
{ key: "input", label: "输入阶段", desc: "对发送给 LLM 的 prompt 执行正则替换。" },
{ key: "output", label: "输出阶段", desc: "对 LLM 返回的结果执行正则替换。" },
];
let panelEl = null;
@@ -1996,9 +1989,9 @@ function _renderTaskRegexTab(state) {
.join("")}
</div>
<div class="bme-task-section-label">输入阶段</div>
<div class="bme-task-section-label">执行阶段</div>
<div class="bme-task-toggle-list">
${TASK_PROFILE_REGEX_STAGES.filter((s) => !s.key.startsWith("output.") && s.key !== "rawResponse" && s.key !== "beforeParse").map(
${TASK_PROFILE_REGEX_STAGES.map(
(stage) => `
<label class="bme-toggle-item">
<span class="bme-toggle-copy">
@@ -2008,26 +2001,7 @@ function _renderTaskRegexTab(state) {
<input
type="checkbox"
data-regex-stage="${_escHtml(stage.key)}"
${(regex.stages?.[stage.key] ?? false) ? "checked" : ""}
/>
</label>
`,
).join("")}
</div>
<div class="bme-task-section-label">输出阶段</div>
<div class="bme-task-toggle-list">
${TASK_PROFILE_REGEX_STAGES.filter((s) => s.key.startsWith("output.") || s.key === "rawResponse" || s.key === "beforeParse").map(
(stage) => `
<label class="bme-toggle-item">
<span class="bme-toggle-copy">
<span class="bme-toggle-title">${_escHtml(stage.label)}</span>
<span class="bme-toggle-desc">${_escHtml(stage.desc)}</span>
</span>
<input
type="checkbox"
data-regex-stage="${_escHtml(stage.key)}"
${(regex.stages?.[stage.key] ?? false) ? "checked" : ""}
${(regex.stages?.[stage.key] ?? true) ? "checked" : ""}
/>
</label>
`,
@@ -2812,7 +2786,7 @@ function _normalizeTaskProfileDraft(profile = {}) {
const draft = profile || {};
draft.blocks = _normalizeTaskBlocks(draft.blocks);
draft.regex = {
enabled: false,
enabled: true,
inheritStRegex: true,
sources: {
global: true,
@@ -2820,15 +2794,8 @@ function _normalizeTaskProfileDraft(profile = {}) {
character: true,
},
stages: {
finalPrompt: true,
"input.userMessage": false,
"input.recentMessages": false,
"input.candidateText": false,
"input.finalPrompt": false,
rawResponse: false,
beforeParse: false,
"output.rawResponse": false,
"output.beforeParse": false,
input: true,
output: true,
},
localRules: [],
...(draft.regex || {}),
@@ -2839,15 +2806,8 @@ function _normalizeTaskProfileDraft(profile = {}) {
...(draft.regex?.sources || {}),
},
stages: {
finalPrompt: true,
"input.userMessage": false,
"input.recentMessages": false,
"input.candidateText": false,
"input.finalPrompt": false,
rawResponse: false,
beforeParse: false,
"output.rawResponse": false,
"output.beforeParse": false,
input: true,
output: true,
...(draft.regex?.stages || {}),
},
localRules: Array.isArray(draft.regex?.localRules)

View File

@@ -215,14 +215,16 @@ function collectLocalRules(regexConfig = {}) {
.filter((rule) => rule.enabled && rule.findRegex);
}
function shouldApplyRuleForStage(rule, stage = "") {
function shouldApplyRuleForStage(rule, stage = "", stagesConfig = {}) {
// 将细粒度的 stage 名映射到 input / output 两大类
if (PROMPT_STAGES.has(stage)) {
return rule.destinationFlags.prompt !== false;
return stagesConfig.input !== false && rule.destinationFlags.prompt !== false;
}
if (OUTPUT_STAGES.has(stage)) {
return true;
return stagesConfig.output !== false;
}
return rule.destinationFlags.prompt !== false;
// 未知 stage 回退到 input
return stagesConfig.input !== false && rule.destinationFlags.prompt !== false;
}
function shouldApplyRuleForRole(rule, role = "system") {
@@ -280,18 +282,8 @@ export function applyTaskRegex(
return input;
}
const stageEnabled = regexConfig?.stages?.[stage] === true;
if (!stageEnabled) {
pushDebug(debugCollector, {
taskType,
stage,
enabled: true,
appliedRules: [],
sourceCount: { tavern: 0, local: 0 },
skipped: "stage_disabled",
});
return input;
}
// 阶段检查已移到 shouldApplyRuleForStage 中,无需单独 gate
const stagesConfig = regexConfig?.stages || {};
const tavernRules = collectTavernRules(regexConfig);
const localRules = collectLocalRules(regexConfig);
@@ -300,7 +292,7 @@ export function applyTaskRegex(
let output = input;
for (const rule of orderedRules) {
if (!shouldApplyRuleForStage(rule, stage)) continue;
if (!shouldApplyRuleForStage(rule, stage, stagesConfig)) continue;
if (!shouldApplyRuleForRole(rule, role)) continue;
const result = applyOneRule(output, rule, stage);