mirror of
https://github.com/tiennm99/goclaw.git
synced 2026-10-04 10:13:16 +00:00
When a member calls team_tasks(action="complete"), goclaw fans the result
back to the Lead's session via the team-task announce queue. The Lead
resumes a turn whose initial user message is the synthesized
"[System Message] Team member ... completed task. Result: ..." string.
Inside that resumed turn, the Lead is a regular agent — it can call any
tool, including write_file and cron mutations. Those tools route through
CheckFileWriterPermission / CheckCronPermission, which in group-scope
sessions deny when the resumed RunRequest carries no SenderID:
permission denied: system context cannot write files in group chats.
If this is a legitimate user action, ensure the acting sender is
preserved through the tool chain.
team_tool_dispatch.go already stamps MetaOriginSenderID and MetaOriginRole
into the dispatch metadata. consumer_handlers.go already reads inMeta on
the completion-side teammate message. The gap was in between:
- announceRouting (cmd/gateway_announce_queue.go) had no field for
OriginSenderID / OriginRole
- The RunRequest it built had no SenderID / Role set
- loop_context.injectContext skips WithSenderID when req.SenderID is
empty — so the Lead's resumed ctx had no sender attribution, and
every group-scope permission check then tripped the deny path.
Subagent path (subagentAnnounceRouting in gateway_subagent_announce_queue.go)
already had these fields wired since #915. This brings the team-task
path to parity. No security relaxation: empty upstream → still empty
downstream (still denies, as intended for genuine system-initiated
turns); only legitimately-attributed dispatches now flow through.
- cmd/gateway_announce_queue.go: add OriginSenderID + OriginRole to
announceRouting; pass them into the RunRequest.
- cmd/gateway_consumer_handlers.go: read MetaOriginSenderID +
MetaOriginRole from inMeta when building the routing struct.
- cmd/gateway_announce_routing_test.go: 2 unit tests guarding both
"real human propagates through" and "empty stays empty" cases so
this regression can't re-land silently.
Tests: existing cmd/ + internal/tools/ suites pass; new tests pass.
252 lines
8.8 KiB
Go
252 lines
8.8 KiB
Go
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/google/uuid"
|
|
|
|
"github.com/nextlevelbuilder/goclaw/internal/agent"
|
|
"github.com/nextlevelbuilder/goclaw/internal/bus"
|
|
"github.com/nextlevelbuilder/goclaw/internal/config"
|
|
orch "github.com/nextlevelbuilder/goclaw/internal/orchestration"
|
|
"github.com/nextlevelbuilder/goclaw/internal/scheduler"
|
|
"github.com/nextlevelbuilder/goclaw/internal/store"
|
|
"github.com/nextlevelbuilder/goclaw/internal/tools"
|
|
)
|
|
|
|
// announceEntry holds one teammate completion result waiting to be announced.
|
|
type announceEntry struct {
|
|
MemberAgent string // agent key (e.g. "researcher")
|
|
MemberDisplayName string // display name (e.g. "Nhà Nghiên Cứu"), empty if not set
|
|
Content string
|
|
Media []agent.MediaResult
|
|
}
|
|
|
|
// teamAnnounceQueue uses BatchQueue for producer-consumer synchronization.
|
|
var teamAnnounceQueue orch.BatchQueue[announceEntry]
|
|
|
|
// enqueueAnnounce adds a result to the queue. Returns isProcessor.
|
|
// If isProcessor=true, the caller must run processAnnounceLoop.
|
|
func enqueueAnnounce(key string, entry announceEntry) bool {
|
|
return teamAnnounceQueue.Enqueue(key, entry)
|
|
}
|
|
|
|
// announceRouting holds the shared routing info captured by the first goroutine.
|
|
type announceRouting struct {
|
|
LeadAgent string
|
|
LeadSessionKey string
|
|
OrigChannel string
|
|
OrigChatID string
|
|
OrigPeerKind string
|
|
OrigLocalKey string
|
|
OriginUserID string
|
|
// OriginSenderID and OriginRole carry the real acting human's identity
|
|
// from the original team-task dispatch. Without them, the Lead's session
|
|
// resumes from this re-ingress with an empty SenderID, which then fails
|
|
// CheckFileWriterPermission / CheckCronPermission in group contexts
|
|
// ("system context cannot write files in group chats"). The subagent
|
|
// announce queue (subagentAnnounceRouting) already carries these fields
|
|
// — this keeps the team-task announce queue at parity. (#915 follow-up)
|
|
OriginSenderID string
|
|
OriginRole string
|
|
TeamID string
|
|
TeamWorkspace string
|
|
OriginTraceID string
|
|
ParentTraceID uuid.UUID
|
|
ParentRootSpanID uuid.UUID
|
|
OutMeta map[string]string
|
|
}
|
|
|
|
// processAnnounceLoop drains entries, builds merged announce, schedules to leader.
|
|
// Loops until queue is empty.
|
|
func processAnnounceLoop(
|
|
ctx context.Context,
|
|
r announceRouting,
|
|
sched *scheduler.Scheduler,
|
|
msgBus *bus.MessageBus,
|
|
teamStore store.TeamStore,
|
|
postTurn tools.PostTurnProcessor,
|
|
cfg *config.Config,
|
|
) {
|
|
for {
|
|
entries := teamAnnounceQueue.Drain(r.LeadSessionKey)
|
|
if len(entries) == 0 {
|
|
if teamAnnounceQueue.TryFinish(r.LeadSessionKey) {
|
|
return
|
|
}
|
|
continue // entries arrived between drain and tryFinish
|
|
}
|
|
|
|
// Build task board snapshot (latest state, after all completions in this batch).
|
|
snapshot := ""
|
|
if r.TeamID != "" && r.OriginTraceID != "" {
|
|
if teamUUID, err := uuid.Parse(r.TeamID); err == nil {
|
|
snapshot = buildTaskBoardSnapshot(ctx, teamStore, teamUUID, r.OrigChatID, r.OriginTraceID)
|
|
}
|
|
}
|
|
|
|
content := buildMergedAnnounceContent(entries, snapshot, r.TeamWorkspace)
|
|
|
|
req := agent.RunRequest{
|
|
SessionKey: r.LeadSessionKey,
|
|
Message: content,
|
|
Channel: r.OrigChannel,
|
|
ChatID: r.OrigChatID,
|
|
PeerKind: r.OrigPeerKind,
|
|
LocalKey: r.OrigLocalKey,
|
|
UserID: r.OriginUserID,
|
|
// SenderID + Role propagate the original human acting through this
|
|
// team-task announce. loop_context.injectContext gates WithSenderID
|
|
// on req.SenderID being non-empty, so missing them silently strips
|
|
// the Lead's identity on resume — and group-scoped permission
|
|
// checks then deny write_file etc. (#915 follow-up)
|
|
SenderID: r.OriginSenderID,
|
|
Role: r.OriginRole,
|
|
RunID: fmt.Sprintf("teammate-announce-%s-%d", r.LeadAgent, len(entries)),
|
|
RunKind: "announce",
|
|
HideInput: true,
|
|
Stream: false,
|
|
TeamID: r.TeamID,
|
|
ParentTraceID: r.ParentTraceID,
|
|
ParentRootSpanID: r.ParentRootSpanID,
|
|
}
|
|
// Collect all media from entries.
|
|
for _, e := range entries {
|
|
for _, mr := range e.Media {
|
|
req.ForwardMedia = append(req.ForwardMedia, bus.MediaFile{
|
|
Path: mr.Path,
|
|
MimeType: mr.ContentType,
|
|
Filename: filepath.Base(mr.Path), // preserve sanitized stem from producer
|
|
})
|
|
}
|
|
}
|
|
// WS channel has no outbound media handler — deliver via ContentSuffix.
|
|
if r.OrigChannel == "ws" && len(req.ForwardMedia) > 0 {
|
|
req.ContentSuffix = mediaToMarkdownFromPaths(req.ForwardMedia, cfg)
|
|
req.ForwardMedia = nil
|
|
}
|
|
|
|
// Process batch in closure so defer is scoped per iteration (panic safety).
|
|
func() {
|
|
ptd := tools.NewPendingTeamDispatch()
|
|
defer ptd.ReleaseTeamLock()
|
|
schedCtx := tools.WithPendingTeamDispatch(ctx, ptd)
|
|
outCh := sched.Schedule(schedCtx, scheduler.LaneSubagent, req)
|
|
outcome := <-outCh
|
|
|
|
ptd.ReleaseTeamLock()
|
|
if postTurn != nil {
|
|
for tid, tIDs := range ptd.Drain() {
|
|
if err := postTurn.ProcessPendingTasks(ctx, tid, tIDs); err != nil {
|
|
slog.Warn("post_turn(announce): failed", "team_id", tid, "error", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
if outcome.Err != nil {
|
|
slog.Error("teammate announce: lead run failed", "error", outcome.Err, "batch_size", len(entries))
|
|
} else {
|
|
isSilent := outcome.Result.Content == "" || agent.IsSilentReply(outcome.Result.Content)
|
|
if !(isSilent && len(outcome.Result.Media) == 0) {
|
|
out := outcome.Result.Content
|
|
if isSilent {
|
|
out = ""
|
|
}
|
|
outMsg := bus.OutboundMessage{
|
|
Channel: r.OrigChannel,
|
|
ChatID: r.OrigChatID,
|
|
Content: out,
|
|
Metadata: r.OutMeta,
|
|
}
|
|
appendMediaToOutbound(&outMsg, outcome.Result.Media)
|
|
msgBus.PublishOutbound(outMsg)
|
|
}
|
|
}
|
|
|
|
slog.Info("teammate announce: batch processed",
|
|
"batch_size", len(entries), "session", r.LeadSessionKey)
|
|
}()
|
|
|
|
// Loop back — tryFinish at top will exit when queue is truly empty.
|
|
}
|
|
}
|
|
|
|
// memberLabel returns a display-friendly name for announce messages.
|
|
func memberLabel(e announceEntry) string {
|
|
if e.MemberDisplayName != "" {
|
|
return fmt.Sprintf("%s (%s)", e.MemberDisplayName, e.MemberAgent)
|
|
}
|
|
return e.MemberAgent
|
|
}
|
|
|
|
// buildMergedAnnounceContent creates the announce message for one or more completed/failed tasks.
|
|
func buildMergedAnnounceContent(entries []announceEntry, taskBoardSnapshot, teamWorkspace string) string {
|
|
var sb strings.Builder
|
|
|
|
if len(entries) == 1 {
|
|
e := entries[0]
|
|
label := memberLabel(e)
|
|
if strings.HasPrefix(e.Content, "[FAILED]") {
|
|
fmt.Fprintf(&sb, "[System Message] Team member %q failed to complete task.\n\nError: %s", label, strings.TrimPrefix(e.Content, "[FAILED] "))
|
|
sb.WriteString("\n\nInform the user about the failure. You may suggest retrying with team_tasks(action=\"retry\", task_id=\"...\") if appropriate.")
|
|
} else {
|
|
fmt.Fprintf(&sb, "[System Message] Team member %q completed task.\n\nResult:\n%s", label, e.Content)
|
|
}
|
|
} else {
|
|
// Count successes vs failures for header.
|
|
var failed, succeeded int
|
|
for _, e := range entries {
|
|
if strings.HasPrefix(e.Content, "[FAILED]") {
|
|
failed++
|
|
} else {
|
|
succeeded++
|
|
}
|
|
}
|
|
if failed > 0 && succeeded > 0 {
|
|
fmt.Fprintf(&sb, "[System Message] %d task(s) completed, %d task(s) failed.\n", succeeded, failed)
|
|
} else if failed > 0 {
|
|
fmt.Fprintf(&sb, "[System Message] %d task(s) failed.\n", failed)
|
|
} else {
|
|
fmt.Fprintf(&sb, "[System Message] %d team tasks completed.\n", succeeded)
|
|
}
|
|
for _, e := range entries {
|
|
label := memberLabel(e)
|
|
if strings.HasPrefix(e.Content, "[FAILED]") {
|
|
fmt.Fprintf(&sb, "\n--- FAILED: %q ---\nError: %s\n", label, strings.TrimPrefix(e.Content, "[FAILED] "))
|
|
} else {
|
|
fmt.Fprintf(&sb, "\n--- Result from %q ---\n%s\n", label, e.Content)
|
|
}
|
|
}
|
|
if failed > 0 {
|
|
sb.WriteString("\nFor failed tasks, you may suggest retrying with team_tasks(action=\"retry\", task_id=\"...\").")
|
|
}
|
|
}
|
|
|
|
if taskBoardSnapshot != "" {
|
|
sb.WriteString("\n\n")
|
|
sb.WriteString(taskBoardSnapshot)
|
|
}
|
|
|
|
// Batch-aware prompting: guide leader to summarize vs acknowledge.
|
|
allDone := strings.Contains(taskBoardSnapshot, "All ") && strings.Contains(taskBoardSnapshot, " completed")
|
|
if allDone {
|
|
sb.WriteString("\n\nAll tasks in this batch are completed. Present a comprehensive summary of ALL results to the user.")
|
|
} else if taskBoardSnapshot != "" {
|
|
sb.WriteString("\n\nSome tasks are still in progress. Briefly acknowledge this result (1-2 sentences). A full summary will come when all tasks complete.")
|
|
} else {
|
|
sb.WriteString("\n\nPresent this result to the user.")
|
|
}
|
|
|
|
sb.WriteString(" Any media files are forwarded automatically. Do NOT search for files — the results above contain all relevant information.")
|
|
|
|
if teamWorkspace != "" {
|
|
fmt.Fprintf(&sb, "\n[Team workspace: %s — use read_file/list_files to access shared files]", teamWorkspace)
|
|
}
|
|
|
|
return sb.String()
|
|
}
|