From 081f91db082ce8b586e701780d6a236be2ab7fa9 Mon Sep 17 00:00:00 2001
From: Aishanee Shah <aishaneeshah@google.com>
Date: Thu, 9 Apr 2026 15:35:40 +0000
Subject: [PATCH] chore: fix test mocks and resolve rebase conflicts for
 watcher subagent

---
 .gemini/settings.json                               | 5 ++++-
 packages/core/src/core/prompts-substitution.test.ts | 1 +
 packages/core/src/core/prompts.test.ts              | 2 ++
 packages/core/src/prompts/promptProvider.test.ts    | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gemini/settings.json b/.gemini/settings.json
index 6a0121df17..83ab4566fb 100644
--- a/.gemini/settings.json
+++ b/.gemini/settings.json
@@ -2,7 +2,10 @@
   "experimental": {
     "extensionReloading": true,
     "modelSteering": true,
-    "topicUpdateNarration": true
+    "memoryManager": true,
+    "topicUpdateNarration": true,
+    "watcher": true,
+    "watcherInterval": 10
   },
   "general": {
     "devtools": true
diff --git a/packages/core/src/core/prompts-substitution.test.ts b/packages/core/src/core/prompts-substitution.test.ts
index 373c3666be..c94b85caa7 100644
--- a/packages/core/src/core/prompts-substitution.test.ts
+++ b/packages/core/src/core/prompts-substitution.test.ts
@@ -61,6 +61,7 @@ describe('Core System Prompt Substitution', () => {
       }),
       getApprovedPlanPath: vi.fn().mockReturnValue(undefined),
       isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
+      isExperimentalWatcherEnabled: vi.fn().mockReturnValue(false),
       isTrackerEnabled: vi.fn().mockReturnValue(false),
       isModelSteeringEnabled: vi.fn().mockReturnValue(false),
       getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
diff --git a/packages/core/src/core/prompts.test.ts b/packages/core/src/core/prompts.test.ts
index b448ec0f30..21abd2e42e 100644
--- a/packages/core/src/core/prompts.test.ts
+++ b/packages/core/src/core/prompts.test.ts
@@ -103,6 +103,7 @@ describe('Core System Prompt (prompts.ts)', () => {
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
       isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
+      isExperimentalWatcherEnabled: vi.fn().mockReturnValue(false),
       isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
       isAgentsEnabled: vi.fn().mockReturnValue(false),
       getPreviewFeatures: vi.fn().mockReturnValue(true),
@@ -457,6 +458,7 @@ describe('Core System Prompt (prompts.ts)', () => {
         isInteractive: vi.fn().mockReturnValue(false),
         isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
         isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
+        isExperimentalWatcherEnabled: vi.fn().mockReturnValue(false),
         isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
         isAgentsEnabled: vi.fn().mockReturnValue(false),
         getModel: vi.fn().mockReturnValue('auto'),
diff --git a/packages/core/src/prompts/promptProvider.test.ts b/packages/core/src/prompts/promptProvider.test.ts
index 27a0e7844d..6f4947e6f7 100644
--- a/packages/core/src/prompts/promptProvider.test.ts
+++ b/packages/core/src/prompts/promptProvider.test.ts
@@ -71,6 +71,7 @@ describe('PromptProvider', () => {
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
       isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
+      isExperimentalWatcherEnabled: vi.fn().mockReturnValue(false),
       isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
       getSkillManager: vi.fn().mockReturnValue({
         getSkills: vi.fn().mockReturnValue([]),