Reduce planned task progress noise

pkg/agent/session_planner.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -103,7 +104,10 @@ func splitPlannedSegments(content string) []string {
 		return bullet
 	}
 
-	replaced := strings.NewReplacer("；", ";", "\n", ";", "。然后", ";", " 然后 ", ";", " and then ", ";")
+	// Only split implicit plans on strong separators. Plain newlines are often
+	// just formatting inside a single request, and "然后/and then" frequently
+	// describes execution order inside one task rather than separate tasks.
+	replaced := strings.NewReplacer("；", ";")
 	norm := replaced.Replace(content)
 	parts := strings.Split(norm, ";")
 	out := make([]string, 0, len(parts))
@@ -120,6 +124,11 @@ func splitPlannedSegments(content string) []string {
 func (al *AgentLoop) runPlannedTasks(ctx context.Context, msg bus.InboundMessage, tasks []plannedTask) (string, error) {
 	results := make([]plannedTaskResult, len(tasks))
 	var wg sync.WaitGroup
+	var progressMu sync.Mutex
+	completed := 0
+	failed := 0
+	milestones := plannedProgressMilestones(len(tasks))
+	notified := make(map[int]struct{}, len(milestones))
 	for i, task := range tasks {
 		wg.Add(1)
 		go func(index int, t plannedTask) {
@@ -139,7 +148,22 @@ func (al *AgentLoop) runPlannedTasks(ctx context.Context, msg bus.InboundMessage
 				res.ErrText = err.Error()
 			}
 			results[index] = res
-			al.publishPlannedTaskProgress(msg, len(tasks), res)
+			progressMu.Lock()
+			completed++
+			if res.ErrText != "" {
+				failed++
+			}
+			snapshotCompleted := completed
+			snapshotFailed := failed
+			shouldNotify := shouldPublishPlannedTaskProgress(len(tasks), snapshotCompleted, res, milestones, notified)
+			if shouldNotify && res.ErrText == "" {
+				notified[snapshotCompleted] = struct{}{}
+			}
+			progressMu.Unlock()
+
+			if shouldNotify {
+				al.publishPlannedTaskProgress(msg, len(tasks), snapshotCompleted, snapshotFailed, res)
+			}
 		}(i, task)
 	}
 	wg.Wait()
@@ -160,7 +184,50 @@ func (al *AgentLoop) runPlannedTasks(ctx context.Context, msg bus.InboundMessage
 	return strings.TrimSpace(b.String()), nil
 }
 
-func (al *AgentLoop) publishPlannedTaskProgress(msg bus.InboundMessage, total int, res plannedTaskResult) {
+func plannedProgressMilestones(total int) []int {
+	if total <= 3 {
+		return nil
+	}
+	points := []float64{0.33, 0.66}
+	out := make([]int, 0, len(points))
+	seen := map[int]struct{}{}
+	for _, p := range points {
+		step := int(math.Round(float64(total) * p))
+		if step <= 0 || step >= total {
+			continue
+		}
+		if _, ok := seen[step]; ok {
+			continue
+		}
+		seen[step] = struct{}{}
+		out = append(out, step)
+	}
+	return out
+}
+
+func shouldPublishPlannedTaskProgress(total, completed int, res plannedTaskResult, milestones []int, notified map[int]struct{}) bool {
+	if total <= 1 {
+		return false
+	}
+	if strings.TrimSpace(res.ErrText) != "" {
+		return true
+	}
+	if completed >= total {
+		return false
+	}
+	for _, step := range milestones {
+		if completed != step {
+			continue
+		}
+		if _, ok := notified[step]; ok {
+			return false
+		}
+		return true
+	}
+	return false
+}
+
+func (al *AgentLoop) publishPlannedTaskProgress(msg bus.InboundMessage, total, completed, failed int, res plannedTaskResult) {
 	if al == nil || al.bus == nil || total <= 1 {
 		return
 	}
@@ -180,8 +247,8 @@ func (al *AgentLoop) publishPlannedTaskProgress(msg bus.InboundMessage, total in
 	if body == "" {
 		body = "(无输出)"
 	}
-	body = truncate(strings.ReplaceAll(body, "\n", " "), 280)
-	content := fmt.Sprintf("进度 %d/%d：任务%d已%s\n%s", idx, total, idx, status, body)
+	body = summarizePlannedTaskProgressBody(body, 6, 320)
+	content := fmt.Sprintf("阶段进度 %d/%d（失败 %d）\n最近任务：%d 已%s\n%s", completed, total, failed, idx, status, body)
 	al.bus.PublishOutbound(bus.OutboundMessage{
 		Channel: msg.Channel,
 		ChatID:  msg.ChatID,
@@ -189,6 +256,37 @@ func (al *AgentLoop) publishPlannedTaskProgress(msg bus.InboundMessage, total in
 	})
 }
 
+func summarizePlannedTaskProgressBody(body string, maxLines, maxChars int) string {
+	body = strings.ReplaceAll(body, "\r\n", "\n")
+	body = strings.TrimSpace(body)
+	if body == "" {
+		return "(无输出)"
+	}
+	lines := strings.Split(body, "\n")
+	out := make([]string, 0, len(lines))
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if line == "" {
+			continue
+		}
+		out = append(out, line)
+		if maxLines > 0 && len(out) >= maxLines {
+			break
+		}
+	}
+	if len(out) == 0 {
+		return "(无输出)"
+	}
+	joined := strings.Join(out, "\n")
+	if maxChars > 0 && len(joined) > maxChars {
+		joined = truncate(joined, maxChars)
+	}
+	if len(lines) > len(out) && !strings.HasSuffix(joined, "...") {
+		joined += "\n..."
+	}
+	return joined
+}
+
 func (al *AgentLoop) enrichTaskContentWithMemoryAndEKG(ctx context.Context, task plannedTask) string {
 	base := strings.TrimSpace(task.Content)
 	if base == "" {

pkg/agent/session_planner_progress_test.go

@@ -0,0 +1,35 @@
+package agent
+
+import "testing"
+
+func TestPlannedProgressMilestones(t *testing.T) {
+	t.Parallel()
+
+	got := plannedProgressMilestones(12)
+	if len(got) != 2 || got[0] != 4 || got[1] != 8 {
+		t.Fatalf("unexpected milestones: %#v", got)
+	}
+}
+
+func TestShouldPublishPlannedTaskProgress(t *testing.T) {
+	t.Parallel()
+
+	milestones := plannedProgressMilestones(12)
+	notified := map[int]struct{}{}
+	if shouldPublishPlannedTaskProgress(12, 1, plannedTaskResult{}, milestones, notified) {
+		t.Fatalf("did not expect early success notification")
+	}
+	if !shouldPublishPlannedTaskProgress(12, 4, plannedTaskResult{}, milestones, notified) {
+		t.Fatalf("expected milestone notification")
+	}
+	notified[4] = struct{}{}
+	if shouldPublishPlannedTaskProgress(12, 4, plannedTaskResult{}, milestones, notified) {
+		t.Fatalf("did not expect duplicate milestone notification")
+	}
+	if !shouldPublishPlannedTaskProgress(12, 5, plannedTaskResult{ErrText: "boom"}, milestones, notified) {
+		t.Fatalf("expected failure notification")
+	}
+	if shouldPublishPlannedTaskProgress(3, 3, plannedTaskResult{}, plannedProgressMilestones(3), map[int]struct{}{}) {
+		t.Fatalf("did not expect final success notification")
+	}
+}

pkg/agent/session_planner_split_test.go

@@ -0,0 +1,33 @@
+package agent
+
+import "testing"
+
+func TestSplitPlannedSegmentsDoesNotSplitPlainNewlines(t *testing.T) {
+	t.Parallel()
+
+	content := "编写ai漫画创作平台demo\n让产品出方案，方案出完让前端后端开始编写，写完后交个测试过一下"
+	got := splitPlannedSegments(content)
+	if len(got) != 1 {
+		t.Fatalf("expected 1 segment, got %d: %#v", len(got), got)
+	}
+}
+
+func TestSplitPlannedSegmentsStillSplitsBullets(t *testing.T) {
+	t.Parallel()
+
+	content := "1. 先实现前端\n2. 再补测试"
+	got := splitPlannedSegments(content)
+	if len(got) != 2 {
+		t.Fatalf("expected 2 segments, got %d: %#v", len(got), got)
+	}
+}
+
+func TestSplitPlannedSegmentsStillSplitsSemicolons(t *testing.T) {
+	t.Parallel()
+
+	content := "先实现前端；再补测试"
+	got := splitPlannedSegments(content)
+	if len(got) != 2 {
+		t.Fatalf("expected 2 segments, got %d: %#v", len(got), got)
+	}
+}

pkg/agent/session_planner_test.go

@@ -0,0 +1,23 @@
+package agent
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestSummarizePlannedTaskProgressBodyPreservesUsefulLines(t *testing.T) {
+	t.Parallel()
+
+	body := "subagent 已写入 config.json。\npath: /root/.clawgo/config.json\nagent_id: tester\nrole: testing\ndisplay_name: Test Agent\ntool_allowlist: [filesystem shell]\nrouting_keywords: [test qa]\nsystem_prompt_file: agents/tester/AGENT.md"
+	out := summarizePlannedTaskProgressBody(body, 6, 320)
+
+	if !strings.Contains(out, "subagent 已写入 config.json。") {
+		t.Fatalf("expected title line, got:\n%s", out)
+	}
+	if !strings.Contains(out, "agent_id: tester") {
+		t.Fatalf("expected agent id line, got:\n%s", out)
+	}
+	if strings.Contains(out, "subagent 已写入 config.json。 path:") {
+		t.Fatalf("expected multi-line formatting, got:\n%s", out)
+	}
+}