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(provider-group): 保存旧冷却首次缩短的截止时间

Dash7c393c0aeba7
diff --git a/apps/desktop/src/main/provider-group/__tests__/coolingStore.test.ts b/apps/desktop/src/main/provider-group/__tests__/coolingStore.test.ts
index 6a8db9086a..6e98be9c14 100644
--- a/apps/desktop/src/main/provider-group/__tests__/coolingStore.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/coolingStore.test.ts
@@ -47,6 +47,11 @@ describe('mergeCooling', () => {
)).toEqual({ anthropic: { local: { 'claude:fable': 500_000, 'claude:sonnet': 400_000 } } });
expect(mergeCooling({ anthropic: { local: 86_400_000 } }, {}, 1_000))
.toEqual({ anthropic: { local: { '': 121_000 } } });
+ // 旧数字已在加载时截短;排队写入不能按拿锁时间重新延长,过期后也不能复活。
+ const legacy = { anthropic: { local: 86_400_000 } };
+ const migrated = { anthropic: { local: { '': 121_000 } } };
+ expect(mergeCooling(legacy, migrated, 60_000)).toEqual(migrated);
+ expect(mergeCooling(legacy, migrated, 180_000)).toEqual({});
});
it('keeps both members when they are in different snapshots', () => {
diff --git a/apps/desktop/src/main/provider-group/__tests__/router.state.test.ts b/apps/desktop/src/main/provider-group/__tests__/router.state.test.ts
index ab1d999846..9498628fdf 100644
--- a/apps/desktop/src/main/provider-group/__tests__/router.state.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/router.state.test.ts
@@ -35,7 +35,7 @@ const A = member('device:a:anthropic', 'a');
const B = member('device:b:anthropic', 'b');
const CONFIG: ProviderGroupConfig = { strategy: 'order', autoSwitch: true, members: [A, B] };
-function harness(resolveMembers: ProviderGroupDirectory['resolveMembers'], persisted: { value: ProviderGroupPersistedCooling }) {
+function harness(resolveMembers: ProviderGroupDirectory['resolveMembers'], persisted: { value: ProviderGroupPersistedCooling }, now = START) {
return createProviderGroupRouter({
directory: {
resolveMembers,
@@ -54,7 +54,7 @@ function harness(resolveMembers: ProviderGroupDirectory['resolveMembers'], persi
persisted.value = value;
},
},
- now: () => START,
+ now: () => now,
random: () => 0,
});
}
@@ -75,8 +75,16 @@ describe('provider group state kept by the group computer', () => {
expect((await restarted.view('anthropic')).members[0].state).toBe('available');
expect(await restarted.pick({ providerId: 'anthropic', agentKind: 'claude-code', model: MODEL }))
.toMatchObject({ kind: 'member', member: { key: A.key } });
- const legacy = harness(bothOk, { value: { anthropic: { [A.key]: START + 86_400_000 } } });
+ // PR #6322: 仅在内存截短会让每次重建 router 都重新冷却两分钟;unit 覆盖真实加载/保存入口。
+ const oldStore = { value: { anthropic: { [A.key]: START + 86_400_000 } } as ProviderGroupPersistedCooling };
+ const legacy = harness(bothOk, oldStore);
expect(legacy.coolingUntil('anthropic', A.key)).toBe(START + 120_000);
+ expect(oldStore.value.anthropic[A.key]).toEqual({ '': START + 120_000 });
+ expect(harness(bothOk, oldStore, START + 60_000).coolingUntil('anthropic', A.key)).toBe(START + 120_000);
+ const afterExpiry = harness(bothOk, oldStore, START + 180_000);
+ expect(afterExpiry.coolingUntil('anthropic', A.key)).toBeNull();
+ expect(await afterExpiry.pick({ providerId: 'anthropic', agentKind: 'claude-code', model: MODEL }))
+ .toMatchObject({ kind: 'member', member: { key: A.key } });
});
it('remembers cooldowns across restarts and drops the ones that have ended', async () => {
diff --git a/apps/desktop/src/main/provider-group/coolingStore.ts b/apps/desktop/src/main/provider-group/coolingStore.ts
index 2ac16a2b69..9d80269f85 100644
--- a/apps/desktop/src/main/provider-group/coolingStore.ts
+++ b/apps/desktop/src/main/provider-group/coolingStore.ts
@@ -76,7 +76,10 @@ function mergeCooling(
const b = next[providerId] ?? {};
const entries: Record<string, ProviderGroupCooling> = {};
for (const memberKey of new Set([...Object.keys(a), ...Object.keys(b)])) {
- const scopes = currentCooling(a[memberKey], now);
+ const incoming = b[memberKey];
+ // 加载时已截短的旧记录优先,不能因排队拿锁而用 now 再截短一次并延长。
+ const migrated = typeof a[memberKey] === 'number' && typeof incoming === 'object' && incoming[''] !== undefined;
+ const scopes = migrated ? {} : currentCooling(a[memberKey], now);
for (const [scope, until] of Object.entries(currentCooling(b[memberKey], now))) {
scopes[scope] = Math.max(scopes[scope] ?? 0, until);
}
diff --git a/apps/desktop/src/main/provider-group/router.ts b/apps/desktop/src/main/provider-group/router.ts
index f091f06599..3d9df5708e 100644
--- a/apps/desktop/src/main/provider-group/router.ts
+++ b/apps/desktop/src/main/provider-group/router.ts
@@ -112,9 +112,11 @@ function coolKey(providerId: string, memberKey: string): string {
export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): ProviderGroupRouter {
const guestSupportReader = deps.readCaps ? createGuestSupportReader(deps.readCaps) : null;
const cooling = new Map<string, Record<string, number>>();
+ let hasLegacyCooling = false;
try {
for (const [providerId, members] of Object.entries(deps.coolingStore?.read() ?? {})) {
for (const [memberKey, value] of Object.entries(members)) {
+ if (typeof value === 'number') hasLegacyCooling = true;
cooling.set(coolKey(providerId, memberKey), currentCooling(value, deps.now()));
}
}
@@ -139,6 +141,9 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid
}
}
+ // 固定首次加载时截短的截止时间,重启或切回账号不能重新起算两分钟。
+ if (hasLegacyCooling) persistCooling();
+
const lastPicked = new Map<string, string>();
const tried = new Map<string, { at: number; keys: Set<string> }>();
/** 本机任务刚选中、还没开始运行一轮的临时占用:任务 id → 那台。 */