fix(regression-test): stabilize Windows selection and restart

Signed-off-by: kangfenmao <kangfenmao@qq.com>

Author: kangfenmao

scripts/cherry-regression-test/__tests__/lifecycle.test.ts

@@ -117,7 +117,8 @@ describe('owned application lifecycle', () => {
     execFileSyncMock.mockImplementation((file: string, args: string[]) => {
       const script = String(args.at(-1))
       if (file === 'taskkill.exe') {
-        alive.delete(Number(args[1]))
+        if (Number(args[1]) === runnerPid) alive.clear()
+        else alive.delete(Number(args[1]))
         return ''
       }
       if (script.includes('Get-NetTCPConnection')) return String(electronPid)
@@ -128,7 +129,7 @@ describe('owned application lifecycle', () => {
 
     try {
       await stopOwnedApp(paths)
-      expect(execFileSyncMock).toHaveBeenCalledWith(
+      expect(execFileSyncMock).not.toHaveBeenCalledWith(
         'taskkill.exe',
         ['/PID', String(electronPid), '/T', '/F'],
         expect.anything()
@@ -182,7 +183,8 @@ describe('owned application lifecycle', () => {
     execFileSyncMock.mockImplementation((file: string, args: string[]) => {
       const script = String(args.at(-1))
       if (file === 'taskkill.exe') {
-        alive.delete(Number(args[1]))
+        if (Number(args[1]) === runnerPid) alive.clear()
+        else alive.delete(Number(args[1]))
         return ''
       }
       if (script.includes('Get-NetTCPConnection')) return String(currentElectronPid)
@@ -202,12 +204,12 @@ describe('owned application lifecycle', () => {
       await stopOwnedApp(paths)
       expect(execFileSyncMock).toHaveBeenCalledWith(
         'taskkill.exe',
-        ['/PID', String(currentElectronPid), '/T', '/F'],
+        ['/PID', String(runnerPid), '/T', '/F'],
         expect.anything()
       )
-      expect(execFileSyncMock).toHaveBeenCalledWith(
+      expect(execFileSyncMock).not.toHaveBeenCalledWith(
         'taskkill.exe',
-        ['/PID', String(runnerPid), '/T', '/F'],
+        ['/PID', String(currentElectronPid), '/T', '/F'],
         expect.anything()
       )
     } finally {

scripts/cherry-regression-test/lifecycle.ts

@@ -566,7 +566,8 @@ export async function stopOwnedApp(paths: RunPaths): Promise<void> {
       throw new Error('Refusing cleanup because the recorded Electron process is no longer owned by its runner')
     }
   }
-  for (const pid of ownedPids) {
+  const terminationPids = record.platform === 'windows' ? [record.runnerPid, ...ownedPids] : ownedPids
+  for (const pid of new Set(terminationPids)) {
     if (!isAlive(pid)) continue
     try {
       terminateExactProcess(pid, record.platform)

scripts/cherry-regression-test/system-automation.ts

@@ -7,7 +7,7 @@ import type { RunPaths } from './paths'
 import { resolveAllowedPath } from './paths'
 import type { Platform } from './types'
 
-const ALLOWED_KEYS = new Set(['Alt', 'Control', 'Enter', 'Escape', 'F8', 'Meta', 'Shift', 'Space', 'a', 'e', 'k', 's'])
+const ALLOWED_KEYS = new Set(['Alt', 'Control', 'Enter', 'Escape', 'Meta', 'Shift', 'Space', 'a', 'e', 'k', 's'])
 let activeWindowsExternalTextPid: number | undefined
 
 function escapePowerShell(value: string): string {
@@ -48,7 +48,6 @@ function runWindowsHotkey(keys: string[]): void {
     Control: 0x11,
     Enter: 0x0d,
     Escape: 0x1b,
-    F8: 0x77,
     Meta: 0x5b,
     Shift: 0x10,
     Space: 0x20

tests/e2e/cherry-regression/05-desktop-assistants.test.ts

@@ -98,10 +98,10 @@ test('[C-03] 使用划词助手处理跨应用选中文本 @selection-assistant'
           }
         ],
         'feature.selection.enabled': true,
-        'feature.selection.trigger_mode': 'shortcut',
+        'feature.selection.trigger_mode': platform === 'windows' ? 'selected' : 'shortcut',
         'shortcut.selection.capture_text': {
-          binding: platform === 'windows' ? ['F8'] : ['CommandOrControl', 'Shift', 'K'],
-          enabled: true
+          binding: ['CommandOrControl', 'Shift', 'K'],
+          enabled: platform !== 'windows'
         }
       })
     },
@@ -127,10 +127,10 @@ test('[C-03] 使用划词助手处理跨应用选中文本 @selection-assistant'
   await expect
     .poll(
       async () => {
-        sendSystemHotkey(app.record.platform, [
-          ...(app.record.platform === 'macos' ? ['Meta', 'Shift'] : []),
-          app.record.platform === 'windows' ? 'F8' : 'k'
-        ])
+        sendSystemHotkey(
+          app.record.platform,
+          app.record.platform === 'macos' ? ['Meta', 'Shift', 'k'] : ['Control', 'a']
+        )
         await selection.waitForTimeout(1_000)
         return selection.locator('body').getAttribute('data-selected-text')
       },