chore: fix test mocks and resolve rebase conflicts for watcher subagent

This commit is contained in:
Aishanee Shah
2026-04-09 15:35:40 +00:00
parent dfa89d516b
commit 081f91db08
4 changed files with 8 additions and 1 deletions
+4 -1
View File
@@ -2,7 +2,10 @@
"experimental": {
"extensionReloading": true,
"modelSteering": true,
"topicUpdateNarration": true
"memoryManager": true,
"topicUpdateNarration": true,
"watcher": true,
"watcherInterval": 10
},
"general": {
"devtools": true
@@ -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),
+2
View File
@@ -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'),
@@ -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([]),