From 0ae939422c609b43b4e5542f043b0fe8ebb88ad8 Mon Sep 17 00:00:00 2001
From: Aishanee Shah <aishaneeshah@google.com>
Date: Fri, 15 May 2026 18:40:42 +0000
Subject: [PATCH] fix: resolve Stage 2 rebase conflicts and restore
 non-breaking behavior

---
 packages/cli/src/ui/utils/historyExportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/ui/utils/historyExportUtils.ts b/packages/cli/src/ui/utils/historyExportUtils.ts
index a89c31c652..91eed28735 100644
--- a/packages/cli/src/ui/utils/historyExportUtils.ts
+++ b/packages/cli/src/ui/utils/historyExportUtils.ts
@@ -81,7 +81,7 @@ export async function exportHistoryToFile(
   const {
     messages,
     filePath,
-    trajectories: _trajectories, // Collected but not yet included in Stage 1 JSON output
+    trajectories: _trajectories, // Collected but not yet included in Stage 2 JSON output
     history: providedHistory,
   } = options;
   const extension = path.extname(filePath).toLowerCase();