DBT/clawgo
1
0
Fork 0
mirror of https://github.com/YspCoder/clawgo.git synced 2026-05-07 02:37:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix subagent completion notify path and pipeline origin routing

Browse Source
This commit is contained in:
lpf
2026-03-05 22:17:44 +08:00
parent e8e1cdae32
commit b9e1efa3ef
5 changed files with 228 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/tools/pipeline_tools.go
View File

@@ -53,6 +53,14 @@ func (t *PipelineCreateTool) Parameters() map[string]interface{} {
"required": []string{"id", "goal"},
},
},
"channel": map[string]interface{}{
"type": "string",
"description": "Optional origin channel for completion notifications (auto-injected in normal chat flow)",
},
"chat_id": map[string]interface{}{
"type": "string",
"description": "Optional origin chat ID for completion notifications (auto-injected in normal chat flow)",
},
},
"required": []string{"objective", "tasks"},
}
@@ -97,7 +105,8 @@ func (t *PipelineCreateTool) Execute(_ context.Context, args map[string]interfac
})
}
p, err := t.orc.CreatePipeline(label, objective, "tool", "tool", specs)
originChannel, originChatID := resolvePipelineOrigin(args, "tool", "tool")
p, err := t.orc.CreatePipeline(label, objective, originChannel, originChatID, specs)
if err != nil {
return "", err
}
@@ -227,6 +236,14 @@ func (t *PipelineDispatchTool) Parameters() map[string]interface{} {
"description": "Maximum number of tasks to dispatch in this call (default 3)",
"default": 3,
},
"channel": map[string]interface{}{
"type": "string",
"description": "Optional origin channel override for spawned subagents",
},
"chat_id": map[string]interface{}{
"type": "string",
"description": "Optional origin chat ID override for spawned subagents",
},
},
"required": []string{"pipeline_id"},
}
@@ -247,6 +264,21 @@ func (t *PipelineDispatchTool) Execute(ctx context.Context, args map[string]inte
if raw, ok := args["max_dispatch"].(float64); ok && raw > 0 {
maxDispatch = int(raw)
}
originChannel, originChatID := resolvePipelineOrigin(args, "", "")
if p, ok := t.orc.GetPipeline(pipelineID); ok && p != nil {
if strings.TrimSpace(originChannel) == "" {
originChannel = strings.TrimSpace(p.OriginChannel)
}
if strings.TrimSpace(originChatID) == "" {
originChatID = strings.TrimSpace(p.OriginChatID)
}
}
if strings.TrimSpace(originChannel) == "" {
originChannel = "tool"
}
if strings.TrimSpace(originChatID) == "" {
originChatID = "tool"
}
ready, err := t.orc.ReadyTasks(pipelineID)
if err != nil {
@@ -289,8 +321,8 @@ func (t *PipelineDispatchTool) Execute(ctx context.Context, args map[string]inte
Label: label,
Role: task.Role,
AgentID: agentID,
OriginChannel: "tool",
OriginChatID: "tool",
OriginChannel: originChannel,
OriginChatID: originChatID,
PipelineID: pipelineID,
PipelineTask: task.ID,
}); err != nil {
@@ -306,3 +338,17 @@ func (t *PipelineDispatchTool) Execute(ctx context.Context, args map[string]inte
}
return fmt.Sprintf("Pipeline %s dispatch result:\n%s", pipelineID, strings.Join(lines, "\n")), nil
}
func resolvePipelineOrigin(args map[string]interface{}, defaultChannel, defaultChatID string) (string, string) {
originChannel, _ := args["channel"].(string)
originChatID, _ := args["chat_id"].(string)
originChannel = strings.TrimSpace(originChannel)
originChatID = strings.TrimSpace(originChatID)
if originChannel == "" {
originChannel = strings.TrimSpace(defaultChannel)
}
if originChatID == "" {
originChatID = strings.TrimSpace(defaultChatID)
}
return originChannel, originChatID
}