From 0d05a8acca4b4e5d45ee428cb2be4690ffbc6ab7 Mon Sep 17 00:00:00 2001
From: Max Beizer <max.beizer@gmail.com>
Date: Sun, 1 Mar 2026 10:18:21 -0600
Subject: [PATCH] Address Copilot review feedback

- Prioritize --json output over --log/--follow so JSON is not silently ignored
- Emit null for zero createdAt/updatedAt values, consistent with completedAt

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 pkg/cmd/agent-task/capi/sessions.go | 12 ++++++++++--
 pkg/cmd/agent-task/view/view.go     |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkg/cmd/agent-task/capi/sessions.go b/pkg/cmd/agent-task/capi/sessions.go
index 3a74ef3d9..4b457d799 100644
--- a/pkg/cmd/agent-task/capi/sessions.go
+++ b/pkg/cmd/agent-task/capi/sessions.go
@@ -142,9 +142,17 @@ func (s *Session) ExportData(fields []string) map[string]interface{} {
 				data[f] = nil
 			}
 		case "createdAt":
-			data[f] = s.CreatedAt
+			if s.CreatedAt.IsZero() {
+				data[f] = nil
+			} else {
+				data[f] = s.CreatedAt
+			}
 		case "updatedAt":
-			data[f] = s.LastUpdatedAt
+			if s.LastUpdatedAt.IsZero() {
+				data[f] = nil
+			} else {
+				data[f] = s.LastUpdatedAt
+			}
 		case "completedAt":
 			if s.CompletedAt.IsZero() {
 				data[f] = nil
diff --git a/pkg/cmd/agent-task/view/view.go b/pkg/cmd/agent-task/view/view.go
index 137efdb64..854faa73d 100644
--- a/pkg/cmd/agent-task/view/view.go
+++ b/pkg/cmd/agent-task/view/view.go
@@ -288,14 +288,14 @@ func viewRun(opts *ViewOptions) error {
 		opts.IO.StopProgressIndicator()
 	}
 
-	if opts.Log {
-		return printLogs(opts, capiClient, session.ID)
-	}
-
 	if opts.Exporter != nil {
 		return opts.Exporter.Write(opts.IO, session)
 	}
 
+	if opts.Log {
+		return printLogs(opts, capiClient, session.ID)
+	}
+
 	printSession(opts, session)
 	return nil
 }