From db8e1acaa021c81e7996942f830fe3b4995c180d Mon Sep 17 00:00:00 2001
From: dj-oyu <68707227+dj-oyu@users.noreply.github.com>
Date: Mon, 2 Mar 2026 04:38:41 +0900
Subject: [PATCH] fix: prevent duplicate heartbeat completion messages on
 Telegram

The streaming status bubble (IsStatus) and task completion notification
(IsTaskStatus) were creating two separate messages. Now the streaming
bubble's message ID is promoted to taskMsgIDs so the completion
notification edits the existing bubble instead of creating a new one.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pkg/agent/loop.go       | 17 ++++++++---------
 pkg/channels/manager.go | 13 +++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index a052da4ea..5c8a1e768 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -1354,17 +1354,16 @@ func (al *AgentLoop) runAgentLoop(ctx context.Context, agent *AgentInstance, opt
 		task.Result = utils.Truncate(finalContent, 280)
 	}
 
-	// 5e. Replace orphaned streaming status bubble for background tasks.
+	// 5e. Promote streaming status bubble to task message for background tasks.
 	// When SendResponse is false (e.g. heartbeat), no final non-status message
-	// triggers cleanup, so the last streaming chunk persists on Telegram.
+	// triggers preSend's statusMsgIDs.LoadAndDelete cleanup, so the last
+	// streaming chunk persists on Telegram. Move the tracked status message ID
+	// into taskMsgIDs so the defer's IsTaskStatus completion notification edits
+	// the existing bubble instead of creating a duplicate message.
 	if opts.Background && !opts.SendResponse && !constants.IsInternalChannel(opts.Channel) && task != nil &&
-		task.streamedChunks {
-		_ = al.bus.PublishOutbound(ctx, bus.OutboundMessage{
-			Channel:  opts.Channel,
-			ChatID:   opts.ChatID,
-			Content:  utils.Truncate(finalContent, 200),
-			IsStatus: true,
-		})
+		task.streamedChunks && opts.TaskID != "" {
+		statusKey := opts.Channel + ":" + opts.ChatID
+		al.channelManager.PromoteStatusToTask(statusKey, opts.TaskID)
 	}
 
 	// 6. Save final assistant message to session (deferred write-behind)
diff --git a/pkg/channels/manager.go b/pkg/channels/manager.go
index f6ba2c2cc..de1df78e3 100644
--- a/pkg/channels/manager.go
+++ b/pkg/channels/manager.go
@@ -839,6 +839,19 @@ func (m *Manager) runTTLJanitor(ctx context.Context) {
 	}
 }
 
+// PromoteStatusToTask moves the tracked streaming status message for the given
+// channel:chatID key into the task message map under taskID. This allows the
+// next IsTaskStatus publish to edit the streaming bubble instead of creating a
+// new message. Returns true if a status message was found and promoted.
+func (m *Manager) PromoteStatusToTask(statusKey, taskID string) bool {
+	v, loaded := m.statusMsgIDs.LoadAndDelete(statusKey)
+	if !loaded {
+		return false
+	}
+	m.taskMsgIDs.Store(taskID, v)
+	return true
+}
+
 func (m *Manager) GetChannel(name string) (Channel, bool) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()