fix(regression-test): stabilize platform integrations

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

Author: kangfenmao

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

@@ -32,6 +32,18 @@ afterEach(() => {
   vi.unstubAllGlobals()
 })
 
+function mockMainInspector(): void {
+  vi.stubGlobal(
+    'fetch',
+    vi.fn().mockResolvedValue({
+      json: async () => [{ type: 'node', webSocketDebuggerUrl: 'ws://127.0.0.1:9229/main-process' }],
+      ok: true,
+      status: 200
+    })
+  )
+  evaluateCdpExpressionMock.mockResolvedValue(true)
+}
+
 describe('owned application lifecycle', () => {
   it('reuses a live application when the requested profile already matches', async () => {
     const directory = mkdtempSync(join(tmpdir(), 'cherry-regression-lifecycle-'))
@@ -131,7 +143,7 @@ describe('owned application lifecycle', () => {
     }
   })
 
-  it('delivers a protocol URL through the owned Windows development instance', async () => {
+  it('delivers a protocol URL through the owned Windows main-process inspector', async () => {
     const electronPid = 42_001
     const targetRoot = 'D:\\target-app'
     const executablePath = `${targetRoot}\\node_modules\\electron\\dist\\electron.exe`
@@ -157,27 +169,21 @@ describe('owned application lifecycle', () => {
     }
     const callback = 'cherrystudio://oauth/callback?code=test-code&state=test-state'
     vi.spyOn(process, 'kill').mockReturnValue(true)
+    mockMainInspector()
     execFileSyncMock.mockImplementation((file: string, args: string[]) => {
       const script = String(args.at(-1))
-      if (file === executablePath) return ''
       if (script.includes('Get-NetTCPConnection')) return String(electronPid)
       if (script.includes('CommandLine')) return `${executablePath} ${targetRoot}`
-      if (script.includes('ExecutablePath')) return executablePath
       throw new Error(`Unexpected command: ${file} ${args.join(' ')}`)
     })
 
     await sendProtocolUrlToOwnedApp(record, callback)
 
-    expect(execFileSyncMock).toHaveBeenCalledWith(
-      executablePath,
-      [targetRoot, callback],
-      expect.objectContaining({
-        cwd: targetRoot,
-        env: expect.objectContaining({ CS_DEV_USER_DATA_SUFFIX: 'Regression-test-run-authenticated' }),
-        stdio: 'ignore',
-        windowsHide: true
-      })
+    expect(evaluateCdpExpressionMock).toHaveBeenCalledWith(
+      'ws://127.0.0.1:9229/main-process',
+      expect.stringContaining("electron.app.emit('second-instance'")
     )
+    expect(evaluateCdpExpressionMock.mock.calls[0][1]).toContain(callback)
   })
 
   it('disposes non-main windows before a Windows CDP connection', async () => {
@@ -233,7 +239,7 @@ describe('owned application lifecycle', () => {
     expect(evaluateCdpExpressionMock.mock.calls[0][1]).toContain('window.destroy()')
   })
 
-  it('delivers a protocol URL through the owned macOS development instance', async () => {
+  it('delivers a protocol URL through the owned macOS main-process inspector', async () => {
     const electronPid = 42_001
     const targetRoot = '/tmp/target-app'
     const executablePath = `${targetRoot}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron`
@@ -259,27 +265,24 @@ describe('owned application lifecycle', () => {
     }
     const callback = 'cherrystudio://oauth/callback?code=test-code&state=test-state'
     vi.spyOn(process, 'kill').mockReturnValue(true)
+    mockMainInspector()
     execFileSyncMock.mockImplementation((file: string, args: string[]) => {
-      if (file === 'open') return ''
-      if (file === 'lsof') return String(electronPid)
+      if (file === 'lsof' && args.includes('-iTCP:9222')) return String(electronPid)
+      if (file === 'lsof' && args.includes('-iTCP:9229')) return String(electronPid)
       if (file === 'ps' && args.includes('command=')) return `${executablePath} ${targetRoot}`
-      if (file === 'ps' && args.includes('comm=')) return executablePath
       throw new Error(`Unexpected command: ${file} ${args.join(' ')}`)
     })
 
     await sendProtocolUrlToOwnedApp(record, callback)
 
-    expect(execFileSyncMock).toHaveBeenCalledWith(
-      'open',
-      ['-a', `${targetRoot}/node_modules/electron/dist/Electron.app`, callback],
-      expect.objectContaining({
-        cwd: targetRoot,
-        stdio: 'ignore'
-      })
+    expect(evaluateCdpExpressionMock).toHaveBeenCalledWith(
+      'ws://127.0.0.1:9229/main-process',
+      expect.stringContaining("electron.app.emit('open-url'")
     )
+    expect(evaluateCdpExpressionMock.mock.calls[0][1]).toContain(callback)
   })
 
-  it('rejects a development executable outside the owned target root', async () => {
+  it('rejects a main-process inspector owned by another process', async () => {
     const electronPid = 42_001
     const targetRoot = '/tmp/target-app'
     const record: AppRecord = {
@@ -304,15 +307,16 @@ describe('owned application lifecycle', () => {
     }
     vi.spyOn(process, 'kill').mockReturnValue(true)
     execFileSyncMock.mockImplementation((file: string, args: string[]) => {
-      if (file === 'lsof') return String(electronPid)
+      if (file === 'lsof' && args.includes('-iTCP:9222')) return String(electronPid)
+      if (file === 'lsof' && args.includes('-iTCP:9229')) return '99999'
       if (file === 'ps' && args.includes('command='))
         return `${targetRoot}/node_modules/electron/Electron ${targetRoot}`
-      if (file === 'ps' && args.includes('comm=')) return '/tmp/other-app/Electron'
       throw new Error(`Unexpected command: ${file} ${args.join(' ')}`)
     })
 
     await expect(
       sendProtocolUrlToOwnedApp(record, 'cherrystudio://oauth/callback?code=test-code&state=test-state')
-    ).rejects.toThrow('Owned macOS Electron executable could not be verified')
+    ).rejects.toThrow('does not own the main-process inspector')
+    expect(evaluateCdpExpressionMock).not.toHaveBeenCalled()
   })
 })

scripts/cherry-regression-test/lifecycle.ts

@@ -103,14 +103,6 @@ function windowsProcessExecutablePath(pid: number): string {
   }
 }
 
-function macosProcessExecutablePath(pid: number): string {
-  try {
-    return execFileSync('ps', ['-o', 'comm=', '-p', String(pid)], { encoding: 'utf8', timeout: 10_000 }).trim()
-  } catch {
-    return ''
-  }
-}
-
 function assertOwnedProcess(record: AppRecord, pid: number, kind: 'electron' | 'runner'): void {
   const command = processCommand(pid, record.platform)
   const expected =
@@ -489,14 +481,29 @@ export async function prepareWindowsCdpConnection(record: AppRecord): Promise<vo
 export async function sendProtocolUrlToOwnedApp(record: AppRecord, url: string): Promise<void> {
   if (!isAlive(record.electronPid)) throw new Error('Owned Cherry Studio instance is not running')
   assertOwnedProcess(record, record.electronPid, 'electron')
+  if (record.mode === 'branch') {
+    const debuggerUrl = await ownedMainInspectorUrl(record)
+    const delivered = await evaluateCdpExpression<boolean>(
+      debuggerUrl,
+      `(() => {
+        const electron = process.mainModule?.require?.('electron')
+        if (!electron?.app) throw new Error('Electron app is unavailable')
+        const callbackUrl = ${JSON.stringify(url)}
+        if (${JSON.stringify(record.platform)} === 'macos') {
+          return electron.app.emit('open-url', { preventDefault() {} }, callbackUrl)
+        }
+        return electron.app.emit('second-instance', {}, [process.execPath, process.argv[1] ?? '', callbackUrl], process.cwd())
+      })()`
+    )
+    if (!delivered) throw new Error('Owned Cherry Studio instance has no protocol URL listener')
+    return
+  }
 
   if (record.platform === 'macos') {
-    const executablePath =
-      record.mode === 'branch' ? macosProcessExecutablePath(record.electronPid) : record.executablePath
-    const isVerifiedExecutable =
-      record.mode === 'branch'
-        ? basename(executablePath ?? '') === 'Electron' && isPathInside(record.targetRoot, executablePath ?? '')
-        : Boolean(record.executablePath && resolve(executablePath ?? '') === resolve(record.executablePath))
+    const executablePath = record.executablePath
+    const isVerifiedExecutable = Boolean(
+      record.executablePath && resolve(executablePath ?? '') === resolve(record.executablePath)
+    )
     if (!executablePath || !isVerifiedExecutable) {
       throw new Error('Owned macOS Electron executable could not be verified')
     }
@@ -517,32 +524,19 @@ export async function sendProtocolUrlToOwnedApp(record: AppRecord, url: string):
   }
 
   const executablePath = windowsProcessExecutablePath(record.electronPid)
-  const relativeExecutable = win32.relative(win32.resolve(record.targetRoot), win32.resolve(executablePath))
-  const isVerifiedExecutable =
-    record.mode === 'branch'
-      ? win32.basename(executablePath).toLowerCase() === 'electron.exe' &&
-        !relativeExecutable.startsWith('..') &&
-        !win32.isAbsolute(relativeExecutable)
-      : Boolean(
-          record.executablePath &&
-            win32.resolve(executablePath).toLowerCase() === win32.resolve(record.executablePath).toLowerCase()
-        )
+  const isVerifiedExecutable = Boolean(
+    record.executablePath &&
+      win32.resolve(executablePath).toLowerCase() === win32.resolve(record.executablePath).toLowerCase()
+  )
   if (!executablePath || !isVerifiedExecutable) {
     throw new Error('Owned Windows Electron executable could not be verified')
   }
   const userDataArgument = record.args.find((arg) => arg.startsWith('--user-data-dir='))
-  if (record.mode === 'tag' && !userDataArgument) throw new Error('Owned Windows application profile is missing')
-  const args =
-    record.mode === 'branch' ? [record.targetRoot, url] : ([userDataArgument, url].filter(Boolean) as string[])
+  if (!userDataArgument) throw new Error('Owned Windows application profile is missing')
   try {
-    execFileSync(executablePath, args, {
+    execFileSync(executablePath, [userDataArgument, url], {
       cwd: record.cwd,
-      env: {
-        ...process.env,
-        ...(record.mode === 'branch'
-          ? { CS_DEV_USER_DATA_SUFFIX: `Regression-${record.runKey}-${record.profile}` }
-          : {})
-      },
+      env: { ...process.env },
       stdio: 'ignore',
       timeout: 15_000,
       windowsHide: true

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

@@ -58,11 +58,14 @@ function runWindowsHotkey(keys: string[]): void {
   const script = [
     `Add-Type -TypeDefinition 'using System; using System.Runtime.InteropServices; public static class NativeKeyboard { [DllImport("user32.dll")] public static extern void keybd_event(byte key, byte scan, uint flags, UIntPtr extra); }'`,
     ...modifiers.map((modifier) => `[NativeKeyboard]::keybd_event(${virtualKeys[modifier]}, 0, 0, [UIntPtr]::Zero)`),
+    'Start-Sleep -Milliseconds 100',
     `[NativeKeyboard]::keybd_event(${keyCode}, 0, 0, [UIntPtr]::Zero)`,
+    'Start-Sleep -Milliseconds 100',
     `[NativeKeyboard]::keybd_event(${keyCode}, 0, 2, [UIntPtr]::Zero)`,
     ...modifiers
       .toReversed()
-      .map((modifier) => `[NativeKeyboard]::keybd_event(${virtualKeys[modifier]}, 0, 2, [UIntPtr]::Zero)`)
+      .map((modifier) => `[NativeKeyboard]::keybd_event(${virtualKeys[modifier]}, 0, 2, [UIntPtr]::Zero)`),
+    'Start-Sleep -Milliseconds 500'
   ].join('; ')
   execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
     stdio: 'ignore',
@@ -102,7 +105,8 @@ export function openExternalText(platform: Platform, paths: RunPaths, candidateP
       '$shell = New-Object -ComObject WScript.Shell',
       'if (-not $shell.AppActivate($process.Id)) { throw "Notepad window could not be activated" }',
       'Start-Sleep -Milliseconds 500',
-      '$shell.SendKeys("^a")'
+      '$shell.SendKeys("^a")',
+      'Start-Sleep -Milliseconds 500'
     ].join('\n')
     execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
       stdio: ['ignore', 'ignore', 'pipe'],
@@ -138,8 +142,11 @@ export function chooseNativeFile(platform: Platform, paths: RunPaths, candidateP
   } else {
     const isDirectory = statSync(filePath).isDirectory()
     const script = [
+      'Set-StrictMode -Version Latest',
+      '$ErrorActionPreference = "Stop"',
       'Add-Type -AssemblyName UIAutomationClient',
       'Add-Type -AssemblyName UIAutomationTypes',
+      'Add-Type -AssemblyName System.Windows.Forms',
       '$root = [System.Windows.Automation.AutomationElement]::RootElement',
       `$processCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::ProcessIdProperty, ${electronPid})`,
       '$deadline = [DateTime]::UtcNow.AddSeconds(10)',
@@ -155,33 +162,26 @@ export function chooseNativeFile(platform: Platform, paths: RunPaths, candidateP
       'Start-Sleep -Milliseconds 300',
       ...(isDirectory
         ? [
-            'Add-Type -AssemblyName System.Windows.Forms',
             '[System.Windows.Forms.SendKeys]::SendWait("^l")',
             'Start-Sleep -Milliseconds 200',
-            '$pathInput = [System.Windows.Automation.AutomationElement]::FocusedElement',
-            '$valuePattern = $pathInput.GetCurrentPattern([System.Windows.Automation.ValuePattern]::Pattern)',
-            `$valuePattern.SetValue('${escapePowerShell(filePath)}')`,
+            `[System.Windows.Forms.SendKeys]::SendWait('${escapePowerShell(filePath)}')`,
             '[System.Windows.Forms.SendKeys]::SendWait("{ENTER}")',
             'Start-Sleep -Milliseconds 500',
             '$windows = $root.FindAll([System.Windows.Automation.TreeScope]::Children, $processCondition)',
             '$dialog = $windows | Where-Object { $_.Current.ClassName -eq "#32770" } | Select-Object -Last 1',
             'if (-not $dialog) { throw "Native folder dialog closed before selection" }',
             '$buttonCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::ControlTypeProperty, [System.Windows.Automation.ControlType]::Button)',
             '$buttons = $dialog.FindAll([System.Windows.Automation.TreeScope]::Descendants, $buttonCondition)',
-            '$selectButton = $buttons | Where-Object { $_.Current.Name -in @("Select Folder", "Choose Folder", "Choose this folder", "Select") } | Select-Object -First 1',
+            '$selectButton = $buttons | Where-Object { $_.Current.Name -in @("Select Folder", "Choose Folder", "Choose this folder", "Select a folder", "Select") } | Select-Object -First 1',
             'if (-not $selectButton) { throw "Select Folder button was not found" }',
-            '$selectButton.GetCurrentPattern([System.Windows.Automation.InvokePattern]::Pattern).Invoke()'
+            '$selectButton.SetFocus()',
+            '[System.Windows.Forms.SendKeys]::SendWait("{ENTER}")'
           ]
         : [
-            '$fileNameCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::AutomationIdProperty, "1148")',
-            '$fileNameInput = $dialog.FindFirst([System.Windows.Automation.TreeScope]::Descendants, $fileNameCondition)',
-            'if (-not $fileNameInput) { throw "File name input was not found" }',
-            '$valuePattern = $fileNameInput.GetCurrentPattern([System.Windows.Automation.ValuePattern]::Pattern)',
-            `$valuePattern.SetValue('${escapePowerShell(filePath)}')`,
-            '$openCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::NameProperty, "Open")',
-            '$openButton = $dialog.FindFirst([System.Windows.Automation.TreeScope]::Descendants, $openCondition)',
-            'if (-not $openButton) { throw "Open button was not found" }',
-            '$openButton.GetCurrentPattern([System.Windows.Automation.InvokePattern]::Pattern).Invoke()'
+            '[System.Windows.Forms.SendKeys]::SendWait("%n")',
+            'Start-Sleep -Milliseconds 200',
+            `[System.Windows.Forms.SendKeys]::SendWait('${escapePowerShell(filePath)}')`,
+            '[System.Windows.Forms.SendKeys]::SendWait("{ENTER}")'
           ])
     ].join('\n')
     execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {

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

@@ -64,6 +64,7 @@ test('[C-02] 使用快捷助手完成全局问答 @quick-assistant', async ({ ap
   await invokeQuickAssistant(app, prompt)
   page = await app.restart('authenticated')
   await dismissOnboarding(page)
+  await page.waitForTimeout(2_000)
   await invokeQuickAssistant(app, prompt)
 })
 

tests/e2e/cherry-regression/06-knowledge.test.ts

@@ -58,6 +58,6 @@ test('[K-02] 基于知识库问答并验证引用 @knowledge-qa', async ({ app,
   await page.keyboard.press('Escape')
   await page.getByRole('button', { name: 'Send', exact: true }).click()
   await expect(page.locator('body')).toContainText('CHERRY_KNOWLEDGE_58597', { timeout: 2 * 60_000 })
-  await page.getByText('ground-truth.txt', { exact: true }).last().click()
-  await expect(page.locator('body')).toContainText('CHERRY_KNOWLEDGE_58597')
+  await expect(page.locator('body')).toContainText('ground-truth.txt')
+  await expect(page.getByText(/\d+ citations?/i)).toBeVisible()
 })

tests/e2e/cherry-regression/08-code-tools.test.ts

@@ -101,15 +101,7 @@ test('[CODE-03] 启动 OpenClaw @openclaw', async ({ app, mainWindow: page }) =>
     .poll(() => observeOwnedProcess(app.record, 'openclaw', true, baseline).passed, { timeout: 2 * 60_000 })
     .toBe(true)
 
-  await page
-    .getByRole('banner')
-    .getByRole('button', { name: 'Code Mate', exact: true })
-    .last()
-    .click({ noWaitAfter: true })
-  await expect(codeView).toBeVisible()
-  const stop = codeView.getByRole('button', { name: 'Stop', exact: true })
-  await expect(stop).toBeVisible()
-  await stop.click()
-  await expect(codeView.getByRole('button', { name: 'Launch', exact: true })).toBeVisible({ timeout: 60_000 })
+  const openClawTab = page.getByRole('banner').getByRole('button', { name: 'OpenClaw', exact: true })
+  await openClawTab.getByRole('button', { name: 'Close Tab', exact: true }).click()
   await expect.poll(() => observeOwnedProcess(app.record, 'openclaw', false).passed, { timeout: 60_000 }).toBe(true)
 })