修的是「文档说 ✅、生产不可达」:此前 Scheduler.Spawn 只有测试调用方、无 bus 入口、无派发工具;Span.Record 无生产调用方 → 泳道画不出、节点日志恒空。
- 入口:subagent_spawn 工具(internal/runtime/orchestration/spawntool.go,同包便于用真 Scheduler/loop/Tracer/Flow 做集成测试;注册在 cmd/cyrene/subagent_tool.go 照 terminal_tool 范式)。默认 owner-only,不设 AllowInGroup/AllowInStranger;安全仍由 restrictSchemas + applyToolSecurityGate 双层保证,未绕代审
- 父会话归属:AgentSpec.ParentSession(请求语义)→ Scheduler 转运行期 ctx 标记 loop.WithFlowBranch → 分支 span 以父 session 发布;**allow 谓词一行未改**;单图语义靠「分支 Run 不调 StartRound/EndRound」+ FlowPublisher 不新建图;未归属 spawn 一张图都不发(有测试锁)
- 前台最多等 2s(对齐 task.autoBackgroundThreshold)→ 合并结果作工具结果;转后台则广播 bus subagent.result(design/05 §9 回填 hook);新增 Scheduler.Wait(ids) 按批等待(Join 会串并发批次,故不重用)
- 子代理跑在 WithoutCancel(ctx):保留 span 归属、不被工具超时/回合结束顺手杀掉;生命周期由 PerAgentTimeout + CancelAll 约束;内部 WithMutedBroadcast 静音(不进前台 stream)
- 节点日志:loop/spanlog.go 新增 llm.done / tool.done / subagent.done;工具参数**只记键名不记值**;仅步骤真正结束才追加(跳过/被拒路径不发,不伪造)
- 脱敏(红线):新增 trace/redact.go(形状规则 sk-/Bearer/JWT/key:value + 键名规则 api_key/token/authorization/password…,递归嵌套、不改调用方事件),graph.go 发布前必经;**顺带修掉一个既有泄漏**:result_summary prop 原先未脱敏(工具结果里的密钥会进图),由图级变异测试抓出
- 测试:新增 22 个(工具级 / 图级 / 日志级),含 4 次变异验证(去掉 WithFlowBranch、去掉 record*、还原未脱敏、去掉静音 各自 FAIL);-race 过 orchestration+trace+loop
- 已知限制:真实模型端到端未验(无凭据/不起服务);工具白名单是 design gap 未做;subagent.result 暂无消费者(design/15 未实现);后台子代理跨轮次边界迟到 span 会丢泳道根;PerAgentTimeout=10min 待确认
125 lines
5.4 KiB
Go
125 lines
5.4 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/capacity"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/trace"
|
|
)
|
|
|
|
// Run drives the agent loop: assemble a fresh model-visible context every round
|
|
// (re-inject relevant memory from the current conversation, optionally compacting
|
|
// the older turns when the context exceeds the configured budget), then run up to
|
|
// MaxRounds steps. Each step runs the model (streaming through OnStream when
|
|
// configured) and any requested tool calls are executed under a per-invoke
|
|
// timeout and fed back as RoleTool messages so the model can continue.
|
|
// A checkpoint is persisted at every step, every step is traced as a
|
|
// state_transition span (with an llm_call child and tool_call spans for each
|
|
// invocation), and when the turn settles the memory Extractor runs over the
|
|
// turn's conversation (design/03 §1: the LLM extractor on a background
|
|
// goroutine, so extraction never delays the reply) with errors logged rather
|
|
// than fatal.
|
|
//
|
|
// When a turn settles with a Result, the OnTurnEnd hook is called once for that
|
|
// turn (never per step) and its mood label is recorded on Result.Mood, so the
|
|
// layers around the loop can advance persona state and tag the persisted reply.
|
|
//
|
|
// It returns the final answer, or a partial Result with StopReasonMaxRounds when
|
|
// the budget is exhausted without a final answer. Step errors are wrapped with %w
|
|
// so callers can classify them with errors.Is.
|
|
func (l *Loop) Run(ctx context.Context, sessionID string, messages []model.Message) (*Result, error) {
|
|
if ctx == nil {
|
|
ctx = context.Background()
|
|
}
|
|
if l.agent == nil {
|
|
return nil, fmt.Errorf("loop: run: %w", ErrNilAgent)
|
|
}
|
|
|
|
// Seed the per-Run capacity accumulator at quiet so the state can progress
|
|
// (quiet→awake→full) across a multi-step tool loop; a nil/disabled decider
|
|
// leaves it unused. It is scoped to this Run, so concurrent runs never share.
|
|
// The session id rides the same context so a capacity_awaken emission can be
|
|
// targeted to the session that produced it (design/14 §5).
|
|
ctx = withCapState(ctx, &capStateAccum{state: capacity.StateQuiet})
|
|
ctx = withLoopSession(ctx, sessionID)
|
|
|
|
// Resume an interrupted run (design §1 durable execution): when the session
|
|
// has a resumable checkpoint, rebuild its context and continue at the next
|
|
// step rather than restarting from a fresh conversation. A different
|
|
// sessionID — or a checkpoint left by a completed run — falls through to a
|
|
// fresh start (LoadLatest misses, or the stop reason is not resumable).
|
|
msgs, startStep, _ := l.loadCheckpoint(ctx, sessionID, messages)
|
|
msgs = l.resolveImages(ctx, msgs)
|
|
toolState := &toolLoopState{prevFP: make(map[string]bool)}
|
|
res := &Result{}
|
|
// A branch Run (a sub-agent) folds its spans into the parent session's live
|
|
// graph; only the owning Run starts and ends a round. Without this a sub-agent
|
|
// would reset the frontend's single flowGraph and gap the parent's own nodes.
|
|
if _, isBranch := flowBranch(ctx); l.flow != nil && !isBranch {
|
|
l.flow.StartRound(sessionID, lastUserText(msgs))
|
|
defer func() { l.flow.EndRound(sessionID, res.Text) }()
|
|
}
|
|
for step := startStep; step <= l.maxRounds; step++ {
|
|
if err := ctx.Err(); err != nil {
|
|
return nil, fmt.Errorf("loop: run: step %d: %w", step, err)
|
|
}
|
|
|
|
// Compact older turns when the conversation exceeds the context budget,
|
|
// then assemble the model-visible context for this round (fresh memory
|
|
// injection + transform hook), so every step sees an up-to-date context.
|
|
msgs = l.compactIfNeeded(ctx, msgs)
|
|
view := l.assembleContext(ctx, msgs, step)
|
|
|
|
rc, roundSpan := l.span(ctx, "loop.step", trace.SpanKindStateTransition)
|
|
outcome, err := l.step(rc, sessionID, view)
|
|
if err != nil {
|
|
l.spanProp(roundSpan, "error", err.Error())
|
|
l.finishSpan(roundSpan, trace.SpanStatusError)
|
|
return nil, fmt.Errorf("loop: run: step %d: %w", step, err)
|
|
}
|
|
l.spanProp(roundSpan, "step", step)
|
|
l.spanProp(roundSpan, "stop_reason", outcome.stopReason)
|
|
l.finishSpan(roundSpan, trace.SpanStatusOK)
|
|
|
|
res.Steps = step
|
|
if outcome.final {
|
|
res.Text = outcome.text
|
|
res.StopReason = outcome.stopReason
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, outcome.stopReason)
|
|
l.extractMemoryAsync(ctx, msgs, step)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|
|
|
|
batch, err := l.runToolCalls(rc, msgs, outcome.toolCalls, toolState)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: run: step %d: tools: %w", step, err)
|
|
}
|
|
msgs = batch.messages
|
|
res.ToolCallsExecuted += batch.executed
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, agent.StopReasonToolCalls)
|
|
|
|
// The critical-tool-loop safety net (or a terminating hook) stops the
|
|
// round without waiting for a real final answer.
|
|
if batch.terminate {
|
|
res.Text = criticalToolLoopTerminalReason
|
|
res.StopReason = StopReasonToolLoopTerminated
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, StopReasonToolLoopTerminated)
|
|
l.extractMemoryAsync(ctx, msgs, step)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|
|
}
|
|
|
|
// Budget exhausted without a final answer.
|
|
res.Steps = l.maxRounds
|
|
res.StopReason = StopReasonMaxRounds
|
|
l.saveCheckpoint(ctx, sessionID, l.maxRounds, msgs, StopReasonMaxRounds)
|
|
l.extractMemoryAsync(ctx, msgs, l.maxRounds)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|