Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(computer): 刷新 CUA Driver 更新结果并显示检查状态 (#5449)
Dashd14eaac64b16
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex f7279b4691..9086c8c76c 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -20349,11 +20349,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)return { cancelled: true };});- // 查询型:checkComputerDriverUpdate 内部已把所有失败兜成- // updateAvailable=false,正常不会走到 catch;保留兜底以防实现回归。- ipcMain.handle(MAKER_INVOKE.COMPUTER_CHECK_UPDATE, async () => {+ // 查询型:失败通过 checkStatus 返回,保留已知版本供页面显示和重试。+ ipcMain.handle(MAKER_INVOKE.COMPUTER_CHECK_UPDATE, async (_event, options?: { force?: boolean }) => {try {- return await checkComputerDriverUpdate();+ return await checkComputerDriverUpdate(undefined, { force: options?.force === true });} catch (err) {throwIpcError('INTERNAL', err instanceof Error ? err.message : String(err));}diff --git a/apps/desktop/src/main/mcp-integrations/__tests__/computer.test.ts b/apps/desktop/src/main/mcp-integrations/__tests__/computer.test.tsindex 736d0c9236..fb4a2f2c29 100644--- a/apps/desktop/src/main/mcp-integrations/__tests__/computer.test.ts+++ b/apps/desktop/src/main/mcp-integrations/__tests__/computer.test.ts@@ -4297,6 +4297,8 @@ describe('computer driver update check', () => {latestVersion: '0.7.0',updateAvailable: true,updating: false,+ checkStatus: 'success',+ checkedAt: expect.any(Number),});expect(fetchImpl).toHaveBeenCalledTimes(2);expect(String(fetchImpl.mock.calls[0][0])).toContain('git/matching-refs/tags/cua-driver-rs-v');@@ -4315,6 +4317,8 @@ describe('computer driver update check', () => {latestVersion: '0.7.0',updateAvailable: false,updating: false,+ checkStatus: 'success',+ checkedAt: expect.any(Number),});// 无更新时不拉 assets,恒定 1 个请求expect(fetchImpl).toHaveBeenCalledTimes(1);@@ -4329,6 +4333,8 @@ describe('computer driver update check', () => {latestVersion: null,updateAvailable: false,updating: false,+ checkStatus: 'error',+ checkedAt: expect.any(Number),});expect(fetchImpl).not.toHaveBeenCalled();});@@ -4342,6 +4348,8 @@ describe('computer driver update check', () => {latestVersion: null,updateAvailable: false,updating: false,+ checkStatus: 'error',+ checkedAt: expect.any(Number),});});@@ -4358,13 +4366,15 @@ describe('computer driver update check', () => {latestVersion: null,updateAvailable: false,updating: false,+ checkStatus: 'error',+ checkedAt: expect.any(Number),});});it('serves the cached result instantly on subsequent checks (no network wait)', async () => {mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });const firstFetch = mockRefsThenReleaseFetch();- await checkComputerDriverUpdate(firstFetch as unknown as typeof fetch);+ const first = await checkComputerDriverUpdate(firstFetch as unknown as typeof fetch);// 第二次立即返回缓存;且距上次检查未满节流窗口,不应触发后台刷新// (未鉴权 GitHub API 限额有限,面板频繁开合不能放大请求量)。@@ -4376,11 +4386,44 @@ describe('computer driver update check', () => {latestVersion: '0.7.0',updateAvailable: true,updating: false,+ checkStatus: 'success',+ checkedAt: first.checkedAt,});expect(hangingFetch).not.toHaveBeenCalled();});- it('keeps the cached "update available" result when a background refresh fails', async () => {+ it('bypasses fresh cached results on manual checks and shares an in-flight request', async () => {+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ await checkComputerDriverUpdate(mockRefsThenReleaseFetch() as unknown as typeof fetch);+ mockDriverSpawn({ stdout: 'cua-driver 0.7.0\n' });+ let finish!: (response: unknown) => void;+ const fetchImpl = vi.fn().mockReturnValue(new Promise((resolve) => { finish = resolve; }));+ const first = checkComputerDriverUpdate(fetchImpl as unknown as typeof fetch, { force: true });+ const second = checkComputerDriverUpdate(fetchImpl as unknown as typeof fetch, { force: true });+ await vi.waitFor(() => expect(fetchImpl).toHaveBeenCalledOnce());+ finish({ ok: true, json: async () => [{ ref: 'refs/tags/cua-driver-rs-v0.7.0' }] });+ const result = await first;+ expect(result).toMatchObject({ currentVersion: '0.7.0', updateAvailable: false, checkStatus: 'success' });+ expect(await second).toEqual(result);+ expect(fetchImpl).toHaveBeenCalledOnce();+ });++ it('awaits an expired cache refresh and returns the new result to the same caller', async () => {+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const previous = await checkComputerDriverUpdate(mockRefsThenReleaseFetch() as unknown as typeof fetch);+ vi.useFakeTimers({ toFake: ['Date'] });+ try {+ vi.setSystemTime(Date.now() + 11 * 60_000);+ mockDriverSpawn({ stdout: 'cua-driver 0.7.0\n' });+ const result = await checkComputerDriverUpdate(mockRefsThenReleaseFetch() as unknown as typeof fetch);+ expect(result).toMatchObject({ currentVersion: '0.7.0', updateAvailable: false, checkStatus: 'success' });+ expect(result.checkedAt).toBeGreaterThan(previous.checkedAt!);+ } finally {+ vi.useRealTimers();+ }+ });++ it('reports a failed refresh while keeping the previously verified update offer', async () => {mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });const okFetch = mockRefsThenReleaseFetch();await checkComputerDriverUpdate(okFetch as unknown as typeof fetch);@@ -4392,8 +4435,9 @@ describe('computer driver update check', () => {vi.setSystemTime(Date.now() + 11 * 60_000);mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });const failingFetch = vi.fn().mockResolvedValue({ ok: false, status: 500 });- await checkComputerDriverUpdate(failingFetch as unknown as typeof fetch);- await new Promise((resolve) => { setTimeout(resolve, 0); });+ await expect(checkComputerDriverUpdate(failingFetch as unknown as typeof fetch)).resolves.toMatchObject({+ latestVersion: '0.7.0', updateAvailable: true, checkStatus: 'error', checkedAt: Date.now(),+ });// 节流窗口外确实触发了后台刷新expect(failingFetch).toHaveBeenCalledTimes(1);@@ -4401,12 +4445,22 @@ describe('computer driver update check', () => {const hangingFetch = vi.fn().mockReturnValue(new Promise(() => {}));await expect(checkComputerDriverUpdate(hangingFetch as unknown as typeof fetch),- ).resolves.toMatchObject({ latestVersion: '0.7.0', updateAvailable: true });+ ).resolves.toMatchObject({ latestVersion: '0.7.0', updateAvailable: true, checkStatus: 'error' });} finally {vi.useRealTimers();}});+ it('does not turn an unverified cached tag into an update after a local downgrade and network failure', async () => {+ mockDriverSpawn({ stdout: 'cua-driver 0.7.0\n' });+ await expect(checkComputerDriverUpdate(mockRefsThenReleaseFetch() as unknown as typeof fetch))+ .resolves.toMatchObject({ latestVersion: '0.7.0', updateAvailable: false });+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const failedFetch = vi.fn().mockResolvedValue({ ok: false, status: 500 });+ await expect(checkComputerDriverUpdate(failedFetch as unknown as typeof fetch, { force: true }))+ .resolves.toMatchObject({ currentVersion: '0.5.8', updateAvailable: false, checkStatus: 'error' });+ });+it('keeps a newer verified target when its background probe transiently falls back', async () => {mockDriverSpawn({ stdout: 'cua-driver 0.10.0\n' });const initialFetch = vi@@ -4509,10 +4563,102 @@ describe('computer driver update check', () => {latestVersion: '0.7.0',updateAvailable: false,updating: false,+ checkStatus: 'success',+ checkedAt: expect.any(Number),});expect(refreshedFetch).toHaveBeenCalledTimes(1);});+ it.each(['0.5.8', '0.7.0'])('rechecks the installed version %s after a nonzero installer exit', async (version) => {+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const fetchImpl = mockRefsThenReleaseFetch();+ await checkComputerDriverUpdate(fetchImpl as unknown as typeof fetch);++ mockDriverSpawn({ exitCode: 1, stderr: 'installer cleanup failed' });+ mockDriverSpawn({ stdout: `cua-driver ${version}\n` });+ mockDriverSpawn({ stdout: 'Cua Driver daemon is stopped\n' });+ await expect(updateComputerDriver(undefined, {+ fetchImpl: fetchImpl as unknown as typeof fetch,+ })).rejects.toThrow('installer cleanup failed');++ // Completion must invalidate the ten-minute cache even if the binary changed.+ mockDriverSpawn({ stdout: `cua-driver ${version}\n` });+ const refreshedFetch = mockRefsThenReleaseFetch();+ await expect(checkComputerDriverUpdate(refreshedFetch as unknown as typeof fetch))+ .resolves.toMatchObject({+ currentVersion: version,+ updateAvailable: version === '0.5.8',+ updating: false,+ });+ expect(refreshedFetch).toHaveBeenCalled();+ });++ it('invalidates the cached offer when the installer cannot start', async () => {+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const fetchImpl = mockRefsThenReleaseFetch();+ await checkComputerDriverUpdate(fetchImpl as unknown as typeof fetch);+ mockDriverSpawn({ error: new Error('spawn failed') });+ await expect(updateComputerDriver(undefined, {+ fetchImpl: fetchImpl as unknown as typeof fetch,+ })).rejects.toThrow('spawn failed');++ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const refreshedFetch = mockRefsThenReleaseFetch();+ await expect(checkComputerDriverUpdate(refreshedFetch as unknown as typeof fetch))+ .resolves.toMatchObject({ currentVersion: '0.5.8', updateAvailable: true, updating: false });+ expect(refreshedFetch).toHaveBeenCalled();+ });++ it.each(['cached', 'pending', 'absent'])('returns post-install state to late check callers (new check: %s)', async (freshState) => {+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ const fetchImpl = mockRefsThenReleaseFetch();+ await checkComputerDriverUpdate(fetchImpl as unknown as typeof fetch);++ vi.useFakeTimers({ toFake: ['Date'] });+ try {+ vi.setSystemTime(Date.now() + 11 * 60_000);+ mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });+ let finishOldCheck!: (response: unknown) => void;+ const lateFetch = vi.fn()+ .mockImplementationOnce(() => new Promise((resolve) => { finishOldCheck = resolve; }))+ .mockResolvedValueOnce({+ ok: true,+ json: async () => ({ tag_name: 'cua-driver-rs-v0.7.0', assets: [currentPlatformReleaseAsset('0.7.0')] }),+ })+ .mockImplementation(mockRefsThenReleaseFetch());+ const oldCheck = checkComputerDriverUpdate(lateFetch as unknown as typeof fetch);+ await vi.waitFor(() => expect(lateFetch).toHaveBeenCalledOnce());++ mockDriverSpawn({ stdout: 'installed\n' });+ mockDriverSpawn({ stdout: 'cua-driver 0.7.0\n' });+ mockDriverSpawn({ stdout: 'Cua Driver daemon is stopped\n' });+ await updateComputerDriver(undefined, { fetchImpl: fetchImpl as unknown as typeof fetch });++ mockDriverSpawn({ stdout: 'cua-driver 0.7.0\n' });+ let finishFreshCheck!: (response: unknown) => void;+ const freshFetch = vi.fn().mockImplementation(() => new Promise((resolve) => { finishFreshCheck = resolve; }));+ const freshCheck = freshState === 'absent' ? null : checkComputerDriverUpdate(+ (freshState === 'cached' ? mockRefsThenReleaseFetch() : freshFetch) as unknown as typeof fetch,+ );+ if (freshState === 'cached') await freshCheck;+ if (freshState === 'pending') await vi.waitFor(() => expect(freshFetch).toHaveBeenCalledOnce());+ finishOldCheck({ ok: true, json: async () => [{ ref: 'refs/tags/cua-driver-rs-v0.7.0' }] });+ if (freshState === 'pending') {+ await vi.waitFor(() => expect(lateFetch).toHaveBeenCalledTimes(2));+ finishFreshCheck({ ok: true, json: async () => [{ ref: 'refs/tags/cua-driver-rs-v0.7.0' }] });+ }+ await expect(oldCheck).resolves.toMatchObject({ currentVersion: '0.7.0', updateAvailable: false });+ if (freshCheck) await expect(freshCheck).resolves.toMatchObject({ currentVersion: '0.7.0', updateAvailable: false });+ expect(lateFetch).toHaveBeenCalledTimes(freshState === 'absent' ? 3 : 2);+ const unusedFetch = vi.fn();+ await expect(checkComputerDriverUpdate(unusedFetch as unknown as typeof fetch))+ .resolves.toMatchObject({ currentVersion: '0.7.0', updateAvailable: false });+ expect(unusedFetch).not.toHaveBeenCalled();+ } finally {+ vi.useRealTimers();+ }+ });+it('reports updating=true while a driver update install is in flight', async () => {mockDriverSpawn({ stdout: 'cua-driver 0.5.8\n' });const fetchImpl = mockRefsThenReleaseFetch();@@ -4995,6 +5141,8 @@ describe('review follow-ups: releases pagination and Windows idle timeout', () =latestVersion: '0.10.0',updateAvailable: false,updating: false,+ checkStatus: 'success',+ checkedAt: expect.any(Number),});const installerCallsBefore = spawnMock.mock.calls.length;await expect(updateComputerDriver()).rejects.toThrow(@@ -5115,6 +5263,8 @@ describe('review follow-ups: releases pagination and Windows idle timeout', () =latestVersion: null,updateAvailable: false,updating: false,+ checkStatus: 'error',+ checkedAt: expect.any(Number),});});diff --git a/apps/desktop/src/main/mcp-integrations/computer.ts b/apps/desktop/src/main/mcp-integrations/computer.tsindex 432486768c..fc3ca745f3 100644--- a/apps/desktop/src/main/mcp-integrations/computer.ts+++ b/apps/desktop/src/main/mcp-integrations/computer.ts@@ -350,9 +350,8 @@ export interface ComputerDriverInstallResult {}/**- * cua-driver 更新检查结果。查询型数据:任何一步失败(本地未装 / 网络不通 /- * API 限流 / tag 解析不出)都静默落到 updateAvailable=false,renderer 直接- * 不渲染更新入口,绝不打扰用户。+ * cua-driver 更新检查结果。检查状态和已知可安装版本分别保留,网络失败+ * 不能伪装成“已是最新”,也不能抹掉此前已发现的更新。* updating 表示 main 侧此刻有一个更新安装在跑(设置面板关闭不影响它),* renderer 重新打开面板时据此恢复「更新中」态并 join 完成时刻。*/@@ -361,6 +360,9 @@ export interface ComputerDriverUpdateCheck {latestVersion: string | null;updateAvailable: boolean;updating: boolean;+ /** Optional on the wire for older desktop peers. */+ checkStatus?: 'success' | 'error';+ checkedAt?: number;}export interface ComputerDriverPermissionGrantResult {@@ -2745,6 +2747,13 @@ export async function installComputerDriver(const res = await runInstallCommand(onSpawn, targetVersion);const status = await getComputerDriverStatus();if (res.exitCode !== 0 || !status.installed) {+ logger.warn('cua-driver install did not complete cleanly', {+ exitCode: res.exitCode,+ signal: res.signal,+ installed: status.installed,+ installedVersion: status.version,+ statusError: status.error,+ });throw new ComputerDriverError(res.stderr.trim() || res.stdout.trim() || `cua-driver installer exited ${res.exitCode}`,);@@ -2965,7 +2974,7 @@ let driverUpdateCheckInFlight: Promise<Omit<ComputerDriverUpdateCheck, 'updatinglet driverUpdateInstallInFlight: Promise<ComputerDriverInstallResult> | null = null;// 最新 release 的 asset 列表(name + size),供更新进度采样换算总字节数。let cachedDriverReleaseAssets: CuaDriverReleaseAsset[] = [];-// 上次检查(成功或失败)完成时刻,SWR 后台刷新节流用。+// 上次检查(成功或失败)完成时刻,自动检查节流用。let driverUpdateCheckLastFetchAt = 0;/** 测试隔离用:清空更新检查缓存与 in-flight 状态。 */@@ -3073,7 +3082,7 @@ async function fetchDriverUpdateCheck(cachedDriverReleaseAssets = [];return { currentVersion, latestVersion: currentVersion, updateAvailable: false };} catch (err) {- logger.debug('cua-driver update check failed (silently ignored)', {+ logger.debug('cua-driver update check failed', {message: err instanceof Error ? err.message : String(err),});return { currentVersion, latestVersion: null, updateAvailable: false };@@ -3090,49 +3099,74 @@ function commitDriverUpdateCheck(): void {if (result.latestVersion !== null || result.currentVersion === null || !cachedDriverUpdateCheck) {cachedDriverUpdateCheck = result;+ } else {+ cachedDriverUpdateCheck = {+ ...cachedDriverUpdateCheck,+ currentVersion: result.currentVersion,+ updateAvailable: cachedDriverUpdateCheck.updateAvailable && cachedDriverUpdateCheck.latestVersion !== null+ && compareSemver(result.currentVersion, cachedDriverUpdateCheck.latestVersion) < 0,+ checkStatus: result.checkStatus,+ checkedAt: result.checkedAt,+ };}}+function completedDriverUpdateCheck(+ result: Omit<ComputerDriverUpdateCheck, 'updating'>,+): Omit<ComputerDriverUpdateCheck, 'updating'> {+ return {+ ...result,+ checkStatus: result.currentVersion && result.latestVersion ? 'success' : 'error',+ checkedAt: Date.now(),+ };+}+function startDriverUpdateCheck(fetchImpl: typeof fetch): Promise<Omit<ComputerDriverUpdateCheck, 'updating'>> {if (!driverUpdateCheckInFlight) {const knownVerifiedTarget = cachedDriverUpdateCheck?.updateAvailable? cachedDriverUpdateCheck.latestVersion: null;- driverUpdateCheckInFlight = fetchDriverUpdateCheck(fetchImpl, new Set(), knownVerifiedTarget)+ const pending: Promise<Omit<ComputerDriverUpdateCheck, 'updating'>> = fetchDriverUpdateCheck(fetchImpl, new Set(), knownVerifiedTarget).then((result) => {- commitDriverUpdateCheck(result);- return result;+ const completed = completedDriverUpdateCheck(result);+ // An installation can invalidate a check that started against the old binary.+ if (driverUpdateCheckInFlight === pending) {+ commitDriverUpdateCheck(completed);+ return cachedDriverUpdateCheck!;+ }+ // Existing callers must also receive the post-install state, not only+ // callers of a later check. Reuse the current check/cache when available.+ return driverUpdateCheckInFlight ?? cachedDriverUpdateCheck ?? startDriverUpdateCheck(fetchImpl);}).finally(() => {- driverUpdateCheckInFlight = null;- driverUpdateCheckLastFetchAt = Date.now();+ if (driverUpdateCheckInFlight === pending) {+ driverUpdateCheckInFlight = null;+ driverUpdateCheckLastFetchAt = Date.now();+ }});+ driverUpdateCheckInFlight = pending;}return driverUpdateCheckInFlight;}/**- * 检查 cua-driver 是否有新版本。刻意保持"安静"语义:仅在用户打开设置页- * 时由 renderer 触发,不做启动检查、不做后台轮询;任何失败都返回- * updateAvailable=false 而不是抛错(查询型,失败时 renderer 静默隐藏入口)。- *- * 缓存语义(stale-while-revalidate):有缓存时立即返回缓存——用户第二次- * 打开面板不必等网络往返;同时后台静默刷新,结果供下次读取。更新安装- * 进行中不发起刷新(装完缓存会被清)。fetchImpl 可注入用于测试。+ * 打开设置时自动检查,十分钟内复用结果;手动检查绕过节流。+ * 到期后等待共享的检查 Promise,让当前页面收到新结果,无需轮询或重开。+ * 安装期间只返回已有状态,避免对正在替换的二进制发起检查。*/export async function checkComputerDriverUpdate(// 默认吃系统代理:api.github.com / raw.githubusercontent.com 都是境外端点。fetchImpl: typeof fetch = outboundFetch,+ options?: { force?: boolean },): Promise<ComputerDriverUpdateCheck> {const updating = driverUpdateInstallInFlight !== null;if (cachedDriverUpdateCheck) {- // 后台刷新节流:面板频繁开合时不重复打 GitHub API(未鉴权限额有限)。+ // 自动检查节流:面板频繁开合时不重复打 GitHub API(未鉴权限额有限)。const refreshDue =Date.now() - driverUpdateCheckLastFetchAt >= UPDATE_CHECK_REFRESH_MIN_INTERVAL_MS;- if (!updating && refreshDue) {- void startDriverUpdateCheck(fetchImpl);+ if (updating || (!options?.force && !refreshDue && !driverUpdateCheckInFlight)) {+ return { ...cachedDriverUpdateCheck, updating };}- return { ...cachedDriverUpdateCheck, updating };}const result = await startDriverUpdateCheck(fetchImpl);return { ...result, updating: driverUpdateInstallInFlight !== null };@@ -3158,7 +3192,7 @@ async function revalidateComputerDriverUpdateTarget(fetchImpl: typeof fetch): Prconst refreshed = await fetchDriverUpdateCheck(fetchImpl, new Set([cachedTarget]));// 已确认 cachedTarget 不可安装,即使 fallback 刷新失败也不能保留旧入口。- cachedDriverUpdateCheck = refreshed;+ cachedDriverUpdateCheck = completedDriverUpdateCheck(refreshed);if (!refreshed.updateAvailable) cachedDriverReleaseAssets = [];return refreshed.updateAvailable ? refreshed.latestVersion : null;} finally {@@ -3266,7 +3300,7 @@ function startInstallProgressSampler(* 执行 cua-driver 更新(复用官方安装脚本,装最新版覆盖旧版)。* in-flight 复用:更新过程托管在 main,设置面板关闭它照常跑完;面板重开* 后再调用本函数会 join 同一个安装 Promise,不会重复起安装进程。- * 成功后清掉更新检查缓存(本地版本已变,旧结果作废)。+ * 安装尝试结束后清掉更新检查缓存(报错时也可能已经替换了本地版本)。* onProgress 只在发起安装的那次调用被采纳(进度经 IPC 广播给所有窗口,* join 的调用方天然共享),结束时保证发一条 phase='done'。* opts.joinOnly:仅 join 既有安装,绝不起新安装——renderer 的 resume 路径@@ -3290,18 +3324,24 @@ export async function updateComputerDriver(if (!targetVersion) {throw new ComputerDriverError('no verified installable cua-driver update is available');}- const result = await installComputerDriver((pid) => {- if (onProgress) stopSampler = startInstallProgressSampler(pid, onProgress);- }, targetVersion);- const installedVersion = extractDriverSemver(result.status.version);- if (!installedVersion || compareSemver(installedVersion, targetVersion) < 0) {- throw new ComputerDriverError(- `cua-driver update did not reach v${targetVersion} (installed: ${result.status.version ?? 'unknown'})`,- );+ try {+ const result = await installComputerDriver((pid) => {+ if (onProgress) stopSampler = startInstallProgressSampler(pid, onProgress);+ }, targetVersion);+ const installedVersion = extractDriverSemver(result.status.version);+ if (!installedVersion || compareSemver(installedVersion, targetVersion) < 0) {+ throw new ComputerDriverError(+ `cua-driver update did not reach v${targetVersion} (installed: ${result.status.version ?? 'unknown'})`,+ );+ }+ return result;+ } finally {+ // Failed installers can still replace the binary. The next check must+ // read it again, including when the settings panel was closed meanwhile.+ cachedDriverUpdateCheck = null;+ cachedDriverReleaseAssets = [];+ driverUpdateCheckInFlight = null;}- cachedDriverUpdateCheck = null;- cachedDriverReleaseAssets = [];- return result;})().finally(() => {driverUpdateInstallInFlight = null;stopSampler();diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex 54bd311c48..d5b2ce851f 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -1018,6 +1018,8 @@ interface ComputerDriverUpdateCheck {latestVersion: string | null;updateAvailable: boolean;updating: boolean;+ checkStatus?: 'success' | 'error';+ checkedAt?: number;}const appDisplayVersionInfo = ipcRenderer.sendSync('get-app-display-version-info') as {@@ -7967,8 +7969,8 @@ contextBridge.exposeInMainWorld('electronAPI', {fanOutComputerPermissionGuideStatusChanged((data: unknown) =>callback(data as ComputerDriverStatus),),- checkUpdate: (): Promise<ComputerDriverUpdateCheck> =>- ipcRenderer.invoke('maker:computer:check-update'),+ checkUpdate: (options?: { force?: boolean }): Promise<ComputerDriverUpdateCheck> =>+ ipcRenderer.invoke('maker:computer:check-update', options),updateDriver: (opts?: { joinOnly?: boolean }): Promise<ComputerDriverInstallResult> =>ipcRenderer.invoke('maker:computer:update-driver', opts),onUpdateProgress: fanOutComputerDriverUpdateProgress,diff --git a/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx b/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsxindex b7ca1604ce..850eab33ac 100644--- a/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx@@ -162,7 +162,7 @@ interface ComputerUseSectionProps {export function ComputerUseSection({workingDir,}: ComputerUseSectionProps) {- const { t } = useTranslation();+ const { t, i18n } = useTranslation();// null = not loaded yet (blank, no flash). After load, all resolve.const [browserEnabled, setBrowserEnabled] = useState<boolean | null>(null);const [androidEnabled, setAndroidEnabled] = useState<boolean | null>(null);@@ -173,8 +173,10 @@ export function ComputerUseSection({const [androidAdbPathDraft, setAndroidAdbPathDraft] = useState('');const [androidAdbPathEdited, setAndroidAdbPathEdited] = useState(false);const [computerStatus, setComputerStatus] = useState<ComputerDriverStatus | null>(null);- // 安静的 driver 更新入口:只在打开本设置面板时查一次,查不到 / 无更新都不渲染。+ // Update results remain visible, including failures and cached check times.const [driverUpdate, setDriverUpdate] = useState<ComputerDriverUpdateCheck | null>(null);+ const [driverCheckPending, setDriverCheckPending] = useState(false);+ const [driverCheckFailed, setDriverCheckFailed] = useState(false);const [driverUpdatePending, setDriverUpdatePending] = useState(false);// main 侧采样广播的下载进度;null = 未开始/已结束(显示通用「更新中…」)。const [driverUpdateProgress, setDriverUpdateProgress] =@@ -652,8 +654,6 @@ export function ComputerUseSection({}}, [browserBackendPending, browserBackendRecovering, t]);- // driver 已安装时安静地查一次是否有新版本。失败或无更新都不渲染任何 UI,- // 不弹 toast、不做启动检查、不后台轮询 —— 更新入口只是设置里的一个可选项。// 更新期间订阅 main 广播的下载进度;phase='done' 或组件卸载时清空。useEffect(() => {if (!driverUpdatePending) {@@ -666,21 +666,93 @@ export function ComputerUseSection({return unsubscribe;}, [driverUpdatePending]);+ const refreshDriverUpdateCheck = useCallback(async (force = false) => {+ setDriverCheckPending(true);+ setDriverCheckFailed(false);+ try {+ const result = await window.electronAPI.maker.computer.checkUpdate(force ? { force: true } : undefined);+ if (!computerUseSectionMountedRef.current) return null;+ setDriverUpdate(result);+ // Older peers have no checkStatus. A missing latestVersion still means+ // that a successful check cannot be established, never “up to date”.+ setDriverCheckFailed(result.checkStatus === 'error' || !result.currentVersion || !result.latestVersion);+ if (result.currentVersion) {+ setComputerStatus((current) => current?.installed+ ? { ...current, version: result.currentVersion }+ : current);+ }+ return result;+ } catch (err) {+ log.warn('computer.checkUpdate failed', err);+ if (computerUseSectionMountedRef.current) setDriverCheckFailed(true);+ return null;+ } finally {+ if (computerUseSectionMountedRef.current) setDriverCheckPending(false);+ }+ }, []);+// 等待 main 侧更新安装完成并刷新本地展示。更新的 in-flight 托管在 main:// 面板关闭它照常跑完;面板重开后本函数 join 同一个安装 Promise。// resume 路径传 joinOnly:若 main 侧安装在 IPC 到达前恰好完成,只读状态// 刷新,绝不误起一次新安装(用户没点按钮不该有安装发生)。const joinDriverUpdate = useCallback(async (joinOnly: boolean) => {try {- const result = await window.electronAPI.maker.computer.updateDriver(- joinOnly ? { joinOnly: true } : undefined,- );- let nextStatus = result.status;- if (nextStatus.installed && nextStatus.permissionState?.platform === 'macos') {- // A driver replacement may receive a new TCC identity. Re-probe the- // installed binary before allowing the capability to look usable.- nextStatus = await refreshComputerPermissionStatus('driver-update', { fresh: true });+ let nextStatus: ComputerDriverStatus | null = null;+ let updateSucceeded = false;+ try {+ const result = await window.electronAPI.maker.computer.updateDriver(+ joinOnly ? { joinOnly: true } : undefined,+ );+ nextStatus = result.status;+ updateSucceeded = true;+ } catch (err) {+ log.warn('computer driver update failed', err);+ if (!computerUseSectionMountedRef.current) return;+ toast.error(t('settings.computerUse.directControl.update.toast.failed'));+ // A nonzero installer exit does not mean the old binary is still on disk.+ try {+ nextStatus = await window.electronAPI.maker.computer.status({ skipPermissionProbe: true });+ } catch (refreshErr) {+ log.warn('computer.status after failed update failed', refreshErr);+ }}+ if (!computerUseSectionMountedRef.current) return;+ if (nextStatus) setComputerStatus(nextStatus);+ // Publish the installed version and remove the old offer before probing+ // permissions. A slow/failed permission probe must not retain old versions.+ setDriverUpdate(null);+ if (!nextStatus?.installed || !computerUseSectionMountedRef.current) return;+ if (nextStatus.permissionState?.platform === 'macos') {+ const previousPermissionState = nextStatus.permissionState;+ try {+ const permissions = await window.electronAPI.maker.computer.status({+ forcePermissionProbe: true,+ freshPermissionProbe: true,+ });+ // Keep the independently verified version if the permission status+ // request could not even read the binary during daemon recovery.+ nextStatus = {+ ...permissions,+ installed: true,+ version: nextStatus.version,+ executablePath: nextStatus.executablePath,+ };+ } catch (err) {+ log.warn('computer permission check after update failed', err);+ nextStatus = {+ ...nextStatus,+ permissions: undefined,+ permissionState: {+ ...previousPermissionState,+ status: 'unknown',+ accessibility: 'unknown',+ screenRecording: 'unknown',+ screenRecordingCapturable: 'unknown',+ },+ };+ }+ }+ if (!computerUseSectionMountedRef.current) return;setComputerStatus(nextStatus);if (!isComputerPermissionReady(nextStatus)) {setComputerPermissionPending(false);@@ -691,36 +763,27 @@ export function ComputerUseSection({}toast.warning(t('settings.computerUse.directControl.toast.permissionPending'));}- setDriverUpdate(null);- if (isComputerPermissionReady(nextStatus)) {+ if (updateSucceeded && isComputerPermissionReady(nextStatus)) {toast.success(t('settings.computerUse.directControl.update.toast.success'));}- } catch (err) {- log.warn('computer driver update failed', err);- toast.error(t('settings.computerUse.directControl.update.toast.failed'));- // 预检发现缓存目标已失效时 main 已把 updateAvailable 置 false;同步清掉- // 渲染层残留入口,避免失败 toast 后按钮仍显示并可重复点。- try {- const latest = await window.electronAPI.maker.computer.checkUpdate();- setDriverUpdate(latest.updateAvailable ? latest : null);- } catch (refreshErr) {- log.warn('computer.checkUpdate after failed update failed', refreshErr);- }} finally {- setDriverUpdatePending(false);+ if (computerUseSectionMountedRef.current) {+ setDriverUpdatePending(false);+ // Finish local permission recovery before starting the network check.+ void refreshDriverUpdateCheck();+ }}- }, [computerEnabled, refreshComputerPermissionStatus, t]);+ }, [computerEnabled, refreshDriverUpdateCheck, t]);useEffect(() => {if (!computerStatus?.installed || driverUpdateCheckedRef.current) return;driverUpdateCheckedRef.current = true;let cancelled = false;- void window.electronAPI.maker.computer- .checkUpdate()+ let settled = false;+ void refreshDriverUpdateCheck().then((result) => {- if (cancelled) return;- // main 有缓存时这里立即返回(第二次打开面板不等网络),后台自动刷新。- if (result.updateAvailable) setDriverUpdate(result);+ settled = true;+ if (cancelled || !result) return;if (result.updating) {// 上次面板关闭前发起的更新还在 main 侧跑:恢复「更新中」态并以// join-only 语义重挂结果(安装恰好已完成时只读状态,不起新安装)。@@ -729,18 +792,22 @@ export function ComputerUseSection({}}).catch((err) => {+ settled = true;log.warn('computer.checkUpdate failed', err);});return () => {cancelled = true;+ // Loading the opt-in state can replace joinDriverUpdate before this+ // request settles. Let the next effect consume the shared main check.+ if (!settled) driverUpdateCheckedRef.current = false;};- }, [computerStatus?.installed, joinDriverUpdate]);+ }, [computerStatus?.installed, joinDriverUpdate, refreshDriverUpdateCheck]);const handleUpdateDriver = useCallback(() => {- if (driverUpdatePending) return;+ if (driverUpdatePending || driverCheckPending) return;setDriverUpdatePending(true);void joinDriverUpdate(false);- }, [driverUpdatePending, joinDriverUpdate]);+ }, [driverUpdatePending, driverCheckPending, joinDriverUpdate]);const persistComputerEnabled = useCallback(async (next: boolean) => {const result = await window.electronAPI.maker.plugins.setEnabled(COMPUTER_PLUGIN_ID, next);@@ -1428,7 +1495,7 @@ export function ComputerUseSection({{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')}+ {t('settings.computerUse.directControl.update.readingVersion')}</div>) : (<>@@ -1536,34 +1603,78 @@ export function ComputerUseSection({</span></>) : null}- {computerStatus.installed && driverUpdate?.latestVersion ? (+ {computerStatus.installed ? (+ <>+ {(!driverUpdate?.updateAvailable || driverCheckPending || driverUpdatePending || driverCheckFailed) ? (+ <>+ <span aria-hidden="true" className="text-11 text-[var(--settings-theme-card-border)]">·</span>+ <span role="status" className="text-11 text-[var(--settings-section-desc)]">+ {driverCheckPending+ ? t('settings.computerUse.directControl.update.checking')+ : driverUpdatePending+ ? driverUpdateProgress?.phase === 'installing'+ ? t('settings.computerUse.directControl.update.installing')+ : t('settings.computerUse.directControl.update.updating')+ : driverCheckFailed+ ? t('settings.computerUse.directControl.update.checkFailed')+ : driverUpdate+ ? t('settings.computerUse.directControl.update.upToDate')+ : t('settings.computerUse.directControl.update.notChecked')}+ </span>+ </>+ ) : null}+ {driverUpdate?.checkedAt && !driverUpdatePending ? (+ <span className="text-11 text-[var(--settings-section-desc)]">+ {t('settings.computerUse.directControl.update.lastChecked', {+ time: new Date(driverUpdate.checkedAt).toLocaleString(i18n?.language, {+ month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit',+ }),+ })}+ </span>+ ) : null}+ </>+ ) : null}+ {computerStatus.installed && driverUpdate?.updateAvailable && driverUpdate.latestVersion && !driverUpdatePending ? (<><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,- })}+ {t(driverCheckFailed+ ? 'settings.computerUse.directControl.update.previouslyAvailable'+ : 'settings.computerUse.directControl.update.available', {+ version: driverUpdate.latestVersion,+ })}</span><Buttonvariant="secondary"size="sm"className="px-2.5"- loading={driverUpdatePending}type="button"onClick={() => void handleUpdateDriver()}- disabled={driverUpdatePending || computerInstallPending}+ disabled={driverCheckPending || computerInstallPending}><Download size={12} className="shrink-0" />{t('settings.computerUse.directControl.update.action')}</Button></>) : null}+ {computerStatus.installed ? (+ <Button+ variant="secondary"+ size="sm"+ className="px-2.5"+ type="button"+ loading={driverCheckPending}+ disabled={driverCheckPending || driverUpdatePending || computerInstallPending}+ onClick={() => void refreshDriverUpdateCheck(true)}+ >+ <RefreshCw size={12} className="shrink-0" />+ {driverCheckFailed+ ? t('settings.computerUse.directControl.update.retry')+ : t('settings.computerUse.directControl.update.check')}+ </Button>+ ) : null}</div><buttontype="button"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 1530814c84..4d3c03954f 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@@ -140,7 +140,7 @@ describe('ComputerUseSection browser backend health loading', () => {name: 'settings.computerUse.directControl.toggleAria',});expect((computerToggle as HTMLButtonElement).disabled).toBe(true);- expect(screen.getByText('settings.computerUse.directControl.status.checking')).toBeTruthy();+ expect(screen.getByText('settings.computerUse.directControl.update.readingVersion')).toBeTruthy();expect(screen.queryByText('settings.computerUse.directControl.notDetected')).toBeNull();expect(api.getComputerStatus).toHaveBeenCalledWith({refreshPermissionGuide: false,@@ -158,14 +158,14 @@ describe('ComputerUseSection browser backend health loading', () => {await act(async () => { initialComputer.resolve(computerUnavailable); });expect((computerToggle as HTMLButtonElement).disabled).toBe(false);- expect(screen.queryByText('settings.computerUse.directControl.status.checking')).toBeNull();+ expect(screen.queryByText('settings.computerUse.directControl.update.readingVersion')).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.queryByText('settings.computerUse.directControl.update.readingVersion')).toBeNull();expect((screen.getByRole('switch', {name: 'settings.computerUse.directControl.toggleAria',}) as HTMLButtonElement).disabled).toBe(false);diff --git a/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.driverUpdate.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.driverUpdate.test.tsxnew file mode 100644index 0000000000..51b04df308--- /dev/null+++ b/apps/desktop/src/renderer/components/settings/__tests__/ComputerUseSection.driverUpdate.test.tsx@@ -0,0 +1,276 @@+// @vitest-environment jsdom++import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { afterEach, describe, expect, it, vi } from 'vitest';++const { translate } = vi.hoisted(() => ({+ translate: (key: string, args?: { version?: string; time?: string }) =>+ args?.version || args?.time ? `${key}: ${args.version ?? args.time}` : key,+}));+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: translate }) }));+vi.mock('@/lib/toast', () => ({+ toast: { info: vi.fn(), success: vi.fn(), warning: vi.fn(), error: vi.fn() },+}));++import { toast } from '@/lib/toast';+import { ComputerUseSection } from '../ComputerUseSection';++const updateKey = 'settings.computerUse.directControl.update';+const versionKey = 'settings.computerUse.directControl.status.version';+const oldVersion = '0.33.0';+const newVersion = '0.33.1';++function deferred<T>() {+ let resolve!: (value: T) => void;+ let reject!: (error: Error) => void;+ const promise = new Promise<T>((res, rej) => { resolve = res; reject = rej; });+ return { promise, resolve, reject };+}++function driverStatus(version = oldVersion, macos = false): ComputerDriverStatus {+ return {+ installed: true, version, executablePath: 'cua-driver', daemonRunning: true,+ installCommand: 'noop', docsUrl: 'https://example.invalid/docs',+ permissionState: {+ platform: macos ? 'macos' : 'windows', required: macos, canGrant: macos,+ status: macos ? 'granted' : 'not_required',+ accessibility: 'granted', screenRecording: 'granted', screenRecordingCapturable: 'granted',+ },+ };+}++const offer: ComputerDriverUpdateCheck = {+ currentVersion: '0.33.0', latestVersion: '0.33.1', updateAvailable: true, updating: false,+};+const upToDate: ComputerDriverUpdateCheck = {+ ...offer, currentVersion: '0.33.1', updateAvailable: false,+};+function installed(macos = false): ComputerDriverInstallResult {+ return { ok: true, stdout: '', stderr: '', status: driverStatus(newVersion, macos) };+}++function installApi(macos = false) {+ const computer = {+ status: vi.fn<(...args: unknown[]) => Promise<ComputerDriverStatus>>()+ .mockResolvedValue(driverStatus(oldVersion, macos)),+ checkUpdate: vi.fn().mockResolvedValueOnce(offer).mockResolvedValue(upToDate),+ updateDriver: vi.fn().mockResolvedValue(installed(macos)),+ onPermissionGuideStatusChanged: vi.fn(() => () => {}),+ onPermissionGuideCancelled: vi.fn(() => () => {}),+ onUpdateProgress: vi.fn(() => () => {}),+ cancelPermissionGrant: vi.fn(async () => {}),+ };+ const setEnabled = vi.fn(async () => ({ codexMcpRefreshed: true }));+ const getState = vi.fn(async (pluginId: string) => ({ effectiveEnabled: pluginId === 'computer' }));+ Object.defineProperty(window, 'electronAPI', {+ configurable: true,+ value: {+ platform: macos ? 'darwin' : 'win32',+ maker: {+ plugins: {+ getState,+ setEnabled,+ },+ browser: { status: vi.fn(async () => ({ detected: false })) },+ computer,+ android: { getConfig: vi.fn(async () => ({ value: {} })) },+ },+ },+ });+ return { computer, setEnabled, getState };+}++async function clickUpdate() {+ fireEvent.click(await screen.findByRole('button', { name: `${updateKey}.action` }));+}++afterEach(() => {+ cleanup();+ Reflect.deleteProperty(window, 'electronAPI');+ vi.clearAllMocks();+});++describe('ComputerUseSection driver update completion', () => {+ it.each(['response', 'rejection'])('labels a retained offer after a failed recheck (%s)', async (failure) => {+ const { computer } = installApi();+ render(<ComputerUseSection />);+ await screen.findByText(`${updateKey}.available: ${newVersion}`);+ if (failure === 'response') computer.checkUpdate.mockResolvedValue({ ...offer, checkStatus: 'error' });+ else computer.checkUpdate.mockRejectedValue(new Error('offline'));+ fireEvent.click(screen.getByRole('button', { name: `${updateKey}.check` }));+ await screen.findByText(`${updateKey}.checkFailed`);+ expect(screen.getByText(`${updateKey}.previouslyAvailable: ${newVersion}`)).toBeTruthy();+ expect(screen.queryByText(`${updateKey}.available: ${newVersion}`)).toBeNull();+ expect((screen.getByRole('button', { name: `${updateKey}.action` }) as HTMLButtonElement).disabled).toBe(false);+ expect(screen.getByRole('button', { name: `${updateKey}.retry` })).toBeTruthy();+ });++ it('finishes local permission recovery even when the post-install network check is slow', async () => {+ const { computer, setEnabled } = installApi(true);+ const check = deferred<ComputerDriverUpdateCheck>();+ render(<ComputerUseSection />);+ await screen.findByText(`${updateKey}.available: ${newVersion}`);+ computer.checkUpdate.mockReturnValue(check.promise);+ computer.status.mockRejectedValue(new Error('permission probe unavailable'));+ await clickUpdate();+ await waitFor(() => expect(setEnabled).toHaveBeenCalledWith('computer', false));+ expect(computer.status).toHaveBeenCalledWith({ forcePermissionProbe: true, freshPermissionProbe: true });+ expect(toast.warning).toHaveBeenCalledWith('settings.computerUse.directControl.toast.permissionPending');+ await screen.findByText(`${updateKey}.checking`);+ expect(screen.getByText(`${versionKey}: ${newVersion}`)).toBeTruthy();+ expect(screen.queryByText(`${updateKey}.updating`)).toBeNull();+ await act(async () => { check.resolve(upToDate); });+ });++ it('distinguishes reading the local version from checking for updates and shows the final result', async () => {+ const { computer } = installApi();+ const status = deferred<ComputerDriverStatus>();+ const check = deferred<ComputerDriverUpdateCheck>();+ computer.status.mockReturnValue(status.promise);+ computer.checkUpdate.mockReset().mockReturnValue(check.promise);+ render(<ComputerUseSection />);+ await screen.findByText(`${updateKey}.readingVersion`);+ expect(computer.checkUpdate).not.toHaveBeenCalled();+ await act(async () => { status.resolve(driverStatus()); });+ await screen.findByText(`${updateKey}.checking`);+ expect(screen.queryByText(`${updateKey}.upToDate`)).toBeNull();+ expect((screen.getByRole('button', { name: `${updateKey}.check` }) as HTMLButtonElement).disabled).toBe(true);+ await act(async () => { check.resolve({ ...upToDate, checkStatus: 'success', checkedAt: Date.now() }); });+ await screen.findByText(`${updateKey}.upToDate`);+ expect(screen.getByText(new RegExp(`${updateKey}.lastChecked:`))).toBeTruthy();+ expect(screen.queryByText(`${updateKey}.checking`)).toBeNull();+ });++ it.each(['response', 'rejection'])('shows a failed check and lets retry bypass the cache (%s)', async (failure) => {+ const { computer } = installApi();+ computer.checkUpdate.mockReset();+ if (failure === 'response') {+ computer.checkUpdate.mockResolvedValueOnce({ ...offer, latestVersion: null, updateAvailable: false, checkStatus: 'error' });+ } else {+ computer.checkUpdate.mockRejectedValueOnce(new Error('offline'));+ }+ const retry = deferred<ComputerDriverUpdateCheck>();+ computer.checkUpdate.mockReturnValue(retry.promise);+ render(<ComputerUseSection />);+ await screen.findByText(`${updateKey}.checkFailed`);+ expect(screen.queryByText(`${updateKey}.upToDate`)).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: `${updateKey}.retry` }));+ expect(computer.checkUpdate).toHaveBeenLastCalledWith({ force: true });+ await screen.findByText(`${updateKey}.checking`);+ await act(async () => { retry.resolve(offer); });+ await screen.findByText(`${updateKey}.available: ${newVersion}`);+ expect(screen.queryByText(`${updateKey}.checkFailed`)).toBeNull();+ });++ it('keeps manual checking available when up to date and displays a newly found update', async () => {+ const { computer } = installApi();+ computer.checkUpdate.mockReset().mockResolvedValueOnce(upToDate).mockResolvedValue(offer);+ render(<ComputerUseSection />);+ await screen.findByText(`${updateKey}.upToDate`);+ fireEvent.click(screen.getByRole('button', { name: `${updateKey}.check` }));+ await screen.findByText(`${updateKey}.available: ${newVersion}`);+ expect(computer.checkUpdate).toHaveBeenLastCalledWith({ force: true });+ });++ it('still joins an update when opt-in loading changes the callback during its check', async () => {+ const { computer, getState } = installApi();+ const optIn = deferred<{ effectiveEnabled: boolean }>();+ const check = deferred<ComputerDriverUpdateCheck>();+ getState.mockImplementation((pluginId) => pluginId === 'computer'+ ? optIn.promise : Promise.resolve({ effectiveEnabled: false }));+ computer.checkUpdate.mockReset().mockReturnValue(check.promise);+ render(<ComputerUseSection />);+ await waitFor(() => expect(computer.checkUpdate).toHaveBeenCalledOnce());+ await act(async () => { optIn.resolve({ effectiveEnabled: true }); });+ computer.checkUpdate.mockResolvedValue(upToDate);+ await act(async () => { check.resolve({ ...offer, updating: true }); });+ await screen.findByText(`${versionKey}: ${newVersion}`);+ expect(computer.updateDriver).toHaveBeenCalledExactlyOnceWith({ joinOnly: true });+ expect(screen.queryByRole('button', { name: `${updateKey}.action` })).toBeNull();+ });++ it('shows the installed version and clears the offer on success', async () => {+ installApi();+ render(<ComputerUseSection />);+ await clickUpdate();+ await screen.findByText(`${versionKey}: ${newVersion}`);+ await waitFor(() => expect(toast.success).toHaveBeenCalledWith(`${updateKey}.toast.success`));+ expect(screen.queryByText(`${updateKey}.available: 0.33.1`)).toBeNull();+ expect(screen.queryByRole('button', { name: `${updateKey}.action` })).toBeNull();+ });++ it.each([true, false])('refreshes actual state after an installer error (binary replaced: %s)', async (replaced) => {+ const { computer } = installApi();+ computer.updateDriver.mockRejectedValue(new Error('installer cleanup failed'));+ render(<ComputerUseSection />);+ await screen.findByText(`${versionKey}: ${oldVersion}`);+ computer.status.mockResolvedValue(driverStatus(replaced ? newVersion : oldVersion));+ computer.checkUpdate.mockResolvedValue(replaced ? upToDate : offer);+ await clickUpdate();+ await waitFor(() => expect(computer.status).toHaveBeenCalledWith({ skipPermissionProbe: true }));+ await waitFor(() => expect(computer.checkUpdate).toHaveBeenCalledTimes(2));+ await screen.findByText(`${versionKey}: ${replaced ? newVersion : oldVersion}`);+ await waitFor(() => {+ const button = screen.queryByRole('button', { name: `${updateKey}.action` });+ if (replaced) expect(button).toBeNull();+ else expect((button as HTMLButtonElement).disabled).toBe(false);+ });+ expect(toast.success).not.toHaveBeenCalled();+ });++ it('publishes the new version before a slow permission check and reports its failure separately', async () => {+ const { computer, setEnabled } = installApi(true);+ const permissions = deferred<ComputerDriverStatus>();+ render(<ComputerUseSection />);+ await screen.findByText(`${versionKey}: ${oldVersion}`);+ computer.status.mockReturnValue(permissions.promise);+ await clickUpdate();+ await screen.findByText(`${versionKey}: ${newVersion}`);+ expect(screen.queryByRole('button', { name: `${updateKey}.action` })).toBeNull();+ await act(async () => { permissions.reject(new Error('permission probe failed')); });+ await waitFor(() => expect(toast.warning).toHaveBeenCalledWith(+ 'settings.computerUse.directControl.toast.permissionPending',+ ));+ expect(toast.error).not.toHaveBeenCalled();+ expect(setEnabled).toHaveBeenCalledWith('computer', false);+ expect(screen.getByText(`${versionKey}: ${newVersion}`)).toBeTruthy();+ expect(screen.queryByText(`${updateKey}.available: 0.33.1`)).toBeNull();+ });++ it('keeps the verified version when the permission probe returns an unavailable status', async () => {+ const { computer } = installApi(true);+ render(<ComputerUseSection />);+ await screen.findByText(`${versionKey}: ${oldVersion}`);+ computer.status.mockResolvedValue({+ ...driverStatus(newVersion, true), installed: false, version: null,+ permissionState: { platform: 'macos', required: true, canGrant: true, status: 'unknown' },+ });+ await clickUpdate();+ await waitFor(() => expect(toast.warning).toHaveBeenCalled());+ expect(screen.getByText(`${versionKey}: ${newVersion}`)).toBeTruthy();+ expect(toast.error).not.toHaveBeenCalled();+ });++ it.each([true, false])('joins the existing update after reopening (installer succeeds: %s)', async (succeeds) => {+ const { computer } = installApi();+ const installation = deferred<ComputerDriverInstallResult>();+ computer.updateDriver.mockReturnValue(installation.promise);+ const first = render(<ComputerUseSection />);+ await clickUpdate();+ first.unmount();+ computer.checkUpdate.mockResolvedValue({ ...offer, updating: true });+ render(<ComputerUseSection />);+ await waitFor(() => expect(computer.updateDriver).toHaveBeenLastCalledWith({ joinOnly: true }));+ computer.status.mockResolvedValue(driverStatus(newVersion));+ computer.checkUpdate.mockResolvedValue(upToDate);+ await act(async () => {+ if (succeeds) installation.resolve(installed());+ else installation.reject(new Error('installer cleanup failed'));+ });+ await screen.findByText(`${versionKey}: ${newVersion}`);+ expect(computer.updateDriver.mock.calls).toEqual([[undefined], [{ joinOnly: true }]]);+ expect(screen.queryByRole('button', { name: `${updateKey}.action` })).toBeNull();+ expect(toast.success).toHaveBeenCalledTimes(succeeds ? 1 : 0);+ expect(toast.error).toHaveBeenCalledTimes(succeeds ? 0 : 1);+ });+});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 5dd2662f22..3c4cbbf2fe 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -3966,6 +3966,15 @@"noProjectHint": "Open Settings from a project session to toggle direct computer control for that project.","update": {"available": "New version v{{version}} available. You may need to re-grant system permissions after updating.",+ "previouslyAvailable": "Previous check found v{{version}}. Availability will be verified before installing.",+ "readingVersion": "Reading version…",+ "checking": "Checking for updates…",+ "upToDate": "Up to date",+ "checkFailed": "Could not check for updates",+ "lastChecked": "Last checked {{time}}",+ "check": "Check for updates",+ "retry": "Retry",+ "notChecked": "Not checked yet","action": "Update","updating": "Updating…","downloadingPercent": "Downloading {{percent}}% ({{downloaded}}/{{total}} MB)…",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 8d80f80842..7fb8f5881b 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -3965,6 +3965,15 @@"noProjectHint": "プロジェクトのセッションから「設定」を開くと、そのプロジェクトのコンピュータ直接操作を切り替えられます。","update": {"available": "新しいバージョン v{{version}} が利用可能です。更新後、システム権限の再許可が必要になる場合があります。",+ "previouslyAvailable": "前回の確認で v{{version}} が見つかりました。インストール前に利用可能か再確認します。",+ "readingVersion": "バージョンを読み込み中…",+ "checking": "更新を確認中…",+ "upToDate": "最新バージョンです",+ "checkFailed": "更新を確認できませんでした",+ "lastChecked": "前回の確認: {{time}}",+ "check": "更新を確認",+ "retry": "再試行",+ "notChecked": "未確認","action": "更新","updating": "更新中…","downloadingPercent": "ダウンロード中 {{percent}}%({{downloaded}}/{{total}} MB)…",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 5a3ef8a751..695c7b51fa 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -3965,6 +3965,15 @@"noProjectHint": "프로젝트 세션에서 설정을 열면 해당 프로젝트의 컴퓨터 직접 제어를 전환할 수 있습니다.","update": {"available": "새 버전 v{{version}}을(를) 사용할 수 있습니다. 업데이트 후 시스템 권한을 다시 허용해야 할 수 있습니다.",+ "previouslyAvailable": "이전 확인에서 v{{version}}을(를) 찾았습니다. 설치 전에 사용 가능한지 다시 확인합니다.",+ "readingVersion": "버전 확인 중…",+ "checking": "업데이트 확인 중…",+ "upToDate": "최신 버전입니다",+ "checkFailed": "업데이트를 확인하지 못했습니다",+ "lastChecked": "마지막 확인: {{time}}",+ "check": "업데이트 확인",+ "retry": "다시 시도",+ "notChecked": "아직 확인하지 않음","action": "업데이트","updating": "업데이트 중…","downloadingPercent": "다운로드 중 {{percent}}%({{downloaded}}/{{total}} MB)…",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 38041b9eda..6e000e6689 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -3965,6 +3965,15 @@"noProjectHint": "从项目任务中打开「设置」可针对该项目开关直接电脑控制。","update": {"available": "发现新版本 v{{version}},更新后如系统权限失效需重新授权。",+ "previouslyAvailable": "上次检查发现 v{{version}},安装前会重新确认是否可用。",+ "readingVersion": "正在读取版本…",+ "checking": "正在检查更新…",+ "upToDate": "已是最新版本",+ "checkFailed": "检查更新失败",+ "lastChecked": "上次检查 {{time}}",+ "check": "检查更新",+ "retry": "重试",+ "notChecked": "尚未检查更新","action": "更新","updating": "更新中…","downloadingPercent": "正在下载 {{percent}}%({{downloaded}}/{{total}} MB)…",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 904dd2b198..7d62d9cd1e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -3965,6 +3965,15 @@"noProjectHint": "從專案任務中開啟「設定」可針對該專案開關直接電腦控制。","update": {"available": "發現新版本 v{{version}},更新後如系統權限失效需重新授權。",+ "previouslyAvailable": "上次檢查發現 v{{version}},安裝前會重新確認是否可用。",+ "readingVersion": "正在讀取版本…",+ "checking": "正在檢查更新…",+ "upToDate": "已是最新版本",+ "checkFailed": "檢查更新失敗",+ "lastChecked": "上次檢查 {{time}}",+ "check": "檢查更新",+ "retry": "重試",+ "notChecked": "尚未檢查更新","action": "更新","updating": "更新中…","downloadingPercent": "正在下載 {{percent}}%({{downloaded}}/{{total}} MB)…",diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex f090c84928..2432dc2da3 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -425,6 +425,8 @@ interface ComputerDriverUpdateCheck {latestVersion: string | null;updateAvailable: boolean;updating: boolean;+ checkStatus?: 'success' | 'error';+ checkedAt?: number;}interface ComputerDriverUpdateProgress {@@ -7103,7 +7105,7 @@ interface ElectronAPI {onPermissionGuideStatusChanged: (callback: (status: ComputerDriverStatus) => void,) => () => void;- checkUpdate: () => Promise<ComputerDriverUpdateCheck>;+ checkUpdate: (options?: { force?: boolean }) => Promise<ComputerDriverUpdateCheck>;updateDriver: (opts?: { joinOnly?: boolean }) => Promise<ComputerDriverInstallResult>;onUpdateProgress: (callback: (progress: ComputerDriverUpdateProgress) => void) => () => void;};