fix(session-management): session-set-defaults clears mutually exclusive counterparts before merge to prevent invalid store state; add tests

Author: cameroncooke

src/mcp/tools/session-management/__tests__/session_set_defaults.test.ts

@@ -56,5 +56,37 @@ describe('session-set-defaults tool', () => {
       expect(result.content[0].text).toContain('Parameter validation failed');
       expect(result.content[0].text).toContain('useLatestOS');
     });
+
+    it('should clear workspacePath when projectPath is set', async () => {
+      sessionStore.setDefaults({ workspacePath: '/old/App.xcworkspace' });
+      await sessionSetDefaultsLogic({ projectPath: '/new/App.xcodeproj' });
+      const current = sessionStore.getAll();
+      expect(current.projectPath).toBe('/new/App.xcodeproj');
+      expect(current.workspacePath).toBeUndefined();
+    });
+
+    it('should clear projectPath when workspacePath is set', async () => {
+      sessionStore.setDefaults({ projectPath: '/old/App.xcodeproj' });
+      await sessionSetDefaultsLogic({ workspacePath: '/new/App.xcworkspace' });
+      const current = sessionStore.getAll();
+      expect(current.workspacePath).toBe('/new/App.xcworkspace');
+      expect(current.projectPath).toBeUndefined();
+    });
+
+    it('should clear simulatorName when simulatorId is set', async () => {
+      sessionStore.setDefaults({ simulatorName: 'iPhone 16' });
+      await sessionSetDefaultsLogic({ simulatorId: 'SIM-UUID' });
+      const current = sessionStore.getAll();
+      expect(current.simulatorId).toBe('SIM-UUID');
+      expect(current.simulatorName).toBeUndefined();
+    });
+
+    it('should clear simulatorId when simulatorName is set', async () => {
+      sessionStore.setDefaults({ simulatorId: 'SIM-UUID' });
+      await sessionSetDefaultsLogic({ simulatorName: 'iPhone 16' });
+      const current = sessionStore.getAll();
+      expect(current.simulatorName).toBe('iPhone 16');
+      expect(current.simulatorId).toBeUndefined();
+    });
   });
 });

src/mcp/tools/session-management/session_set_defaults.ts

@@ -19,6 +19,17 @@ const schemaObj = z.object({
 type Params = z.infer<typeof schemaObj>;
 
 export async function sessionSetDefaultsLogic(params: Params): Promise<ToolResponse> {
+  // Clear mutually exclusive counterparts before merging new defaults
+  const toClear = new Set<keyof SessionDefaults>();
+  if (Object.prototype.hasOwnProperty.call(params, 'projectPath')) toClear.add('workspacePath');
+  if (Object.prototype.hasOwnProperty.call(params, 'workspacePath')) toClear.add('projectPath');
+  if (Object.prototype.hasOwnProperty.call(params, 'simulatorId')) toClear.add('simulatorName');
+  if (Object.prototype.hasOwnProperty.call(params, 'simulatorName')) toClear.add('simulatorId');
+
+  if (toClear.size > 0) {
+    sessionStore.clear(Array.from(toClear));
+  }
+
   sessionStore.setDefaults(params as Partial<SessionDefaults>);
   const current = sessionStore.getAll();
   return {