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): prevent deleted devices returning from cold cache

zqchris96142eac0767
diff --cc apps/desktop/src/renderer/__tests__/remoteProjectsStartup.test.tsx
index 2c9badaf52,2c9badaf52..de8e5352e5
--- a/apps/desktop/src/renderer/__tests__/remoteProjectsStartup.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/remoteProjectsStartup.test.tsx
@@@ -2,7 -2,7 +2,16 @@@
import { act, cleanup, renderHook } from '@testing-library/react';
import { afterEach, expect, it, vi } from 'vitest';
--const state = vi.hoisted(() => ({ refresh: vi.fn(async () => 'ok') }));
++const state = vi.hoisted(() => ({
++ refresh: vi.fn(async () => 'ok'),
++ translate: (key: string) => key,
++ readCache: vi.fn(async (): Promise<import('@/features/device-link/mirrorCacheClient').CachedDeviceSessionsSnapshot[]> => []),
++}));
++vi.mock('react-i18next', async (importOriginal) => ({
++ ...await importOriginal<typeof import('react-i18next')>(),
++ useTranslation: () => ({ t: state.translate }),
++}));
++vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } }));
vi.mock('@/contexts/AuthContext', () => ({
useAuth: () => ({ isAuthenticated: true, deviceId: 'self', dataOwnerId: 'owner' }),
}));
@@@ -12,7 -12,7 +21,7 @@@ vi.mock('@/features/device-link/refresh
}));
vi.mock('@/features/device-link/mirrorCacheClient', () => ({
clearMirrorCacheAccountState: vi.fn(),
-- readCachedSessionList: async () => [],
++ readCachedSessionList: state.readCache,
sessionListOwnerTokensReady: () => true,
cancelSessionListPersist: vi.fn(),
scheduleSessionListPersist: vi.fn(),
@@@ -32,14 -32,14 +41,97 @@@ vi.mock('@/hooks/useGitSafetySettings'
}));
import { remoteProjectsStore } from '@/features/device-link/remoteProjectsStore';
import { useDeviceLinkRemoteProjects } from '@/features/device-link/useDeviceLinkRemoteProjects';
++import { useDeviceLinkSettings } from '@/hooks/useDeviceLinkSettings';
++import { clearCachedDevice } from '@/features/device-link/mirrorCacheClient';
afterEach(() => {
cleanup();
vi.useRealTimers();
state.refresh.mockClear();
++ state.readCache.mockReset().mockResolvedValue([]);
++ vi.mocked(clearCachedDevice).mockClear();
Reflect.deleteProperty(window, 'electronAPI');
});
++it.each(['deleted', 'refused'] as const)('handles confirmed deletion before the old cold cache returns: %s', async (outcome) => {
++ vi.useFakeTimers();
++ let finishCache!: (devices: Awaited<ReturnType<typeof state.readCache>>) => void;
++ state.readCache.mockReturnValue(new Promise(resolve => { finishCache = resolve; }));
++ const listen = () => () => {};
++ const api = {
++ getState: async () => ({ linkStatus: 'connecting' }),
++ listDevices: vi.fn().mockRejectedValue(new Error('directory unavailable')),
++ deleteDevice: vi.fn(async () => ({ deviceId: 'deleted-peer', deleted: outcome === 'deleted' })),
++ unsubscribe: vi.fn(async () => {}),
++ onPresenceChanged: listen,
++ onStatusChanged: listen,
++ onAccessRevoked: listen,
++ onControlTargetChanged: listen,
++ onRemotePush: listen,
++ onResponsivenessChanged: listen,
++ };
++ Object.defineProperty(window, 'electronAPI', { configurable: true, value: { deviceLink: api } });
++ const { result, unmount } = renderHook(() => {
++ useDeviceLinkRemoteProjects();
++ return useDeviceLinkSettings(false);
++ });
++ await act(async () => {
++ expect(await result.current.remove('deleted-peer')).toBe(outcome === 'deleted');
++ });
++ await act(async () => {
++ finishCache(['deleted-peer', 'offline-peer'].map(deviceId => ({
++ deviceId, deviceName: deviceId, sessions: [{ id: `${deviceId}-task`, status: 'active' }] as never,
++ })));
++ await vi.advanceTimersByTimeAsync(0);
++ });
++ expect(api.listDevices).toHaveBeenCalled();
++ expect(remoteProjectsStore.getAllDeviceIds().sort()).toEqual(
++ outcome === 'deleted' ? ['offline-peer'] : ['deleted-peer', 'offline-peer'],
++ );
++ expect(remoteProjectsStore.getSessionDeviceId('deleted-peer-task')).toBe(
++ outcome === 'deleted' ? undefined : 'deleted-peer',
++ );
++ if (outcome === 'deleted') expect(clearCachedDevice).toHaveBeenCalledWith('deleted-peer');
++ else expect(clearCachedDevice).not.toHaveBeenCalled();
++ unmount();
++});
++
++it('ignores a directory snapshot started before confirmed deletion', async () => {
++ vi.useFakeTimers();
++ let finishDirectory!: (value: { devices: unknown[] }) => void;
++ const directory = new Promise<{ devices: unknown[] }>(resolve => { finishDirectory = resolve; });
++ const listen = () => () => {};
++ const subscribe = vi.fn(async () => {});
++ const api = {
++ getState: async () => ({ linkStatus: 'online' }),
++ listDevices: vi.fn(() => directory),
++ deleteDevice: async () => ({ deviceId: 'deleted-peer', deleted: true }),
++ subscribe,
++ unsubscribe: vi.fn(async () => {}),
++ onPresenceChanged: listen,
++ onStatusChanged: listen,
++ onAccessRevoked: listen,
++ onControlTargetChanged: listen,
++ onRemotePush: listen,
++ onResponsivenessChanged: listen,
++ };
++ Object.defineProperty(window, 'electronAPI', { configurable: true, value: { deviceLink: api } });
++ const { result, unmount } = renderHook(() => {
++ useDeviceLinkRemoteProjects();
++ return useDeviceLinkSettings(false);
++ });
++ await act(async () => { await vi.advanceTimersByTimeAsync(0); });
++ expect(api.listDevices).toHaveBeenCalled();
++ await act(async () => { expect(await result.current.remove('deleted-peer')).toBe(true); });
++ await act(async () => {
++ finishDirectory({ devices: [{ deviceId: 'deleted-peer', name: 'Old peer', online: true, remoteControlEnabled: true, isSelf: false }] });
++ await vi.advanceTimersByTimeAsync(0);
++ });
++ expect(subscribe).not.toHaveBeenCalled();
++ expect(remoteProjectsStore.hasDevice('deleted-peer')).toBe(false);
++ unmount();
++});
++
it.each(['connecting', 'unknown', 'late-subscribe', 'late-snapshot', 'circuit-subscribe', 'circuit-snapshot'])('handles initial %s state without redundant bootstrap', async (initialStatus) => {
vi.useFakeTimers();
const listeners: Record<string, (...args: any[]) => void> = {};
diff --cc apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
index 5c2091780a,dc81e84adc..9a084617da
--- a/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
+++ b/apps/desktop/src/renderer/features/device-link/useDeviceLinkDeviceList.ts
@@@ -19,6 -19,6 +19,7 @@@ import { useSyncExternalStore } from 'r
let devices: DeviceLinkDeviceView[] | null = null;
const subs = new Set<() => void>();
++const removalSubs = new Set<(deviceId: string) => void>();
let started = false;
const DEVICE_LIST_RETRY_BASE_MS = 2_000;
const DEVICE_LIST_RETRY_MAX_MS = 30_000;
@@@ -233,17 -233,6 +234,24 @@@ export function renameDeviceLinkDevice(
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;
++ removalSubs.forEach(fn => fn(deviceId));
+ if (devices?.some(device => device.deviceId === deviceId)) {
+ devices = devices.filter(device => device.deviceId !== deviceId);
+ subs.forEach(fn => fn());
+ }
+ refreshImpl?.();
+}
+
++/** Confirmed deletion must also invalidate mirrors, even before a shard exists. */
++export function subscribeDeviceLinkDeviceRemoval(fn: (deviceId: string) => void): () => void {
++ removalSubs.add(fn);
++ return () => { removalSubs.delete(fn); };
++}
++
function ensureStarted(): void {
if (started) return;
started = true;
diff --cc apps/desktop/src/renderer/features/device-link/useDeviceLinkRemoteProjects.ts
index df390ff141,927eee2778..efb3d76d81
--- a/apps/desktop/src/renderer/features/device-link/useDeviceLinkRemoteProjects.ts
+++ b/apps/desktop/src/renderer/features/device-link/useDeviceLinkRemoteProjects.ts
@@@ -53,6 -53,6 +53,7 @@@ import
} from './remoteSessionActivityStore';
import { revokedDevicesStore } from './revokedDevicesStore';
import { unresponsiveDevicesStore } from './unresponsiveDevicesStore';
++import { subscribeDeviceLinkDeviceRemoval } from './useDeviceLinkDeviceList';
import { collectSessionListSnapshot, refreshRemoteDeviceSessions } from './refreshRemoteSessions';
import {
cancelSessionListPersist,
@@@ -371,11 -373,11 +374,12 @@@ export function useDeviceLinkRemoteProj
let disposed = false;
/**
-- * 「已明确离场、不许被冷缓存种回来」的设备 id。撤销访问 / 关闭被控 / 本机停用控制这三条
++ * 「已明确离场、不许被冷缓存种回来」的设备 id。删除 / 撤销访问 / 关闭被控 / 本机停用控制
* 路径都会往里加 —— 它们清盘是异步的,而 mount 时那次 readCachedSessionList 可能早已
* 读到旧快照(review: codex P1)。
*/
const cacheHydrationBlocked = new Set<string>();
++ let directoryGeneration = 0;
/** relay 在线时才跑 anti-entropy;初始状态未知时保守暂停,避免离线失败重试。 */
let linkOnline: boolean | null = null;
/** push 一旦到达即权威:迟到的 getState 快照不得覆盖更新的 link status。 */
@@@ -607,10 -661,10 +663,11 @@@
/** 全量重播(初始 + WS 重连):listDevices 带 isSelf,权威。 */
const reseed = (): void => {
++ const generation = directoryGeneration;
void window.electronAPI.deviceLink
.listDevices()
.then(({ devices }) => {
-- if (disposed) return;
++ if (disposed || generation !== directoryGeneration) return;
for (const d of devices) {
applyDevice({
deviceId: d.deviceId,
@@@ -883,6 -942,6 +945,24 @@@
if (eligible.has(deviceId)) eligible.set(deviceId, name);
});
++ const offRemoval = subscribeDeviceLinkDeviceRemoval((deviceId) => {
++ // Deletion is authoritative even if the directory is unavailable or a cold read is in flight.
++ directoryGeneration += 1;
++ cacheHydrationBlocked.add(deviceId);
++ clearCachedDevice(deviceId);
++ cancelDeviceReseeds(deviceId);
++ clearArchivedSessionRetry(deviceId);
++ sessionsSubscribeRetry.delete(deviceId);
++ if (eligible.delete(deviceId)) {
++ window.electronAPI.deviceLink.unsubscribe(deviceId, ['sessions']).catch(() => {});
++ }
++ removeRemoteSessionActivityForDevice(deviceId);
++ evictTaskTagCatalog(deviceId);
++ evictDeviceCapabilities(deviceId);
++ evictDeviceProviders(deviceId);
++ evictDeviceGitSafetySettings(deviceId);
++ });
++
// 冷缓存回写由「分片变更」驱动,而不是只在一次成功 refresh 之后:
// 被控端推来的 archived / deleted 增量(applyPatch)只改内存,若 app 在下一次 10 秒对账
// 之前退出,下次离线冷启动就会把那条已归档 / 已删除的会话又 hydrate 回侧边栏
@@@ -909,6 -968,6 +989,7 @@@
offAccessRevoked();
offControlTarget();
offRename();
++ offRemoval();
offShardChange();
offResponsiveness();
unresponsiveDevicesStore.clearAll();
diff --cc docs/dev-rules/protocol-compatibility.md
index 84db46135b,b406e78274..188b42cfab
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@@ -1529,17 -1980,25 +1980,42 @@@ PC 同源 ghostPermissionItems 声明�
旧 Host 缺字段时新手机仅显示原有 Version 与资源 Identifier,说明其余数据未提供;旧控制端忽略新增字段。
服务端、relay、协议版本及原生 fingerprint 均不变。
+
+ ### Cindy AI 企业周期配额
+
+ 云端组织账号优先通过 Model Access `GET /api/model-access/quota` 查询本人周期配额,
+ 不再假定推理入口暴露 LiteLLM 管理 API。返回 spend/maxBudget/budgetResetAt/currency;
+ 沿用现有 account-usage IPC 和账号作用域缓存,所以设置卡片与任务用量提示使用相同来源。
+ 服务端尚未提供接口(404),或明确返回 501/MODEL_ACCESS_QUOTA_NOT_SUPPORTED(Nova),
+ 才使用原有网关查询。鉴权失败、上游故障或响应无效均显示不可用,不回退或借用其他身份数据。
+ 本接口尚无当日统计,todaySpend 为 null;未设周期上限时不伪造有限配额。
+ 本地手填网关和个人计费路径保持原协议。无新环境变量或数据库变更。
+
+ 管理员取消周期上限后,主进程明确清空当前 owner 的配额缓存,并通过现有
+ `usage:claude-account-changed` 广播 null;renderer 同步清除当前 owner 的快照与热缓存。
+ 已有未知载荷消费者会忽略 null,新旧有限配额快照字段不变;网络失败仍保留既有缓存策略。
+
+ 配额读取 IPC 返回 null 仅表示当前无可用快照,不清除 renderer 已缓存的同账号额度;只有权威 clear 读取结果或显式 clear push 才清除缓存。
+
+ `maker:usage:account('claude-code', 'cindy-quota-state-v1')` 为可选读取能力:有限额度保持原快照,权威不限额返回 `{ quotaState: 'unlimited' }`,暂无当前账号快照返回 null。无该能力参数的旧消费者仍只收到快照/null;旧主机忽略该参数,新消费者对其 null 保留旧缓存。本地重新挂载和远程读取均查询该状态,避免错过 clear 推送;仅权威 clear 可淘汰同账号缓存。
+
+ 企业凭据迁移:`/quota` 查询不依赖本地推理凭据;仅在当前进程、当前账号已成功同步服务端凭据,且实际 endpoint 与本次同步一致时,允许 404/明确 501 后的旧直连回退。持久化凭据不能作为本轮同步成功的证明。网关 endpoint 或身份代次变化时,失效当前账号额度并丢弃旧代次在途结果;失效结果通过既有 null push 通知,可选状态读取返回 `{ quotaState: 'invalidated' }`,与 unavailable null 区分。新本地/远程消费者将 invalidated 和 unlimited 都作为权威清缓存;未携带能力参数的旧消费者保持 snapshot/null 返回。此处不变更凭据存储、推理回退或额度计算口径。
+
+ 额度身份隔离使用主进程 `ownerGeneration` 与 `dataOwnerId`,覆盖同 membership 跨认证 realm 切换及同账号修复;凭据状态与额度快照使用同一身份键。
+ 远程 transport-timeout 出站退避重连成功、或普通同账号 peer 入站 link-accept 成功后,Main 通过本地 `device-link:peer-link-reopened` 推送 `{ deviceId }`,preload 暴露可选 `onPeerLinkReopened`,仅目标设备触发排队补读。被取消的重连代次不发通知。该事件不进入 relay wire、不增加远端 IPC allowlist,也不改变 Mobile/旧消费者的请求协议。
++
+## 同账号设备版本与移除
+
+设备列表展示现有 `appVersion` 和完整 `deviceId`;版本沿用现有 hello 字段,不改协议版本。
+服务端在 hello 时保存版本,离线目录也可返回;历史设备首次重新上报后补齐。未知值不伪造。
+
+在线与离线设备均可确认移除。服务端保留移除标记、清理路由与推送 token,关闭连接时使用
+4410。新客户端将其投影为 `device-removed`,停止自动重连并显示重新登录提示;显式登录
+可再次登记。本地任务与文件不删除。旧客户端可继续重试,但服务端标记阻止重新登记。
+
+部署先迁移数据库并升级全部 device-link 服务实例,再开放新版客户端的在线删除入口;
+新版客户端遇到旧服务在线删除冲突时保留设备并提示服务尚未升级。服务端迁移、回退边界
+见 `cindy-server/docs/device-link-server.md`。删除失败不清理本地远程任务分片,重复点击在
+请求期间被挡住;取消确认不发起删除。UI 继续复用语义颜色与标准确认弹窗。
++确认删除同时阻止在途冷缓存回填、清理该设备磁盘缓存并作废删除前的目录读取;
++目录暂时不可用时,其他离线设备继续保留缓存。