fix(tool)：修复runtime内部缺少run级diff对比问题

Author: phantom5099

internal/runtime/checkpoint_flow_test.go

@@ -2,6 +2,7 @@ package runtime
 
 import (
 	"context"
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -776,6 +777,76 @@ func TestCheckpointDiffRejectsMissingStateAndReturnsEmptyWhenNoPreviousSnapshot(
 	}
 }
 
+func TestCreateEndOfTurnCheckpoint_SetsLastCheckpointID(t *testing.T) {
+	fixture := newRuntimeCheckpointFixture(t)
+	fixture.captureFile(t, "tracked.go", []byte("package main\n"))
+
+	state := newRunState("run-eot-id", fixture.session)
+	fixture.service.createEndOfTurnCheckpoint(context.Background(), &state, true)
+
+	if state.lastEndOfTurnCheckpointID == "" {
+		t.Fatal("expected lastEndOfTurnCheckpointID to be set after end-of-turn checkpoint creation")
+	}
+
+	records, err := fixture.checkpointStore.ListCheckpoints(context.Background(), fixture.session.ID, checkpoint.ListCheckpointOpts{})
+	if err != nil {
+		t.Fatalf("ListCheckpoints() error = %v", err)
+	}
+	if len(records) != 1 {
+		t.Fatalf("records = %#v, want 1", records)
+	}
+	wantRef := checkpoint.PerEditCheckpointIDFromRef(records[0].CodeCheckpointRef)
+	if state.lastEndOfTurnCheckpointID != wantRef {
+		t.Fatalf("lastEndOfTurnCheckpointID = %q, want %q", state.lastEndOfTurnCheckpointID, wantRef)
+	}
+}
+
+func TestFindPreviousEndOfTurnCheckpoint(t *testing.T) {
+	spy := &checkpointStoreSpy{
+		listRecords: []agentsession.CheckpointRecord{
+			{CheckpointID: "cp-skip-current", SessionID: "session-1", Reason: agentsession.CheckpointReasonEndOfTurn, CodeCheckpointRef: checkpoint.RefForPerEditCheckpoint("cp-skip-current"), RunID: "current-run", Status: agentsession.CheckpointStatusAvailable},
+			{CheckpointID: "cp-skip-reason", SessionID: "session-1", Reason: agentsession.CheckpointReasonCompact, CodeCheckpointRef: checkpoint.RefForPerEditCheckpoint("cp-skip-reason"), RunID: "old-run", Status: agentsession.CheckpointStatusAvailable},
+			{CheckpointID: "cp-valid", SessionID: "session-1", Reason: agentsession.CheckpointReasonEndOfTurn, CodeCheckpointRef: checkpoint.RefForPerEditCheckpoint("cp-valid"), RunID: "old-run", Status: agentsession.CheckpointStatusAvailable},
+		},
+	}
+	service := &Service{checkpointStore: spy}
+
+	got := service.findPreviousEndOfTurnCheckpoint(context.Background(), "session-1", "current-run")
+	if got != "cp-valid" {
+		t.Fatalf("findPreviousEndOfTurnCheckpoint() = %q, want cp-valid", got)
+	}
+	if spy.listSessionID != "session-1" || !spy.listOpts.RestorableOnly || spy.listOpts.Limit != 50 {
+		t.Fatalf("list opts = %#v, want session-1 restorableOnly=true limit=50", spy.listOpts)
+	}
+}
+
+func TestFindPreviousEndOfTurnCheckpoint_NoStore(t *testing.T) {
+	service := &Service{}
+	if got := service.findPreviousEndOfTurnCheckpoint(context.Background(), "session-1", "run-1"); got != "" {
+		t.Fatalf("expected empty, got %q", got)
+	}
+}
+
+func TestFindPreviousEndOfTurnCheckpoint_ListError(t *testing.T) {
+	spy := &checkpointStoreSpy{listErr: errors.New("db down")}
+	service := &Service{checkpointStore: spy}
+	if got := service.findPreviousEndOfTurnCheckpoint(context.Background(), "session-1", "run-1"); got != "" {
+		t.Fatalf("expected empty on list error, got %q", got)
+	}
+}
+
+func TestFindPreviousEndOfTurnCheckpoint_SkipsNonPerEditRef(t *testing.T) {
+	spy := &checkpointStoreSpy{
+		listRecords: []agentsession.CheckpointRecord{
+			{CheckpointID: "cp-no-ref", SessionID: "session-1", Reason: agentsession.CheckpointReasonEndOfTurn, CodeCheckpointRef: "", RunID: "old-run", Status: agentsession.CheckpointStatusAvailable},
+		},
+	}
+	service := &Service{checkpointStore: spy}
+	if got := service.findPreviousEndOfTurnCheckpoint(context.Background(), "session-1", "current-run"); got != "" {
+		t.Fatalf("expected empty when no per-edit ref available, got %q", got)
+	}
+}
+
 func mustReadRuntimeFile(t *testing.T, path string) []byte {
 	t.Helper()
 	data, err := os.ReadFile(path)

internal/runtime/checkpoint_gate.go

@@ -66,7 +66,11 @@ func (s *Service) createEndOfTurnCheckpoint(ctx context.Context, state *runState
 	defer s.perEditStore.Reset()
 	if err := s.createCheckpointRecord(ctx, session, runID, state, checkpointID, agentsession.CheckpointReasonEndOfTurn); err != nil {
 		log.Printf("checkpoint: end-of-turn record: %v", err)
+		return
 	}
+	state.mu.Lock()
+	state.lastEndOfTurnCheckpointID = checkpointID
+	state.mu.Unlock()
 }
 
 // createCheckpointRecord 写入 SQLite checkpoint 记录 + session 快照，并发出 EventCheckpointCreated。
@@ -191,3 +195,32 @@ func (s *Service) createSessionOnlyCheckpoint(
 	})
 	return nil
 }
