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(device-link): show device versions and confirm online removal

zqchris7efa76c3c6a5
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index f8616a0ba6..a9ef52cdbe 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -4561,7 +4561,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
keepAwake: boolean;
linkStatus: 'stopped' | 'connecting' | 'online';
connectionIssue: {
- kind: 'auth-failed' | 'replaced' | 'too-many-connections' | 'version-mismatch' | 'unstable';
+ kind: 'auth-failed' | 'device-removed' | 'replaced' | 'too-many-connections' | 'version-mismatch' | 'unstable';
closeCode?: number;
detail?: string;
at: number;
diff --git a/apps/desktop/src/renderer/__tests__/deviceLinkDeviceListLoading.test.tsx b/apps/desktop/src/renderer/__tests__/deviceLinkDeviceListLoading.test.tsx
index d983d1ce01..d0ddcef6d3 100644
--- a/apps/desktop/src/renderer/__tests__/deviceLinkDeviceListLoading.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/deviceLinkDeviceListLoading.test.tsx
@@ -998,3 +998,26 @@ describe('useDeviceLinkDeviceList initial request', () => {
expect(result.current.hasRemote).toBe(false);
});
});
+
+
+it('removes an offline device immediately and ignores a directory reply started before deletion', async () => {
+ const target = { deviceId: 'old-device', name: 'Old Mac', platform: 'darwin', appVersion: '0.1.0-dev',
+ online: false, busy: false, remoteControlEnabled: false, controlEnabled: true, isSelf: false, lastSeenAt: null,
+ } satisfies DeviceLinkDeviceView;
+ let resolveStale!: (value: { devices: DeviceLinkDeviceView[] }) => void;
+ const stale = new Promise<{ devices: DeviceLinkDeviceView[] }>(resolve => { resolveStale = resolve; });
+ const listDevices = vi.fn().mockResolvedValueOnce({ devices: [target] }).mockReturnValueOnce(stale).mockResolvedValue({ devices: [] });
+ vi.stubGlobal('electronAPI', { deviceLink: { listDevices, getState: vi.fn().mockResolvedValue({ linkStatus: 'online' }),
+ onPresenceChanged: vi.fn(), onStatusChanged: vi.fn(), onControlTargetChanged: vi.fn(),
+ } });
+ const { useDeviceLinkDeviceList, retryDeviceLinkDeviceList, removeDeviceLinkDevice } = await import('@/features/device-link/useDeviceLinkDeviceList');
+ const { result, unmount } = renderHook(() => useDeviceLinkDeviceList());
+ await waitFor(() => expect(result.current?.[0]?.deviceId).toBe(target.deviceId));
+ act(() => retryDeviceLinkDeviceList());
+ await waitFor(() => expect(listDevices).toHaveBeenCalledTimes(2));
+ await act(async () => { removeDeviceLinkDevice(target.deviceId); });
+ expect(result.current).toEqual([]);
+ await act(async () => { resolveStale({ devices: [target] }); });
+ expect(result.current).toEqual([]);
+ unmount();
+});
diff --git a/apps/desktop/src/renderer/__tests__/myDevicesPanel.test.ts b/apps/desktop/src/renderer/__tests__/myDevicesPanel.test.ts
index 329e614510..6490c49b26 100644
--- a/apps/desktop/src/renderer/__tests__/myDevicesPanel.test.ts
+++ b/apps/desktop/src/renderer/__tests__/myDevicesPanel.test.ts
@@ -2,7 +2,7 @@
import { readFileSync } from 'node:fs';
import { resolve } from 'node:path';
-import { act, cleanup, render } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react';
import { createElement } from 'react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -26,7 +26,7 @@ describe('MyDevicesPanel rename guards', () => {
});
});
-function device(deviceId: string, name: string, isSelf = false) {
+function device(deviceId: string, name: string, isSelf = false): DeviceLinkDeviceView {
return {
deviceId,
name,
@@ -41,6 +41,31 @@ function device(deviceId: string, name: string, isSelf = false) {
};
}
+describe('MyDevicesPanel device identity', () => {
+ afterEach(cleanup);
+
+ it('shows the reported versions and complete identities of same-name devices', () => {
+ const s = settings();
+ s.devices = [
+ { ...device('self', 'Mac Studio', true), appVersion: '0.1.76' },
+ { ...device('release-device', 'Mac Studio'), appVersion: '0.1.75' },
+ { ...device('dev-dev-0123456789abcdef0123456789abcdef', 'Mac Studio'), appVersion: '0.1.76-beta.2' },
+ { ...device('legacy', 'iPhone'), appVersion: null },
+ ];
+ render(createElement(MyDevicesPanel, { s }));
+
+ for (const d of s.devices) {
+ const row = document.querySelector(`[data-device-id="${d.deviceId}"]`);
+ expect(row?.textContent).toContain(d.deviceId);
+ if (d.appVersion) expect(row?.textContent).toContain(`Cindy ${d.appVersion}`);
+ else {
+ expect(row?.textContent).not.toContain('Cindy null');
+ expect(row?.textContent).not.toContain('Cindy undefined');
+ }
+ }
+ });
+});
+
function settings(): DeviceLinkSettings {
const noop = vi.fn(async () => undefined);
return {
@@ -173,3 +198,52 @@ describe('MyDevicesPanel device focus deep link', () => {
expect(scrollIntoView).not.toHaveBeenCalled();
});
});
+
+
+describe('MyDevicesPanel removal confirmation', () => {
+ afterEach(cleanup);
+ const deleteButton = () => within(document.querySelector('[data-device-id="phone-1"]') as HTMLElement).getByRole('button', { name: 'settings.devices.delete' });
+
+ it('allows an online device to be removed only after confirmation', async () => {
+ const s = settings();
+ s.devices![1].online = true;
+ render(createElement(MyDevicesPanel, { s }));
+ expect(deleteButton().hasAttribute('disabled')).toBe(false);
+ fireEvent.click(deleteButton());
+ expect(s.remove).not.toHaveBeenCalled();
+ const dialog = screen.getByRole('alertdialog');
+ expect(dialog.textContent).toContain('settings.devices.deleteMessage');
+ await act(async () => fireEvent.click(within(dialog).getByRole('button', { name: 'settings.devices.delete' })));
+ expect(s.remove).toHaveBeenCalledExactlyOnceWith('phone-1');
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ });
+
+ it('cancels without deleting and keeps a failed deletion available for retry', async () => {
+ const s = settings();
+ s.remove = vi.fn(async () => false);
+ render(createElement(MyDevicesPanel, { s }));
+ fireEvent.click(deleteButton());
+ fireEvent.click(screen.getByRole('button', { name: 'commonUi.confirmDialog.cancel' }));
+ expect(s.remove).not.toHaveBeenCalled();
+ fireEvent.click(deleteButton());
+ await act(async () => fireEvent.click(within(screen.getByRole('alertdialog')).getByRole('button', { name: 'settings.devices.delete' })));
+ expect(s.remove).toHaveBeenCalledExactlyOnceWith('phone-1');
+ expect(screen.getByRole('alertdialog')).toBeTruthy();
+ });
+
+ it('does not submit twice or dismiss while deletion is in flight', async () => {
+ const s = settings();
+ let finish!: (value: boolean) => void;
+ s.remove = vi.fn(() => new Promise<boolean>((resolve) => { finish = resolve; }));
+ render(createElement(MyDevicesPanel, { s }));
+ fireEvent.click(deleteButton());
+ const confirm = within(screen.getByRole('alertdialog')).getByRole('button', { name: 'settings.devices.delete' });
+ fireEvent.click(confirm);
+ fireEvent.click(confirm);
+ fireEvent.keyDown(screen.getByRole('alertdialog'), { key: 'Escape' });
+ expect(s.remove).toHaveBeenCalledExactlyOnceWith('phone-1');
+ expect(screen.getByRole('alertdialog')).toBeTruthy();
+ await act(async () => finish(true));
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx b/apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx
index 1cdf68f957..f847462883 100644
--- a/apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx
+++ b/apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx
@@ -27,6 +27,7 @@ import { RefreshCw, Pencil, Trash2, Check, X, Monitor } from 'lucide-react';
import { toast } from '@/lib/toast';
import { Switch } from '@/components/ui/switch';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
import type { DeviceLinkSettings } from '@/hooks/useDeviceLinkSettings';
import { revokedDevicesStore } from '@/features/device-link/revokedDevicesStore';
import { compareDevicesByName } from '@/features/device-link/deviceSort';
@@ -82,6 +83,7 @@ function deviceSubtitle(
): string {
const parts = [
platformLabel(device.platform),
+ device.appVersion?.trim() ? `Cindy ${device.appVersion.trim()}` : null,
hardwareLabel(device.deviceInfo),
memoryLabel(device.deviceInfo?.memoryGb),
opts.statusOverride ?? deviceStatusLabel(device, t),
@@ -199,6 +201,9 @@ export function MyDevicesPanel({
const { t } = useTranslation();
const [editingId, setEditingId] = useState<string | null>(null);
const [editingName, setEditingName] = useState('');
+ const [deleteTarget, setDeleteTarget] = useState<DeviceLinkDeviceView | null>(null);
+ const [deleting, setDeleting] = useState(false);
+ const deletePending = useRef(false);
// 被对方撤销了本机访问权限的设备(控制端内存推导)。
const revokedByPeer = useSyncExternalStore(
revokedDevicesStore.subscribe,
@@ -255,8 +260,20 @@ export function MyDevicesPanel({
// 失败,故必须看返回值)。否则若删的是被对方撤销过的设备,切换栏的 buildSwitcherDevices 仍会拿
// revoked id 单独撑起一颗陈旧 rejected chip,直到登出 / 停服才消失;而删除失败时清掉则会错误地
// 抹掉一台仍存在、仍被撤销的设备的被拒状态。
- const handleDelete = async (deviceId: string) => {
- if (await s.remove(deviceId)) revokedDevicesStore.clearRevoked(deviceId);
+ const handleDelete = async () => {
+ if (!deleteTarget || deletePending.current) return;
+ const { deviceId } = deleteTarget;
+ deletePending.current = true;
+ setDeleting(true);
+ try {
+ if (await s.remove(deviceId)) {
+ revokedDevicesStore.clearRevoked(deviceId);
+ setDeleteTarget(null);
+ }
+ } finally {
+ deletePending.current = false;
+ setDeleting(false);
+ }
};
const cardClass = 'rounded-xl border border-[var(--border-default)] px-4 py-3';
@@ -345,6 +362,11 @@ export function MyDevicesPanel({
})
: `${t('settings.devices.thisDevice')} · ${t(`settings.devices.linkStatus.${s.linkStatus}`)}`}
</span>
+ {self ? (
+ <span className="break-all text-11 text-[var(--text-tertiary)]">
+ {self.deviceId}
+ </span>
+ ) : null}
{activeConnectionIssue ? (
<span className="text-11 text-[var(--error-fg)]">
{t(`settings.devices.connectionIssue.${activeConnectionIssue.kind}`)}
@@ -461,9 +483,12 @@ export function MyDevicesPanel({
{d.name}
</span>
)}
- <span className="truncate text-11 text-[var(--text-tertiary)]">
+ <span className="break-words text-11 text-[var(--text-tertiary)]">
{deviceSubtitle(d, t, { isControlling })}
</span>
+ <span className="break-all text-11 text-[var(--text-tertiary)]">
+ {d.deviceId}
+ </span>
</div>
{editingId !== d.deviceId && (
<div className="flex shrink-0 items-center gap-1">
@@ -488,9 +513,8 @@ export function MyDevicesPanel({
</button>
<button
type="button"
- onClick={() => void handleDelete(d.deviceId)}
- disabled={d.online}
- title={d.online ? t('settings.devices.deleteOnlineHint') : undefined}
+ onClick={() => setDeleteTarget(d)}
+ disabled={deleting}
aria-label={t('settings.devices.delete')}
className="rounded-md p-1.5 text-[var(--text-tertiary)] transition-colors hover:text-[var(--text-primary)] disabled:cursor-not-allowed disabled:opacity-40"
>
@@ -538,6 +562,19 @@ export function MyDevicesPanel({
})
)}
</ul>
+ <ConfirmDialog
+ open={deleteTarget !== null}
+ onOpenChange={(open) => {
+ if (!open && !deletePending.current) setDeleteTarget(null);
+ }}
+ presentation="standard"
+ title={t('settings.devices.deleteTitle', { name: deleteTarget?.name ?? '' })}
+ description={t('settings.devices.deleteMessage')}
+ confirmText={t('settings.devices.delete')}
+ confirmVariant="destructive"
+ loading={deleting}
+ onConfirm={() => void handleDelete()}
+ />
</div>
);
}
diff --git a/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts b/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
index dc81e84adc..5c2091780a 100644
--- a/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
+++ b/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
@@ -233,6 +233,17 @@ export function renameDeviceLinkDevice(deviceId: string, name: string): void {
subs.forEach((fn) => fn());
}
+/** Apply confirmed deletion even for an already-offline device; its presence
+ * snapshot may not otherwise trigger a directory refresh. */
+export function removeDeviceLinkDevice(deviceId: string): void {
+ loadGeneration += 1;
+ if (devices?.some(device => device.deviceId === deviceId)) {
+ devices = devices.filter(device => device.deviceId !== deviceId);
+ subs.forEach(fn => fn());
+ }
+ refreshImpl?.();
+}
+
function ensureStarted(): void {
if (started) return;
started = true;
diff --git a/apps/desktop/src/renderer/hooks/__tests__/useDeviceLinkSettings.test.tsx b/apps/desktop/src/renderer/hooks/__tests__/useDeviceLinkSettings.test.tsx
index 7433a603d1..00563c7111 100644
--- a/apps/desktop/src/renderer/hooks/__tests__/useDeviceLinkSettings.test.tsx
+++ b/apps/desktop/src/renderer/hooks/__tests__/useDeviceLinkSettings.test.tsx
@@ -6,6 +6,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
import { useDeviceLinkSettings } from '../useDeviceLinkSettings';
const translate = vi.hoisted(() => (key: string) => key);
+const effects = vi.hoisted(() => ({ removeDevice: vi.fn(), success: vi.fn(), error: vi.fn() }));
+vi.mock('@/features/device-link/remoteProjectsStore', () => ({ remoteProjectsStore: { removeDevice: effects.removeDevice } }));
+vi.mock('@/lib/toast', () => ({ toast: { success: effects.success, error: effects.error } }));
vi.mock('react-i18next', () => ({
useTranslation: () => ({ t: translate }),
@@ -94,3 +97,25 @@ describe('useDeviceLinkSettings ownership state', () => {
unmount();
});
});
+
+
+describe('useDeviceLinkSettings deletion', () => {
+ it.each(['refused', 'wrong-device', 'error', 'deleted'] as const)('clears cached remote sessions only on confirmed success: %s', async outcome => {
+ const deleteDevice = outcome === 'error' ? vi.fn().mockRejectedValue(new Error('offline'))
+ : vi.fn().mockResolvedValue({ deviceId: outcome === 'wrong-device' ? 'other' : 'target', deleted: outcome !== 'refused' });
+ const api = { deleteDevice };
+ (window as unknown as { electronAPI: { deviceLink: typeof api } }).electronAPI = { deviceLink: api };
+ const { result, unmount } = renderHook(() => useDeviceLinkSettings(false));
+ let deleted = false;
+ await act(async () => { deleted = await result.current.remove('target'); });
+ expect(deleted).toBe(outcome === 'deleted');
+ if (deleted) {
+ expect(effects.removeDevice).toHaveBeenCalledWith('target');
+ expect(effects.success).toHaveBeenCalledWith('settings.devices.toast.deleted');
+ } else {
+ expect(effects.removeDevice).not.toHaveBeenCalled();
+ expect(effects.error).toHaveBeenCalledWith('settings.devices.toast.deleteFailed');
+ }
+ unmount();
+ });
+});
diff --git a/apps/desktop/src/renderer/hooks/useDeviceLinkSettings.ts b/apps/desktop/src/renderer/hooks/useDeviceLinkSettings.ts
index fdd9a07e6d..1f6b5769e4 100644
--- a/apps/desktop/src/renderer/hooks/useDeviceLinkSettings.ts
+++ b/apps/desktop/src/renderer/hooks/useDeviceLinkSettings.ts
@@ -18,7 +18,7 @@ import { toast } from '@/lib/toast';
import { createLogger } from '@/lib/logger';
import { extractIpcError } from '@/utils/ipcError';
import { remoteProjectsStore } from '@/features/device-link/remoteProjectsStore';
-import { renameDeviceLinkDevice } from '@/features/device-link/useDeviceLinkDeviceList';
+import { renameDeviceLinkDevice, removeDeviceLinkDevice } from '@/features/device-link/useDeviceLinkDeviceList';
const log = createLogger('useDeviceLinkSettings');
@@ -80,6 +80,7 @@ export function useDeviceLinkSettings(active = true): DeviceLinkSettings {
const [listError, setListError] = useState<string | null>(null);
const [refreshing, setRefreshing] = useState(false);
const mounted = useRef(true);
+ const refreshGeneration = useRef(0);
const disabledControlDeviceIdsRef = useRef<string[]>([]);
// getState() 与 ownership push 可能乱序返回;事件版本推进后,旧快照不得覆盖新事实。
const ownershipEventVersion = useRef(0);
@@ -100,15 +101,16 @@ export function useDeviceLinkSettings(active = true): DeviceLinkSettings {
const refresh = useCallback(
async (showSpinner = false) => {
if (!active) return;
+ const generation = ++refreshGeneration.current;
if (showSpinner) setRefreshing(true);
try {
const { devices: list } = await window.electronAPI.deviceLink.listDevices();
- if (!mounted.current) return;
+ if (!mounted.current || generation !== refreshGeneration.current) return;
setDevices(list);
setListError(null);
} catch (err) {
log.warn('listDevices failed', err);
- if (!mounted.current) return;
+ if (!mounted.current || generation !== refreshGeneration.current) return;
const ipcErr = extractIpcError(err);
setListError(
ipcErr?.code === 'DEVICE_LINK_UNAVAILABLE'
@@ -227,7 +229,15 @@ export function useDeviceLinkSettings(active = true): DeviceLinkSettings {
const remove = useCallback(
async (deviceId: string): Promise<boolean> => {
try {
- await window.electronAPI.deviceLink.deleteDevice(deviceId);
+ const result = await window.electronAPI.deviceLink.deleteDevice(deviceId);
+ if (!result.deleted || result.deviceId !== deviceId) {
+ toast.error(t('settings.devices.toast.deleteFailed'));
+ return false;
+ }
+ refreshGeneration.current += 1;
+ setDevices((current) => current?.filter((device) => device.deviceId !== deviceId) ?? current);
+ remoteProjectsStore.removeDevice(deviceId);
+ removeDeviceLinkDevice(deviceId);
void refresh();
toast.success(t('settings.devices.toast.deleted'));
return true;
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 560beb2a58..24d25cd9aa 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -5144,6 +5144,7 @@
"online": "Connected"
},
"connectionIssue": {
+ "device-removed": "This device was removed from your account. Sign out and sign in again on this device.",
"auth-failed": "Sign-in expired — please sign in again",
"replaced": "Connection replaced by another instance of this device",
"too-many-connections": "Connection limit reached for this account",
@@ -5166,7 +5167,9 @@
"renameConfirm": "Confirm",
"renameCancel": "Cancel",
"delete": "Delete",
- "deleteOnlineHint": "Online devices cannot be deleted",
+ "deleteTitle": "Delete “{{name}}”?",
+ "deleteMessage": "Remove this device from your account and disconnect remote access. Its sessions and files are kept. Sign in again on that device to rejoin.",
+ "deleteOnlineHint": "This server does not yet support removing online devices. Retry after the service is upgraded.",
"error": {
"unavailable": "Device Link service is unavailable (not enabled on server or network error)",
"listFailed": "Failed to load device list"
@@ -5183,7 +5186,7 @@
"keepAwakeToggleFailed": "Failed to toggle keep awake",
"renameFailed": "Rename failed",
"deleted": "Device deleted",
- "deleteOnline": "Device is online and cannot be deleted",
+ "deleteOnline": "This server does not yet support removing online devices. Retry after the service is upgraded.",
"deleteFailed": "Delete failed",
"disconnected": "Disconnected all remote connections",
"disconnectFailed": "Failed to disconnect remote connection",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 3732815215..070764bc2f 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -5118,6 +5118,7 @@
"online": "接続済み"
},
"connectionIssue": {
+ "device-removed": "このデバイスはアカウントから削除されました。このデバイスでログアウトして再度ログインしてください。",
"auth-failed": "ログインが無効になりました。再ログインしてください",
"replaced": "同じデバイスの別の接続に置き換えられました",
"too-many-connections": "このアカウントの同時接続数が上限に達しました",
@@ -5140,7 +5141,9 @@
"renameConfirm": "確定",
"renameCancel": "キャンセル",
"delete": "削除",
- "deleteOnlineHint": "オンラインのデバイスは削除できません",
+ "deleteTitle": "「{{name}}」を削除しますか?",
+ "deleteMessage": "アカウントからこのデバイスを削除し、リモート接続を切断します。デバイス上のセッションとファイルは保持されます。再度ログインすると追加できます。",
+ "deleteOnlineHint": "現在のサーバーはオンラインのデバイス削除に未対応です。サービス更新後に再試行してください。",
"error": {
"unavailable": "デバイス連携サービスは現在利用できません(サーバー未対応またはネットワークエラー)",
"listFailed": "デバイス一覧の取得に失敗しました"
@@ -5157,7 +5160,7 @@
"keepAwakeToggleFailed": "スリープ防止の切り替えに失敗しました",
"renameFailed": "名前の変更に失敗しました",
"deleted": "デバイスを削除しました",
- "deleteOnline": "デバイスがオンラインのため削除できません",
+ "deleteOnline": "現在のサーバーはオンラインのデバイス削除に未対応です。サービス更新後に再試行してください。",
"deleteFailed": "削除に失敗しました",
"disconnected": "すべてのリモート接続を切断しました",
"disconnectFailed": "リモート接続の切断に失敗しました",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 2d58992732..e6d196353d 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -5118,6 +5118,7 @@
"online": "연결됨"
},
"connectionIssue": {
+ "device-removed": "계정에서 이 기기가 제거되었습니다. 이 기기에서 로그아웃한 후 다시 로그인하세요.",
"auth-failed": "로그인이 만료되었습니다. 다시 로그인해 주세요",
"replaced": "동일한 기기의 다른 연결로 대체되었습니다",
"too-many-connections": "이 계정의 동시 연결 수가 상한에 도달했습니다",
@@ -5140,7 +5141,9 @@
"renameConfirm": "확인",
"renameCancel": "취소",
"delete": "삭제",
- "deleteOnlineHint": "온라인 기기는 삭제할 수 없습니다",
+ "deleteTitle": "“{{name}}” 기기를 삭제할까요?",
+ "deleteMessage": "계정에서 이 기기를 제거하고 원격 연결을 끊습니다. 기기의 세션과 파일은 유지됩니다. 해당 기기에서 다시 로그인하면 추가할 수 있습니다.",
+ "deleteOnlineHint": "현재 서버는 온라인 기기 제거를 지원하지 않습니다. 서비스 업데이트 후 다시 시도하세요.",
"error": {
"unavailable": "기기 연동 서비스를 사용할 수 없습니다(서버 미지원 또는 네트워크 오류)",
"listFailed": "기기 목록을 불러오지 못했습니다"
@@ -5157,7 +5160,7 @@
"keepAwakeToggleFailed": "절전 방지 전환에 실패했습니다",
"renameFailed": "이름 변경에 실패했습니다",
"deleted": "기기를 삭제했습니다",
- "deleteOnline": "기기가 온라인 상태라 삭제할 수 없습니다",
+ "deleteOnline": "현재 서버는 온라인 기기 제거를 지원하지 않습니다. 서비스 업데이트 후 다시 시도하세요.",
"deleteFailed": "삭제에 실패했습니다",
"disconnected": "모든 원격 연결를 끊었습니다",
"disconnectFailed": "원격 연결 끊기에 실패했습니다",
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 bd3b185cee..8caf26bf7c 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -5118,6 +5118,7 @@
"online": "已连接"
},
"connectionIssue": {
+ "device-removed": "设备已从账号中移除,请在本设备退出后重新登录。",
"auth-failed": "登录已失效,请重新登录",
"replaced": "连接被另一处相同设备顶替",
"too-many-connections": "同账号连接数已达上限",
@@ -5140,7 +5141,9 @@
"renameConfirm": "确认",
"renameCancel": "取消",
"delete": "删除",
- "deleteOnlineHint": "在线设备无法删除",
+ "deleteTitle": "删除“{{name}}”?",
+ "deleteMessage": "将此设备从账号中移除并断开远程连接。设备上的任务和文件会保留,重新登录后可再次加入。",
+ "deleteOnlineHint": "当前服务端尚不支持移除在线设备,请待服务升级后重试。",
"error": {
"unavailable": "设备互联服务暂不可用(服务端未启用或网络异常)",
"listFailed": "设备列表获取失败"
@@ -5157,7 +5160,7 @@
"keepAwakeToggleFailed": "切换保持唤醒失败",
"renameFailed": "重命名失败",
"deleted": "设备已删除",
- "deleteOnline": "设备在线,无法删除",
+ "deleteOnline": "当前服务端尚不支持移除在线设备,请待服务升级后重试。",
"deleteFailed": "删除失败",
"disconnected": "已断开所有远程连接",
"disconnectFailed": "断开远程连接失败",
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 c3cc15d75c..3a41f69714 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -5118,6 +5118,7 @@
"online": "已連線"
},
"connectionIssue": {
+ "device-removed": "裝置已從帳號中移除,請在本裝置登出後重新登入。",
"auth-failed": "登入已失效,請重新登入",
"replaced": "連線被另一處相同裝置頂替",
"too-many-connections": "同帳號連線數已達上限",
@@ -5140,7 +5141,9 @@
"renameConfirm": "確認",
"renameCancel": "取消",
"delete": "刪除",
- "deleteOnlineHint": "線上裝置無法刪除",
+ "deleteTitle": "刪除「{{name}}」?",
+ "deleteMessage": "將此裝置從帳號中移除並中斷遠端連線。裝置上的任務和檔案會保留,重新登入後可再次加入。",
+ "deleteOnlineHint": "目前伺服器尚不支援移除線上裝置,請待服務升級後重試。",
"error": {
"unavailable": "裝置互聯服務暫不可用(服務端未啟用或網路異常)",
"listFailed": "裝置列表獲取失敗"
@@ -5157,7 +5160,7 @@
"keepAwakeToggleFailed": "切換保持喚醒失敗",
"renameFailed": "重新命名失敗",
"deleted": "裝置已刪除",
- "deleteOnline": "裝置線上,無法刪除",
+ "deleteOnline": "目前伺服器尚不支援移除線上裝置,請待服務升級後重試。",
"deleteFailed": "刪除失敗",
"disconnected": "已斷開所有遠端連線",
"disconnectFailed": "斷開遠端連線失敗",
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index f1f147440e..c0c5d2c94b 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -138,7 +138,7 @@ interface DeviceLinkDeviceView {
/** 设备互联:relay 连接问题(镜像 @cindy/device-link 的 DeviceLinkConnectionIssue) */
interface DeviceLinkConnectionIssuePayload {
- kind: 'auth-failed' | 'replaced' | 'too-many-connections' | 'version-mismatch' | 'unstable';
+ kind: 'auth-failed' | 'device-removed' | 'replaced' | 'too-many-connections' | 'version-mismatch' | 'unstable';
closeCode?: number;
detail?: string;
at: number;
diff --git a/apps/desktop/src/shared/deviceLinkIpc.ts b/apps/desktop/src/shared/deviceLinkIpc.ts
index d6b3bfda02..08f18e9469 100644
--- a/apps/desktop/src/shared/deviceLinkIpc.ts
+++ b/apps/desktop/src/shared/deviceLinkIpc.ts
@@ -118,6 +118,7 @@ export type DeviceLinkStatus = 'stopped' | 'connecting' | 'online';
/** 连接问题分类(同 @cindy/device-link 的 DeviceLinkConnectionIssueKind) */
export type DeviceLinkConnectionIssueKind =
| 'auth-failed'
+ | 'device-removed'
| 'replaced'
| 'too-many-connections'
| 'version-mismatch'
diff --git a/apps/mobile/src/__tests__/remoteStatus.test.ts b/apps/mobile/src/__tests__/remoteStatus.test.ts
index 46b459d4e2..bf0d71da0a 100644
--- a/apps/mobile/src/__tests__/remoteStatus.test.ts
+++ b/apps/mobile/src/__tests__/remoteStatus.test.ts
@@ -130,6 +130,8 @@ describe('remoteStatus', () => {
expect(connectionIssueTitle('too-many-connections')).toBe('Too many connections');
expect(connectionIssueHint('version-mismatch')).toContain('Update to the latest version');
expect(connectionIssueTitle('unstable')).toBe('Connection keeps dropping');
+ expect(connectionIssueTitle('device-removed')).toBe('Device removed');
+ expect(connectionIssueHint('device-removed')).toContain('Sign out');
} finally {
await i18n.changeLanguage(previousLanguage);
}
diff --git a/apps/mobile/src/device-link/remoteStatus.ts b/apps/mobile/src/device-link/remoteStatus.ts
index 5675042a71..d707049648 100644
--- a/apps/mobile/src/device-link/remoteStatus.ts
+++ b/apps/mobile/src/device-link/remoteStatus.ts
@@ -18,6 +18,7 @@ const CONNECTION_ISSUE_COPY_KEYS: Record<
{ title: string; hint: string }
> = {
'auth-failed': { title: 'deviceLink.authFailedTitle', hint: 'deviceLink.authFailedHint' },
+ 'device-removed': { title: 'deviceLink.deviceRemovedTitle', hint: 'deviceLink.deviceRemovedHint' },
replaced: { title: 'deviceLink.replacedTitle', hint: 'deviceLink.replacedHint' },
'too-many-connections': {
title: 'deviceLink.tooManyConnectionsTitle',
diff --git a/apps/mobile/src/i18n/locales/en/deviceLink.json b/apps/mobile/src/i18n/locales/en/deviceLink.json
index 564948cd5e..a39ef7cf30 100644
--- a/apps/mobile/src/i18n/locales/en/deviceLink.json
+++ b/apps/mobile/src/i18n/locales/en/deviceLink.json
@@ -26,6 +26,8 @@
"sectionAccessRevoked": "Approve Access Again",
"retryAccess": "Retry Access",
"recheck": "Check Again",
+ "deviceRemovedTitle": "Device removed",
+ "deviceRemovedHint": "Sign out and sign in again to rejoin the device list.",
"authFailedTitle": "Sign-in expired",
"authFailedHint": "Your sign-in has expired. Sign out and sign in again.",
"replacedTitle": "Connection replaced",
diff --git a/apps/mobile/src/i18n/locales/en/devices.json b/apps/mobile/src/i18n/locales/en/devices.json
index ae66fffea9..db70221407 100644
--- a/apps/mobile/src/i18n/locales/en/devices.json
+++ b/apps/mobile/src/i18n/locales/en/devices.json
@@ -8,9 +8,9 @@
"notFound": "This device is no longer in your account.",
"deleteDevice": "Delete device",
"deleteTitle": "Delete {{name}}?",
- "deleteMessage": "Remove this device from your device list. This does not delete files on the computer.",
+ "deleteMessage": "Remove this device from your account and disconnect remote access. Its sessions and files are kept. Sign in again on that device to rejoin.",
"deleteFailed": "Could not delete the device.",
- "deleteOnline": "This device is online. Take it offline before deleting it.",
+ "deleteOnline": "This server does not yet support removing online devices. Retry after the service is upgraded.",
"currentlyOnline": "Currently online",
"availableSection": "Online",
"offlineSection": "Offline",
diff --git a/apps/mobile/src/i18n/locales/ja/deviceLink.json b/apps/mobile/src/i18n/locales/ja/deviceLink.json
index 77e3627485..e3189e0efe 100644
--- a/apps/mobile/src/i18n/locales/ja/deviceLink.json
+++ b/apps/mobile/src/i18n/locales/ja/deviceLink.json
@@ -26,6 +26,8 @@
"sectionAccessRevoked": "再度の許可が必要",
"retryAccess": "アクセスを再試行",
"recheck": "再確認",
+ "deviceRemovedTitle": "デバイスが削除されました",
+ "deviceRemovedHint": "ログアウトして再度ログインすると、デバイス一覧に追加できます。",
"authFailedTitle": "ログインの有効期限が切れました",
"authFailedHint": "ログインの有効期限が切れています。ログアウトして、もう一度ログインしてください。",
"replacedTitle": "接続が置き換えられました",
diff --git a/apps/mobile/src/i18n/locales/ja/devices.json b/apps/mobile/src/i18n/locales/ja/devices.json
index e460eb7152..672b08627d 100644
--- a/apps/mobile/src/i18n/locales/ja/devices.json
+++ b/apps/mobile/src/i18n/locales/ja/devices.json
@@ -8,9 +8,9 @@
"notFound": "このデバイスはアカウントに登録されていません。",
"deleteDevice": "デバイスを削除",
"deleteTitle": "「{{name}}」を削除しますか?",
- "deleteMessage": "デバイスを一覧から削除します。コンピューター上のファイルは削除されません。",
+ "deleteMessage": "アカウントからこのデバイスを削除し、リモート接続を切断します。デバイス上のセッションとファイルは保持されます。再度ログインすると追加できます。",
"deleteFailed": "デバイスを削除できませんでした。",
- "deleteOnline": "デバイスがオンラインです。オフラインにしてから削除してください。",
+ "deleteOnline": "現在のサーバーはオンラインのデバイス削除に未対応です。サービス更新後に再試行してください。",
"currentlyOnline": "現在オンライン",
"availableSection": "オンラインのデバイス",
"offlineSection": "オフラインのデバイス",
diff --git a/apps/mobile/src/i18n/locales/ko/deviceLink.json b/apps/mobile/src/i18n/locales/ko/deviceLink.json
index 484dbe9145..ee5fa58dcb 100644
--- a/apps/mobile/src/i18n/locales/ko/deviceLink.json
+++ b/apps/mobile/src/i18n/locales/ko/deviceLink.json
@@ -26,6 +26,8 @@
"sectionAccessRevoked": "다시 허용 필요",
"retryAccess": "액세스 재시도",
"recheck": "다시 확인",
+ "deviceRemovedTitle": "기기가 제거됨",
+ "deviceRemovedHint": "로그아웃한 후 다시 로그인하면 기기 목록에 추가됩니다.",
"authFailedTitle": "로그인이 만료되었습니다",
"authFailedHint": "로그인이 만료되었습니다. 로그아웃한 후 다시 로그인해 주세요.",
"replacedTitle": "연결이 다른 곳에서 대체되었습니다",
diff --git a/apps/mobile/src/i18n/locales/ko/devices.json b/apps/mobile/src/i18n/locales/ko/devices.json
index 4e78721349..b12b6ce4fe 100644
--- a/apps/mobile/src/i18n/locales/ko/devices.json
+++ b/apps/mobile/src/i18n/locales/ko/devices.json
@@ -8,9 +8,9 @@
"notFound": "이 기기는 더 이상 계정에 없습니다.",
"deleteDevice": "기기 삭제",
"deleteTitle": "{{name}} 기기를 삭제할까요?",
- "deleteMessage": "기기 목록에서 이 기기를 삭제합니다. 컴퓨터의 파일은 삭제되지 않습니다.",
+ "deleteMessage": "계정에서 이 기기를 제거하고 원격 연결을 끊습니다. 기기의 세션과 파일은 유지됩니다. 해당 기기에서 다시 로그인하면 추가할 수 있습니다.",
"deleteFailed": "기기를 삭제하지 못했습니다.",
- "deleteOnline": "기기가 온라인입니다. 오프라인으로 전환한 후 삭제하세요.",
+ "deleteOnline": "현재 서버는 온라인 기기 제거를 지원하지 않습니다. 서비스 업데이트 후 다시 시도하세요.",
"currentlyOnline": "현재 온라인",
"availableSection": "온라인 기기",
"offlineSection": "오프라인 기기",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/deviceLink.json b/apps/mobile/src/i18n/locales/zh-CN/deviceLink.json
index 7740bdf371..c30fc419a4 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/deviceLink.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/deviceLink.json
@@ -26,6 +26,8 @@
"sectionAccessRevoked": "需要重新允许",
"retryAccess": "重试访问",
"recheck": "重新检查",
+ "deviceRemovedTitle": "设备已移除",
+ "deviceRemovedHint": "请退出后重新登录,以重新加入设备列表。",
"authFailedTitle": "登录已失效",
"authFailedHint": "登录状态已过期,请退出后重新登录。",
"replacedTitle": "连接被顶替",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/devices.json b/apps/mobile/src/i18n/locales/zh-CN/devices.json
index ca86347be2..d6c10b27f5 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/devices.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/devices.json
@@ -8,9 +8,9 @@
"notFound": "该设备已不在你的账号中。",
"deleteDevice": "删除设备",
"deleteTitle": "删除“{{name}}”?",
- "deleteMessage": "将此设备从设备列表中移除,不会删除电脑上的文件。",
+ "deleteMessage": "将此设备从账号中移除并断开远程连接。设备上的任务和文件会保留,重新登录后可再次加入。",
"deleteFailed": "删除设备失败。",
- "deleteOnline": "设备当前在线,请让设备离线后再删除。",
+ "deleteOnline": "当前服务端尚不支持移除在线设备,请待服务升级后重试。",
"currentlyOnline": "当前在线",
"availableSection": "在线设备",
"offlineSection": "离线设备",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/deviceLink.json b/apps/mobile/src/i18n/locales/zh-TW/deviceLink.json
index 9ff5a78940..0783415c8e 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/deviceLink.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/deviceLink.json
@@ -26,6 +26,8 @@
"sectionAccessRevoked": "需要重新允許",
"retryAccess": "重試訪問",
"recheck": "重新檢查",
+ "deviceRemovedTitle": "裝置已移除",
+ "deviceRemovedHint": "請登出後重新登入,以重新加入裝置清單。",
"authFailedTitle": "登入已失效",
"authFailedHint": "登入狀態已過期,請退出後重新登入。",
"replacedTitle": "連線被頂替",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/devices.json b/apps/mobile/src/i18n/locales/zh-TW/devices.json
index 625c552d69..ff0e2f10f1 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/devices.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/devices.json
@@ -8,9 +8,9 @@
"notFound": "此裝置已不在你的帳號中。",
"deleteDevice": "刪除裝置",
"deleteTitle": "刪除「{{name}}」?",
- "deleteMessage": "將此裝置從裝置列表中移除,不會刪除電腦上的檔案。",
+ "deleteMessage": "將此裝置從帳號中移除並中斷遠端連線。裝置上的任務和檔案會保留,重新登入後可再次加入。",
"deleteFailed": "刪除裝置失敗。",
- "deleteOnline": "裝置目前在線,請讓裝置離線後再刪除。",
+ "deleteOnline": "目前伺服器尚不支援移除線上裝置,請待服務升級後重試。",
"currentlyOnline": "目前在線",
"availableSection": "在線裝置",
"offlineSection": "離線裝置",
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index a6670a7482..84db46135b 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1528,3 +1528,18 @@ PC 同源 ghostPermissionItems 声明摘要投影并排除 tool,以请求 loca
当前 PC 窗口的停靠位置不在此声明投影内,有面板只报告存在,无面板沿用 PC 文案。
旧 Host 缺字段时新手机仅显示原有 Version 与资源 Identifier,说明其余数据未提供;旧控制端忽略新增字段。
服务端、relay、协议版本及原生 fingerprint 均不变。
+
+
+## 同账号设备版本与移除
+
+设备列表展示现有 `appVersion` 和完整 `deviceId`;版本沿用现有 hello 字段,不改协议版本。
+服务端在 hello 时保存版本,离线目录也可返回;历史设备首次重新上报后补齐。未知值不伪造。
+
+在线与离线设备均可确认移除。服务端保留移除标记、清理路由与推送 token,关闭连接时使用
+4410。新客户端将其投影为 `device-removed`,停止自动重连并显示重新登录提示;显式登录
+可再次登记。本地任务与文件不删除。旧客户端可继续重试,但服务端标记阻止重新登记。
+
+部署先迁移数据库并升级全部 device-link 服务实例,再开放新版客户端的在线删除入口;
+新版客户端遇到旧服务在线删除冲突时保留设备并提示服务尚未升级。服务端迁移、回退边界
+见 `cindy-server/docs/device-link-server.md`。删除失败不清理本地远程任务分片,重复点击在
+请求期间被挡住;取消确认不发起删除。UI 继续复用语义颜色与标准确认弹窗。
diff --git a/packages/device-link/src/__tests__/client.test.ts b/packages/device-link/src/__tests__/client.test.ts
index eec936840d..78973d7bfb 100644
--- a/packages/device-link/src/__tests__/client.test.ts
+++ b/packages/device-link/src/__tests__/client.test.ts
@@ -10226,3 +10226,25 @@ describe('confirmed duplicate-open gap repair', () => {
} finally { f.h.client.stop(); vi.useRealTimers(); }
});
});
+
+
+it('stops automatic reconnect after device removal and permits a new login lifecycle', async () => {
+ const h = makeHarness();
+ h.client.start();
+ await tick();
+ h.current().ack();
+ h.current().emit('close', 4410, 'device removed');
+ expect(h.client.getStatus()).toBe('stopped');
+ expect(h.client.getConnectionIssue()?.kind).toBe('device-removed');
+ h.client.connectNow('foreground');
+ h.client.restartConnection('token-refresh');
+ await tick(50);
+ expect(h.sockets).toHaveLength(1);
+ h.client.start();
+ await tick();
+ expect(h.sockets).toHaveLength(2);
+ h.current().ack();
+ expect(h.client.getStatus()).toBe('online');
+ expect(h.client.getConnectionIssue()).toBeNull();
+ h.client.stop();
+});
diff --git a/packages/device-link/src/client.ts b/packages/device-link/src/client.ts
index 8c29c91f6e..a3f8b828bd 100644
--- a/packages/device-link/src/client.ts
+++ b/packages/device-link/src/client.ts
@@ -440,6 +440,8 @@ export type DeviceLinkStatus = 'stopped' | 'connecting' | 'online';
export type DeviceLinkConnectionIssueKind =
/** WS upgrade 被 401 拒绝:token 失效 / 已在别处登出 */
| 'auth-failed'
+ /** 4410:设备登记已被同账号另一台设备移除。 */
+ | 'device-removed'
/** 4409:同 deviceId 的新连接顶掉了本连接 */
| 'replaced'
/** 4429:同账号连接数超限 */
@@ -503,6 +505,7 @@ export function classifyConnectionIssue(
reason?: string,
socketErrorMessage?: string | null,
): DeviceLinkConnectionIssueKind | null {
+ if (code === 4410) return 'device-removed';
if (code === 4409) return 'replaced';
if (code === 4429) return 'too-many-connections';
if (code === 4400 && /version/i.test(reason ?? '')) return 'version-mismatch';
@@ -870,6 +873,7 @@ export class DeviceLinkClient {
// online 时强制重建请用 restartConnection —— 它才是「半开假活」场景的入口,
// 且已包含 resetLinkStateForReconnect(此处曾有一个等价的 { force } 分支,
// 生产代码从未使用,只有测试在调,故收敛为单一入口)。
+ if (this.connectionIssue?.kind === 'device-removed') return;
if (this.status === 'online') return;
// A foreground flicker (Face ID, notification, Control Center) re-fires this
// within seconds. Restarting a handshake that is still inside its window only
@@ -2028,6 +2032,11 @@ export class DeviceLinkClient {
this.resetLinkStateForReconnect();
this.failNonReliablePending(new DeviceLinkError('NOT_CONNECTED', 'relay connection lost'));
if (this.stopped) return;
+ if (code === 4410) {
+ this.stop();
+ this.setConnectionIssue({ kind: 'device-removed', closeCode: code, at: Date.now() });
+ return;
+ }
if (code === DUPLICATE_CONNECTION_CLOSE_CODE) {
this.log.warn(
`relay replaced this device connection; keeping reconnect backoff warm${reason ? ` (${reason})` : ''}`,