T-1197: Show variant agent and warn on consolidation mismatch in orbit finalize

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- `orbit finalize` now displays the variant's agent (alias, type, model) in its preamble, falling back to "Agent: unknown" when none of the fields are populated.
+- `orbit finalize` now reads the spec's `consolidation-log.json` and prints a warning before the confirmation prompt when the requested `--variant` differs from the most recent consolidation entry. The warning fires under `--force` as well so it remains visible in CI output.
+
 ## [0.9.0] - 2026-04-11
 
 Initial public release of Orbit and Apsis.

cmd/orbit/finalize.go

@@ -8,7 +8,9 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
+	"github.com/arjenschwarz/orbit/internal/consolidation"
 	"github.com/arjenschwarz/orbit/internal/variants"
 )
 
@@ -96,12 +98,17 @@ func finalizeCommand(args []string) error {
 
 	// Show what will happen
 	fmt.Printf("Finalize spec: %s\n\n", specName)
+	fmt.Printf("%s\n", formatVariantAgentInfo(targetVariant))
 	fmt.Printf("This will:\n")
 	fmt.Printf("  1. Rebase variant %d (%s) onto %s\n", targetVariant.ID, targetVariant.Branch, metadata.OriginalBranch)
 	fmt.Printf("  2. Remove all variant worktrees\n")
 	fmt.Printf("  3. Delete all variant branches\n")
 	fmt.Println()
 
+	// Verify against the most recent consolidation log entry, if any.
+	// Runs before the force-gate so the warning is visible in --force / CI runs.
+	printConsolidationMismatchWarning(filepath.Join(specDir, ".orbit"), *variantID)
+
 	// Confirm unless force flag is set
 	if !*force {
 		fmt.Print("Proceed with finalize? [y/N] ")
@@ -145,3 +152,51 @@ func finalizeCommand(args []string) error {
 
 	return nil
 }
+
+// printConsolidationMismatchWarning reads consolidation-log.json under orbitDir
+// and prints a warning when the most recent entry's ChosenVariantID differs
+// from the requested variantID. Missing log, parse failure, or empty entries
+// are treated as "no verification possible" and print nothing.
+func printConsolidationMismatchWarning(orbitDir string, variantID int) {
+	log, err := consolidation.NewLogger(orbitDir).Read()
+	if err != nil {
+		return
+	}
+	if len(log.Entries) == 0 {
+		return
+	}
+	latest := log.Entries[len(log.Entries)-1]
+	if latest.ChosenVariantID == variantID {
+		return
+	}
+	fmt.Printf("Warning: variant %d does not match the most recent consolidation (variant %d, %s)\n\n",
+		variantID, latest.ChosenVariantID, latest.Timestamp.Format(time.RFC3339))
+}
+
+// formatVariantAgentInfo renders an "Agent: ..." line for the finalize preamble.
+// When all of Agent, AgentType, and Model are empty, returns "Agent: unknown".
+// Otherwise, builds "Agent: <alias> (<type>, model: <model>)" with each parenthetical
+// piece omitted cleanly when its source field is empty.
+func formatVariantAgentInfo(v *variants.Variant) string {
+	if v.Agent == "" && v.AgentType == "" && v.Model == "" {
+		return "Agent: unknown"
+	}
+
+	var parens []string
+	if v.AgentType != "" {
+		parens = append(parens, v.AgentType)
+	}
+	if v.Model != "" {
+		parens = append(parens, "model: "+v.Model)
+	}
+
+	var parts []string
+	if v.Agent != "" {
+		parts = append(parts, v.Agent)
+	}
+	if len(parens) > 0 {
+		parts = append(parts, "("+strings.Join(parens, ", ")+")")
+	}
+
+	return "Agent: " + strings.Join(parts, " ")
+}