执行方案阶段 2 · P2-3(`DevDocs/audit/_plan.md`)。契约 `Docs/api-client.md` → **v0.50**。
- **01.4.1 `tool_execution` 拆三事件**:`model/stream.go` 删旧 `StreamKindToolExecution`,新增
`tool_execution.start/update/end` + `ToolPhaseRunning/Done/Error`(与 design/19 status 同值);
`StreamEvent` 增 `Tool`/`Phase`;`loop/tools.go` 的 `emitToolExecution` 重写为结构化字段、
**Delta 恒空**(断言锁死),`ID` 复用 provider tool call id(可与 `tool_call.*` 关联)。
⚠️ **诚实边界**:start/end 有真实生产者;`update` 的 wire 映射已实现并单测锁定,但**工具分发器
无中途进度上报源 ⇒ loop 暂不产出 update 帧**(已在 api-client §3.1 如实登记)。
- **03.4.4 phase 驱动图节点状态**:`invokeOne` 用**单一 phase 决策**同时决定 end 帧 phase、
span 的 `phase` prop 与终态;`trace/graph.go` 新增 `FlowStatusForPhase`,`graph_build.go` 的
`AddSpan` 对 tool 节点**优先消费 phase prop**(缺省回落 span 终态 ⇒ 两路不可能矛盾)。
- **01.4.2 `streamId`**:`StreamEvent` 增 `StreamID`;`loop/stream.go` 每次 ChatStream 生成
`stream-<hex>`(crypto/rand,降级时间戳),该流所有帧共享、多步工具轮取新 id;`ws_bridge`
把它并进**模型流帧** `data`(`tool_execution.*`/`turn.*` 不带)。语义区分:`turnId` = 哪轮回答,
`streamId` = 这条流式消息。
- **01.4.3 `turn.start`/`turn.end`**:`loop/run.go` 入口发 start、defer 发 end,**覆盖全部出口**
(最终答案/安全网终止/预算耗尽/步骤错误);帧**无 data 载荷**;静音的内部 run(backthink/子代理)
不发。顺带把 91 行的 `Run` 拆成 `driveTurn` + `settleAndReturn`(清掉一处既有 >80 行违规)。
- **01.4.5**:仅 `Docs/api-client.md` §3.5 补 `graph_update` 三范围(`web`/`web:<uuid>`/`sess-backthink`),
与 `wire_runtime.go` 的 allow 谓词一致,**零代码变更**。
验证:`go build ./...` 绿;本批四包(loop/model/trace/gateway)vet + 测试绿(含 `-count=1`);
linux/amd64 + darwin/arm64 交叉编译绿;本批 16 文件 ≤500 行、函数 ≤80 行。
**真 WS 帧断言 8 条**:帧序 `turn.start → message.delta → tool_execution.start →
tool_execution.end → message.delta → turn.end`(+`stream_end`)、turn 边界无载荷且整轮 turnId 一致、
两条模型流 `streamId` 互异、tool 帧 `{tool,phase,id}` 且无 `delta`/`streamId` 键、
`turn.end` 在步骤出错时也发出、内部静音 run 不发边界帧。
**变异验证**:把 `ev.StreamID = streamID` 改为赋空 → 两条断言 FAIL(`streamId` 为空/两流同空),
还原后复绿(直接删行会先被编译期 `declared and not used` 拦截)。
未验证:前端未消费这些帧(本轮未动 `frontend/**`,「前端能渲染」待前端批);无真实模型端到端。
153 lines
5.1 KiB
Go
153 lines
5.1 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
// thinkingAdapter 发出一个完整的思考分段,后接一个文本分段,
|
|
// 并记录它收到的每个请求,使测试能断言循环的
|
|
// 推理旋钮确实到达了模型调用。
|
|
type thinkingAdapter struct {
|
|
reqs []model.Request
|
|
}
|
|
|
|
func (a *thinkingAdapter) Name() string { return "thinking-mock" }
|
|
|
|
func (a *thinkingAdapter) Chat(_ context.Context, req model.Request, _ model.Options) (model.Response, error) {
|
|
a.reqs = append(a.reqs, req)
|
|
return model.Response{Content: "Hello"}, nil
|
|
}
|
|
|
|
func (a *thinkingAdapter) ChatStream(_ context.Context, req model.Request, on func(model.StreamEvent)) (model.Response, error) {
|
|
a.reqs = append(a.reqs, req)
|
|
events := []model.StreamEvent{
|
|
{Kind: model.StreamKindThinkingStart},
|
|
{Kind: model.StreamKindThinkingDelta, Delta: "let me think"},
|
|
{Kind: model.StreamKindThinkingEnd},
|
|
{Kind: model.StreamKindTextStart},
|
|
{Kind: model.StreamKindTextDelta, Delta: "Hello"},
|
|
{Kind: model.StreamKindTextEnd},
|
|
}
|
|
for _, ev := range events {
|
|
if on != nil {
|
|
on(ev)
|
|
}
|
|
}
|
|
return model.Response{Content: "Hello"}, nil
|
|
}
|
|
|
|
// kindsOf 把事件 kind 作为集合返回,便于紧凑断言。
|
|
func kindsOf(events []model.StreamEvent) map[model.StreamKind]int {
|
|
out := make(map[model.StreamKind]int, len(events))
|
|
for _, ev := range events {
|
|
out[ev.Kind]++
|
|
}
|
|
return out
|
|
}
|
|
|
|
// runThinkingTurn 用给定广播开关配置的循环驱动一个流式 turn,
|
|
// 并返回 OnStream 见过的事件。
|
|
func runThinkingTurn(t *testing.T, show *bool) ([]model.StreamEvent, *thinkingAdapter) {
|
|
t.Helper()
|
|
ad := &thinkingAdapter{}
|
|
onStream, streams := collectStream()
|
|
l := New(Options{
|
|
Agent: newTestAgent(t, ad, nil),
|
|
OnStream: onStream,
|
|
MaxRounds: 8,
|
|
ThinkingShowToUser: show,
|
|
})
|
|
if _, err := l.Run(context.Background(), "web", []model.Message{model.TextMessage(model.RoleUser, "hi")}); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
return streams(), ad
|
|
}
|
|
|
|
// TestRun_ThinkingShowToUserFalseWithholdsThinkingFrames 是 showToUser=false
|
|
// 的契约:思考帧绝不抵达客户端回调,而正文本
|
|
// 分段原样投递(展示被门控,答案不受影响)。
|
|
func TestRun_ThinkingShowToUserFalseWithholdsThinkingFrames(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
show := false
|
|
events, _ := runThinkingTurn(t, &show)
|
|
kinds := kindsOf(events)
|
|
for _, k := range []model.StreamKind{model.StreamKindThinkingStart, model.StreamKindThinkingDelta, model.StreamKindThinkingEnd} {
|
|
if n := kinds[k]; n != 0 {
|
|
t.Fatalf("event kind %q emitted %d time(s) with showToUser=false", k, n)
|
|
}
|
|
}
|
|
for _, k := range []model.StreamKind{model.StreamKindTextStart, model.StreamKindTextDelta, model.StreamKindTextEnd} {
|
|
if kinds[k] != 1 {
|
|
t.Fatalf("event kind %q emitted %d time(s), want 1 (body must be unaffected)", k, kinds[k])
|
|
}
|
|
}
|
|
if len(events) != 5 {
|
|
t.Fatalf("events = %d, want the 3 text frames plus the 2 turn boundaries", len(events))
|
|
}
|
|
}
|
|
|
|
// TestRun_ThinkingShowToUserDefaultBroadcastsThinking 在选项未设置
|
|
// (nil)时保持既有行为:思考帧被推送。
|
|
func TestRun_ThinkingShowToUserDefaultBroadcastsThinking(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
events, _ := runThinkingTurn(t, nil)
|
|
kinds := kindsOf(events)
|
|
if kinds[model.StreamKindThinkingDelta] != 1 || kinds[model.StreamKindThinkingStart] != 1 || kinds[model.StreamKindThinkingEnd] != 1 {
|
|
t.Fatalf("thinking frames = %v, want start/delta/end each once with the option unset", kinds)
|
|
}
|
|
if len(events) != 8 {
|
|
t.Fatalf("events = %d, want all 8 frames (6 segment frames + 2 turn boundaries)", len(events))
|
|
}
|
|
}
|
|
|
|
// TestRun_ThinkingShowToUserTrueBroadcastsThinking 断言显式 true
|
|
// 的行为与默认值一致。
|
|
func TestRun_ThinkingShowToUserTrueBroadcastsThinking(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
show := true
|
|
events, _ := runThinkingTurn(t, &show)
|
|
if kinds := kindsOf(events); kinds[model.StreamKindThinkingDelta] != 1 {
|
|
t.Fatalf("thinking delta frames = %d, want 1 with showToUser=true", kinds[model.StreamKindThinkingDelta])
|
|
}
|
|
}
|
|
|
|
// TestRun_RequestCarriesThinkingKnobs 断言循环把它配置的推理
|
|
// 选项注入它构建的每个模型请求,使某人格的思考配置
|
|
// 真正被应用,而不是校验后被忽略。
|
|
func TestRun_RequestCarriesThinkingKnobs(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
ad := &thinkingAdapter{}
|
|
onStream, _ := collectStream()
|
|
want := &model.Thinking{BudgetTokens: 4096}
|
|
l := New(Options{
|
|
Agent: newTestAgent(t, ad, nil),
|
|
OnStream: onStream,
|
|
MaxRounds: 8,
|
|
Thinking: want,
|
|
ReasoningEffort: "low",
|
|
})
|
|
if _, err := l.Run(context.Background(), "web", []model.Message{model.TextMessage(model.RoleUser, "hi")}); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if len(ad.reqs) == 0 {
|
|
t.Fatal("no model request was recorded")
|
|
}
|
|
got := ad.reqs[0]
|
|
if got.Thinking != want {
|
|
t.Fatalf("request.Thinking = %+v, want %+v", got.Thinking, want)
|
|
}
|
|
if got.Thinking.BudgetTokens != 4096 {
|
|
t.Fatalf("request.Thinking.BudgetTokens = %d, want 4096", got.Thinking.BudgetTokens)
|
|
}
|
|
if got.ReasoningEffort != "low" {
|
|
t.Fatalf("request.ReasoningEffort = %q, want low", got.ReasoningEffort)
|
|
}
|
|
}
|