fix subagent completion notify path and pipeline origin routing

pkg/agent/loop.go

@@ -668,7 +668,11 @@ func loadHeartbeatAckToken(workspace string) string {
 
 func (al *AgentLoop) prepareOutbound(msg bus.InboundMessage, response string) (bus.OutboundMessage, bool) {
 	if shouldDropNoReply(response) {
-		return bus.OutboundMessage{}, false
+		if fallback, ok := fallbackSubagentNotification(msg); ok {
+			response = fallback
+		} else {
+			return bus.OutboundMessage{}, false
+		}
 	}
 	currentMsgID := ""
 	if msg.Metadata != nil {
@@ -677,19 +681,18 @@ func (al *AgentLoop) prepareOutbound(msg bus.InboundMessage, response string) (b
 	clean, replyToID := parseReplyTag(response, currentMsgID)
 	clean = strings.TrimSpace(clean)
 	if clean == "" {
-		return bus.OutboundMessage{}, false
+		if fallback, ok := fallbackSubagentNotification(msg); ok {
+			clean = fallback
+		} else {
+			return bus.OutboundMessage{}, false
+		}
 	}
 	if al.shouldSuppressOutbound(msg, clean) {
 		return bus.OutboundMessage{}, false
 	}
 	outbound := bus.OutboundMessage{Channel: msg.Channel, ChatID: msg.ChatID, Content: clean, ReplyToID: strings.TrimSpace(replyToID)}
 	if msg.Channel == "system" {
-		if originChannel, originChatID, ok := strings.Cut(msg.ChatID, ":"); ok && strings.TrimSpace(originChannel) != "" {
-			outbound.Channel = originChannel
-			outbound.ChatID = originChatID
-		} else {
-			outbound.Channel = "cli"
-		}
+		outbound.Channel, outbound.ChatID = resolveSystemOrigin(msg.ChatID)
 	}
 	return outbound, true
 }
@@ -1075,16 +1078,7 @@ func (al *AgentLoop) processSystemMessage(ctx context.Context, msg bus.InboundMe
 			"chat_id":   msg.ChatID,
 		})
 
-	// Parse origin from chat_id (format: "channel:chat_id")
-	var originChannel, originChatID string
-	if idx := strings.Index(msg.ChatID, ":"); idx > 0 {
-		originChannel = msg.ChatID[:idx]
-		originChatID = msg.ChatID[idx+1:]
-	} else {
-		// Fallback
-		originChannel = "cli"
-		originChatID = msg.ChatID
-	}
+	originChannel, originChatID := resolveSystemOrigin(msg.ChatID)
 
 	// Use the origin session for context
 	sessionKey := fmt.Sprintf("%s:%s", originChannel, originChatID)
@@ -1817,6 +1811,54 @@ func shouldDropNoReply(text string) bool {
 	return strings.EqualFold(t, "NO_REPLY")
 }
 
+func resolveSystemOrigin(chatID string) (string, string) {
+	raw := strings.TrimSpace(chatID)
+	if raw == "" {
+		return "cli", "direct"
+	}
+	originChannel, originChatID, ok := strings.Cut(raw, ":")
+	if !ok {
+		return "cli", raw
+	}
+	originChannel = strings.TrimSpace(originChannel)
+	originChatID = strings.TrimSpace(originChatID)
+	switch {
+	case originChannel == "" && originChatID == "":
+		return "cli", "direct"
+	case originChannel == "":
+		return "cli", originChatID
+	case originChatID == "":
+		return originChannel, "direct"
+	default:
+		return originChannel, originChatID
+	}
+}
+
+func isSubagentSystemMessage(msg bus.InboundMessage) bool {
+	if msg.Channel != "system" {
+		return false
+	}
+	if msg.Metadata != nil && strings.EqualFold(strings.TrimSpace(msg.Metadata["trigger"]), "subagent") {
+		return true
+	}
+	return strings.HasPrefix(strings.ToLower(strings.TrimSpace(msg.SenderID)), "subagent:")
+}
+
+func fallbackSubagentNotification(msg bus.InboundMessage) (string, bool) {
+	if !isSubagentSystemMessage(msg) {
+		return "", false
+	}
+	content := strings.TrimSpace(msg.Content)
+	if content == "" {
+		id := strings.TrimSpace(strings.TrimPrefix(msg.SenderID, "subagent:"))
+		if id == "" {
+			id = "unknown"
+		}
+		content = fmt.Sprintf("Subagent %s completed.", id)
+	}
+	return content, true
+}
+
 func shouldFlushTelegramStreamSnapshot(s string) bool {
 	s = strings.TrimRight(s, " \t")
 	if s == "" {

pkg/agent/loop_system_notify_test.go

@@ -0,0 +1,68 @@
+package agent
+
+import (
+	"strings"
+	"testing"
+
+	"clawgo/pkg/bus"
+)
+
+func TestPrepareOutboundSubagentNoReplyFallback(t *testing.T) {
+	al := &AgentLoop{}
+	msg := bus.InboundMessage{
+		Channel:  "system",
+		SenderID: "subagent:subagent-1",
+		ChatID:   "telegram:9527",
+		Content:  "Task 'coder' completed.\n\nResult:\nOK",
+		Metadata: map[string]string{
+			"trigger": "subagent",
+		},
+	}
+
+	outbound, ok := al.prepareOutbound(msg, "NO_REPLY")
+	if !ok {
+		t.Fatalf("expected outbound notification for subagent NO_REPLY fallback")
+	}
+	if outbound.Channel != "telegram" || outbound.ChatID != "9527" {
+		t.Fatalf("unexpected outbound target: %s:%s", outbound.Channel, outbound.ChatID)
+	}
+	if strings.TrimSpace(outbound.Content) != strings.TrimSpace(msg.Content) {
+		t.Fatalf("expected fallback content from system message, got: %q", outbound.Content)
+	}
+}
+
+func TestPrepareOutboundNoReplySuppressedForNonSubagent(t *testing.T) {
+	al := &AgentLoop{}
+	msg := bus.InboundMessage{
+		Channel: "cli",
+		ChatID:  "direct",
+		Content: "hello",
+	}
+
+	if _, ok := al.prepareOutbound(msg, "NO_REPLY"); ok {
+		t.Fatalf("expected NO_REPLY to be suppressed for non-subagent messages")
+	}
+}
+
+func TestPrepareOutboundSubagentNoReplyFallbackWithMissingOrigin(t *testing.T) {
+	al := &AgentLoop{}
+	msg := bus.InboundMessage{
+		Channel:  "system",
+		SenderID: "subagent:subagent-9",
+		ChatID:   ":",
+		Metadata: map[string]string{
+			"trigger": "subagent",
+		},
+	}
+
+	outbound, ok := al.prepareOutbound(msg, "NO_REPLY")
+	if !ok {
+		t.Fatalf("expected outbound notification for malformed system origin")
+	}
+	if outbound.Channel != "cli" || outbound.ChatID != "direct" {
+		t.Fatalf("expected fallback origin cli:direct, got %s:%s", outbound.Channel, outbound.ChatID)
+	}
+	if outbound.Content != "Subagent subagent-9 completed." {
+		t.Fatalf("unexpected fallback content: %q", outbound.Content)
+	}
+}