Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(settings): 自动操作配置页异步加载电脑权限状态 (#5023)
Dash2f169d6aeb44
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/computerStatusHandler.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/computerStatusHandler.test.tsnew file mode 100644index 0000000000..2f5f6f3ffd--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/__tests__/computerStatusHandler.test.ts@@ -0,0 +1,54 @@+import { describe, expect, it, vi } from 'vitest';+import { readComputerStatusForSettings } from '../computerStatusHandler.js';++const status = {+ installed: false,+ executablePath: null,+ version: null,+ daemonRunning: false,+ installCommand: 'install cua-driver',+ docsUrl: 'https://cua.ai/docs/cua-driver',+};++describe('readComputerStatusForSettings', () => {+ it('returns background probe results without publishing them to other windows', async () => {+ const getStatus = vi.fn().mockResolvedValue(status);+ const refreshPermissionGuide = vi.fn();+ expect(await readComputerStatusForSettings({+ refreshPermissionGuide: false,+ forcePermissionProbe: true,+ bypassPermissionProbeCache: true,+ passivePermissionProbeOnly: true,+ }, { getStatus, refreshPermissionGuide })).toBe(status);+ expect(getStatus).toHaveBeenCalledWith({+ forcePermissionProbe: true,+ bypassPermissionProbeCache: true,+ passivePermissionProbeOnly: true,+ });+ expect(refreshPermissionGuide).not.toHaveBeenCalled();+ });++ it.each([{ forcePermissionProbe: true }, { freshPermissionProbe: true }])(+ 'preserves existing guide refreshes for %j', async (options) => {+ const refreshPermissionGuide = vi.fn();+ expect(await readComputerStatusForSettings(options, {+ getStatus: vi.fn().mockResolvedValue(status),+ refreshPermissionGuide,+ })).toBe(status);+ expect(refreshPermissionGuide).toHaveBeenCalledExactlyOnceWith(status);+ },+ );++ it('keeps ordinary reads private and does not publish failed probes', async () => {+ const refreshPermissionGuide = vi.fn();+ await readComputerStatusForSettings(undefined, {+ getStatus: vi.fn().mockResolvedValue(status),+ refreshPermissionGuide,+ });+ await expect(readComputerStatusForSettings({ forcePermissionProbe: true }, {+ getStatus: vi.fn().mockRejectedValue(new Error('probe failed')),+ refreshPermissionGuide,+ })).rejects.toThrow('probe failed');+ expect(refreshPermissionGuide).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/main/maker-ipc/computerStatusHandler.ts b/apps/desktop/src/main/maker-ipc/computerStatusHandler.tsnew file mode 100644index 0000000000..9321072748--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/computerStatusHandler.ts@@ -0,0 +1,25 @@+import type { getComputerDriverStatus } from '../mcp-integrations/computer.js';++export type ComputerStatusRequest = NonNullable<Parameters<typeof getComputerDriverStatus>[0]> & {+ /** Page-entry reads must not publish a delayed snapshot into an active guide. */+ refreshPermissionGuide?: boolean;+};++/** Keep request-local reads separate from explicit permission-guide refreshes. */+export async function readComputerStatusForSettings(+ options: ComputerStatusRequest | undefined,+ deps: {+ getStatus: typeof getComputerDriverStatus;+ refreshPermissionGuide: (status: Awaited<ReturnType<typeof getComputerDriverStatus>>) => void;+ },+) {+ const { refreshPermissionGuide, ...probeOptions } = options ?? {};+ const status = await deps.getStatus(probeOptions);+ if (+ refreshPermissionGuide !== false+ && (probeOptions.forcePermissionProbe === true || probeOptions.freshPermissionProbe === true)+ ) {+ deps.refreshPermissionGuide(status);+ }+ return status;+}diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 3fd16dd6c3..4acd2b8fbd 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -179,6 +179,7 @@ import {type RenameSessionsConfirmInteractionSnapshot,} from '../session-title-rename/index.js';import { getBrowserAvailability, openBrowserForLogin } from '../mcp-integrations/browser.js';+import { readComputerStatusForSettings, type ComputerStatusRequest } from './computerStatusHandler.js';import { isBrowserOpenForLoginError } from '../../shared/browserBackend.js';import {getActiveCodexBridgeInstanceId,@@ -18331,21 +18332,13 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)MAKER_INVOKE.COMPUTER_STATUS,async (_event,- options?: {- includeDoctor?: boolean;- forcePermissionProbe?: boolean;- skipPermissionProbe?: boolean;- freshPermissionProbe?: boolean;- bypassPermissionProbeCache?: boolean;- passivePermissionProbeOnly?: boolean;- },+ options?: ComputerStatusRequest,) => {try {- const status = await getComputerDriverStatus(options);- if (options?.forcePermissionProbe === true || options?.freshPermissionProbe === true) {- refreshComputerPermissionGuideWindow(status);- }- return status;+ return await readComputerStatusForSettings(options, {+ getStatus: getComputerDriverStatus,+ refreshPermissionGuide: refreshComputerPermissionGuideWindow,+ });} catch (err) {throwIpcError('INTERNAL', err instanceof Error ? err.message : String(err));}diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex e44c549a42..862015bd7c 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -946,6 +946,8 @@ interface ComputerDriverStatus {}interface ComputerDriverStatusOptions {+ /** False keeps background page reads from broadcasting into the permission guide. */+ refreshPermissionGuide?: boolean;includeDoctor?: boolean;forcePermissionProbe?: boolean;skipPermissionProbe?: boolean;diff --git a/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx b/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsxindex faa315997f..a33b255fb2 100644--- a/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx@@ -7,11 +7,11 @@* - 未探测到时引导去 Chrome 官方下载页* 以及「直接操作电脑」能力 (cindy_computer MCP, machine-wide opt-in).*- * 数据流 (规则 7: 先拉数据再渲染, 无 loading 闪屏):+ * 数据流:* - mount → 并行拉 plugins.getState('browser', workingDir) (取 browser 开关态)* + browser.status()。注意 browser 是 HOSTED_ELSEWHERE, 不在 plugins.list()* 里, 必须按 id 直接读单个状态, 否则 find() 永远 undefined。- * - 两者都到位后一次性渲染+ * - 基础配置到位后渲染;电脑权限与浏览器健康检测独立补齐,不阻塞整页。* 浏览器开关读写完全复用 builtin plugin IPC, 不新造持久化通道。*/@@ -451,6 +451,37 @@ export function ComputerUseSection({androidStatus?.adb_preparation?.path,]);+ useEffect(() => {+ let cancelled = false;+ // Machine-wide status is independent of workingDir and may include slow+ // daemon recovery / TCC probes. Never make it a prerequisite for this page.+ void window.electronAPI.maker.computer.status({+ refreshPermissionGuide: false,+ forcePermissionProbe: true,+ bypassPermissionProbeCache: true,+ passivePermissionProbeOnly: true,+ }).catch((err) => {+ log.warn('computer.status failed', err);+ return {+ installed: false,+ executablePath: null,+ version: null,+ daemonRunning: false,+ installCommand: 'cua-driver install instructions: https://cua.ai/docs/cua-driver',+ docsUrl: 'https://cua.ai/docs/cua-driver',+ error: String(err),+ } as ComputerDriverStatus;+ }).then((computer) => {+ if (cancelled) return;+ // A native permission-guide event may already have supplied newer state.+ setComputerStatus((current) => current ?? computer);+ log.debug('computer initial status loaded', getComputerPermissionLogSummary(computer));+ });+ return () => {+ cancelled = true;+ };+ }, []);+useEffect(() => {let cancelled = false;const backendHealthSeq = ++browserBackendHealthSeqRef.current;@@ -470,7 +501,7 @@ export function ComputerUseSection({}})();void (async () => {- const [browserState, computerState, avail, computer, backendState] = await Promise.all([+ const [browserState, computerState, avail, backendState] = await Promise.all([// `browser` is hidden from plugins.list() (HOSTED_ELSEWHERE), so read its// enable state directly by id — list().find() would always be undefined// and the toggle would wrongly reset to enabled on every remount.@@ -486,27 +517,6 @@ export function ComputerUseSection({log.warn('browser.status failed', err);return { detected: false, browserKind: null, executablePath: null } as BrowserAvailability;}),- // Entering Automation is the shared refresh boundary for every card.- // CuaDriver 0.12.2+ reports its own TCC state without opening the legacy- // grant flow. Bypass our prior-result cache so reopening this page- // reflects the latest settings without requiring a manual Recheck.- window.electronAPI.maker.computer.status({- forcePermissionProbe: true,- bypassPermissionProbeCache: true,- passivePermissionProbeOnly: true,- }).catch((err) => {- log.warn('computer.status failed', err);- return {- installed: false,- executablePath: null,- version: null,- daemonRunning: false,- installCommand:- 'cua-driver install instructions: https://cua.ai/docs/cua-driver',- docsUrl: 'https://cua.ai/docs/cua-driver',- error: String(err),- } as ComputerDriverStatus;- }),window.electronAPI.browserBackend?.getState?.().catch((err) => {log.warn('browserBackend.getState failed', err);return null;@@ -519,8 +529,6 @@ export function ComputerUseSection({const effectiveComputerEnabled = computerState ? computerState.effectiveEnabled : false;setComputerEnabled(effectiveComputerEnabled);setAvailability(avail);- setComputerStatus(computer);- log.debug('computer initial status loaded', getComputerPermissionLogSummary(computer));// Phase 5: backend kind 拉不到时(老版本 preload / IPC 缺失)安全 fallback// 到 'external',保持现有 Chrome 探测 / 登录 UI 可见 — 总比因为 IPC 失败// 让卡片整张瘫成内置态强。@@ -1205,10 +1213,9 @@ export function ComputerUseSection({const automationViewLoading =browserEnabled === null|| computerEnabled === null- || availability === null- || computerStatus === null;+ || availability === null;- // First render: blank until all reads land (no flash, rule 7).+ // Only base configuration gates the page; runtime probes update independently.if (automationViewLoading) {return null;}@@ -1221,7 +1228,7 @@ export function ComputerUseSection({computerAccessibilityGranted &&!computerScreenRecordingGranted;const computerReady =- computerStatus.installed && isComputerPermissionReady(computerStatus);+ computerStatus?.installed && isComputerPermissionReady(computerStatus);// Persisted opt-in and runtime readiness are separate states. Keeping an// unavailable enabled configuration checked lets the user turn it off// instead of forcing the only interaction back into onboarding.@@ -1231,7 +1238,7 @@ export function ComputerUseSection({computerEnableIntentRef.current,);const computerSwitchDisabled =- computerTogglePending || computerInstallPending || computerPermissionPending;+ computerStatus === null || computerTogglePending || computerInstallPending || computerPermissionPending;const configuredDefaultAndroidDevice =androidConfig?.value.defaultDeviceSerial@@ -1418,208 +1425,217 @@ export function ComputerUseSection({aria-label={t('settings.computerUse.directControl.toggleAria')}/></div>- {/* Windows/Linux 没有 macOS TCC 权限,整块隐藏;安装进度改在下方状态行展示。 */}- {window.electronAPI.platform === 'darwin' ? (- <div className="border-t border-[var(--settings-theme-card-border)] px-4 py-4">- <div className="flex items-center justify-between gap-3">- <p id="settings-search-settings-computerUse-directControl-permissions-title" className="text-13 font-medium text-[var(--settings-section-title)]">- {t('settings.computerUse.directControl.permissions.title')}- </p>- {computerInstallPending || computerPermissionPending ? (- <span className="inline-flex items-center gap-1.5 text-12 text-[var(--settings-section-desc)]">- <Spinner size={12} />- {computerInstallPending- ? t('settings.computerUse.directControl.installing')- : t('settings.computerUse.directControl.authorizing')}- </span>- ) : (- <Button- variant="secondary"- size="sm"- className="px-2.5"- loading={computerPermissionRecheckPending}+ {computerStatus === null ? (+ <div role="status" className="flex items-center gap-2 border-t border-[var(--settings-theme-card-border)] px-4 py-4 text-12 text-[var(--settings-section-desc)]">+ <Spinner size={12} />+ {t('settings.computerUse.directControl.status.checking')}+ </div>+ ) : (+ <>+ {/* Windows/Linux 没有 macOS TCC 权限,整块隐藏;安装进度改在下方状态行展示。 */}+ {window.electronAPI.platform === 'darwin' ? (+ <div className="border-t border-[var(--settings-theme-card-border)] px-4 py-4">+ <div className="flex items-center justify-between gap-3">+ <p id="settings-search-settings-computerUse-directControl-permissions-title" className="text-13 font-medium text-[var(--settings-section-title)]">+ {t('settings.computerUse.directControl.permissions.title')}+ </p>+ {computerInstallPending || computerPermissionPending ? (+ <span className="inline-flex items-center gap-1.5 text-12 text-[var(--settings-section-desc)]">+ <Spinner size={12} />+ {computerInstallPending+ ? t('settings.computerUse.directControl.installing')+ : t('settings.computerUse.directControl.authorizing')}+ </span>+ ) : (+ <Button+ variant="secondary"+ size="sm"+ className="px-2.5"+ loading={computerPermissionRecheckPending}+ type="button"+ onClick={() => void handleRecheckComputerStatus()}+ disabled={computerPermissionRecheckPending}+ >+ <RefreshCw size={12} className="shrink-0" />+ {t('settings.computerUse.directControl.permissions.recheck')}+ </Button>+ )}+ </div>++ <div id="settings-search-settings-computerUse-directControl-permissions-accessibilityLabel" className="mt-3 grid gap-2.5 sm:grid-cols-2">+ <ComputerPermissionRow+ label={t('settings.computerUse.directControl.permissions.accessibilityLabel')}+ iconSrc={accessibilityPermissionIcon}+ granted={computerAccessibilityGranted}+ pending={computerAccessibilityPending}+ actionLabel={+ computerAccessibilityPending+ ? t('settings.computerUse.directControl.permissionGuide.waiting')+ : computerAccessibilityGranted+ ? t('settings.computerUse.directControl.permissions.granted')+ : t('settings.computerUse.directControl.permissions.grant')+ }+ onAction={() =>+ void (+ computerStatus.installed+ ? handleOpenComputerPermission(+ MAC_ACCESSIBILITY_SETTINGS_URL,+ computerAccessibilityGranted,+ )+ : handleToggleComputer(true)+ )+ }+ />+ <div id="settings-search-settings-computerUse-directControl-permissions-screenRecordingLabel">+ <ComputerPermissionRow+ label={t('settings.computerUse.directControl.permissions.screenRecordingLabel')}+ iconSrc={screenRecordingPermissionIcon}+ granted={computerScreenRecordingGranted}+ pending={computerScreenRecordingPending}+ actionLabel={+ computerScreenRecordingPending+ ? t('settings.computerUse.directControl.permissionGuide.waiting')+ : computerScreenRecordingGranted+ ? t('settings.computerUse.directControl.permissions.granted')+ : t('settings.computerUse.directControl.permissions.grant')+ }+ onAction={() =>+ void (+ computerStatus.installed+ ? handleOpenComputerPermission(+ MAC_SCREEN_RECORDING_SETTINGS_URL,+ computerScreenRecordingGranted,+ )+ : handleToggleComputer(true)+ )+ }+ />+ </div>+ </div>+ </div>+ ) : null}++ <div className="relative border-t border-[var(--settings-theme-card-border)] px-4 py-2.5">+ <div className="flex flex-wrap items-center justify-between gap-x-3 gap-y-2">+ <div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">+ <span className="text-11 text-[var(--settings-section-desc)]">+ {computerStatus.installed+ ? t('settings.computerUse.directControl.status.version', {+ version: computerStatus.version ?? 'cua-driver',+ })+ : t('settings.computerUse.directControl.notDetected')}+ </span>+ {window.electronAPI.platform !== 'darwin' && computerInstallPending ? (+ <>+ <span aria-hidden="true" className="text-11 text-[var(--settings-theme-card-border)]">+ ·+ </span>+ <span className="inline-flex items-center gap-1.5 text-11 text-[var(--settings-section-desc)]">+ <Spinner size={12} />+ {t('settings.computerUse.directControl.installing')}+ </span>+ </>+ ) : null}+ {computerStatus.installed && driverUpdate?.latestVersion ? (+ <>+ <span aria-hidden="true" className="text-11 text-[var(--settings-theme-card-border)]">+ ·+ </span>+ <span className="text-11 text-[var(--settings-section-desc)]">+ {driverUpdatePending+ ? driverUpdateProgress?.phase === 'installing'+ ? t('settings.computerUse.directControl.update.installing')+ : t('settings.computerUse.directControl.update.updating')+ : t('settings.computerUse.directControl.update.available', {+ version: driverUpdate.latestVersion,+ })}+ </span>+ <Button+ variant="secondary"+ size="sm"+ className="px-2.5"+ loading={driverUpdatePending}+ type="button"+ onClick={() => void handleUpdateDriver()}+ disabled={driverUpdatePending || computerInstallPending}+ >+ <Download size={12} className="shrink-0" />+ {t('settings.computerUse.directControl.update.action')}+ </Button>+ </>+ ) : null}+ </div>+ <buttontype="button"- onClick={() => void handleRecheckComputerStatus()}- disabled={computerPermissionRecheckPending}+ onClick={() => setComputerDetailsOpen((open) => !open)}+ aria-expanded={computerDetailsOpen}+ className={cn(+ 'inline-flex h-6 shrink-0 items-center gap-1 rounded-md px-1.5',+ 'text-11 font-medium text-[var(--settings-section-desc)]',+ 'transition-colors hover:bg-[var(--settings-input-bg)] hover:text-[var(--settings-section-title)]',+ 'focus:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]',+ )}>- <RefreshCw size={12} className="shrink-0" />- {t('settings.computerUse.directControl.permissions.recheck')}- </Button>- )}- </div>-- <div id="settings-search-settings-computerUse-directControl-permissions-accessibilityLabel" className="mt-3 grid gap-2.5 sm:grid-cols-2">- <ComputerPermissionRow- label={t('settings.computerUse.directControl.permissions.accessibilityLabel')}- iconSrc={accessibilityPermissionIcon}- granted={computerAccessibilityGranted}- pending={computerAccessibilityPending}- actionLabel={- computerAccessibilityPending- ? t('settings.computerUse.directControl.permissionGuide.waiting')- : computerAccessibilityGranted- ? t('settings.computerUse.directControl.permissions.granted')- : t('settings.computerUse.directControl.permissions.grant')- }- onAction={() =>- void (- computerStatus.installed- ? handleOpenComputerPermission(- MAC_ACCESSIBILITY_SETTINGS_URL,- computerAccessibilityGranted,- )- : handleToggleComputer(true)- )- }- />- <div id="settings-search-settings-computerUse-directControl-permissions-screenRecordingLabel">- <ComputerPermissionRow- label={t('settings.computerUse.directControl.permissions.screenRecordingLabel')}- iconSrc={screenRecordingPermissionIcon}- granted={computerScreenRecordingGranted}- pending={computerScreenRecordingPending}- actionLabel={- computerScreenRecordingPending- ? t('settings.computerUse.directControl.permissionGuide.waiting')- : computerScreenRecordingGranted- ? t('settings.computerUse.directControl.permissions.granted')- : t('settings.computerUse.directControl.permissions.grant')- }- onAction={() =>- void (- computerStatus.installed- ? handleOpenComputerPermission(- MAC_SCREEN_RECORDING_SETTINGS_URL,- computerScreenRecordingGranted,- )- : handleToggleComputer(true)- )- }- />+ {computerDetailsOpen+ ? t('settings.computerUse.directControl.permissions.hideDetails')+ : t('settings.computerUse.directControl.permissions.moreDetails')}+ <ChevronDown+ size={12}+ className={cn(+ 'transition-transform duration-200',+ computerDetailsOpen && 'rotate-180',+ )}+ />+ </button></div>+ {driverUpdatePending &&+ driverUpdateProgress?.phase === 'downloading' &&+ driverUpdateProgress.downloadedBytes !== null &&+ driverUpdateProgress.totalBytes ? (+ <div className="absolute inset-x-0 bottom-0 h-[2px] bg-[var(--settings-input-bg)]">+ <div+ className="h-full bg-[var(--settings-section-title)] transition-[width] duration-500"+ style={{+ width: `${Math.min(+ 100,+ (driverUpdateProgress.downloadedBytes / driverUpdateProgress.totalBytes) * 100,+ )}%`,+ }}+ />+ </div>+ ) : null}</div>- </div>- ) : null}- <div className="relative border-t border-[var(--settings-theme-card-border)] px-4 py-2.5">- <div className="flex flex-wrap items-center justify-between gap-x-3 gap-y-2">- <div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">- <span className="text-11 text-[var(--settings-section-desc)]">- {computerStatus.installed- ? t('settings.computerUse.directControl.status.version', {- version: computerStatus.version ?? 'cua-driver',- })- : t('settings.computerUse.directControl.notDetected')}- </span>- {window.electronAPI.platform !== 'darwin' && computerInstallPending ? (- <>- <span aria-hidden="true" className="text-11 text-[var(--settings-theme-card-border)]">- ·- </span>- <span className="inline-flex items-center gap-1.5 text-11 text-[var(--settings-section-desc)]">- <Spinner size={12} />- {t('settings.computerUse.directControl.installing')}- </span>- </>- ) : null}- {computerStatus.installed && driverUpdate?.latestVersion ? (- <>- <span aria-hidden="true" className="text-11 text-[var(--settings-theme-card-border)]">- ·- </span>- <span className="text-11 text-[var(--settings-section-desc)]">- {driverUpdatePending- ? driverUpdateProgress?.phase === 'installing'- ? t('settings.computerUse.directControl.update.installing')- : t('settings.computerUse.directControl.update.updating')- : t('settings.computerUse.directControl.update.available', {- version: driverUpdate.latestVersion,- })}- </span>+ {computerDetailsOpen ? (+ <div className="flex flex-col gap-3 border-t border-[var(--settings-theme-card-border)] px-4 py-3.5">+ <div className="flex flex-col gap-2">+ <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">+ {t('settings.computerUse.directControl.driverInfo')}+ </p>+ {window.electronAPI.platform === 'darwin' ? (+ <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">+ {computerReady+ ? t('settings.computerUse.directControl.permissions.runtimeConfirmations')+ : t('settings.computerUse.directControl.permissions.macosHint')}+ </p>+ ) : null}+ </div>+ <div><Buttonvariant="secondary"size="sm"- className="px-2.5"- loading={driverUpdatePending}+ className="px-3"type="button"- onClick={() => void handleUpdateDriver()}- disabled={driverUpdatePending || computerInstallPending}+ onClick={handleOpenCuaProject}>- <Download size={12} className="shrink-0" />- {t('settings.computerUse.directControl.update.action')}+ <ExternalLink size={12} className="shrink-0" />+ {t('settings.computerUse.directControl.openSourceProject')}</Button>- </>- ) : null}- </div>- <button- type="button"- onClick={() => setComputerDetailsOpen((open) => !open)}- aria-expanded={computerDetailsOpen}- className={cn(- 'inline-flex h-6 shrink-0 items-center gap-1 rounded-md px-1.5',- 'text-11 font-medium text-[var(--settings-section-desc)]',- 'transition-colors hover:bg-[var(--settings-input-bg)] hover:text-[var(--settings-section-title)]',- 'focus:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]',- )}- >- {computerDetailsOpen- ? t('settings.computerUse.directControl.permissions.hideDetails')- : t('settings.computerUse.directControl.permissions.moreDetails')}- <ChevronDown- size={12}- className={cn(- 'transition-transform duration-200',- computerDetailsOpen && 'rotate-180',- )}- />- </button>- </div>- {driverUpdatePending &&- driverUpdateProgress?.phase === 'downloading' &&- driverUpdateProgress.downloadedBytes !== null &&- driverUpdateProgress.totalBytes ? (- <div className="absolute inset-x-0 bottom-0 h-[2px] bg-[var(--settings-input-bg)]">- <div- className="h-full bg-[var(--settings-section-title)] transition-[width] duration-500"- style={{- width: `${Math.min(- 100,- (driverUpdateProgress.downloadedBytes / driverUpdateProgress.totalBytes) * 100,- )}%`,- }}- />- </div>- ) : null}- </div>-- {computerDetailsOpen ? (- <div className="flex flex-col gap-3 border-t border-[var(--settings-theme-card-border)] px-4 py-3.5">- <div className="flex flex-col gap-2">- <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">- {t('settings.computerUse.directControl.driverInfo')}- </p>- {window.electronAPI.platform === 'darwin' ? (- <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">- {computerReady- ? t('settings.computerUse.directControl.permissions.runtimeConfirmations')- : t('settings.computerUse.directControl.permissions.macosHint')}- </p>- ) : null}- </div>- <div>- <Button- variant="secondary"- size="sm"- className="px-3"- type="button"- onClick={handleOpenCuaProject}- >- <ExternalLink size={12} className="shrink-0" />- {t('settings.computerUse.directControl.openSourceProject')}- </Button>- </div>- </div>- ) : null}+ </div>+ </div>+ ) : null}+ </>+ )}</div><div aria-hidden="true" className="h-px bg-[var(--settings-theme-card-border)]" />diff --git a/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.browserHealth.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.browserHealth.test.tsxindex ae785e6f7c..1530814c84 100644--- a/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.browserHealth.test.tsx+++ b/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.browserHealth.test.tsx@@ -4,6 +4,7 @@ import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-libraimport { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { BrowserBackendHealth } from '../../../../shared/browserBackend';+import { readComputerStatusForSettings } from '../../../../main/maker-ipc/computerStatusHandler';const api = vi.hoisted(() => ({getPluginState: vi.fn(),@@ -128,6 +129,81 @@ beforeEach(() => {afterEach(cleanup);describe('ComputerUseSection browser backend health loading', () => {+ it('renders other settings while computer permission detection is pending', async () => {+ const initialComputer = deferred<ComputerDriverStatus>();+ api.getComputerStatus.mockReturnValueOnce(initialComputer.promise);+ const { rerender } = render(<ComputerUseSection workingDir="/tmp/project" />);++ expect(await screen.findByText('settings.computerUse.title')).toBeTruthy();+ expect(screen.getByText('settings.computerUse.android.title')).toBeTruthy();+ const computerToggle = screen.getByRole('switch', {+ name: 'settings.computerUse.directControl.toggleAria',+ });+ expect((computerToggle as HTMLButtonElement).disabled).toBe(true);+ expect(screen.getByText('settings.computerUse.directControl.status.checking')).toBeTruthy();+ expect(screen.queryByText('settings.computerUse.directControl.notDetected')).toBeNull();+ expect(api.getComputerStatus).toHaveBeenCalledWith({+ refreshPermissionGuide: false,+ forcePermissionProbe: true,+ bypassPermissionProbeCache: true,+ passivePermissionProbeOnly: true,+ });++ fireEvent.click(screen.getByRole('radio', {+ name: 'settings.computerUse.browserBackend.external.title',+ }));+ await waitFor(() => expect(api.setBackendKind).toHaveBeenCalledWith('external'));+ rerender(<ComputerUseSection workingDir="/tmp/other-project" />);+ expect(api.getComputerStatus).toHaveBeenCalledTimes(1);++ await act(async () => { initialComputer.resolve(computerUnavailable); });+ expect((computerToggle as HTMLButtonElement).disabled).toBe(false);+ expect(screen.queryByText('settings.computerUse.directControl.status.checking')).toBeNull();+ });++ it('settles a failed computer probe without hiding the settings', async () => {+ api.getComputerStatus.mockRejectedValueOnce(new Error('probe failed'));+ render(<ComputerUseSection workingDir="/tmp/project" />);+ expect(await screen.findByText('settings.computerUse.title')).toBeTruthy();+ expect(screen.queryByText('settings.computerUse.directControl.status.checking')).toBeNull();+ expect((screen.getByRole('switch', {+ name: 'settings.computerUse.directControl.toggleAria',+ }) as HTMLButtonElement).disabled).toBe(false);+ });++ it('preserves a newer native status when the initial probe returns late', async () => {+ const initialComputer = deferred<ComputerDriverStatus>();+ // Use the real IPC business handler: forced reads normally broadcast before+ // resolving, which must not overwrite a newer guide event for page entry.+ const broadcast = vi.fn((status: ComputerDriverStatus) => {+ vi.mocked(window.electronAPI.maker.computer.onPermissionGuideStatusChanged)+ .mock.calls.at(-1);+ });+ api.getComputerStatus.mockImplementationOnce((options) =>+ readComputerStatusForSettings(options, {+ getStatus: () => initialComputer.promise,+ refreshPermissionGuide: broadcast,+ }),+ );+ vi.mocked(window.electronAPI.maker.computer.checkUpdate).mockResolvedValue({+ currentVersion: '0.12.2',+ latestVersion: null,+ updateAvailable: false,+ updating: false,+ });+ render(<ComputerUseSection workingDir="/tmp/project" />);+ await screen.findByText('settings.computerUse.title');+ const onStatus = vi.mocked(window.electronAPI.maker.computer.onPermissionGuideStatusChanged)+ .mock.calls.at(-1)![0];+ await act(async () => {+ onStatus({ ...computerUnavailable, installed: true, version: '0.12.2' });+ });+ expect(screen.getByText('settings.computerUse.directControl.status.version')).toBeTruthy();+ await act(async () => { initialComputer.resolve(computerUnavailable); });+ expect(broadcast).not.toHaveBeenCalled();+ expect(screen.getByText('settings.computerUse.directControl.status.version')).toBeTruthy();+ });+it('keeps optional copy diagnostics out of user-facing launch notifications', async () => {api.getBackendState.mockResolvedValue({ active: 'external' });api.getBackendHealth.mockResolvedValue({diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex 8b81363984..2038be8d70 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -384,6 +384,8 @@ interface ComputerDriverStatus {}interface ComputerDriverStatusOptions {+ /** False keeps background page reads from broadcasting into the permission guide. */+ refreshPermissionGuide?: boolean;includeDoctor?: boolean;forcePermissionProbe?: boolean;skipPermissionProbe?: boolean;