Aska
35cb2d3942
- 重复调用安全网（critical-tool-loop）：指纹=name+canonical JSON(args)；批内重复第二次跳过回喂
「duplicate call」；跨轮关键重复(同指纹重现)→首次 block+criticalSeen，再次连续重复→终止整轮
StopReasonToolLoopTerminated（替代裸 8 轮针对同调用的硬截止）。
- 并行/串行混合：invokeParallel 默认并行，信号量(ToolParallelism 默认4)限并发，结果按调用索引
写回按原序渲染；串行触发=Options.ToolExecution:sequential 或 SetToolExecutionMode(name,sequential)
（对齐 OpenClaw「一个 sequential 标记→整组串行」）；goroutine 不泄漏、ctx 取消快速返回。
- 工具钩子：ToolLoopHooks(BatchAdmit/CallAdmit/AfterCall/AfterOutcome) 经 Options.Hooks 注入，
均 nil-tolerant；供后续敏感操作代审复用（design/11）。terminate 用 every 语义。
- status 分类：ToolError.Kind() 区分 argument-validation(JSON-Schema 失败)/execution；
失败消息渲染 {kind,message} 让模型区分重发参数 vs 执行失败。
- tool-call-repair：LenientJSONUnmarshal 修 fence 包裹/尾逗号畸形；agent.extractToolCalls 与
loop.decodeToolCalls 走它；不可修复退化为文本不崩整轮。意图调用未区分回喂提示(后置)。
- tool_execution_update：流式路径 emitToolExecution 发 StreamKindToolExecution(start/end/end:error)。
go build/vet/test 全绿(46包)。TestRun_MaxRounds 改每轮不同参(原同 echo 被安全网拦，预期新行为)。
-race 受宿主 TSan VMA 限制无法运行(与代码无关)。
88 lines
2.5 KiB
Go
88 lines
2.5 KiB
Go
package tool
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
)
|
|
|
|
func TestLenientJSONUnmarshal_TrailingComma(t *testing.T) {
|
|
t.Parallel()
|
|
var v map[string]any
|
|
if err := LenientJSONUnmarshal([]byte(`{"a":1,}`), &v); err != nil {
|
|
t.Fatalf("LenientJSONUnmarshal: %v", err)
|
|
}
|
|
if v["a"] != float64(1) {
|
|
t.Fatalf("a = %#v, want 1", v["a"])
|
|
}
|
|
}
|
|
|
|
func TestLenientJSONUnmarshal_Fenced(t *testing.T) {
|
|
t.Parallel()
|
|
raw := "```json\n{\"tool_calls\":[{\"name\":\"echo\",\"args\":{\"q\":\"hi\"}}]}\n```"
|
|
var v struct {
|
|
ToolCalls []map[string]any `json:"tool_calls"`
|
|
}
|
|
if err := LenientJSONUnmarshal([]byte(raw), &v); err != nil {
|
|
t.Fatalf("LenientJSONUnmarshal: %v", err)
|
|
}
|
|
if len(v.ToolCalls) != 1 {
|
|
t.Fatalf("tool_calls = %d, want 1", len(v.ToolCalls))
|
|
}
|
|
}
|
|
|
|
func TestLenientJSONUnmarshal_Unrecoverable(t *testing.T) {
|
|
t.Parallel()
|
|
// Malformed beyond repair must return an error, never panic or silently
|
|
// succeed.
|
|
var v map[string]any
|
|
if err := LenientJSONUnmarshal([]byte(`{"a":"unterminated`), &v); err == nil {
|
|
t.Fatal("expected error for unrecoverable JSON")
|
|
}
|
|
}
|
|
|
|
func TestSetToolExecutionMode_Sequential(t *testing.T) {
|
|
t.Parallel()
|
|
d, _ := newDispatcher(t)
|
|
if d.IsSequential("x") {
|
|
t.Fatal("x should default to parallel")
|
|
}
|
|
if err := d.SetToolExecutionMode("x", ExecutionModeSequential); err != nil {
|
|
t.Fatalf("SetToolExecutionMode: %v", err)
|
|
}
|
|
if !d.IsSequential("x") {
|
|
t.Fatal("x should be sequential after marking")
|
|
}
|
|
// Clearing back to parallel.
|
|
if err := d.SetToolExecutionMode("x", ExecutionModeParallel); err != nil {
|
|
t.Fatalf("SetToolExecutionMode(parallel): %v", err)
|
|
}
|
|
if d.IsSequential("x") {
|
|
t.Fatal("x should be parallel after clearing")
|
|
}
|
|
}
|
|
|
|
func TestSetToolExecutionMode_EmptyName(t *testing.T) {
|
|
t.Parallel()
|
|
d, _ := newDispatcher(t)
|
|
if err := d.SetToolExecutionMode("", ExecutionModeSequential); !errors.Is(err, ErrUnknownTool) {
|
|
t.Fatalf("SetToolExecutionMode(\"\") error = %v, want ErrUnknownTool", err)
|
|
}
|
|
}
|
|
|
|
func TestToolError_Kind(t *testing.T) {
|
|
t.Parallel()
|
|
val := &ToolError{Name: "x", Message: "bad args", cause: fmt.Errorf("validate: %w", ErrInvalidArgs)}
|
|
if val.Kind() != KindArgumentValidation {
|
|
t.Fatalf("validation Kind = %q, want %q", val.Kind(), KindArgumentValidation)
|
|
}
|
|
exec := &ToolError{Name: "x", Message: "boom", cause: errors.New("boom")}
|
|
if exec.Kind() != KindExecution {
|
|
t.Fatalf("execution Kind = %q, want %q", exec.Kind(), KindExecution)
|
|
}
|
|
none := &ToolError{Name: "x", Message: "m"}
|
|
if none.Kind() != KindExecution {
|
|
t.Fatalf("nil-cause Kind = %q, want %q", none.Kind(), KindExecution)
|
|
}
|
|
}
|