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 待确认
67 lines
2.6 KiB
Go
67 lines
2.6 KiB
Go
package loop
|
|
|
|
import "context"
|
|
|
|
// flowBranchKey is the context key marking a Run as a branch of another
|
|
// session's flow graph. It is set by the orchestration layer (through
|
|
// WithFlowBranch) before it drives a sub-agent's Run.
|
|
type flowBranchKey struct{}
|
|
|
|
// WithFlowBranch returns ctx marking the current Run as a branch: its spans fold
|
|
// into parentSession's live flow graph and the Run neither starts nor ends a
|
|
// round of its own — the owning session's round does. It is how the orchestration
|
|
// layer attributes a sub-agent's work to the session that spawned it, so parallel
|
|
// sub-agents render as swimlanes of one graph instead of replacing the frontend's
|
|
// single flowGraph with a graph of their own (design/19 §2).
|
|
//
|
|
// An empty parentSession still marks the Run as a branch: it owns no round and
|
|
// publishes nothing. That is the state of a background sub-agent nobody attributed
|
|
// to a session, and it must not silently become a graph of its own. A nil ctx is
|
|
// returned unchanged.
|
|
func WithFlowBranch(ctx context.Context, parentSession string) context.Context {
|
|
if ctx == nil {
|
|
return ctx
|
|
}
|
|
return context.WithValue(ctx, flowBranchKey{}, parentSession)
|
|
}
|
|
|
|
// flowBranch reports the parent session recorded by WithFlowBranch and whether the
|
|
// Run is a branch at all. A non-branch Run owns its own round and publishes under
|
|
// its own session id.
|
|
func flowBranch(ctx context.Context) (string, bool) {
|
|
if ctx == nil {
|
|
return "", false
|
|
}
|
|
v := ctx.Value(flowBranchKey{})
|
|
if v == nil {
|
|
return "", false
|
|
}
|
|
s, _ := v.(string)
|
|
return s, true
|
|
}
|
|
|
|
// flowOwner returns the session whose flow graph should receive this Run's spans:
|
|
// the branch parent when the Run is a sub-agent branch (empty when the branch is
|
|
// unattributed, which suppresses publication), otherwise the Run's own sessionID.
|
|
func flowOwner(ctx context.Context, sessionID string) string {
|
|
if parent, isBranch := flowBranch(ctx); isBranch {
|
|
return parent
|
|
}
|
|
return sessionID
|
|
}
|
|
|
|
// FlowOwnerFromContext returns the session whose flow graph owns work started
|
|
// from ctx: the branch parent when ctx runs inside a sub-agent branch, otherwise
|
|
// the session id the enclosing Run was driven with (empty when neither is set).
|
|
//
|
|
// A tool that dispatches background work — the sub-agent spawn tool — passes this
|
|
// as the parent session, so a sub-agent spawned from inside another sub-agent
|
|
// stays attributed to the same top-level graph instead of to an id that owns no
|
|
// graph.
|
|
func FlowOwnerFromContext(ctx context.Context) string {
|
|
if parent, isBranch := flowBranch(ctx); isBranch {
|
|
return parent
|
|
}
|
|
return SessionFromContext(ctx)
|
|
}
|