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(desktop): resume history on fresh recovery triggers

DavidShenc146d105472b
diff --git a/apps/desktop/src/renderer/__tests__/remoteContentRecovery.test.ts b/apps/desktop/src/renderer/__tests__/remoteContentRecovery.test.ts
index 416b0110dc..666418969b 100644
--- a/apps/desktop/src/renderer/__tests__/remoteContentRecovery.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteContentRecovery.test.ts
@@ -10,6 +10,37 @@ function deferred<T>() {
}
afterEach(() => vi.useRealTimers());
describe('remote content recovery', () => {
+ it('keeps cleanup passive until a new eligible trigger, then coalesces recovery behind the stale request', async () => {
+ vi.useFakeTimers();
+ const old = deferred<boolean>();
+ const ack = deferred<void>();
+ const reconcile = vi.fn().mockReturnValueOnce(old.promise).mockResolvedValue(true);
+ const subscribe = vi.fn().mockResolvedValueOnce(undefined).mockReturnValue(ack.promise);
+ const changed = vi.fn();
+ const recovery = createRemoteContentRecovery({ subscribe, reconcile, changed, completed: vi.fn() });
+ recovery.request();
+ await vi.advanceTimersByTimeAsync(0);
+ recovery.invalidate(false);
+ await vi.advanceTimersByTimeAsync(60_000);
+ expect(subscribe).toHaveBeenCalledTimes(1);
+ expect(changed).not.toHaveBeenCalledWith('ready');
+ recovery.request(true);
+ recovery.request(true);
+ expect(subscribe).toHaveBeenCalledTimes(1);
+ old.resolve(true);
+ await vi.advanceTimersByTimeAsync(0);
+ expect(changed).not.toHaveBeenCalledWith('ready');
+ expect(subscribe).toHaveBeenCalledTimes(2);
+ recovery.request(true);
+ expect(subscribe).toHaveBeenCalledTimes(2);
+ ack.resolve();
+ await vi.advanceTimersByTimeAsync(0);
+ expect(changed).toHaveBeenLastCalledWith('ready');
+ recovery.dispose();
+ recovery.request(true);
+ expect(subscribe).toHaveBeenCalledTimes(2);
+ });
+
it('waits for both subscription ACK and an applied snapshot, coalescing triggers', async () => {
vi.useFakeTimers();
const ack = deferred<void>();
diff --git a/apps/desktop/src/renderer/__tests__/remoteContentRecoveryHook.test.ts b/apps/desktop/src/renderer/__tests__/remoteContentRecoveryHook.test.ts
index 3017c80226..ab9e585044 100644
--- a/apps/desktop/src/renderer/__tests__/remoteContentRecoveryHook.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteContentRecoveryHook.test.ts
@@ -1,5 +1,5 @@
// @vitest-environment jsdom
-import { act, renderHook } from '@testing-library/react';
+import { act, cleanup, renderHook } from '@testing-library/react';
import { afterEach, expect, it, vi } from 'vitest';
import { useRemoteSessionSync } from '../features/cc-agent/hooks/useRemoteSessionSync';
@@ -17,16 +17,101 @@ vi.mock('@/lib/logger', () => ({
}));
vi.mock('@/lib/makerTransport', () => ({ isSessionTurnRunningFor: async () => true }));
vi.mock('@/features/device-link/remoteProjectsStore', () => ({
- remoteProjectsStore: { getDeviceIds: () => ['host', 'neighbor'], subscribe: () => () => {} },
+ remoteProjectsStore: { getDeviceIds: () => ['host', 'neighbor'], getDeviceName: () => 'host', subscribe: () => () => {} },
}));
vi.mock('@/features/device-link/refreshRemoteSessions', () => ({
refreshRemoteDeviceSessions: vi.fn(),
}));
afterEach(() => {
+ cleanup();
vi.useRealTimers();
vi.unstubAllGlobals();
});
+function recoveryEvents() {
+ function event<T>() {
+ const listeners = new Set<(payload: T) => void>();
+ return {
+ on: (cb: (payload: T) => void) => { listeners.add(cb); return () => { listeners.delete(cb); }; },
+ emit: (payload: T) => listeners.forEach((cb) => cb(payload)),
+ };
+ }
+ const status = event<{ status: string }>();
+ const presence = event<{ deviceId: string; online: boolean; remoteControlEnabled: boolean }>();
+ const responsiveness = event<{ deviceId: string; unresponsive: boolean; recovered: boolean }>();
+ const subscribe = vi.fn(async () => {});
+ vi.stubGlobal('electronAPI', { deviceLink: {
+ subscribe, unsubscribe: async () => {},
+ onStatusChanged: status.on,
+ onPresenceChanged: presence.on,
+ onResponsivenessChanged: responsiveness.on,
+ } });
+ mocks.running = false;
+ mocks.reconcile.mockResolvedValue(true);
+ return { status, presence, responsiveness, subscribe };
+}
+
+it.each(['focus', 'manual', 'presence', 'relay', 'response'])('allows %s recovery after a terminal reply clears the breaker', async (trigger) => {
+ vi.useFakeTimers();
+ const events = recoveryEvents();
+ const hook = renderHook(() => useRemoteSessionSync('session', 'host'));
+ const neighbor = renderHook(() => useRemoteSessionSync('neighbor-session', 'neighbor'));
+ await act(async () => {
+ events.status.emit({ status: 'online' });
+ await vi.advanceTimersByTimeAsync(250);
+ });
+ expect(hook.result.current.contentState).toBe('ready');
+ const callsBeforeClear = events.subscribe.mock.calls.length;
+ await act(async () => {
+ events.responsiveness.emit({ deviceId: 'host', unresponsive: true, recovered: false });
+ events.responsiveness.emit({ deviceId: 'host', unresponsive: false, recovered: false });
+ await vi.advanceTimersByTimeAsync(60_000);
+ });
+ expect(hook.result.current.contentState).toBe('syncing');
+ expect(neighbor.result.current.contentState).toBe('ready');
+ expect(events.subscribe).toHaveBeenCalledTimes(callsBeforeClear);
+ await act(async () => {
+ if (trigger === 'focus') window.dispatchEvent(new Event('focus'));
+ else if (trigger === 'manual') hook.result.current.resync();
+ else if (trigger === 'presence') events.presence.emit({ deviceId: 'host', online: true, remoteControlEnabled: true });
+ else if (trigger === 'relay') events.status.emit({ status: 'online' });
+ else events.responsiveness.emit({ deviceId: 'host', unresponsive: false, recovered: true });
+ await vi.advanceTimersByTimeAsync(250);
+ });
+ expect(hook.result.current.contentState).toBe('ready');
+ expect(neighbor.result.current.contentState).toBe('ready');
+ hook.unmount();
+ neighbor.unmount();
+});
+
+it.each(['relay', 'peer', 'disabled', 'unresponsive'])('does not resume cleared history while %s is unavailable', async (reason) => {
+ vi.useFakeTimers();
+ const events = recoveryEvents();
+ const hook = renderHook(() => useRemoteSessionSync('session', 'host'));
+ await act(async () => { await vi.advanceTimersByTimeAsync(250); });
+ const callsBeforeClear = events.subscribe.mock.calls.length;
+ await act(async () => {
+ events.responsiveness.emit({ deviceId: 'host', unresponsive: true, recovered: false });
+ events.responsiveness.emit({ deviceId: 'host', unresponsive: false, recovered: false });
+ if (reason === 'relay') events.status.emit({ status: 'offline' });
+ else if (reason === 'unresponsive') events.responsiveness.emit({ deviceId: 'host', unresponsive: true, recovered: false });
+ else events.presence.emit({ deviceId: 'host', online: reason !== 'peer', remoteControlEnabled: reason !== 'disabled' });
+ hook.result.current.resync();
+ window.dispatchEvent(new Event('focus'));
+ await vi.advanceTimersByTimeAsync(60_000);
+ });
+ expect(events.subscribe).toHaveBeenCalledTimes(callsBeforeClear);
+ expect(hook.result.current.contentState).toBe('syncing');
+ await act(async () => {
+ if (reason === 'relay') events.status.emit({ status: 'online' });
+ else if (reason === 'unresponsive') events.responsiveness.emit({ deviceId: 'host', unresponsive: false, recovered: true });
+ else events.presence.emit({ deviceId: 'host', online: true, remoteControlEnabled: true });
+ await vi.advanceTimersByTimeAsync(250);
+ });
+ expect(hook.result.current.contentState).toBe('ready');
+ hook.unmount();
+});
+
it('requires a fresh ACK and snapshot after peer-only resets without invalidating neighbors', async () => {
vi.useFakeTimers();
const resets = new Set<(payload: { deviceId: string }) => void>();
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/remoteContentRecovery.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/remoteContentRecovery.ts
index 198031018c..47fc0fbec1 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/remoteContentRecovery.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/remoteContentRecovery.ts
@@ -64,7 +64,14 @@ export function createRemoteContentRecovery(deps: {
})();
};
return {
- request,
+ // A new external trigger may resume a cleared recovery using current
+ // eligibility. Internal retries retain the gate set by invalidate(), so a
+ // stale completion cannot reopen recovery after cleanup on its own.
+ request(availableNow = available) {
+ if (disposed) return;
+ available = availableNow;
+ request();
+ },
isReady: () => ready,
invalidate(nextAvailable: boolean) {
if (disposed) return;
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useRemoteSessionSync.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useRemoteSessionSync.ts
index c511bd338f..aa03f48bfb 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useRemoteSessionSync.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useRemoteSessionSync.ts
@@ -395,7 +395,7 @@ export function useRemoteSessionSync(
{
canRead,
subscribe: (d, topics) => {
- if (!recovery.isReady()) { recovery.request(); return; }
+ if (!recovery.isReady()) { recovery.request(canRead()); return; }
return window.electronAPI.deviceLink
.subscribe(d, topics)
.catch((err) => log.warn('device-link subscribe(session) failed', err));
@@ -404,7 +404,7 @@ export function useRemoteSessionSync(
return window.electronAPI.deviceLink.unsubscribe(d, topics).catch(() => {});
},
reconcile: (s) => {
- if (!recovery.isReady()) { recovery.request(); return; }
+ if (!recovery.isReady()) { recovery.request(canRead()); return; }
// 挂起交互(permission/ask/plan)重建已并入 reconcileRemoteMessages 的同一代
// (远程回执的新鲜度语义需要两者同代落地),这里不再单独调用。
void makerChatStore.reconcileRemoteMessages(s);
@@ -451,7 +451,7 @@ export function useRemoteSessionSync(
recovery.invalidate(relayAvailable !== false && peerAvailable !== false && peerResponsive !== false);
// subscribe already waits for the existing per-peer openLink. Only its new
// ACK followed by an applied snapshot can restore this view's readiness.
- recovery.request();
+ recovery.request(canRead());
});
const offStatus = window.electronAPI.deviceLink.onStatusChanged((p) => {
const online = p.status === 'online';
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index 855a3e46f7..dc128bcaef 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -76,8 +76,10 @@ Desktop 和 Mobile 的按设备排队、并发上限、退避、取消代次由
请求恢复,须等待旧请求结算;旧结果不能取消新请求,也不能恢复已取消的重试。
Desktop 清理某设备的熔断状态不等于该设备已恢复。停用、离线和重置时只清理 UI
-状态,不触发订阅重放或内容刷新;只有真实业务回包才触发恢复。排队中的订阅与列表
-刷新同样受设备生命周期代次约束,迟到的失败不得重启已取消的恢复。周期对账复用在途
+状态,不触发订阅重放或内容刷新;响应性事件只有携带真实业务回包证据才立即触发恢复。
+清理事件本身不启动恢复,但不能永久关闭后续读取:聚焦、手动重试或在线通知再次触发时,
+按当前 relay、设备可用性和响应状态重新判断;内部定时重试及旧请求收尾不能自行解除清理。
+排队中的订阅与列表刷新同样受设备生命周期代次约束,迟到的失败不得重启已取消的恢复。周期对账复用在途
读取,新增内容等事件仍可合并成一次后续刷新;不得为了限制整轮等待而缩短弱网请求预算。
Mobile 历史读取在 relay 已在线且目标 presence 不是明确不可用时,可以沿既有建链和订阅