+
+// findPreviousEndOfTurnCheckpoint 查询指定 session 中、不属于当前 run 的最新可用 end_of_turn checkpoint。
+// 用于 run-scoped diff 的 baseline 定位；找不到时返回空字符串，不报错。
+func (s *Service) findPreviousEndOfTurnCheckpoint(ctx context.Context, sessionID string, currentRunID string) string {
+	if s.checkpointStore == nil {
+		return ""
+	}
+	records, err := s.checkpointStore.ListCheckpoints(ctx, sessionID, checkpoint.ListCheckpointOpts{
+		Limit:          50,
+		RestorableOnly: true,
+	})
+	if err != nil {
+		log.Printf("checkpoint: find previous end-of-turn list failed: %v", err)
+		return ""
+	}
+	for _, r := range records {
+		if r.Reason != agentsession.CheckpointReasonEndOfTurn {
+			continue
+		}
+		if !checkpoint.IsPerEditRef(r.CodeCheckpointRef) {
+			continue
+		}
+		if r.RunID == currentRunID {
+			continue
+		}
+		return checkpoint.PerEditCheckpointIDFromRef(r.CodeCheckpointRef)
+	}
+	return ""
+}

internal/runtime/events.go

@@ -432,6 +432,8 @@ const (
 	EventCheckpointUndoRestore EventType = "checkpoint_undo_restore"
 	// EventBashSideEffect 表示 bash 命令在 workdir 内产生了文件变更。
 	EventBashSideEffect EventType = "bash_side_effect"
+	// EventRunDiffSummary 表示一次完整 run 的端到端代码变更摘要已生成。
+	EventRunDiffSummary EventType = "run_diff_summary"
 )
 
 // TokenUsagePayload 承载单轮 token 用量统计。
@@ -500,6 +502,14 @@ type ToolDiffPayload struct {
 	Diffs      []FileDiffEntry `json:"diffs,omitempty"`
 }
 
+// RunDiffSummaryPayload 描述一次完整 run 结束时的端到端代码变更摘要。
+type RunDiffSummaryPayload struct {
+	FromCheckpointID string          `json:"from_checkpoint_id,omitempty"`
+	ToCheckpointID   string          `json:"to_checkpoint_id,omitempty"`
+	Diff             string          `json:"diff,omitempty"`
+	ChangedFiles     []FileDiffEntry `json:"changed_files,omitempty"`
+}
+
 // BashSideEffectPayload 描述 bash 命令在 workdir 内的文件变更。
 type BashSideEffectPayload struct {
 	ToolCallID                string       `json:"tool_call_id"`

internal/runtime/run.go

@@ -101,6 +101,23 @@ func (s *Service) Run(ctx context.Context, input UserInput) (err error) {
 			}
 			s.updateResumeCheckpoint(runCtx, statePtr, "stopped", completion)
 		}
+		if statePtr != nil && s.perEditStore != nil && statePtr.baselineCheckpointID != "" && statePtr.lastEndOfTurnCheckpointID != "" {
+			diffStr, _ := s.perEditStore.Diff(context.Background(), statePtr.baselineCheckpointID, statePtr.lastEndOfTurnCheckpointID)
+			files, _ := s.perEditStore.ChangedFiles(context.Background(), statePtr.baselineCheckpointID, statePtr.lastEndOfTurnCheckpointID)
+			var changedFiles []FileDiffEntry
+			for _, f := range files {
+				changedFiles = append(changedFiles, FileDiffEntry{
+					Path: f.Path,
+					Kind: string(f.Kind),
+				})
+			}
+			s.emitRunScopedOptional(EventRunDiffSummary, statePtr, RunDiffSummaryPayload{
+				FromCheckpointID: statePtr.baselineCheckpointID,
+				ToCheckpointID:   statePtr.lastEndOfTurnCheckpointID,
+				Diff:             diffStr,
+				ChangedFiles:     changedFiles,
+			})
+		}
 		s.emitRunTermination(runCtx, input, statePtr, err)
 	}()
 	ctx = runCtx
@@ -187,6 +204,7 @@ func (s *Service) Run(ctx context.Context, input UserInput) (err error) {
 	s.updateResumeCheckpoint(ctx, &state, "plan", "")
 
 	maxTurns := resolveRuntimeMaxTurns(initialCfg.Runtime)
+	state.baselineCheckpointID = s.findPreviousEndOfTurnCheckpoint(ctx, sessionID, input.RunID)
 	for turn := 0; ; turn++ {
 		if turn >= maxTurns {
 			state.maxTurnsReached = true

internal/runtime/state.go

@@ -50,6 +50,8 @@ type runState struct {
 	hasUnknownUsage                bool
 	completion                     controlplane.CompletionState
 	progress                       controlplane.ProgressState
+	lastEndOfTurnCheckpointID      string
+	baselineCheckpointID           string
 	hookAnnotations                []string
 	hookNotifications              []queuedHookNotification
 	hookNotificationSeen           map[string]time.Time