执行方案阶段 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/**`,「前端能渲染」待前端批);无真实模型端到端。
331 lines
11 KiB
Go
331 lines
11 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
func TestRun_DuplicateCallInBatch_Skipped(t *testing.T) {
|
|
t.Parallel()
|
|
// 一批中有两个相同调用:第二个必须被跳过而非执行,
|
|
// 并作为重复提示回灌。
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}},{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "done"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.Text != "done" {
|
|
t.Fatalf("Text = %q, want done", res.Text)
|
|
}
|
|
if res.ToolCallsExecuted != 1 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 1 (duplicate skipped)", res.ToolCallsExecuted)
|
|
}
|
|
if res.StopReason != agent.StopReasonStop {
|
|
t.Fatalf("StopReason = %q, want stop", res.StopReason)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
// 第 1 轮追加了两条工具消息:已执行调用的结果,然后是
|
|
// 重复跳过。最终轮之前的最后两条消息就是它们。
|
|
result := last[len(last)-2]
|
|
skip := last[len(last)-1]
|
|
if !strings.Contains(result.Content[0].Text, "hi") {
|
|
t.Fatalf("expected echo result, got %q", result.Content[0].Text)
|
|
}
|
|
if !strings.Contains(skip.Content[0].Text, "skipped") || !strings.Contains(skip.Content[0].Text, "duplicate") {
|
|
t.Fatalf("expected duplicate-skip message, got %q", skip.Content[0].Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_CriticalToolLoop_Terminates(t *testing.T) {
|
|
t.Parallel()
|
|
// 相同调用跨轮重复:第 2 轮被拦截(标记为关键
|
|
// 循环),第 3 轮终止该 run。
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: call}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.StopReason != StopReasonToolLoopTerminated {
|
|
t.Fatalf("StopReason = %q, want %q", res.StopReason, StopReasonToolLoopTerminated)
|
|
}
|
|
if res.ToolCallsExecuted != 1 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 1 (only round 1 executed)", res.ToolCallsExecuted)
|
|
}
|
|
if res.Steps != 3 {
|
|
t.Fatalf("Steps = %d, want 3", res.Steps)
|
|
}
|
|
if !strings.Contains(res.Text, "critical tool-loop") {
|
|
t.Fatalf("Text = %q, want critical tool-loop message", res.Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_Parallel_ResultsInCallOrder(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"aa","args":{}},{"name":"bb","args":{}},{"name":"cc","args":{}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "final"}},
|
|
}}
|
|
td := dispatcherWith(t,
|
|
&mockTool{name: "aa", result: "va"},
|
|
&mockTool{name: "bb", result: "vb"},
|
|
&mockTool{name: "cc", result: "vc"},
|
|
)
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8, ToolExecution: "parallel"})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.Text != "final" {
|
|
t.Fatalf("Text = %q, want final", res.Text)
|
|
}
|
|
if res.ToolCallsExecuted != 3 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 3", res.ToolCallsExecuted)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
if len(last) < 4 {
|
|
t.Fatalf("messages = %d, want at least 4 (user + 3 results)", len(last))
|
|
}
|
|
got := make([]string, 3)
|
|
for i := range got {
|
|
got[i] = last[len(last)-3+i].Content[0].Text
|
|
}
|
|
want := []string{
|
|
"tool aa result: va",
|
|
"tool bb result: vb",
|
|
"tool cc result: vc",
|
|
}
|
|
for i := range want {
|
|
if got[i] != want[i] {
|
|
t.Fatalf("result %d = %q, want %q (call order must be preserved)", i, got[i], want[i])
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestRun_Sequential_ExecutesAll(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"aa","args":{}},{"name":"bb","args":{}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "final"}},
|
|
}}
|
|
td := dispatcherWith(t,
|
|
&mockTool{name: "aa", result: "va"},
|
|
&mockTool{name: "bb", result: "vb"},
|
|
)
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8, ToolExecution: "sequential"})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.ToolCallsExecuted != 2 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 2", res.ToolCallsExecuted)
|
|
}
|
|
}
|
|
|
|
func TestRun_ArgumentValidation_ErrorKind(t *testing.T) {
|
|
t.Parallel()
|
|
// 缺少必填字段 -> 回灌的失败携带 errorKind
|
|
// argument-validation,使模型能重新发出修正后的调用。
|
|
call := `{"tool_calls":[{"name":"req","args":{}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "recovered"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "req", params: map[string]any{"required": []any{"must"}}})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.Text != "recovered" {
|
|
t.Fatalf("Text = %q, want recovered", res.Text)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
lastMsg := last[len(last)-1]
|
|
if !strings.Contains(lastMsg.Content[0].Text, `"kind":"argument-validation"`) {
|
|
t.Fatalf("result should carry argument-validation kind, got %q", lastMsg.Content[0].Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_BatchAdmit_BlocksBatch(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "after block"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8, Hooks: ToolLoopHooks{
|
|
BatchAdmit: func(ctx context.Context, calls []agent.ToolCall) (bool, string) {
|
|
return false, "policy denied"
|
|
},
|
|
}})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.ToolCallsExecuted != 0 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 0 (batch blocked)", res.ToolCallsExecuted)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
lastMsg := last[len(last)-1]
|
|
if !strings.Contains(lastMsg.Content[0].Text, "policy denied") {
|
|
t.Fatalf("expected blocked batch message, got %q", lastMsg.Content[0].Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_CallAdmit_VetoesSingleCall(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "after veto"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8, Hooks: ToolLoopHooks{
|
|
CallAdmit: func(ctx context.Context, call agent.ToolCall) *ToolCallVeto {
|
|
if call.Name == "echo" {
|
|
return &ToolCallVeto{Block: true, Reason: "sensitive action requires approval"}
|
|
}
|
|
return nil
|
|
},
|
|
}})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.ToolCallsExecuted != 0 {
|
|
t.Fatalf("ToolCallsExecuted = %d, want 0 (call vetoed)", res.ToolCallsExecuted)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
lastMsg := last[len(last)-1]
|
|
if !strings.Contains(lastMsg.Content[0].Text, "sensitive action requires approval") {
|
|
t.Fatalf("expected veto message, got %q", lastMsg.Content[0].Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_AfterCall_RewritesResult(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "final"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "raw"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8, Hooks: ToolLoopHooks{
|
|
AfterCall: func(ctx context.Context, call agent.ToolCall, outcome ToolOutcome) *ToolOutcome {
|
|
if call.Name == "echo" {
|
|
outcome.Result = "rewritten"
|
|
return &outcome
|
|
}
|
|
return nil
|
|
},
|
|
}})
|
|
|
|
if _, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")}); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
last := ad.reqs[len(ad.reqs)-1].Messages
|
|
lastMsg := last[len(last)-1]
|
|
if !strings.Contains(lastMsg.Content[0].Text, "rewritten") {
|
|
t.Fatalf("expected rewritten result, got %q", lastMsg.Content[0].Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_ToolCallRepair_FencedJSON(t *testing.T) {
|
|
t.Parallel()
|
|
// 围栏代码块中的工具调用信封被修复并执行,而不是
|
|
// 悄悄变成文本答案。
|
|
call := "```json\n{\"tool_calls\":[{\"name\":\"echo\",\"args\":{\"q\":\"hi\"}}]}\n```"
|
|
ad := &mockAdapter{chat: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "done"}},
|
|
}}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
l := New(Options{Agent: a, MaxRounds: 8})
|
|
|
|
res, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")})
|
|
if err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if res.ToolCallsExecuted != 1 || res.Text != "done" {
|
|
t.Fatalf("ToolCallsExecuted = %d, Text = %q; want 1 + done (fenced JSON repaired)", res.ToolCallsExecuted, res.Text)
|
|
}
|
|
}
|
|
|
|
func TestRun_StreamToolExecution_EmitsProgress(t *testing.T) {
|
|
t.Parallel()
|
|
call := `{"tool_calls":[{"name":"echo","args":{"q":"x"}}]}`
|
|
ad := &mockAdapter{
|
|
stream: []mgResp{
|
|
{resp: model.Response{Content: call}},
|
|
{resp: model.Response{Content: "done"}},
|
|
},
|
|
chunks: [][]string{{"x"}},
|
|
}
|
|
td := dispatcherWith(t, &mockTool{name: "echo", result: "hi"})
|
|
a := newTestAgent(t, ad, td)
|
|
var mu sync.Mutex
|
|
var evs []model.StreamEvent
|
|
l := New(Options{
|
|
Agent: a,
|
|
OnStream: func(ev model.StreamEvent) {
|
|
mu.Lock()
|
|
evs = append(evs, ev)
|
|
mu.Unlock()
|
|
},
|
|
MaxRounds: 8,
|
|
})
|
|
|
|
if _, err := l.Run(context.Background(), "sess", []model.Message{model.TextMessage(model.RoleUser, "go")}); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
saw := false
|
|
for _, ev := range evs {
|
|
if ev.Kind == model.StreamKindToolExecutionStart || ev.Kind == model.StreamKindToolExecutionEnd {
|
|
saw = true
|
|
break
|
|
}
|
|
}
|
|
if !saw {
|
|
t.Fatalf("expected a tool_execution start/end event on the streaming path, got %+v", evs)
|
|
}
|
|
}
|