|
10 | 10 | import test from "node:test"; |
11 | 11 | import assert from "node:assert/strict"; |
12 | 12 | import { STR } from "../src/lang.js"; |
13 | | -import { renderUserSettingsBlock, escapePromptVars, resolvePersonaCard } from "../src/user-settings.js"; |
| 13 | +import { renderUserSettingsBlock, escapePromptVars, resolvePersonaCard, resolveFactsCard } from "../src/user-settings.js"; |
14 | 14 |
|
15 | 15 | // 事实段预算(与 src/user-settings.js 同值,golden 需要它复现截断) |
16 | 16 | const MAX_LINES = 40; |
@@ -44,14 +44,10 @@ function legacyRender({ settings, config, agentId = null, factsProvider = null } |
44 | 44 | ...(typeof persona.replyStyle === "string" && persona.replyStyle.trim() ? [STR.personaReplyStyleLine[language](persona.replyStyle.trim())] : []) |
45 | 45 | ] |
46 | 46 | : []; |
| 47 | + // 事实解析直接调生产函数 resolveFactsCard——内联重写会抄错「先查卡命中还是先判 |
| 48 | + // strict」的顺序(Ephor 2026-11-07 复核指出,内联版实测 3/5 情形与生产不一致)。 |
47 | 49 | const factsResolved = config?.profileFactsEnabled === true && typeof factsProvider === "function" |
48 | | - ? (() => { |
49 | | - const grouped = factsProvider(); |
50 | | - const id = typeof agentId === "string" && agentId.trim() ? agentId.trim() : null; |
51 | | - const strict = config?.personaStrictAddressing === true; |
52 | | - if (id && strict && Object.keys(grouped.byAgent).length > 0) return { facts: [], source: "none" }; |
53 | | - return { facts: id ? (grouped.byAgent[id] ?? []) : grouped.default, source: id ? "byAgent" : "default" }; |
54 | | - })() |
| 50 | + ? resolveFactsCard(factsProvider(), agentId, { strict: config?.personaStrictAddressing === true }) |
55 | 51 | : { facts: [], source: "none" }; |
56 | 52 | const factLines = []; |
57 | 53 | if (factsResolved.facts.length) { |
@@ -154,17 +150,40 @@ const CASES = [ |
154 | 150 | "事实里的 {{ }} 要转义", |
155 | 151 | makeSettings({ profile: "画像", rules: [] }), |
156 | 152 | { profileFactsEnabled: true, factsProvider: () => ({ default: ["模板 {{x}} 事实"], byAgent: {} }) } |
| 153 | + ], |
| 154 | + // 下面三条覆盖 resolveFactsCard 的四条出口:golden 曾把事实解析内联重写, |
| 155 | + // 抄错了「先查本卡命中还是先判 strict」的顺序,而这 20 个用例当时全绿——说明 |
| 156 | + // 分歧路径没被覆盖。Ephor 2026-11-07 复核指出后补齐(实测内联版 3/5 分歧)。 |
| 157 | + [ |
| 158 | + "事实段 strict 开着但本卡命中(命中优先于 strict,不许判 none)", |
| 159 | + makeSettings({ profile: "画像", rules: [] }), |
| 160 | + { profileFactsEnabled: true, personaStrictAddressing: true, agentId: "botA", factsProvider: () => ({ default: ["默认卡"], byAgent: { botA: ["botA 卡"] } }) } |
| 161 | + ], |
| 162 | + [ |
| 163 | + "事实段 strict 关着且本卡未命中(落 default,不许判 byAgent 空)", |
| 164 | + makeSettings({ profile: "画像", rules: [] }), |
| 165 | + { profileFactsEnabled: true, agentId: "ghost", factsProvider: () => ({ default: ["默认卡"], byAgent: { botA: ["botA 卡"] } }) } |
| 166 | + ], |
| 167 | + [ |
| 168 | + "事实段 strict 开着但 byAgent 整体为空(#587 例外,仍落 default)", |
| 169 | + makeSettings({ profile: "画像", rules: [] }), |
| 170 | + { profileFactsEnabled: true, personaStrictAddressing: true, agentId: "botA", factsProvider: () => ({ default: ["默认卡"], byAgent: {} }) } |
157 | 171 | ] |
158 | 172 | ]; |
159 | 173 |
|
160 | | -test("text 逐字节不变:新实现与改动前的实现,20 种配置下输出完全一致", () => { |
| 174 | +test("text 逐字节不变:新实现与改动前的实现,23 种配置下输出完全一致", () => { |
| 175 | + // 逐个比对并把**所有**分歧收集完再断言:循环里直接 assert 会在第一条分歧处 |
| 176 | + // 抛出,后面几条根本没跑到(Ephor 2026-11-07 复核时暴露出这一点——把 golden |
| 177 | + // 换回内联版只报 1 条,实际有 3 条分歧路径)。 |
| 178 | + const bad = []; |
161 | 179 | for (const [name, settings, extra] of CASES) { |
162 | 180 | const { agentId = null, ...config } = extra; |
163 | 181 | const args = { settings, config, agentId, factsProvider: config.factsProvider }; |
164 | 182 | const before = legacyRender(args).text; |
165 | 183 | const after = renderUserSettingsBlock(args).text; |
166 | | - assert.equal(after, before, `配置「${name}」的注入文本必须逐字节不变`); |
| 184 | + if (after !== before) bad.push(`「${name}」\n 改动前: ${JSON.stringify(before)}\n 改动后: ${JSON.stringify(after)}`); |
167 | 185 | } |
| 186 | + assert.equal(bad.length, 0, `${bad.length} 种配置的注入文本变了:\n${bad.join("\n")}`); |
168 | 187 | }); |
169 | 188 |
|
170 | 189 | // ---- ② segments 是 text 的唯一真源 ------------------------------------------ |
|
0 commit comments