Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-share): recover expired gaps and release denied reservations
zqchrisdb030f6df804
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.tsindex ec1b41acef..7414e2b9d4 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts@@ -51,6 +51,32 @@ describe('provider share usage store', () => {expect(createProviderShareUsageStore(file).memberTokenSnapshot(new Set(['s']), 'p', 'alice').available).toBe(false);});+ // Unit: production snapshot/flush/reload must stop pausing once missing data leaves the window.+ // Regression #7666/r4398894972: the prior corrupt-file case only checked fail-closed, not recovery.+ // Minimal input: one corruption marker, a complete new row, restart next day, then advance seven dates.+ it.each(['corrupt-json', 'legacy-marker', 'dated-invalid-row'] as const)(+ 'recovers after incomplete data leaves seven local dates, including reloads (%s)', async (damage) => {+ let now = new Date(2026, 9, 22, 12).getTime();+ const file = path.join(dir, 'usage.json');+ fs.writeFileSync(file, damage === 'corrupt-json' ? '{broken' : JSON.stringify({ version: 1,+ rows: damage === 'dated-invalid-row' ? [{ day: '2026-10-21', inputTokens: -1 }] : [],+ ...(damage === 'legacy-marker' ? { incomplete: true } : {}),+ }));+ let store = createProviderShareUsageStore(file, { now: () => now });+ const snapshot = () => store.memberTokenSnapshot(new Set(['s']), 'p', 'alice');+ expect(snapshot().available).toBe(false);+ await store.flush();+ now = new Date(2026, 9, 23, 12).getTime();+ store = createProviderShareUsageStore(file, { now: () => now });+ expect(snapshot().available).toBe(false);+ store.record('s', 'alice', { kind: 'codex', providerId: 'p', memberKey: 'local', samples: [sample('model', 10, 5)] });+ await store.flush();+ now = new Date(2026, 9, damage === 'dated-invalid-row' ? 28 : 29, 12).getTime();+ store = createProviderShareUsageStore(file, { now: () => now });+ expect(snapshot()).toMatchObject({ available: true, models: [{ model: 'model', tokens: 15 }] });+ },+ );+it('aggregates per member and model, filters by range and only returns requested shares', async () => {let now = new Date(2026, 9, 7, 12).getTime();const file = path.join(dir, 'usage.json');diff --git a/apps/desktop/src/main/device-link/providerShareUsageStore.ts b/apps/desktop/src/main/device-link/providerShareUsageStore.tsindex fd2c6a4c97..b28ba74e0d 100644--- a/apps/desktop/src/main/device-link/providerShareUsageStore.ts+++ b/apps/desktop/src/main/device-link/providerShareUsageStore.ts@@ -154,28 +154,46 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:const now = options.now ?? Date.now;let rows: Map<string, ProviderShareUsageRow> | null = null;let timer: ReturnType<typeof setTimeout> | null = null;- let incomplete = false;+ // Missing data on/before this local date can affect a rolling snapshot until it ages out.+ let incompleteThroughDay: string | null = null;let writing: Promise<void> = Promise.resolve();const keyOf = (row: Pick<ProviderShareUsageRow, 'day' | 'shareId' | 'memberId' | 'kind' | 'providerId' | 'model'>) =>JSON.stringify([row.day, row.shareId, row.memberId, row.kind, row.providerId, row.model]);+ function markIncomplete(day?: unknown, persist = true): void {+ const today = localDay(now());+ let through = today;+ if (typeof day === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= today) {+ const [year, month, date] = day.split('-').map(Number);+ if (localDay(new Date(year!, month! - 1, date!).getTime()) === day) through = day;+ }+ if (!incompleteThroughDay || through > incompleteThroughDay) {+ incompleteThroughDay = through;+ // Persist detection even without a new usage receipt; reopening must not move the boundary.+ if (persist || through !== day) scheduleFlush();+ }+ }+function load(): Map<string, ProviderShareUsageRow> {if (rows) return rows;rows = new Map();try {- const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as { version?: unknown; rows?: unknown; incomplete?: unknown };- incomplete = parsed.incomplete === true;+ const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as {+ version?: unknown; rows?: unknown; incomplete?: unknown; incompleteThroughDay?: unknown;+ };+ if (parsed.incompleteThroughDay !== undefined) markIncomplete(parsed.incompleteThroughDay, false);+ else if (parsed.incomplete === true) markIncomplete(); // Migrate the old undated marker once.if (parsed.version === FILE_VERSION && Array.isArray(parsed.rows)) {for (const raw of parsed.rows) {const row = parseRow(raw);if (row) rows.set(keyOf(row), row);- else incomplete = true;+ else markIncomplete((raw as { day?: unknown } | null)?.day);}- } else incomplete = true;+ } else markIncomplete();} catch (error) {// A missing ledger is empty; unreadable/corrupt data must not become a measured 0%.- incomplete = (error as NodeJS.ErrnoException).code !== 'ENOENT';+ if ((error as NodeJS.ErrnoException).code !== 'ENOENT') markIncomplete();}return rows;}@@ -191,7 +209,9 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:async function writeNow(): Promise<void> {const map = load();prune(map);- const body = JSON.stringify({ version: FILE_VERSION, rows: [...map.values()], ...(incomplete ? { incomplete: true } : {}) });+ if (incompleteThroughDay && incompleteThroughDay < providerShareUsageRangeStart('7d', now())!) incompleteThroughDay = null;+ const body = JSON.stringify({ version: FILE_VERSION, rows: [...map.values()],+ ...(incompleteThroughDay ? { incomplete: true, incompleteThroughDay } : {}) });const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;await fsp.mkdir(path.dirname(filePath), { recursive: true });try {@@ -223,7 +243,7 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:|| row.day < start || row.day > end) continue;totals.set(row.model, (totals.get(row.model) ?? 0) + row.inputTokens + row.outputTokens);}- return { available: !incomplete, windowStart: start, windowEnd: end,+ return { available: !incompleteThroughDay || incompleteThroughDay < start, windowStart: start, windowEnd: end,nextWindowAt: new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).getTime(),models: [...totals].map(([model, tokens]) => ({ model, tokens })) };},diff --git a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.tsindex 73fe7a5cd8..676a6d1818 100644--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts@@ -710,6 +710,27 @@ describe('provider group relay: starting, load and cleanup', () => {await client.close('close', 'navigation');});+ // Unit: Host.handle(open) must release a reserved group slot if final admission throws.+ // Regression #7666/r4398894989: existing cleanup tests covered boolean denials, not budget exceptions.+ // Minimal input: group plan reserves a slot, then isAllowed throws the stable pause error before runs.set.+ it('releases reserved group load when final admission throws a member budget pause', async () => {+ const load = { setRunning: vi.fn(), release: vi.fn() };+ const paused = Object.assign(new Error('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] Model share reached'), {+ code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED',+ });+ const env = setup({ plans: [{ kind: 'local', load }], owner: { modelAccess: { isAllowed: () => { throw paused; } } } });+ try {+ await expect(env.owner.handle(GUEST_A, {+ op: 'open', runId: runId(), agentKind: 'claude-code', payload: { json: openPayload(SESSION) },+ })).rejects.toBe(paused);+ expect(load.release).toHaveBeenCalledTimes(1);+ expect(env.owner.runCount()).toBe(0);+ expect(env.ownerStarted).toHaveLength(0);+ } finally {+ for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); }+ }+ });+it('counts the load from the moment it picks, including tasks the group runs on this computer', async () => {const localLoad = { setRunning: vi.fn(), release: vi.fn() };const memberLoad = { setRunning: vi.fn(), release: vi.fn() };diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex b48f448ec6..28940ae994 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -2802,11 +2802,12 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {failProviderNotAllowed();}// 供应商查询/组分配有 await;最终检查与登记间不能再等待,防止并发 open 超额。- if (providerId && deps.providerAccess && !deps.providerAccess.isAllowed(providerId, controller, payload.options.model)) {- reserved?.release();- failProviderNotAllowed();- }try {+ // Admission may throw a specific pause error after the awaited group reservation.+ // Nothing owns the reserved load until runs.set, so release it on either rejection path.+ if (providerId && deps.providerAccess && !deps.providerAccess.isAllowed(providerId, controller, payload.options.model)) {+ failProviderNotAllowed();+ }assertRunCapacity(controller);} catch (error) {reserved?.release();diff --git a/docs/provider-share-member-budget.md b/docs/provider-share-member-budget.mdindex ffa89e8ffd..db2152ac36 100644--- a/docs/provider-share-member-budget.md+++ b/docs/provider-share-member-budget.md@@ -17,7 +17,7 @@- 开启后,占比大于或等于上限时暂停该成员对此模型的新请求。100% 表示不限制;其他模型维持原授权。- 没有记录时显示“暂无用量数据”,比例为未知,不显示 0%。允许首次请求以建立使用记录;其结果可能使下一请求超限。- 已有记录中某型号没有用量,可以显示它在当前账本中的 0%;不能说它消耗了账号周额度的 0%。-- 无法读取、解析或可靠求和账本时显示不可用。已启用且小于 100% 的受限模型暂停;草案、未受限模型和机主不受影响。+- 无法读取、解析或可靠求和账本时显示不可用。已启用且小于 100% 的受限模型暂停;草案、未受限模型和机主不受影响。 损坏记录的不完整日期边界会持久化;无法定位日期时按发现当日处理。七天窗口移出该边界后恢复,正常写入及重启不会延长暂停。- 已发出的请求完成后入账,不中断当前输出。并发请求与回执延迟可能跨过阈值,不能承诺严格零超支。- 该成员使用其他模型或旧记录退出窗口后重新计算;低于上限才恢复。午夜只更新窗口,不保证恢复。不会自动重试或静默换模型。- 推荐模型也受既有授权及自身上限约束,不推荐已不可用的模型;推荐不是自动切换。