From d8a1a1e527015fdf9646ff656e8acad7a3850e71 Mon Sep 17 00:00:00 2001
From: Aishanee Shah <aishaneeshah@google.com>
Date: Tue, 19 May 2026 19:35:06 +0000
Subject: [PATCH] fix: resolve SimpleGitOptions TS error in original combined
 branch

---
 packages/core/src/core/geminiChat.ts     |  8 ++++----
 packages/core/src/services/gitService.ts | 21 ++++-----------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts
index 1a095925d2..c4f3417ee7 100644
--- a/packages/core/src/core/geminiChat.ts
+++ b/packages/core/src/core/geminiChat.ts
@@ -227,9 +227,9 @@ export class InvalidStreamError extends Error {
     message: string,
     type:
       | 'NO_FINISH_REASON'
-    | 'NO_RESPONSE_TEXT'
-    | 'MALFORMED_FUNCTION_CALL'
-    | 'UNEXPECTED_TOOL_CALL',
+      | 'NO_RESPONSE_TEXT'
+      | 'MALFORMED_FUNCTION_CALL'
+      | 'UNEXPECTED_TOOL_CALL',
   ) {
     super(message);
     this.name = 'InvalidStreamError';
@@ -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,
           );
         }
diff --git a/packages/core/src/services/gitService.ts b/packages/core/src/services/gitService.ts
index 8c075c6071..4a48a577b9 100644
--- a/packages/core/src/services/gitService.ts
+++ b/packages/core/src/services/gitService.ts
@@ -33,26 +33,13 @@ export const SHADOW_REPO_AUTHOR_EMAIL = 'gemini-cli@google.com';
  */
 const SHADOW_REPO_GIT_OPTIONS: Partial<SimpleGitOptions> = {
   unsafe: {
-    allowUnsafeAlias: true,
-    allowUnsafeAskPass: true,
-    allowUnsafeConfigEnvCount: true,
-    allowUnsafeConfigPaths: true,
-    allowUnsafeCredentialHelper: true,
     allowUnsafeCustomBinary: true,
-    allowUnsafeDiffExternal: true,
-    allowUnsafeDiffTextConv: true,
-    allowUnsafeEditor: true,
-    allowUnsafeFilter: true,
-    allowUnsafeFsMonitor: true,
-    allowUnsafeGitProxy: true,
-    allowUnsafeGpgProgram: true,
-    allowUnsafeHooksPath: true,
-    allowUnsafeMergeDriver: true,
-    allowUnsafePack: true,
-    allowUnsafePager: true,
     allowUnsafeProtocolOverride: true,
+    allowUnsafePack: true,
     allowUnsafeSshCommand: true,
-    allowUnsafeTemplateDir: true,
+    allowUnsafeGitProxy: true,
+    allowUnsafeHooksPath: true,
+    allowUnsafeDiffExternal: true,
   },
 };