feat(loop): Top5#4 工具循环增强(对齐 OpenClaw agent-loop)——重复检测/并行串行/钩子/errorKind/repair
CI / Backend (build / vet / test / cross-compile) (push) Has been cancelled
CI / Frontend (tsc + vite build) (push) Has been cancelled

- 重复调用安全网(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 限制无法运行(与代码无关)。
This commit is contained in:
Aska committed 2026-09-06 17:57:18 +08:00
1 parent 2248ddce15
commit 35cb2d3942
11 files changed
+1079 -74

No files matched your search

+49 -26
View File
@@ -36,6 +36,15 @@ const (
// StopReasonMaxRounds reports that the loop exhausted its round budget
// before reaching a final answer.
StopReasonMaxRounds = "max_rounds"
// StopReasonToolLoopTerminated reports that the critical-tool-loop safety net
// stopped the run after the same tool call was repeated identically across
// consecutive rounds.
StopReasonToolLoopTerminated = "tool_loop_terminated"
// DefaultToolParallelism caps how many tool calls run concurrently when the
// loop runs a batch in parallel mode and no explicit cap is configured.
DefaultToolParallelism = 4
)
// Sentinel errors returned by the Loop. Use errors.Is to test for them; they are
@@ -69,19 +78,22 @@ type Result struct {
// dispatcher, stores, recorder, tracer) are themselves concurrency-safe, which
// they are by contract. Run keeps all loop state on the stack.
type Loop struct {
agent *agent.Agent
tools *tool.Dispatcher
memory *memory.Store
retriever *memory.Retriever
working *memory.WorkingMemory
extractor memory.Extractor
checkpoint *persist.Store
tracer *trace.Tracer
guards *guardrail.Pipeline
personaID string
maxRounds int
onStream func(model.StreamEvent)
log *slog.Logger
agent *agent.Agent
tools *tool.Dispatcher
memory *memory.Store
retriever *memory.Retriever
working *memory.WorkingMemory
extractor memory.Extractor
checkpoint *persist.Store
tracer *trace.Tracer
guards *guardrail.Pipeline
personaID string
maxRounds int
toolExec string
toolParallelism int
hooks ToolLoopHooks
onStream func(model.StreamEvent)
log *slog.Logger
}
// New builds a Loop from opts, applying defaults. A non-positive MaxRounds
@@ -94,20 +106,31 @@ func New(opts Options) *Loop {
if maxRounds <= 0 {
maxRounds = DefaultMaxRounds
}
toolExec := opts.ToolExecution
if toolExec == "" {
toolExec = toolExecParallel
}
toolParallelism := opts.ToolParallelism
if toolParallelism <= 0 {
toolParallelism = DefaultToolParallelism
}
return &Loop{
agent: opts.Agent,
tools: opts.Tools,
memory: opts.Memory,
retriever: opts.Retriever,
working: opts.WorkingMemory,
extractor: opts.Extractor,
checkpoint: opts.Checkpoint,
tracer: opts.Tracer,
guards: opts.Guards,
personaID: opts.PersonaID,
maxRounds: maxRounds,
onStream: opts.OnStream,
log: sourcedLog(opts.Log),
agent: opts.Agent,
tools: opts.Tools,
memory: opts.Memory,
retriever: opts.Retriever,
working: opts.WorkingMemory,
extractor: opts.Extractor,
checkpoint: opts.Checkpoint,
tracer: opts.Tracer,
guards: opts.Guards,
personaID: opts.PersonaID,
maxRounds: maxRounds,
toolExec: toolExec,
toolParallelism: toolParallelism,
hooks: opts.Hooks,
onStream: opts.OnStream,
log: sourcedLog(opts.Log),
}
}