fix(worker): search_all_worker_traces 排除调用者自身的意图 trace
之前走 ActivityTraceSearch(nil) 会把 worker 自己这条意图的步骤也搜出来 (纯噪声,本就在其上下文里)。新增 ActivityTraceSearchExcluding(node_id<>x), 工具传 t.ownerNode:worker=自身意图→排除自己;planner/mainagent 不受影响。 Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
db2e1f9a49
commit
9c1591ad8e
2 files changed
+29
-4
No files matched your search
+6
-4
@@ -995,8 +995,9 @@ func (t *ToolSet) getWorkerTrace() actool.CoreTool {
|
||||
// summaries (≤100 chars), each tagged with its intent_id for follow-up drill-down.
|
||||
func (t *ToolSet) searchAllWorkerTraces() actool.CoreTool {
|
||||
return readTool("search_all_worker_traces",
|
||||
"在【本任务所有 work 的执行过程】里按关键字(q)检索——用于找回某个 worker 见过、却没写进 fact 的东西(某路径/token/报错等)。"+
|
||||
"只返回命中步骤的摘要(summary≤100字),每条带 intent_id;据此再用 get_worker_trace(intent_id, step_ids=[...]) 取完整内容。不含思考(thinking)步骤。",
|
||||
"【通常不推荐使用,因为系统中已经给了大部分信息了】在【本任务其他 work 的执行过程】里按关键字(q)检索——用于找回某个 worker 见过、却没写进 fact 的东西(某路径/token/报错等)。"+
|
||||
"已自动排除你自己这条意图的步骤(那些本就在你上下文里)。"+
|
||||
"只返回命中步骤的摘要(summary≤100字),每条带 intent_id;据此再用 get_worker_trace(intent_id, step_ids=[...]) 取完整内容。",
|
||||
obj(map[string]any{
|
||||
"q": str("关键字(在所有 work 步骤的摘要+完整输出里搜)"),
|
||||
"limit": intp("返回上限,默认 100(可选)"),
|
||||
@@ -1010,7 +1011,8 @@ func (t *ToolSet) searchAllWorkerTraces() actool.CoreTool {
|
||||
if strings.TrimSpace(a.Q) == "" {
|
||||
return actool.Errorf("q 必填"), nil
|
||||
}
|
||||
acts, err := t.ts.ActivityTraceSearch(nil, a.Q, a.Limit)
|
||||
// 排除调用者自身这条意图的步骤(worker 的自有 trace 已在其上下文里)。
|
||||
acts, err := t.ts.ActivityTraceSearchExcluding(t.ownerNode, a.Q, a.Limit)
|
||||
if err != nil {
|
||||
return actool.Errorf(err.Error()), nil
|
||||
}
|
||||
@@ -1038,7 +1040,7 @@ func (t *ToolSet) searchAllWorkerTraces() actool.CoreTool {
|
||||
// no process to inspect).
|
||||
func (t *ToolSet) listWorkerTraces() actool.CoreTool {
|
||||
return readTool("list_worker_traces",
|
||||
"列出本任务里【已跑过的 work(意图)】索引:intent_id + 一句话方向(summary) + 状态。"+
|
||||
"【通常不推荐使用,因为系统中已经给了大部分信息了】列出本任务里【已跑过的 work(意图)】索引:intent_id + 一句话方向(summary) + 状态。"+
|
||||
"你(worker)看不到探索图,用它来发现有哪些 work 值得翻看——再用 get_worker_trace(intent_id) 看其步骤、get_worker_trace(intent_id, step_ids=[...]) 取详情。"+
|
||||
"只列已执行的(running/done/exhausted/blocked/stopped),不含还没跑的 open。注意:你的任务边界仍是你领到的那条意图,看别的 work 只为复用观察/避免重复劳动。",
|
||||
obj(map[string]any{
|
||||
|
||||
@@ -615,6 +615,29 @@ AND (summary ILIKE $2 OR detail ILIKE $2) ORDER BY id LIMIT $3`, s.expID, like,
|
||||
return scanTrace(rows)
|
||||
}
|
||||
|
||||
// ActivityTraceSearchExcluding keyword-searches every node's steps in this
|
||||
// exploration EXCEPT one node's own (excludeNodeID) — so a worker's
|
||||
// search_all_worker_traces doesn't return its own in-progress trace (which is
|
||||
// already in its context). excludeNodeID<=0 → no exclusion (searches all nodes).
|
||||
func (s *ExplorationStore) ActivityTraceSearchExcluding(excludeNodeID int64, q string, limit int) ([]Activity, error) {
|
||||
if excludeNodeID <= 0 {
|
||||
return s.ActivityTraceSearch(nil, q, limit)
|
||||
}
|
||||
if limit <= 0 {
|
||||
limit = 100
|
||||
}
|
||||
like := "%" + q + "%"
|
||||
rows, err := s.db.Query(`SELECT `+traceCols+`
|
||||
FROM activity WHERE exploration_id=$1 AND node_id IS NOT NULL AND node_id <> $2
|
||||
AND kind NOT IN ('thinking','usage')
|
||||
AND (summary ILIKE $3 OR detail ILIKE $3) ORDER BY id LIMIT $4`, s.expID, excludeNodeID, like, limit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
return scanTrace(rows)
|
||||
}
|
||||
|
||||
// ActivityByIDs loads full detail for specific step ids (the trace drill-down),
|
||||
// scoped to this exploration. thinking rows are skipped (never returned, even if
|
||||
// their id is asked for). Order is ascending id, not the input order.
|
||||
|
||||
Reference in new issue
Block a user