fix(simulator-management): tighten keyboard window matching

Author: yi-jiang-applovin

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

@@ -22,6 +22,20 @@ const SHUTDOWN_JSON = JSON.stringify({
 });
 
 const EMPTY_JSON = JSON.stringify({ devices: {} });
+const ESCAPED_NAME_JSON = JSON.stringify({
+  devices: {
+    'com.apple.CoreSimulator.SimRuntime.iOS-17-0': [
+      { udid: 'escaped-uuid', name: 'Test\\Device"', state: 'Booted' },
+    ],
+  },
+});
+const PREFIX_NAME_JSON = JSON.stringify({
+  devices: {
+    'com.apple.CoreSimulator.SimRuntime.iOS-17-0': [
+      { udid: 'prefix-uuid', name: 'iPhone 15', state: 'Booted' },
+    ],
+  },
+});
 
 type Call = { command: string[] };
 
@@ -87,6 +101,36 @@ describe('sendKeyboardShortcut', () => {
     expect(keystrokeScript).toContain('shift down');
   });
 
+  it('escapes backslashes before embedding simulator names in the focus AppleScript', async () => {
+    const { executor, calls } = makeFifoExecutor([
+      { success: true, output: ESCAPED_NAME_JSON },
+      { success: true, output: '' },
+      { success: true, output: 'OK' },
+      { success: true, output: '' },
+    ]);
+
+    const result = await sendKeyboardShortcut('escaped-uuid', 'software-keyboard', executor);
+
+    expect(result.success).toBe(true);
+    expect(calls[2].command[2]).toContain('Test\\\\Device\\"');
+  });
+
+  it('matches the simulator window by exact title or runtime suffix instead of substring contains', async () => {
+    const { executor, calls } = makeFifoExecutor([
+      { success: true, output: PREFIX_NAME_JSON },
+      { success: true, output: '' },
+      { success: true, output: 'OK' },
+      { success: true, output: '' },
+    ]);
+
+    const result = await sendKeyboardShortcut('prefix-uuid', 'software-keyboard', executor);
+
+    expect(result.success).toBe(true);
+    expect(calls[2].command[2]).toContain('title is "iPhone 15"');
+    expect(calls[2].command[2]).toContain('title starts with "iPhone 15 –"');
+    expect(calls[2].command[2]).not.toContain('title contains');
+  });
+
   it('errors when simulator UUID is not found', async () => {
     const { executor, calls } = makeFifoExecutor([{ success: true, output: EMPTY_JSON }]);
 

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

@@ -8,6 +8,15 @@ export type KeyboardShortcutResult = { success: true } | { success: false; error
 type SimctlDevice = { udid: string; name: string; state: string };
 type SimctlList = { devices: Record<string, SimctlDevice[]> };
 
+function escapeAppleScriptStringLiteral(value: string): string {
+  return value
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '\\r')
+    .replace(/\t/g, '\\t');
+}
+
 function resolveDevice(list: SimctlList, simulatorId: string): SimctlDevice | undefined {
   for (const runtime in list.devices) {
     const found = list.devices[runtime]?.find((d) => d.udid === simulatorId);
@@ -17,12 +26,18 @@ function resolveDevice(list: SimctlList, simulatorId: string): SimctlDevice | un
 }
 
 function buildFocusScript(deviceName: string): string {
-  const safeName = deviceName.replace(/"/g, '\\"');
+  const safeName = escapeAppleScriptStringLiteral(deviceName);
   return [
     'tell application "System Events"',
     '  tell process "Simulator"',
     '    set frontmost to true',
-    '    set matchingWindows to (every window whose title contains "' + safeName + '")',
+    '    set matchingWindows to (every window whose (title is "' +
+      safeName +
+      '" or title starts with "' +
+      safeName +
+      ' –" or title starts with "' +
+      safeName +
+      ' -"))',
     '    if (count of matchingWindows) is 0 then',
     '      return "NO_WINDOW"',
     '    end if',