AskaEth
de1fa83b79
修的是「文档说 ✅、生产不可达」：此前 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 待确认
52 lines
1.6 KiB
Go
52 lines
1.6 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/trace"
|
|
)
|
|
|
|
// span starts a named span of the given kind when a Tracer is configured, else
|
|
// returns a nil no-op span. The returned context carries the span as the current
|
|
// one so nested spans chain as children. When a FlowPublisher is configured the
|
|
// span's flow owner (the branch parent for a sub-agent Run, else the Run's own
|
|
// session, both threaded via ctx) is stamped as a prop and a running placeholder
|
|
// node is published immediately, so the flow graph shows work in flight.
|
|
func (l *Loop) span(ctx context.Context, name string, kind trace.SpanKind) (context.Context, *trace.Span) {
|
|
if l.tracer == nil {
|
|
return ctx, nil
|
|
}
|
|
sctx, sp := l.tracer.StartSpan(ctx, name, kind)
|
|
if sid := flowOwner(ctx, loopSession(ctx)); sid != "" {
|
|
_ = sp.SetProp("session", sid)
|
|
if l.flow != nil {
|
|
l.flow.SpanStarted(sid, sp)
|
|
}
|
|
}
|
|
return sctx, sp
|
|
}
|
|
|
|
// finishSpan closes a span with the given status, ignoring a nil span. After the
|
|
// span closes (immutable) the finished record is folded into the flow graph and
|
|
// published, flipping the node to its final status.
|
|
func (l *Loop) finishSpan(sp *trace.Span, status trace.SpanStatus) {
|
|
if sp == nil {
|
|
return
|
|
}
|
|
sp.Finish(status)
|
|
if l.flow != nil {
|
|
if sid, ok := sp.Props["session"].(string); ok && sid != "" {
|
|
l.flow.SpanFinished(sid, sp)
|
|
}
|
|
}
|
|
}
|
|
|
|
// spanProp attaches a structured property to a span, ignoring a nil span and any
|
|
// mutation-after-close error.
|
|
func (l *Loop) spanProp(sp *trace.Span, key string, value any) {
|
|
if sp == nil {
|
|
return
|
|
}
|
|
_ = sp.SetProp(key, value)
|
|
}
|