mirror of
https://github.com/tiennm99/goclaw.git
synced 2026-10-11 12:18:59 +00:00
viettranx
014f74ec15
Two fixes: 1. Remove assistant prefill from team task reminders. The injected [user]+[assistant]+[user] pattern caused LLMs to treat the canned ack as "turn complete", returning NO_REPLY for every user message in group sessions with active tasks. Reminders are now merged into the user message as prefix tags. 2. Add PeerKind propagation to team notification routing. TaskTicker and progress notifications were missing PeerKind on InboundMessage, causing them to route to phantom DM sessions instead of the correct group session. PeerKind is now carried through event payloads, notify queue metadata, and all inbound message publications.
96 lines
3.3 KiB
Go
96 lines
3.3 KiB
Go
package tools
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
|
|
"github.com/google/uuid"
|
|
|
|
"github.com/nextlevelbuilder/goclaw/internal/bus"
|
|
"github.com/nextlevelbuilder/goclaw/internal/store"
|
|
"github.com/nextlevelbuilder/goclaw/pkg/protocol"
|
|
)
|
|
|
|
// handleBlockerComment auto-fails the task, cancels the member session via
|
|
// EventTeamTaskFailed broadcast, and escalates to the leader agent.
|
|
func (t *TeamTasksTool) handleBlockerComment(
|
|
ctx context.Context,
|
|
team *store.TeamData,
|
|
task *store.TeamTaskData,
|
|
taskID, agentID uuid.UUID,
|
|
text string,
|
|
) *Result {
|
|
// Only escalate if task is still in progress.
|
|
if task.Status != store.TeamTaskStatusInProgress {
|
|
return NewResult(fmt.Sprintf(
|
|
"Blocker comment saved on task #%d \"%s\", but task is already %s — no escalation needed.",
|
|
task.TaskNumber, task.Subject, task.Status))
|
|
}
|
|
|
|
// Auto-fail the task. FailTask guards with AND status='in_progress' so
|
|
// concurrent calls are safe — only one succeeds.
|
|
reason := "Blocked: " + text
|
|
if len([]rune(reason)) > 500 {
|
|
reason = string([]rune(reason)[:500])
|
|
}
|
|
if err := t.manager.Store().FailTask(ctx, taskID, team.ID, reason); err != nil {
|
|
slog.Warn("blocker: FailTask error", "task_id", taskID, "error", err)
|
|
// Task may have completed concurrently — not a hard error.
|
|
return NewResult("Blocker comment saved. Task may have already completed — check task status.")
|
|
}
|
|
|
|
// Broadcast EventTeamTaskFailed — triggers:
|
|
// 1. Cancel subscriber → sched.CancelSession() → member stops
|
|
// 2. Notify subscriber → "❌ Task failed" → chat channel (direct outbound)
|
|
// 3. WS broadcast → web UI dashboard real-time update
|
|
memberKey := t.manager.AgentKeyFromID(ctx, agentID)
|
|
blockerPeerKind := ""
|
|
if pk, ok := task.Metadata[TaskMetaPeerKind].(string); ok {
|
|
blockerPeerKind = pk
|
|
}
|
|
t.manager.BroadcastTeamEvent(ctx, protocol.EventTeamTaskFailed, BuildTaskEventPayload(
|
|
team.ID.String(), taskID.String(),
|
|
store.TeamTaskStatusFailed,
|
|
"agent", memberKey,
|
|
WithTaskInfo(task.TaskNumber, task.Subject),
|
|
WithOwnerAgentKey(memberKey),
|
|
WithReason(reason),
|
|
WithUserID(store.UserIDFromContext(ctx)),
|
|
WithChannel(task.Channel),
|
|
WithChatID(task.ChatID),
|
|
WithPeerKind(blockerPeerKind),
|
|
))
|
|
|
|
// Escalate to leader if enabled in team settings.
|
|
escalationCfg := ParseBlockerEscalationConfig(team.Settings)
|
|
if escalationCfg.Enabled {
|
|
leadAg, err := t.manager.CachedGetAgentByID(ctx, team.LeadAgentID)
|
|
if err == nil {
|
|
escalationMsg := fmt.Sprintf(
|
|
"[Escalation] Member %q is blocked on task #%d \"%s\"\n\n"+
|
|
"Blocker: %s\n\n"+
|
|
"Use team_tasks(action=\"retry\", task_id=\"%s\") to reopen with updated instructions.",
|
|
memberKey, task.TaskNumber, task.Subject, text, taskID)
|
|
|
|
if !t.manager.TryPublishInbound(bus.InboundMessage{
|
|
Channel: task.Channel,
|
|
SenderID: "system:escalation",
|
|
ChatID: task.ChatID,
|
|
Content: escalationMsg,
|
|
UserID: store.UserIDFromContext(ctx),
|
|
PeerKind: blockerPeerKind,
|
|
TenantID: store.TenantIDFromContext(ctx),
|
|
AgentID: leadAg.AgentKey,
|
|
}) {
|
|
slog.Warn("blocker: escalation dropped (bus unavailable or buffer full)",
|
|
"task_id", taskID, "leader", leadAg.AgentKey)
|
|
}
|
|
}
|
|
}
|
|
|
|
return NewResult(fmt.Sprintf(
|
|
"Task #%d \"%s\" auto-failed due to blocker. Leader has been notified and can retry with updated instructions.",
|
|
task.TaskNumber, task.Subject))
|
|
}
|