test(channelbridge): 窗口夹具按截止时刻推钟 + 去掉无法证实的替身锁（M33 r1 复审）
P1-1（channelbridge 的 -race 门仍红，红在用例不确定性而不是竞态）： - coalesceTimers 改成**截止时刻**语义：每次 after(d) 记 at = 注入时钟 + d， 推钟只把时钟推进到「当前最早的截止时刻」再触发它。旧写法按 FIFO 逐个触发并 按请求时长累加，实测 12 条消息内攒到 5 个废弃定时器把时钟推 +10s（窗口 2s、 绝对上限 6s）⇒ 循环头走「到点直接发车、不 takeAll」的分支，队列尾部落到下一批。 - 推钟前强制「车道排空」这条不变量（pump/advanceAndFire/waitIdle）： 时钟只表示时间过去，它一转就可能跳过 takeAll，因此先等 worker 把货收进本批。 - sendSettled：投递后按**序号**等「这次投递之后新挂的定时器」（旧的都已被 worker 放弃、再没人监听），供「投递与推钟交替」的用例（每 500ms 一条的绝对上限用例）。 - fireLatest/advanceAndFire 带 done 谓词重试，避免「登记与触发之间续臂」导致 推了钟却没人醒；waitIdle 一边等一边推窗口（worker 停在窗口里时永远走不到退休）。 - 用例侧只补相位与等待，不动断言：TwelveBurst 读历史前等 assistant 行落库； 准入用例断言「最新一次续臂」（原来按下标取 d[1]，隐含臂数假设）； stale 用例两条都投完再推时钟（车道不会在两条之间退休）。 P2-1（替身锁无法用变异证实）选 A：删掉 stubChatter/stubSessions 的锁与访问器， 退回原字段访问，并写清理由 —— 21 个用例全走同步便捷路径 （b.process → processFrom → runBatch → Loop.Run），DEV HEAD 上 -race 数十次跑 （含把锁删掉的变异）DATA RACE 恒为 0；若将来从车道 worker 触碰这些字段必须加锁 并补 -race 用例。 证据：go test -race -count=3 ./internal/services/channelbridge/ 连跑 6 轮 18/18 全绿、DATA RACE=0；coalesce 子集 -count=80 全绿；整包 -race -count=20 全绿； 全树 go build/vet/test -count=1 全绿。
This commit is contained in:
AskaEth committed
1 parent
7d9b2132bb
commit
1ae9158250
20 files changed
+584
-371
No files matched your search
@@ -90,8 +90,8 @@ func TestEngageRoleNameMentionProbesAndResponds(t *testing.T) {
|
||||
if !judge.last.Engage {
|
||||
t.Fatal("judge input Engage = false, want true for a participation judgment")
|
||||
}
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (interested → ACTIVE reply)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (interested → ACTIVE reply)", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,8 +106,8 @@ func TestEngageRoleNameMentionNotInterestedSilences(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran after no-interest, session = %q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran after no-interest, session = %q", chat.sessionID)
|
||||
}
|
||||
// 不感兴趣 → 只登记、不回复。
|
||||
if len(hist.records()) != 1 || hist.records()[0].Content != "提一句昔涟而已" {
|
||||
@@ -126,8 +126,8 @@ func TestEngageAvoidTopicStaysIdle(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran after avoidTopic, session = %q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran after avoidTopic, session = %q", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,8 +144,8 @@ func TestEngageNoTriggerNoProbabilitySkipsJudge(t *testing.T) {
|
||||
if judge.calls != 0 {
|
||||
t.Fatalf("light judge calls = %d, want 0 (untriggered must not call LLM)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran without a trigger, session = %q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran without a trigger, session = %q", chat.sessionID)
|
||||
}
|
||||
if len(hist.records()) != 1 {
|
||||
t.Fatalf("records = %d, want 1 (registered only)", len(hist.records()))
|
||||
@@ -165,8 +165,8 @@ func TestEngageProbabilityTriggerResponds(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1 (probability hit → PROBING)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (judge interested → reply)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (judge interested → reply)", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,8 +181,8 @@ func TestEngageProbabilityMissSilences(t *testing.T) {
|
||||
if judge.calls != 0 {
|
||||
t.Fatalf("light judge calls = %d, want 0 (probability miss → no LLM)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran on probability miss, session = %q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran on probability miss, session = %q", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,14 +197,14 @@ func TestEngageStateMachineActivityWindowExpiry(t *testing.T) {
|
||||
|
||||
// msg1：角色名提及 → 探测 → 感兴趣 → ACTIVE（回复）。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("聊昔涟"))
|
||||
if chat.SessionID() != "sess-g" || judge.calls != 1 {
|
||||
t.Fatalf("after probe: session=%q calls=%d, want sess-g/1", chat.SessionID(), judge.calls)
|
||||
if chat.sessionID != "sess-g" || judge.calls != 1 {
|
||||
t.Fatalf("after probe: session=%q calls=%d, want sess-g/1", chat.sessionID, judge.calls)
|
||||
}
|
||||
|
||||
// msg2：仍在窗口内 → 跟进复审，仍回复。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("周末去哪玩"))
|
||||
if chat.SessionID() != "sess-g" || judge.calls != 2 {
|
||||
t.Fatalf("after follow-up: session=%q calls=%d, want sess-g/2", chat.SessionID(), judge.calls)
|
||||
if chat.sessionID != "sess-g" || judge.calls != 2 {
|
||||
t.Fatalf("after follow-up: session=%q calls=%d, want sess-g/2", chat.sessionID, judge.calls)
|
||||
}
|
||||
|
||||
// msg3：2 条消息的窗口已满 → 退出 ACTIVE 回到 IDLE。无触发/无概率
|
||||
@@ -230,8 +230,8 @@ func TestEngageStateMachineFollowUpNoInterestExits(t *testing.T) {
|
||||
b, chat, _ := engageTestBridge(t, judge, cfg, dayNow(), nil)
|
||||
|
||||
b.process(context.Background(), nonOwnerGroupMsg("聊昔涟"))
|
||||
if judge.calls != 1 || chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("probe: calls=%d session=%q, want 1/sess-g", judge.calls, chat.SessionID())
|
||||
if judge.calls != 1 || chat.sessionID != "sess-g" {
|
||||
t.Fatalf("probe: calls=%d session=%q, want 1/sess-g", judge.calls, chat.sessionID)
|
||||
}
|
||||
// 连续两次无兴趣跟进之后，随后一条未触发的消息
|
||||
// 绝不再调用判定器（她已退出 ACTIVE）。
|
||||
@@ -259,36 +259,36 @@ func TestEngageColdAvoidCooldownSuppressesThenExpires(t *testing.T) {
|
||||
if judge.calls != 0 {
|
||||
t.Fatalf("judge calls = %d, want 0 (negative attitude → cooldown, no LLM)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran after negative attitude, session = %q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran after negative attitude, session = %q", chat.sessionID)
|
||||
}
|
||||
|
||||
// 冷却期间，即使是角色名提及也不回复（不做主动回复）。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("那聊聊昔涟"))
|
||||
if judge.calls != 0 || chat.SessionID() != "" {
|
||||
t.Fatalf("during cooldown: calls=%d session=%q, want 0/\"\" (suppressed)", judge.calls, chat.SessionID())
|
||||
if judge.calls != 0 || chat.sessionID != "" {
|
||||
t.Fatalf("during cooldown: calls=%d session=%q, want 0/\"\" (suppressed)", judge.calls, chat.sessionID)
|
||||
}
|
||||
|
||||
// M18（主人 2026-10-14 裁决「给」）：冷却期内**连 @ 也不回** ——
|
||||
// 冷避优先于「@她必回」，群成员的一句「少说点」不被随后的 @ 作废。
|
||||
// （旧口径「@ 打断冷却」正是本片修掉的偏离；见 design/18 §5 与
|
||||
// engage_coldshoulder_test.go 的端到端用例。）
|
||||
chat.clearSessionID()
|
||||
chat.sessionID = ""
|
||||
b.process(context.Background(), nonOwnerGroupMsg("在吗", adapter.Mention{UserID: "bot"}))
|
||||
if chat.SessionID() != "" || judge.calls != 0 {
|
||||
if chat.sessionID != "" || judge.calls != 0 {
|
||||
t.Fatalf("mention during cooldown: session=%q calls=%d, want \"\"/0 (@ no longer breaks the cold shoulder)",
|
||||
chat.SessionID(), judge.calls)
|
||||
chat.sessionID, judge.calls)
|
||||
}
|
||||
|
||||
// 冷却计时结束后，角色名提及会重新触发参与（PROBING → ACTIVE）。
|
||||
now = now.Add(2 * time.Hour)
|
||||
chat.clearSessionID()
|
||||
chat.sessionID = ""
|
||||
b.process(context.Background(), nonOwnerGroupMsg("再提昔涟"))
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("judge calls = %d, want 1 (cooldown expired → re-probe)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("session = %q, want sess-g (re-engaged after cooldown)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("session = %q, want sess-g (re-engaged after cooldown)", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -304,8 +304,8 @@ func TestEngageColdAvoidFollowUpDuringActive(t *testing.T) {
|
||||
b, chat, _ := engageTestBridge(t, judge, cfg, dayNow(), nil)
|
||||
|
||||
b.process(context.Background(), nonOwnerGroupMsg("聊昔涟"))
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("probe: session=%q, want sess-g", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("probe: session=%q, want sess-g", chat.sessionID)
|
||||
}
|
||||
|
||||
// ACTIVE 期间出现负面态度会立刻把她按进 COOLDOWN（design/18 §5）。
|
||||
|
||||
Reference in new issue
Block a user