Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(archive): 本机与冷远程设备并发读取,刷新在途时不直接用旧缓存
Dash048f090e2a6c
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/archiveScheduleWarning.test.ts b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/archiveScheduleWarning.test.tsindex 2ad8c0c815..622fcfe2c1 100644--- a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/archiveScheduleWarning.test.ts+++ b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/archiveScheduleWarning.test.ts@@ -11,13 +11,18 @@ import type { TFunction } from 'i18next';const mocks = vi.hoisted(() => ({ensure: vi.fn(),getSnapshot: vi.fn(),+ pendingRefresh: vi.fn(),getSessionScheduleBindings: vi.fn(),hasScheduleBindings: vi.fn(),invoke: vi.fn(),}));vi.mock('../schedulesStore', () => ({- schedulesStore: { ensure: mocks.ensure, getSnapshot: mocks.getSnapshot },+ schedulesStore: {+ ensure: mocks.ensure,+ getSnapshot: mocks.getSnapshot,+ pendingRefresh: mocks.pendingRefresh,+ },}));vi.mock('@/features/device-link/remoteProjectsStore', () => ({remoteProjectsStore: {@@ -42,6 +47,7 @@ describe('loadActiveBoundScheduleNames', () => {__resetBindingMemoForTest();mocks.ensure.mockReset();mocks.getSnapshot.mockReset();+ mocks.pendingRefresh.mockReset().mockReturnValue(null);mocks.getSessionScheduleBindings.mockReset().mockReturnValue([]);mocks.hasScheduleBindings.mockReset().mockReturnValue(true);mocks.invoke.mockReset();@@ -143,6 +149,55 @@ describe('loadActiveBoundScheduleNames', () => {expect(mocks.ensure).not.toHaveBeenCalled();});+ it('刷新在途时缓存可能过期,等那次请求而不是直接用旧缓存', async () => {+ mocks.getSnapshot.mockReturnValue([]);+ mocks.pendingRefresh.mockReturnValue(+ Promise.resolve([{ id: 'n', name: 'Fresh', status: 'active', targetSessionId: 'task' }]),+ );++ const result = await loadActiveBoundScheduleNames([{ id: 'task' }]);++ expect(result.get('task')).toEqual(['Fresh']);+ });++ it('刷新迟迟不返回时超时退回已有缓存', async () => {+ vi.useFakeTimers();+ try {+ mocks.getSnapshot.mockReturnValue([+ { id: 'a', name: 'Cached', status: 'active', targetSessionId: 'task' },+ ]);+ mocks.pendingRefresh.mockReturnValue(new Promise(() => {}));++ const pending = loadActiveBoundScheduleNames([{ id: 'task' }]);+ await vi.advanceTimersByTimeAsync(COLD_SCHEDULE_LOAD_WAIT_MS);++ expect((await pending).get('task')).toEqual(['Cached']);+ } finally {+ vi.useRealTimers();+ }+ });++ it('本机与冷远程设备同时读取,共用一个等待窗口', async () => {+ vi.useFakeTimers();+ try {+ mocks.getSnapshot.mockReturnValue(null);+ mocks.ensure.mockReturnValue(new Promise(() => {}));+ mocks.hasScheduleBindings.mockReturnValue(false);+ mocks.invoke.mockReturnValue(new Promise(() => {}));++ const pending = loadActiveBoundScheduleNames([+ { id: 'local-task' },+ { id: 'remote-task', deviceLinkDeviceId: 'mac-2' },+ ]);+ await vi.advanceTimersByTimeAsync(COLD_SCHEDULE_LOAD_WAIT_MS);++ expect((await pending).size).toBe(0);+ expect(mocks.invoke).toHaveBeenCalledTimes(1);+ } finally {+ vi.useRealTimers();+ }+ });+it('冷启动时最多等待一小段时间,超时按无绑定处理', async () => {vi.useFakeTimers();try {diff --git a/apps/desktop/src/renderer/features/scheduler/lib/archiveScheduleWarning.ts b/apps/desktop/src/renderer/features/scheduler/lib/archiveScheduleWarning.tsindex 7fad2a9b99..126a46c672 100644--- a/apps/desktop/src/renderer/features/scheduler/lib/archiveScheduleWarning.ts+++ b/apps/desktop/src/renderer/features/scheduler/lib/archiveScheduleWarning.ts@@ -3,6 +3,7 @@* 除外,它会换绑新任务继续跑),归档入口据此升级到确认弹窗,让用户先知道。本机读* schedulesStore,远程任务读 remoteProjectsStore 的绑定分片;读取失败按「无绑定」处理。*/+import type { Schedule } from '@cindy/maker-scheduler';import type { TFunction } from 'i18next';import { remoteProjectsStore } from '@/features/device-link/remoteProjectsStore';@@ -22,14 +23,18 @@ export interface ArchiveTarget {/** 冷启动且缓存未就绪时,最多等这么久;超时按「无绑定」处理,不让普通任务的归档卡在列表请求上。 */export const COLD_SCHEDULE_LOAD_WAIT_MS = 1500;-/** 有缓存直接用(侧栏行常驻订阅,通常已就绪);没有缓存才有限等待一次加载。 */+/**+ * 本机列表:缓存存在且没有刷新在途时直接用(侧栏行常驻订阅,通常已就绪);缓存缺失,或有刷新在途+ * (缓存可能刚被创建 / 恢复 / 改绑作废)时,有限等待那次请求,超时退回已有缓存(没有则当无绑定)。+ */async function readLocalSchedules() {const cached = schedulesStore.getSnapshot();- if (cached) return cached;- const timeout = new Promise<null>((resolve) =>- setTimeout(() => resolve(null), COLD_SCHEDULE_LOAD_WAIT_MS),+ const pending = schedulesStore.pendingRefresh() ?? (cached ? null : schedulesStore.ensure());+ if (!pending) return cached;+ const timeout = new Promise<Schedule[] | null>((resolve) =>+ setTimeout(() => resolve(cached), COLD_SCHEDULE_LOAD_WAIT_MS),);- return Promise.race([schedulesStore.ensure().catch(() => null), timeout]);+ return Promise.race([pending.catch(() => cached), timeout]);}/**@@ -53,11 +58,9 @@ async function readRemoteBindingsOnce(export async function loadActiveBoundScheduleNames(targets: readonly ArchiveTarget[],): Promise<Map<string, string[]>> {+ // 本机与各台冷远程设备的读取同时发起,共用一个等待窗口(混合设备批量归档不会叠加到 2 倍)。const needsLocal = targets.some((target) => !target.deviceLinkDeviceId);- const localSchedules = needsLocal ? await readLocalSchedules() : null;- const localMap: ReadonlyMap<string, readonly ScheduleBinding[]> = localSchedules- ? buildBindingMap(localSchedules)- : new Map();+ const localRead = needsLocal ? readLocalSchedules() : null;// 快照未就绪的远程设备,每台只直接取一次。const coldRemote = new Map<string, Promise<ReadonlyMap<string, ScheduleBinding[]> | null>>();for (const target of targets) {@@ -73,6 +76,10 @@ export async function loadActiveBoundScheduleNames();}}+ const localSchedules = localRead ? await localRead : null;+ const localMap: ReadonlyMap<string, readonly ScheduleBinding[]> = localSchedules+ ? buildBindingMap(localSchedules)+ : new Map();const result = new Map<string, string[]>();for (const target of targets) {const deviceId = target.deviceLinkDeviceId;diff --git a/apps/desktop/src/renderer/features/scheduler/lib/schedulesStore.ts b/apps/desktop/src/renderer/features/scheduler/lib/schedulesStore.tsindex 19b2a33e6f..04eba1a92e 100644--- a/apps/desktop/src/renderer/features/scheduler/lib/schedulesStore.ts+++ b/apps/desktop/src/renderer/features/scheduler/lib/schedulesStore.ts@@ -228,6 +228,11 @@ export const schedulesStore = {ensure,forceRefresh,++ /** 有刷新在途时返回该请求(缓存此时可能已过期,例如刚创建 / 恢复 / 改绑了自动化);否则 null。 */+ pendingRefresh(): Promise<Schedule[]> | null {+ return inflight;+ },};// ── React hook 助手:让 hook 端代码更短 ──────────────────────────────────