fix: resolve mainline conflicts for checkpoint diff

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>

Author: 2 people

internal/cli/gateway_runtime_bridge.go

@@ -1722,8 +1722,8 @@ func (b *gatewayRuntimePortBridge) CheckpointDiff(ctx context.Context, input gat
 	result, err := cp.CheckpointDiff(ctx, agentruntime.CheckpointDiffInput{
 		SessionID:    strings.TrimSpace(input.SessionID),
 		CheckpointID: strings.TrimSpace(input.CheckpointID),
-		RunID:        strings.TrimSpace(input.RunID),
 		Scope:        strings.TrimSpace(input.Scope),
+		RunID:        strings.TrimSpace(input.RunID),
 	})
 	if err != nil {
 		return gateway.CheckpointDiffResult{}, err

internal/gateway/bootstrap.go

@@ -2105,15 +2105,15 @@ func decodeCheckpointDiffPayload(payload any) CheckpointDiffInput {
 			SubjectID:    strings.TrimSpace(typed.SubjectID),
 			SessionID:    strings.TrimSpace(typed.SessionID),
 			CheckpointID: strings.TrimSpace(typed.CheckpointID),
-			RunID:        strings.TrimSpace(typed.RunID),
 			Scope:        strings.TrimSpace(typed.Scope),
+			RunID:        strings.TrimSpace(typed.RunID),
 		}
 	case map[string]any:
 		return CheckpointDiffInput{
 			SessionID:    readStringValue(typed, "session_id"),
 			CheckpointID: readStringValue(typed, "checkpoint_id"),
-			RunID:        readStringValue(typed, "run_id"),
 			Scope:        readStringValue(typed, "scope"),
+			RunID:        readStringValue(typed, "run_id"),
 		}
 	default:
 		raw, marshalErr := json.Marshal(payload)
@@ -2130,8 +2130,8 @@ func decodeCheckpointDiffPayload(payload any) CheckpointDiffInput {
 		return CheckpointDiffInput{
 			SessionID:    strings.TrimSpace(decoded.SessionID),
 			CheckpointID: strings.TrimSpace(decoded.CheckpointID),
-			RunID:        strings.TrimSpace(decoded.RunID),
 			Scope:        strings.TrimSpace(decoded.Scope),
+			RunID:        strings.TrimSpace(decoded.RunID),
 		}
 	}
 }

internal/gateway/contracts.go

@@ -326,10 +326,10 @@ type CheckpointDiffInput struct {
 	SessionID string `json:"session_id"`
 	// CheckpointID 是可选的 checkpoint 标识，为空则查最新代码检查点。
 	CheckpointID string `json:"checkpoint_id,omitempty"`
-	// RunID 是 run 范围 diff 的运行标识。
-	RunID string `json:"run_id,omitempty"`
-	// Scope 控制 diff 范围；为空保持相邻 checkpoint，run 表示本次请求净变更。
+	// Scope 可选，为 "run" 时按 run_id 做聚合 diff；为空时沿用相邻 checkpoint 对比行为。
 	Scope string `json:"scope,omitempty"`
+	// RunID 在 scope=run 时指定目标 run。
+	RunID string `json:"run_id,omitempty"`
 }
 
 // CheckpointDiffResult 描述两个相邻代码检查点之间的差异。

internal/gateway/protocol/jsonrpc.go

@@ -303,8 +303,8 @@ type UndoRestoreParams struct {
 type CheckpointDiffParams struct {
 	SessionID    string `json:"session_id"`
 	CheckpointID string `json:"checkpoint_id,omitempty"`
-	RunID        string `json:"run_id,omitempty"`
-	Scope        string `json:"scope,omitempty"`
+	Scope        string `json:"scope,omitempty"`  // 可选，"run" 表示 run 级聚合 diff
+	RunID        string `json:"run_id,omitempty"` // scope=run 时必需
 }
 
 // ResolvePermissionParams 表示 gateway.resolvePermission 参数。
@@ -954,8 +954,8 @@ func decodeCheckpointDiffParams(raw json.RawMessage) (CheckpointDiffParams, *JSO
 	return decodeParams(raw, "checkpoint.diff", func(p *CheckpointDiffParams) *JSONRPCError {
 		p.SessionID = strings.TrimSpace(p.SessionID)
 		p.CheckpointID = strings.TrimSpace(p.CheckpointID)
-		p.RunID = strings.TrimSpace(p.RunID)
 		p.Scope = strings.TrimSpace(p.Scope)
+		p.RunID = strings.TrimSpace(p.RunID)
 		if p.SessionID == "" {
 			return NewJSONRPCError(JSONRPCCodeInvalidParams, "missing required field: params.session_id", GatewayCodeMissingRequiredField)
 		}

internal/runtime/checkpoint_flow_test.go

@@ -1026,7 +1026,7 @@ func TestCheckpointDiff_ScopeRun_ReturnsAggregateDiff(t *testing.T) {
 	if len(modifiedPaths) != 1 || modifiedPaths[0] != "a.txt" {
 		t.Fatalf("expected a.txt modified, got added=%v modified=%v", addedPaths, modifiedPaths)
 	}
-	// CheckpointID should be set to the target (last) checkpoint in the run
+	// 当前 run-scope diff 默认返回目标 checkpoint（未显式指定时为最新 checkpoint）。
 	if result.CheckpointID != "cp-2" {
 		t.Fatalf("CheckpointID = %q, want cp-2", result.CheckpointID)
 	}

internal/runtime/checkpoint_restore.go

@@ -71,8 +71,7 @@ func (s *Service) restoreCheckpointCore(ctx context.Context, sessionID, checkpoi
 		records, listErr := s.checkpointStore.ListCheckpoints(ctx, sessionID, checkpoint.ListCheckpointOpts{Limit: 5})
 		if listErr == nil {
 			for _, r := range records {
-				if r.Reason == agentsession.CheckpointReasonEndOfTurn &&
-					checkpoint.IsPerEditRef(r.CodeCheckpointRef) {
+				if r.Reason == agentsession.CheckpointReasonEndOfTurn && checkpoint.IsPerEditRef(r.CodeCheckpointRef) {
 					fallbackRef = r.CodeCheckpointRef
 					break
 				}
@@ -304,8 +303,8 @@ func (s *Service) updateRuntimeSessionAfterRestore(sessionID string, head agents
 type CheckpointDiffInput struct {
 	SessionID    string `json:"session_id"`
 	CheckpointID string `json:"checkpoint_id,omitempty"` // 可选，为空则查最新代码检查点
-	RunID        string `json:"run_id,omitempty"`
-	Scope        string `json:"scope,omitempty"`
+	Scope        string `json:"scope,omitempty"`         // 可选，"run" 表示 run 级聚合 diff
+	RunID        string `json:"run_id,omitempty"`        // scope=run 时指定目标 run
 }
 
 // CheckpointDiffResult 描述两个相邻代码检查点之间的差异。

internal/runtime/run.go

@@ -104,10 +104,13 @@ func (s *Service) Run(ctx context.Context, input UserInput) (err error) {
 		}
 		if statePtr != nil && s.perEditStore != nil && statePtr.baselineCheckpointID != "" && statePtr.lastEndOfTurnCheckpointID != "" {
 			runEndCtx := context.Background()
-			records, listErr := s.checkpointStore.ListCheckpoints(runEndCtx, statePtr.session.ID, checkpoint.ListCheckpointOpts{RunID: statePtr.runID})
+			records, listErr := s.checkpointStore.ListCheckpoints(runEndCtx, statePtr.session.ID, checkpoint.ListCheckpointOpts{})
 			if listErr == nil {
 				var perEditIDs []string
 				for _, r := range records {
+					if strings.TrimSpace(r.RunID) != statePtr.runID {
+						continue
+					}
 					if checkpoint.IsPerEditRef(r.CodeCheckpointRef) {
 						perEditIDs = append(perEditIDs, checkpoint.PerEditCheckpointIDFromRef(r.CodeCheckpointRef))
 					}