Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(remote-desktop): 侧栏远程桌面检查在连接恢复后自动重查 (#5513)

Dash05486b31cfe1
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
index 8be0f41a9f..6db9112294 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, type ReactNode } from 'react';
+import { useEffect, useRef, useState, type MutableRefObject, type ReactNode } from 'react';
import { LoaderCircle, Monitor, MonitorOff } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { SIDEBAR_RAIL_ICON_BUTTON_CLASS } from '@/components/sidebar/SidebarIconButton';
@@ -7,9 +7,26 @@ import { cn } from '@/lib/utils';
import { toast } from '@/lib/toast';
import { useRemoteDesktopAvailability } from '@/features/remote-desktop/useRemoteDesktopAvailability';
-function RemoteDesktopShortcut({ deviceId, name }: { deviceId: string; name: string }) {
+function RemoteDesktopShortcut({
+ deviceId,
+ name,
+ revealRef,
+}: {
+ deviceId: string;
+ name: string;
+ revealRef: MutableRefObject<(() => void) | null>;
+}) {
const { t } = useTranslation();
const availability = useRemoteDesktopAvailability(deviceId);
+ // The shortcut is only visible while its row is hovered or focused, so an
+ // interrupted check is repeated exactly when the user is about to read it.
+ const { retryable, retry } = availability;
+ useEffect(() => {
+ revealRef.current = retryable ? retry : null;
+ return () => {
+ revealRef.current = null;
+ };
+ }, [revealRef, retryable, retry]);
const [opening, setOpening] = useState(false);
const openingRef = useRef(false);
const generation = useRef(0);
@@ -95,10 +112,16 @@ export function DeviceSectionHeader({
name: string;
children: ReactNode;
}) {
+ const revealRef = useRef<(() => void) | null>(null);
+ const reveal = () => revealRef.current?.();
return (
- <div className="group/device-header flex min-w-0 items-center gap-1">
+ <div
+ className="group/device-header flex min-w-0 items-center gap-1"
+ onMouseEnter={reveal}
+ onFocus={reveal}
+ >
{children}
- {deviceId && <RemoteDesktopShortcut deviceId={deviceId} name={name} />}
+ {deviceId && <RemoteDesktopShortcut deviceId={deviceId} name={name} revealRef={revealRef} />}
</div>
);
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/DeviceSectionHeader.test.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/DeviceSectionHeader.test.tsx
index 6c12c49fca..36ae061fbd 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/DeviceSectionHeader.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/DeviceSectionHeader.test.tsx
@@ -4,6 +4,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import { REMOTE_DESKTOP_CHANNEL } from '@cindy/device-link';
import i18n from '@/i18n';
import { revokedDevicesStore } from '@/features/device-link/revokedDevicesStore';
+import { unresponsiveDevicesStore } from '@/features/device-link/unresponsiveDevicesStore';
import { toast } from '@/lib/toast';
import { DeviceSectionHeader } from '../DeviceSectionHeader';
@@ -41,6 +42,7 @@ beforeEach(async () => {
vi.useFakeTimers();
vi.clearAllMocks();
revokedDevicesStore.clearAll();
+ unresponsiveDevicesStore.clearAll();
fixture.devices = [device()];
invoke.mockReset().mockResolvedValue(capabilities);
open.mockReset().mockResolvedValue(undefined);
@@ -50,6 +52,7 @@ beforeEach(async () => {
afterEach(() => {
cleanup();
revokedDevicesStore.clearAll();
+ unresponsiveDevicesStore.clearAll();
vi.restoreAllMocks();
vi.useRealTimers();
});
@@ -186,6 +189,90 @@ it.each(['CHANNEL_NOT_ALLOWED', 'ACCESS_REVOKED', 'INVOKE_TIMEOUT'])(
},
);
+it.each([
+ '[DEVICE_LINK_TIMEOUT] no invoke-result within 12000ms',
+ '[DEVICE_LINK_NOT_CONNECTED] link not open',
+ '[DEVICE_LINK_BUSY] backpressure',
+ '[DEVICE_LINK_DEVICE_UNRESPONSIVE] target device remote is unresponsive (circuit open)',
+])('checks again automatically when an interrupted probe is revealed: %s', async (message) => {
+ invoke.mockRejectedValueOnce(new Error(message));
+ render(header());
+ await act(async () => {});
+ const action = screen.getByRole('button', {
+ name: i18n.t('remoteDesktop.shortcut.unavailable', {
+ reason: i18n.t('remoteDesktop.shortcut.checkInterrupted'),
+ }),
+ });
+ expect(invoke).toHaveBeenCalledOnce();
+ await hover();
+ expect(invoke).toHaveBeenCalledTimes(2);
+ expect(screen.getByRole('button', { name: 'Open remote desktop' })).toBe(action);
+ expect(toast.info).not.toHaveBeenCalled();
+ expect(open).not.toHaveBeenCalled();
+});
+
+it('rechecks an interrupted probe on keyboard focus and keeps retrying while it stays interrupted', async () => {
+ invoke.mockRejectedValue(new Error('[DEVICE_LINK_TIMEOUT] no invoke-result within 12000ms'));
+ render(header());
+ await act(async () => {});
+ act(() => screen.getByRole('button', { name: 'Machine' }).focus());
+ await act(async () => {});
+ expect(invoke).toHaveBeenCalledTimes(2);
+ fireEvent.mouseLeave(row());
+ await hover();
+ expect(invoke).toHaveBeenCalledTimes(3);
+ invoke.mockResolvedValue(capabilities);
+ fireEvent.mouseLeave(row());
+ await hover();
+ expect(invoke).toHaveBeenCalledTimes(4);
+ expect(screen.getByRole('button', { name: 'Open remote desktop' })).toBeTruthy();
+ fireEvent.mouseLeave(row());
+ await hover();
+ expect(invoke).toHaveBeenCalledTimes(4);
+});
+
+it('reports a relay offline reply as offline and checks again when revealed', async () => {
+ invoke.mockRejectedValueOnce(new Error('[DEVICE_LINK_DEVICE_OFFLINE] target device is offline'));
+ render(header());
+ await act(async () => {});
+ expect(
+ screen.getByRole('button', { name: /^Remote desktop unavailable:/ }).getAttribute('aria-label'),
+ ).toContain('This computer is offline.');
+ await hover();
+ expect(invoke).toHaveBeenCalledTimes(2);
+ expect(screen.getByRole('button', { name: 'Open remote desktop' })).toBeTruthy();
+});
+
+it('does not recheck a definitive failure on hover', async () => {
+ invoke.mockResolvedValue({ ...capabilities, enabled: false });
+ render(header());
+ await act(async () => {});
+ await hover();
+ fireEvent.mouseLeave(row());
+ await hover();
+ unavailable();
+ expect(invoke).toHaveBeenCalledOnce();
+});
+
+it('waits for an unresponsive device to recover, then checks automatically', async () => {
+ invoke.mockRejectedValueOnce(
+ new Error('[DEVICE_LINK_DEVICE_UNRESPONSIVE] target device remote is unresponsive'),
+ );
+ render(header());
+ await act(async () => {});
+ expect(invoke).toHaveBeenCalledOnce();
+ act(() => unresponsiveDevicesStore.apply('remote', true));
+ await hover();
+ expect(unavailable().getAttribute('aria-label')).toContain(
+ i18n.t('remoteDesktop.shortcut.unresponsive'),
+ );
+ expect(invoke).toHaveBeenCalledOnce();
+ act(() => unresponsiveDevicesStore.apply('remote', false));
+ await act(async () => {});
+ expect(invoke).toHaveBeenCalledTimes(2);
+ expect(screen.getByRole('button', { name: 'Open remote desktop' })).toBeTruthy();
+});
+
it('remembers the automatic check across pointer re-entry without polling', async () => {
render(header());
fireEvent.mouseEnter(row());
diff --git a/apps/desktop/src/renderer/features/remote-desktop/useRemoteDesktopAvailability.ts b/apps/desktop/src/renderer/features/remote-desktop/useRemoteDesktopAvailability.ts
index b1761ba1c1..ef432c7a8c 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/useRemoteDesktopAvailability.ts
+++ b/apps/desktop/src/renderer/features/remote-desktop/useRemoteDesktopAvailability.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState, useSyncExternalStore } from 'react';
+import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from 'react';
import { REMOTE_DESKTOP_CHANNEL, type RemoteDesktopCapabilities } from '@cindy/device-link';
import { isMobilePlatform } from '@cindy/maker-shared/device-list';
import { extractIpcError } from '@/utils/ipcError';
@@ -7,6 +7,14 @@ import {
useDeviceLinkDeviceListRequestState,
} from '@/features/device-link/useDeviceLinkDeviceList';
import { revokedDevicesStore } from '@/features/device-link/revokedDevicesStore';
+import { unresponsiveDevicesStore } from '@/features/device-link/unresponsiveDevicesStore';
+import { isTransientRemoteError } from '@/features/device-link/refreshRemoteSessions';
+
+const CHECK_INTERRUPTED = 'remoteDesktop.shortcut.checkInterrupted';
+const OFFLINE = 'remoteDesktop.shortcut.offline';
+// Probe outcomes that may change without a presence edge: repeat them when the
+// shortcut is revealed instead of keeping a stale failure.
+const RETRYABLE_PROBE_REASONS = new Set([CHECK_INTERRUPTED, OFFLINE]);
export function remoteDesktopUnavailableReason(value: unknown): string | null {
if (!value || typeof value !== 'object' || Array.isArray(value))
@@ -46,7 +54,15 @@ export function remoteDesktopAvailabilityError(error: unknown): string {
if (code.includes('REMOTE_DISABLED')) return 'remoteDesktop.remoteDisabled';
if (code.includes('CHANNEL_NOT_ALLOWED')) return 'remoteDesktop.upgrade';
if (code.includes('DESKTOP_DISABLED')) return 'remoteDesktop.disabled';
- if (code.includes('PEER_OFFLINE')) return 'remoteDesktop.shortcut.offline';
+ if (code.includes('PEER_OFFLINE') || code.includes('DEVICE_OFFLINE')) return OFFLINE;
+ // A link that is reconnecting, congested or behind an open circuit says
+ // nothing about the remote desktop itself; the user can check again.
+ if (
+ isTransientRemoteError(code) ||
+ code.includes('DEVICE_UNRESPONSIVE') ||
+ code.includes('DEVICE_LINK_BUSY')
+ )
+ return CHECK_INTERRUPTED;
return 'remoteDesktop.shortcut.checkFailed';
}
@@ -57,6 +73,10 @@ export function useRemoteDesktopAvailability(deviceId: string) {
revokedDevicesStore.subscribe,
revokedDevicesStore.getSnapshot,
);
+ const unresponsive = useSyncExternalStore(
+ unresponsiveDevicesStore.subscribe,
+ unresponsiveDevicesStore.getSnapshot,
+ );
const device = devices?.find((entry) => entry.deviceId === deviceId);
const denied = revoked.has(deviceId);
const blockedReason = denied
@@ -73,15 +93,20 @@ export function useRemoteDesktopAvailability(deviceId: string) {
? 'remoteDesktop.shortcut.controlDisabled'
: !device.remoteControlEnabled
? 'remoteDesktop.remoteDisabled'
- : null;
- // Presence/permission changes invalidate a check; hover and directory object
- // refreshes do not. Keep this scoped to the mounted device row, not disk.
+ : unresponsive.has(deviceId)
+ ? 'remoteDesktop.shortcut.unresponsive'
+ : null;
+ // Presence/permission/responsiveness changes invalidate a check; hover and
+ // directory object refreshes do not, except that `retry` repeats a probe the
+ // link interrupted. Keep this scoped to the mounted device row, not disk.
const present = !!device;
const version = device?.appVersion;
const platform = device?.platform;
+ const [attempt, setAttempt] = useState(0);
+ const retry = useCallback(() => setAttempt((value) => value + 1), []);
const scope = useMemo(
- () => ({ deviceId, present, blockedReason, version, platform }),
- [deviceId, present, blockedReason, version, platform],
+ () => ({ deviceId, present, blockedReason, version, platform, attempt }),
+ [deviceId, present, blockedReason, version, platform, attempt],
);
const [checked, setChecked] = useState<{ scope: typeof scope; reason: string | null } | null>(
null,
@@ -115,6 +140,11 @@ export function useRemoteDesktopAvailability(deviceId: string) {
checking: !reason && checked?.scope !== scope,
available: !blockedReason && checked?.scope === scope && checked.reason === null,
reason,
+ retryable:
+ !blockedReason &&
+ checked?.scope === scope &&
+ RETRYABLE_PROBE_REASONS.has(checked.reason ?? ''),
+ retry,
markUnavailable: (error: unknown) => {
setChecked({ scope, reason: remoteDesktopAvailabilityError(error) });
},
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 133f768152..f463e22a2f 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -292,6 +292,8 @@
"controlDisabled": "On the remote computer, open Cindy Settings → Remote control and allow control of this computer.",
"unsupported": "This device does not support remote desktop.",
"checkFailed": "Could not check this computer. Check its network connection.",
+ "checkInterrupted": "Couldn’t confirm this computer’s status just now. It will be checked again the next time you view it.",
+ "unresponsive": "This computer isn’t responding right now. It will be checked again automatically when it recovers.",
"screenRecordingRequired": "On the remote Mac, open System Settings → Privacy & Security and allow screen recording for Cindy. Reopen Cindy if prompted.",
"noDisplay": "No available display on this computer."
},
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 733df90322..31d1577a89 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -292,6 +292,8 @@
"controlDisabled": "接続先コンピュータの Cindy の設定 → リモートコントロールで、このコンピュータの操作を許可してください。",
"unsupported": "このデバイスはリモートデスクトップに対応していません。",
"checkFailed": "コンピュータの状態を確認できません。接続先のネットワーク接続を確認してください。",
+ "checkInterrupted": "現在コンピュータの状態を確認できませんでした。次に表示したときに自動的に再確認します。",
+ "unresponsive": "このコンピュータは現在応答していません。復旧すると自動的に再確認します。",
"screenRecordingRequired": "接続先 Mac のシステム設定 → プライバシーとセキュリティで、Cindy の画面収録を許可してください。求められた場合は Cindy を開き直してください。",
"noDisplay": "このコンピュータに利用可能なディスプレイがありません。"
},
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 5d5b278023..6134a8ec92 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -292,6 +292,8 @@
"controlDisabled": "원격 컴퓨터의 Cindy 설정 → 원격 제어에서 이 컴퓨터의 제어를 허용하세요.",
"unsupported": "이 기기는 원격 데스크톱을 지원하지 않습니다.",
"checkFailed": "컴퓨터 상태를 확인하지 못했습니다. 해당 컴퓨터의 네트워크 연결을 확인하세요.",
+ "checkInterrupted": "지금은 컴퓨터 상태를 확인하지 못했습니다. 다음에 표시할 때 자동으로 다시 확인합니다.",
+ "unresponsive": "이 컴퓨터가 현재 응답하지 않습니다. 복구되면 자동으로 다시 확인합니다.",
"screenRecordingRequired": "원격 Mac의 시스템 설정 → 개인정보 보호 및 보안에서 Cindy의 화면 기록을 허용하세요. 요청이 표시되면 Cindy를 다시 여세요.",
"noDisplay": "이 컴퓨터에 사용 가능한 디스플레이가 없습니다."
},
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 11be90d20f..55a1c2dca9 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -292,6 +292,8 @@
"controlDisabled": "请在远程电脑的 Cindy 设置 → 远程控制中,允许控制这台电脑。",
"unsupported": "此设备不支持远程桌面。",
"checkFailed": "未能确认电脑状态,请检查这台电脑的网络连接。",
+ "checkInterrupted": "暂时没能确认电脑状态,再次查看时会自动重新检查。",
+ "unresponsive": "这台电脑暂时没有响应,恢复后会自动重新检查。",
"screenRecordingRequired": "请在远程 Mac 的系统设置 → 隐私与安全性中,为 Cindy 开启屏幕录制权限。如果系统要求,请重新打开 Cindy。",
"noDisplay": "这台电脑没有可用的显示器。"
},
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index fecfe4a80d..dcbd120163 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -292,6 +292,8 @@
"controlDisabled": "請在遠端電腦的 Cindy 設定 → 遠端控制中,允許控制這台電腦。",
"unsupported": "此裝置不支援遠端桌面。",
"checkFailed": "無法確認電腦狀態,請檢查這台電腦的網路連線。",
+ "checkInterrupted": "暫時無法確認電腦狀態,再次查看時會自動重新檢查。",
+ "unresponsive": "這台電腦暫時沒有回應,恢復後會自動重新檢查。",
"screenRecordingRequired": "請在遠端 Mac 的系統設定 → 隱私權與安全性中,為 Cindy 啟用螢幕錄製權限。如果系統要求,請重新開啟 Cindy。",
"noDisplay": "這台電腦沒有可用的顯示器。"
},