修的是「文档说 ✅、生产不可达」:此前 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 待确认
142 lines
4.7 KiB
Go
142 lines
4.7 KiB
Go
package trace
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
// Redaction for everything the flow graph publishes (design/19 §3 红线: 不泄露敏感 ——
|
|
// 工具参数/内容脱敏;design/11 密钥不落日志). The graph is relayed to the admin panel
|
|
// and every connected client, so every string that reaches it — span props and
|
|
// span log events alike — is scrubbed and truncated here. Deciding to redact at
|
|
// publish time (rather than only at record time) means a runtime that records a
|
|
// raw tool result still cannot leak it.
|
|
|
|
// redactedMarker replaces anything that looks like a credential.
|
|
const redactedMarker = "[redacted]"
|
|
|
|
// secretPatterns match credential shapes that must never reach the dashboard: an
|
|
// API-key style assignment (plain or JSON), a standalone provider key, a bearer
|
|
// token, and a JWT. They are deliberately shallow (shape, not semantics): a false
|
|
// positive only over-redacts a dashboard string, while a false negative publishes a
|
|
// live credential.
|
|
var secretPatterns = []*regexp.Regexp{
|
|
regexp.MustCompile(`(?i)\b[a-z0-9_]*(?:api[_-]?key|access[_-]?token|token|secret|password|passwd|pwd)[a-z0-9_]*"?\s*[:=]\s*"?[^\s"',;}\]]{6,}`),
|
|
regexp.MustCompile(`\bsk-[A-Za-z0-9_\-]{8,}`),
|
|
regexp.MustCompile(`(?i)\bbearer\s+[A-Za-z0-9_\-\.=]{10,}`),
|
|
regexp.MustCompile(`\beyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+`),
|
|
}
|
|
|
|
// secretKeyNames are prop names whose value is a credential whatever its shape, so
|
|
// a structured payload that names its secret ({api_key: "..."}) is redacted even
|
|
// when the value itself looks like ordinary text. Keys are compared after
|
|
// lower-casing and normalizing -/. to _.
|
|
var secretKeyNames = map[string]bool{
|
|
"api_key": true, "apikey": true, "api_token": true, "access_token": true,
|
|
"auth_token": true, "authorization": true, "token": true, "secret": true,
|
|
"client_secret": true, "password": true, "passwd": true, "pwd": true,
|
|
"credential": true, "credentials": true, "private_key": true, "session_key": true,
|
|
"raw_api_key": true, "x_api_key": true, "bearer": true,
|
|
}
|
|
|
|
// secretKeySuffixes catch prefixed variants such as openai_api_key.
|
|
var secretKeySuffixes = []string{"_api_key", "_access_token", "_auth_token", "_secret", "_token"}
|
|
|
|
// isSecretKey reports whether a map key names a credential.
|
|
func isSecretKey(key string) bool {
|
|
k := strings.NewReplacer("-", "_", ".", "_").Replace(strings.ToLower(strings.TrimSpace(key)))
|
|
if secretKeyNames[k] {
|
|
return true
|
|
}
|
|
for _, suffix := range secretKeySuffixes {
|
|
if strings.HasSuffix(k, suffix) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// RedactText scrubs credential-looking substrings from s and truncates the result
|
|
// to maxSummaryRunes, so a published string can never carry a secret or an
|
|
// unbounded blob.
|
|
func RedactText(s string) string {
|
|
return truncate(redactSecrets(s), maxSummaryRunes)
|
|
}
|
|
|
|
// RedactEvent returns ev with every string value — including those nested in maps
|
|
// and slices, and including any value under a credential-named key — scrubbed and
|
|
// truncated. Timestamps, types and non-string scalars pass through unchanged.
|
|
func RedactEvent(ev Event) Event {
|
|
out := Event{Time: ev.Time, Type: ev.Type}
|
|
if ev.Props == nil {
|
|
return out
|
|
}
|
|
out.Props = redactProps(ev.Props)
|
|
return out
|
|
}
|
|
|
|
// redactProps scrubs a property map, applying the key-name rule at the top level
|
|
// as well as the shape rule to each value.
|
|
func redactProps(props map[string]any) map[string]any {
|
|
out := make(map[string]any, len(props))
|
|
for k, v := range props {
|
|
if isSecretKey(k) {
|
|
out[k] = redactedMarker
|
|
continue
|
|
}
|
|
out[k] = redactValue(v)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// redactEvents returns a redacted copy of events for publication. A nil or empty
|
|
// slice yields nil so a node carries no empty log array.
|
|
func redactEvents(events []Event) []Event {
|
|
if len(events) == 0 {
|
|
return nil
|
|
}
|
|
out := make([]Event, len(events))
|
|
for i, ev := range events {
|
|
out[i] = RedactEvent(ev)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// redactSecrets replaces every credential-shaped substring with the marker.
|
|
func redactSecrets(s string) string {
|
|
if s == "" {
|
|
return s
|
|
}
|
|
for _, re := range secretPatterns {
|
|
s = re.ReplaceAllString(s, redactedMarker)
|
|
}
|
|
return s
|
|
}
|
|
|
|
// redactValue scrubs one prop/event value: a string is redacted and truncated, a
|
|
// map or slice is copied and redacted recursively (with credential-named keys
|
|
// replaced outright), and any other value (number, bool, time) passes through
|
|
// unchanged.
|
|
func redactValue(v any) any {
|
|
switch x := v.(type) {
|
|
case string:
|
|
return RedactText(x)
|
|
case map[string]any:
|
|
return redactProps(x)
|
|
case []any:
|
|
out := make([]any, len(x))
|
|
for i, item := range x {
|
|
out[i] = redactValue(item)
|
|
}
|
|
return out
|
|
case []string:
|
|
out := make([]any, len(x))
|
|
for i, item := range x {
|
|
out[i] = RedactText(item)
|
|
}
|
|
return out
|
|
default:
|
|
return v
|
|
}
|
|
}
|