执行方案阶段 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/**`,「前端能渲染」待前端批);无真实模型端到端。
124 lines
4.4 KiB
Go
124 lines
4.4 KiB
Go
package loop
|
||
|
||
import (
|
||
"context"
|
||
"sync"
|
||
"testing"
|
||
|
||
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
||
)
|
||
|
||
// collectStream 返回一个 OnStream 回调,外加一个读取它所见过
|
||
// 事件的 reader,使测试能断言循环给每个发出的事件打上的作用域。
|
||
func collectStream() (func(model.StreamEvent), func() []model.StreamEvent) {
|
||
var mu sync.Mutex
|
||
var events []model.StreamEvent
|
||
on := func(ev model.StreamEvent) {
|
||
mu.Lock()
|
||
events = append(events, ev)
|
||
mu.Unlock()
|
||
}
|
||
read := func() []model.StreamEvent {
|
||
mu.Lock()
|
||
defer mu.Unlock()
|
||
return append([]model.StreamEvent(nil), events...)
|
||
}
|
||
return on, read
|
||
}
|
||
|
||
// TestRun_StreamCarriesSessionAndTurn 钉住 A1 契约:循环给每个
|
||
// 流式事件打上它被驱动的会话,以及经 WithTurnID 挂载的 turn id,
|
||
// 使 WS hub 能把 message.delta/thinking.delta/tool_call.*
|
||
// 路由到正确的会话与 turn(design/16 §4.2)。回合边界帧
|
||
// (turn.start/end,v0.50)同样带作用域,因此计入总数。
|
||
func TestRun_StreamCarriesSessionAndTurn(t *testing.T) {
|
||
t.Parallel()
|
||
ad := &mockAdapter{
|
||
stream: []mgResp{{resp: model.Response{Content: "Hello world"}}},
|
||
chunks: [][]string{{"Hel", "lo"}},
|
||
}
|
||
a := newTestAgent(t, ad, nil)
|
||
onStream, streams := collectStream()
|
||
l := New(Options{Agent: a, OnStream: onStream, MaxRounds: 8})
|
||
|
||
ctx := WithTurnID(context.Background(), "turn-xyz")
|
||
if _, err := l.Run(ctx, "web", []model.Message{model.TextMessage(model.RoleUser, "hi")}); err != nil {
|
||
t.Fatalf("Run: %v", err)
|
||
}
|
||
events := streams()
|
||
if len(events) != 4 {
|
||
t.Fatalf("stream events = %d, want 4 (turn.start + 2 deltas + turn.end)", len(events))
|
||
}
|
||
for i, ev := range events {
|
||
if ev.SessionID != "web" || ev.TurnID != "turn-xyz" {
|
||
t.Fatalf("event[%d] scope = session %q turn %q, want session web turn turn-xyz", i, ev.SessionID, ev.TurnID)
|
||
}
|
||
}
|
||
if events[0].Kind != model.StreamKindTurnStart || events[3].Kind != model.StreamKindTurnEnd {
|
||
t.Fatalf("boundary kinds = %q…%q, want turn_start…turn_end", events[0].Kind, events[3].Kind)
|
||
}
|
||
if events[1].Delta != "Hel" || events[2].Delta != "lo" {
|
||
t.Fatalf("deltas = [%q %q], want [Hel lo]", events[1].Delta, events[2].Delta)
|
||
}
|
||
}
|
||
|
||
// TestRun_StreamWithoutTurnIDLeavesItEmpty 保持向后兼容的默认行为:
|
||
// 未挂载 turn id 的调用方在每个事件上仍拿到会话,但
|
||
// TurnID 为空 —— 该字段的零值即旧行为。
|
||
func TestRun_StreamWithoutTurnIDLeavesItEmpty(t *testing.T) {
|
||
t.Parallel()
|
||
ad := &mockAdapter{
|
||
stream: []mgResp{{resp: model.Response{Content: "ok"}}},
|
||
chunks: [][]string{{"o", "k"}},
|
||
}
|
||
a := newTestAgent(t, ad, nil)
|
||
onStream, streams := collectStream()
|
||
l := New(Options{Agent: a, OnStream: onStream, MaxRounds: 8})
|
||
|
||
if _, err := l.Run(context.Background(), "web", []model.Message{model.TextMessage(model.RoleUser, "hi")}); err != nil {
|
||
t.Fatalf("Run: %v", err)
|
||
}
|
||
events := streams()
|
||
if len(events) == 0 {
|
||
t.Fatal("no stream events were emitted")
|
||
}
|
||
for i, ev := range events {
|
||
if ev.SessionID != "web" || ev.TurnID != "" {
|
||
t.Fatalf("event[%d] scope = session %q turn %q, want session web turn \"\"", i, ev.SessionID, ev.TurnID)
|
||
}
|
||
}
|
||
}
|
||
|
||
// TestRun_ToolExecutionCarriesScope 覆盖循环的另一个流式发出点:
|
||
// tool_execution.start/end 进度帧也必须带作用域,否则它就会成为
|
||
// 多会话客户端唯一无法路由的帧。
|
||
func TestRun_ToolExecutionCarriesScope(t *testing.T) {
|
||
t.Parallel()
|
||
ad := &mockAdapter{stream: []mgResp{
|
||
{resp: nativeDatetimeCall()},
|
||
{resp: model.Response{Model: "m", Content: "done"}},
|
||
}}
|
||
td := dispatcherWith(t, &mockTool{name: "datetime", result: map[string]any{"now": "2026-09-08 22:34:00"}})
|
||
a := newTestAgent(t, ad, td)
|
||
onStream, streams := collectStream()
|
||
l := New(Options{Agent: a, OnStream: onStream, MaxRounds: 8})
|
||
|
||
ctx := WithTurnID(context.Background(), "turn-tool")
|
||
if _, err := l.Run(ctx, "web", []model.Message{model.TextMessage(model.RoleUser, "time?")}); err != nil {
|
||
t.Fatalf("Run: %v", err)
|
||
}
|
||
found := 0
|
||
for _, ev := range streams() {
|
||
if ev.Kind != model.StreamKindToolExecutionStart && ev.Kind != model.StreamKindToolExecutionEnd {
|
||
continue
|
||
}
|
||
found++
|
||
if ev.SessionID != "web" || ev.TurnID != "turn-tool" {
|
||
t.Fatalf("tool_execution scope = session %q turn %q, want session web turn turn-tool", ev.SessionID, ev.TurnID)
|
||
}
|
||
}
|
||
if found == 0 {
|
||
t.Fatal("no tool_execution event was emitted")
|
||
}
|
||
}
|