fix(regression-test): close remaining platform races

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

Author: kangfenmao

scripts/cherry-regression-test/fixtures.ts

@@ -62,7 +62,7 @@ export async function createFixtures(paths: RunPaths): Promise<FixtureManifest>
 
   const selectionFile = join(paths.fixtures, 'selection.txt')
   const translationFile = join(paths.fixtures, 'translation.txt')
-  writeFileSync(selectionFile, `${FIXTURE_MARKERS.selection}\n`)
+  writeFileSync(selectionFile, `The validation label printed on this document is ${FIXTURE_MARKERS.selection}.\n`)
   writeFileSync(translationFile, `${FIXTURE_MARKERS.translation}\n`)
 
   writeFileSync(

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

@@ -160,15 +160,25 @@ export function chooseNativeFile(platform: Platform, paths: RunPaths, candidateP
       'if (-not $dialog) { throw "Native file dialog was not found" }',
       '$shell = New-Object -ComObject WScript.Shell',
       `if (-not $shell.AppActivate(${electronPid})) { throw "Native file dialog could not be activated" }`,
+      '$dialog.SetFocus()',
       'Start-Sleep -Milliseconds 300',
       ...(isDirectory
         ? [
             '[System.Windows.Forms.SendKeys]::SendWait("^l")',
             'Start-Sleep -Milliseconds 200',
-            `[System.Windows.Forms.SendKeys]::SendWait('${escapePowerShell(filePath)}')`,
+            '$pathInput = [System.Windows.Automation.AutomationElement]::FocusedElement',
+            '$valuePattern = $pathInput.GetCurrentPattern([System.Windows.Automation.ValuePattern]::Pattern)',
+            `$valuePattern.SetValue('${escapePowerShell(filePath)}')`,
             '[System.Windows.Forms.SendKeys]::SendWait("{ENTER}")',
             'Start-Sleep -Milliseconds 750',
-            '[System.Windows.Forms.SendKeys]::SendWait("%s")'
+            '$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" }',
+            '$acceptCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::AutomationIdProperty, "1")',
+            '$acceptButton = $dialog.FindFirst([System.Windows.Automation.TreeScope]::Descendants, $acceptCondition)',
+            'if (-not $acceptButton) { throw "Native folder accept button was not found" }',
+            '$acceptButton.GetCurrentPattern([System.Windows.Automation.InvokePattern]::Pattern).Invoke()',
+            'Start-Sleep -Milliseconds 500'
           ]
         : [
             '[System.Windows.Forms.SendKeys]::SendWait("%n")',

src/renderer/pages/code/hooks/__tests__/useApiGatewayProvider.test.ts

@@ -1,5 +1,5 @@
 import { preferenceService } from '@data/PreferenceService'
-import { renderHook } from '@testing-library/react'
+import { act, renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useApiGatewayProvider } from '../useApiGatewayProvider'
@@ -12,7 +12,9 @@ const mocks = vi.hoisted(() => ({
     enabled: boolean
   },
   apiGatewayRunning: false,
-  startApiGateway: vi.fn<() => Promise<boolean>>()
+  startApiGateway: vi.fn<() => Promise<boolean>>(),
+  cachedApiKey: null as string | null,
+  preferenceChanged: undefined as (() => void) | undefined
 }))
 
 vi.mock('@renderer/hooks/useApiGateway', () => ({
@@ -24,7 +26,16 @@ vi.mock('@renderer/hooks/useApiGateway', () => ({
 }))
 
 vi.mock('@data/PreferenceService', () => ({
-  preferenceService: { get: vi.fn() }
+  preferenceService: {
+    get: vi.fn(),
+    getCachedValue: vi.fn(() => mocks.cachedApiKey),
+    subscribeChange: vi.fn(() => (callback: () => void) => {
+      mocks.preferenceChanged = callback
+      return () => {
+        if (mocks.preferenceChanged === callback) mocks.preferenceChanged = undefined
+      }
+    })
+  }
 }))
 
 vi.mock('react-i18next', () => ({
@@ -35,8 +46,12 @@ describe('useApiGatewayProvider.ensureReady', () => {
   beforeEach(() => {
     mocks.apiGatewayConfig = { host: '127.0.0.1', port: 23333, apiKey: 'cs-sk-old', enabled: false }
     mocks.apiGatewayRunning = false
+    mocks.cachedApiKey = null
+    mocks.preferenceChanged = undefined
     mocks.startApiGateway.mockReset()
     vi.mocked(preferenceService.get).mockReset()
+    vi.mocked(preferenceService.getCachedValue).mockClear()
+    vi.mocked(preferenceService.subscribeChange).mockClear()
   })
 
   it('rejects (never returns a stale key) when a non-running gateway fails to start', async () => {
@@ -61,6 +76,23 @@ describe('useApiGatewayProvider.ensureReady', () => {
     await expect(result.current!.ensureReady()).resolves.toBe('cs-sk-fresh')
   })
 
+  it('waits for the generated key when the renderer cache has not received the start update yet', async () => {
+    mocks.apiGatewayRunning = false
+    mocks.startApiGateway.mockResolvedValue(true)
+    vi.mocked(preferenceService.get).mockResolvedValue(null)
+
+    const { result } = renderHook(() => useApiGatewayProvider())
+    const keyPromise = result.current!.ensureReady()
+    await vi.waitFor(() => expect(preferenceService.subscribeChange).toHaveBeenCalled())
+
+    act(() => {
+      mocks.cachedApiKey = 'cs-sk-generated'
+      mocks.preferenceChanged?.()
+    })
+
+    await expect(keyPromise).resolves.toBe('cs-sk-generated')
+  })
+
   it('returns the key without starting when the gateway is already running', async () => {
     mocks.apiGatewayRunning = true
     mocks.apiGatewayConfig = { host: '127.0.0.1', port: 23333, apiKey: 'cs-sk-live', enabled: true }

src/renderer/pages/code/hooks/useApiGatewayProvider.ts

@@ -8,6 +8,29 @@ import { useTranslation } from 'react-i18next'
 
 const DEFAULT_GATEWAY_HOST = '127.0.0.1'
 const DEFAULT_GATEWAY_PORT = 23333
+const API_KEY_SYNC_TIMEOUT_MS = 5_000
+
+async function readFreshApiKey(): Promise<string | null> {
+  const key = await preferenceService.get('feature.api_gateway.api_key')
+  if (key) return key
+
+  return new Promise((resolve) => {
+    let unsubscribe = () => {}
+    const timeout = window.setTimeout(() => {
+      unsubscribe()
+      resolve(null)
+    }, API_KEY_SYNC_TIMEOUT_MS)
+    const readCachedKey = () => {
+      const cachedKey = preferenceService.getCachedValue('feature.api_gateway.api_key')
+      if (!cachedKey) return
+      window.clearTimeout(timeout)
+      unsubscribe()
+      resolve(cachedKey)
+    }
+    unsubscribe = preferenceService.subscribeChange('feature.api_gateway.api_key')(readCachedKey)
+    readCachedKey()
+  })
+}
 
 /**
  * The synthetic "Cherry Gateway" entry for the code-CLI provider list, plus the
@@ -52,7 +75,7 @@ export function useApiGatewayProvider(): ApiGatewayProviderBundle | null {
         throw new Error('API gateway failed to start')
       }
     }
-    const key = await preferenceService.get('feature.api_gateway.api_key')
+    const key = await readFreshApiKey()
     if (!key) {
       throw new Error('API gateway did not provide a key')
     }

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

@@ -78,6 +78,15 @@ test('[C-03] 使用划词助手处理跨应用选中文本 @selection-assistant'
     async ({ model, providerId }) => {
       await window.api.preference.setMultiple({
         'chat.default_model_id': `${providerId}::${model}`,
+        'feature.selection.action_items': [
+          {
+            enabled: true,
+            id: 'regression-label',
+            isBuiltIn: false,
+            name: 'Read validation label',
+            prompt: 'What validation label is printed in the selected sentence? Include the label in your answer.'
+          }
+        ],
         'feature.selection.enabled': true,
         'feature.selection.trigger_mode': 'shortcut',
         'shortcut.selection.capture_text': {
@@ -92,11 +101,11 @@ test('[C-03] 使用划词助手处理跨应用选中文本 @selection-assistant'
   await closeSettings(page)
 
   const selection = await app.window('/windows/selection/toolbar/')
-  await expect(selection.getByText('Explain', { exact: true })).toBeVisible()
-  await expect(selection.getByText('Translate', { exact: true })).toBeVisible()
+  const readLabel = selection.getByRole('button', { name: 'Read validation label', exact: true })
+  await expect(readLabel).toBeVisible()
   openExternalText(app.record.platform, app.paths, join(app.paths.fixtures, 'selection.txt'))
   sendSystemHotkey(app.record.platform, [app.record.platform === 'macos' ? 'Meta' : 'Control', 'Alt', 'Shift', 'k'])
-  await selection.getByRole('button', { name: 'Explain', exact: true }).click({ force: true })
+  await readLabel.click({ force: true })
   const action = await app.window('/windows/selection/action/')
   await expect(action.locator('body')).toContainText('SELECTION_ASSISTANT_PASS', { timeout: 2 * 60_000 })
   await expect(action.locator('body')).not.toContainText('Invalid signature')

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

@@ -101,9 +101,11 @@ test('[CODE-03] 启动 OpenClaw @openclaw', async ({ app, mainWindow: page }) =>
     .poll(() => observeOwnedProcess(app.record, 'openclaw', true, baseline).passed, { timeout: 2 * 60_000 })
     .toBe(true)
 
-  const stop = codeView.getByRole('button', { name: 'Stop', exact: true })
+  await page.getByRole('banner').getByRole('button', { name: 'Code Mate', exact: true }).last().click()
+  const activeCodeView = page.locator('[data-ui="code.view"]:visible').first()
+  const stop = activeCodeView.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 })
+  await expect(activeCodeView.getByRole('button', { name: 'Launch', exact: true })).toBeVisible({ timeout: 60_000 })
   await expect.poll(() => observeOwnedProcess(app.record, 'openclaw', false).passed, { timeout: 60_000 }).toBe(true)
 })

tests/e2e/cherry-regression/09-cherryin-and-images.test.ts

@@ -9,8 +9,9 @@ import { saveNativeFile } from '../../../scripts/cherry-regression-test/system-a
 
 const IMAGE_PROMPT = 'A red cherry robot holding a blue umbrella in a bright workshop, detailed illustration.'
 
-test('[M-01] 登录 CherryIN 并完成聊天 @cherryin-chat', async ({ app, mainWindow }) => {
-  let page = mainWindow
+test('[M-01] 登录 CherryIN 并完成聊天 @cherryin-chat', async ({ app, mainWindow: _mainWindow }) => {
+  let page = await app.restart('authenticated')
+  await dismissOnboarding(page)
   await ensureCherryInSignedIn(app, page)
   await addCherryInModel(page, app.config.cherryIn.chatModel)
   await closeSettings(page)

tests/e2e/cherry-regression/fixture.ts

@@ -28,22 +28,23 @@ export const test = base.extend<RegressionFixtures & RegressionOptions>({
     const page = await app.useProfile(profile)
     await use(page)
 
+    const currentPage = await app.mainWindow().catch(() => page)
     if (testInfo.status !== testInfo.expectedStatus) {
-      await page
+      await currentPage
         .locator('input[type="password"]')
         .evaluateAll((inputs) => {
           for (const input of inputs) (input as HTMLInputElement).value = ''
         })
         .catch(() => undefined)
       const screenshotPath = testInfo.outputPath('failure.png')
-      const captured = await page.screenshot({ path: screenshotPath, fullPage: true }).then(
+      const captured = await currentPage.screenshot({ path: screenshotPath, fullPage: true }).then(
         () => true,
         () => false
       )
       if (captured) await testInfo.attach('失败截图', { path: screenshotPath, contentType: 'image/png' })
     }
 
-    await app.cleanupTransientUi(page)
+    await app.cleanupTransientUi(currentPage)
   }
 })