From 3f44f7597e6bce7bbb1ccf61b241a201c35ac6ee Mon Sep 17 00:00:00 2001 From: Aishanee Shah 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 +- packages/core/src/core/geminiChat.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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(); diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts index 058021fa51..2c0561b7b9 100644 --- a/packages/core/src/core/geminiChat.ts +++ b/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, ); }