From d0b05a8f2a9b3a8d4424c08ae489b8de4141914d Mon Sep 17 00:00:00 2001
From: Aishanee Shah <aishaneeshah@google.com>
Date: Tue, 19 May 2026 16:34:00 +0000
Subject: [PATCH] fix: resolve conflict markers in geminiChat.ts for Stage 1

---
 packages/core/src/core/geminiChat.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts
index f013eaface..058021fa51 100644
--- a/packages/core/src/core/geminiChat.ts
+++ b/packages/core/src/core/geminiChat.ts
@@ -1208,7 +1208,7 @@ export class GeminiChat {
 
         if (hookResult.blocked) {
           throw new AgentExecutionBlockedError(
-            hookResult.reason || 'Agent execution blocked by hook',
+            hookResult.reason || 'Model call blocked by hook',
             hookResult.response,
           );
         }