refactor(simulator-management): adopt UDID terminology (simulatorUdid + z.string().uuid), add typed content, update tests; address PR review

Author: cameroncooke

src/mcp/tools/simulator-management/__tests__/erase_sims.test.ts

@@ -10,7 +10,7 @@ describe('erase_sims tool (UDID or ALL only)', () => {
     });
 
     it('should have correct description', () => {
-      expect(eraseSims.description).toContain('Provide exactly one of: simulatorUuid or all=true');
+      expect(eraseSims.description).toContain('Provide exactly one of: simulatorUdid or all=true');
       expect(eraseSims.description).toContain('shutdownFirst');
     });
 
@@ -21,7 +21,9 @@ describe('erase_sims tool (UDID or ALL only)', () => {
     it('should validate schema fields (shape only)', () => {
       const schema = z.object(eraseSims.schema);
       // Valid
-      expect(schema.safeParse({ simulatorUuid: 'UDID-1' }).success).toBe(true);
+      expect(
+        schema.safeParse({ simulatorUdid: '123e4567-e89b-12d3-a456-426614174000' }).success,
+      ).toBe(true);
       expect(schema.safeParse({ all: true }).success).toBe(true);
       // Shape-level schema does not enforce selection rules; handler validation covers that.
     });
@@ -30,15 +32,15 @@ describe('erase_sims tool (UDID or ALL only)', () => {
   describe('Single mode', () => {
     it('erases a simulator successfully', async () => {
       const mock = createMockExecutor({ success: true, output: 'OK' });
-      const res = await erase_simsLogic({ simulatorUuid: 'UD1' }, mock);
+      const res = await erase_simsLogic({ simulatorUdid: 'UD1' }, mock);
       expect(res).toEqual({
         content: [{ type: 'text', text: 'Successfully erased simulator UD1' }],
       });
     });
 
     it('returns failure when erase fails', async () => {
       const mock = createMockExecutor({ success: false, error: 'Booted device' });
-      const res = await erase_simsLogic({ simulatorUuid: 'UD1' }, mock);
+      const res = await erase_simsLogic({ simulatorUdid: 'UD1' }, mock);
       expect(res).toEqual({
         content: [{ type: 'text', text: 'Failed to erase simulator: Booted device' }],
       });
@@ -48,7 +50,7 @@ describe('erase_sims tool (UDID or ALL only)', () => {
       const bootedError =
         'An error was encountered processing the command (domain=com.apple.CoreSimulator.SimError, code=405):\nUnable to erase contents and settings in current state: Booted\n';
       const mock = createMockExecutor({ success: false, error: bootedError });
-      const res = await erase_simsLogic({ simulatorUuid: 'UD1' }, mock);
+      const res = await erase_simsLogic({ simulatorUdid: 'UD1' }, mock);
       expect((res.content?.[1] as any).text).toContain('Tool hint');
       expect((res.content?.[1] as any).text).toContain('shutdownFirst: true');
     });
@@ -59,7 +61,7 @@ describe('erase_sims tool (UDID or ALL only)', () => {
         calls.push(cmd);
         return { success: true, output: 'OK', error: '', process: { pid: 1 } as any };
       };
-      const res = await erase_simsLogic({ simulatorUuid: 'UD1', shutdownFirst: true }, exec as any);
+      const res = await erase_simsLogic({ simulatorUdid: 'UD1', shutdownFirst: true }, exec as any);
       expect(calls).toEqual([
         ['xcrun', 'simctl', 'shutdown', 'UD1'],
         ['xcrun', 'simctl', 'erase', 'UD1'],

src/mcp/tools/simulator-management/erase_sims.ts

@@ -1,11 +1,11 @@
 import { z } from 'zod';
-import { ToolResponse } from '../../../types/common.ts';
+import { ToolResponse, type ToolResponseContent } from '../../../types/common.ts';
 import { log } from '../../../utils/logging/index.ts';
 import { CommandExecutor, getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
 import { createTypedTool } from '../../../utils/typed-tool-factory.ts';
 
 const eraseSimsBaseSchema = z.object({
-  simulatorUuid: z.string().optional().describe('UUID of the simulator to erase.'),
+  simulatorUdid: z.string().uuid().optional().describe('UDID of the simulator to erase.'),
   all: z.boolean().optional().describe('When true, erases all simulators.'),
   shutdownFirst: z
     .boolean()
@@ -15,10 +15,10 @@ const eraseSimsBaseSchema = z.object({
 
 const eraseSimsSchema = eraseSimsBaseSchema.refine(
   (v) => {
-    const selectors = (v.simulatorUuid ? 1 : 0) + (v.all === true ? 1 : 0);
+    const selectors = (v.simulatorUdid ? 1 : 0) + (v.all === true ? 1 : 0);
     return selectors === 1;
   },
-  { message: 'Provide exactly one of: simulatorUuid OR all=true.' },
+  { message: 'Provide exactly one of: simulatorUdid or all=true.' },
 );
 
 type EraseSimsParams = z.infer<typeof eraseSimsSchema>;
@@ -28,8 +28,8 @@ export async function erase_simsLogic(
   executor: CommandExecutor,
 ): Promise<ToolResponse> {
   try {
-    if (params.simulatorUuid) {
-      const udid = params.simulatorUuid;
+    if (params.simulatorUdid) {
+      const udid = params.simulatorUdid;
       log(
         'info',
         `Erasing simulator ${udid}${params.shutdownFirst ? ' (shutdownFirst=true)' : ''}`,
@@ -66,7 +66,7 @@ export async function erase_simsLogic(
             { type: 'text', text: `Failed to erase simulator: ${errText}` },
             {
               type: 'text',
-              text: `Tool hint: The simulator appears to be Booted. Re-run erase_sims with { simulatorUuid: '${udid}', shutdownFirst: true } to shut it down before erasing.`,
+              text: `Tool hint: The simulator appears to be Booted. Re-run erase_sims with { simulatorUdid: '${udid}', shutdownFirst: true } to shut it down before erasing.`,
             },
           ],
         };
@@ -100,7 +100,9 @@ export async function erase_simsLogic(
       );
       if (!result.success) {
         const errText = result.error ?? 'Unknown error';
-        const content = [{ type: 'text', text: `Failed to erase all simulators: ${errText}` }];
+        const content: ToolResponseContent[] = [
+          { type: 'text', text: `Failed to erase all simulators: ${errText}` },
+        ];
         if (
           /Unable to erase contents and settings.*Booted/i.test(errText) &&
           !params.shutdownFirst
@@ -116,7 +118,7 @@ export async function erase_simsLogic(
     }
 
     return {
-      content: [{ type: 'text', text: 'Invalid parameters: provide simulatorUuid or all=true.' }],
+      content: [{ type: 'text', text: 'Invalid parameters: provide simulatorUdid or all=true.' }],
     };
   } catch (error: unknown) {
     const message = error instanceof Error ? error.message : String(error);
@@ -128,7 +130,7 @@ export async function erase_simsLogic(
 export default {
   name: 'erase_sims',
   description:
-    'Erases simulator content and settings. Provide exactly one of: simulatorUuid or all=true. Optional: shutdownFirst to shut down before erasing.',
+    'Erases simulator content and settings. Provide exactly one of: simulatorUdid or all=true. Optional: shutdownFirst to shut down before erasing.',
   schema: eraseSimsBaseSchema.shape,
   handler: createTypedTool(eraseSimsSchema, erase_simsLogic, getDefaultCommandExecutor),
 };