fix: resolve Stage 2 rebase conflicts and restore non-breaking behavior

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();

packages/core/src/core/geminiChat.ts

@@ -771,7 +771,7 @@ export class GeminiChat {
           }
 
           throw new AgentExecutionBlockedError(
-            beforeModelResult.reason || 'Model call blocked by hook',
+            beforeModelResult.reason || 'Agent execution blocked by hook',
             syntheticResponse,
           );
         }
@@ -1208,7 +1208,7 @@ export class GeminiChat {
 
         if (hookResult.blocked) {
           throw new AgentExecutionBlockedError(
-            hookResult.reason || 'Model call blocked by hook',
+            hookResult.reason || 'Agent execution blocked by hook',
             hookResult.response,
           );
         }