Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(auth): resync Codex quota reads after login rollback
Chris463c8442b71d
diff --git a/apps/desktop/src/main/maker-host/__tests__/codex-account-auth.test.ts b/apps/desktop/src/main/maker-host/__tests__/codex-account-auth.test.tsindex daebf2662a..7e53ee2810 100644--- a/apps/desktop/src/main/maker-host/__tests__/codex-account-auth.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codex-account-auth.test.ts@@ -90,6 +90,8 @@ function credential(subject: string, account = 'workspace') {}beforeEach(() => {vi.clearAllMocks();+ vi.mocked(broadcastCodexAccountAuthStarted).mockReset();+ vi.mocked(broadcastCodexAccountAuthReady).mockReset();state.root = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-codex-account-auth-'));state.owner = { dataOwnerId: 'owner-a', generation: 1 };state.raw = credential('person-a');@@ -304,6 +306,25 @@ describe('native Codex account credentials', () => {expect(result.rollbackCredentials?.()).toBe(true);expect(codexAccountState('account-a').authenticated).toBe(false);});+ it.each([false, true])('resynchronizes rollback quota reads only for the original owner (owner changed: %s)', async (ownerChanged) => {+ await loginCodexAccount('account-a', () => true);+ state.raw = credential('person-b');+ const result = await loginCodexAccount('account-a', () => true);+ const events: string[] = [];+ vi.mocked(broadcastCodexAccountAuthStarted).mockImplementationOnce(() => {+ events.push(`start:${codexAccountState('account-a').identity}`);+ });+ vi.mocked(broadcastCodexAccountAuthReady).mockImplementationOnce(() => {+ events.push(`ready:${codexAccountState('account-a').identity}`);+ });+ if (ownerChanged) state.owner = { dataOwnerId: 'owner-b', generation: 2 };+ expect(result.rollbackCredentials?.()).toBe(true);+ expect(events).toEqual(ownerChanged ? [] : [+ 'start:[email protected]', 'ready:[email protected]',+ ]);+ state.owner = { dataOwnerId: 'owner-a', generation: 1 };+ expect(codexAccountState('account-a').identity).toBe('[email protected]');+ });it('cancels a pending login without installing its credentials', async () => {state.hold = true;const pending = loginCodexAccount('account-a', () => true);diff --git a/apps/desktop/src/main/maker-host/codex-account-auth.ts b/apps/desktop/src/main/maker-host/codex-account-auth.tsindex 8c77fb5a67..91010c7ae8 100644--- a/apps/desktop/src/main/maker-host/codex-account-auth.ts+++ b/apps/desktop/src/main/maker-host/codex-account-auth.ts@@ -282,6 +282,12 @@ export async function loginCodexAccount(if (previous === null) fs.rmSync(path.join(home, file), { force: true });else fs.writeFileSync(path.join(home, file), previous, { mode: 0o600 });});+ // The replacement's ready event may already have started a quota read.+ // Invalidate those renderer reads, then resume from the restored identity.+ if (getActiveAppSession().generation === owner.generation) {+ broadcastCodexAccountAuthStarted(providerId);+ broadcastCodexAccountAuthReady(providerId);+ }return true;} catch {return false;diff --git a/apps/desktop/src/renderer/__tests__/useCodexRateLimits.test.ts b/apps/desktop/src/renderer/__tests__/useCodexRateLimits.test.tsindex e806d8d6e4..e9fa606f0f 100644--- a/apps/desktop/src/renderer/__tests__/useCodexRateLimits.test.ts+++ b/apps/desktop/src/renderer/__tests__/useCodexRateLimits.test.ts@@ -198,6 +198,34 @@ describe('useCodexRateLimits', () => {expect(accountB.result.current.snapshot).toBe(refreshedB);});+ it('ignores a replacement identity quota read that finishes after login rollback', async () => {+ const original = { ...result, providerId: 'openai-a', account: { ...result.account, accountId: 'original' } };+ const replacement = { ...original, account: { ...result.account, accountId: 'replacement' } };+ let authStarted: (() => void) | undefined;+ let authReady: (() => void) | undefined;+ let resolveReplacement!: (value: MobileCodexRateLimitsResult) => void;+ const reader = vi.fn().mockResolvedValueOnce(original)+ .mockImplementationOnce(() => new Promise(resolve => { resolveReplacement = resolve; }))+ .mockResolvedValueOnce(original);+ vi.stubGlobal('electronAPI', { maker: { usage: {+ getCodexRateLimits: reader,+ onCodexAccountAuthStarted: (callback: () => void) => { authStarted = callback; return vi.fn(); },+ onCodexAccountAuthReady: (callback: () => void) => { authReady = callback; return vi.fn(); },+ } } });+ const hook = renderHook(() => useCodexRateLimits(true, 'openai-a'));+ await waitFor(() => expect(hook.result.current.snapshot).toBe(original));+ act(() => { authStarted?.(); authReady?.(); });+ expect(reader).toHaveBeenCalledTimes(2);+ expect(hook.result.current.snapshot).toBeNull();++ // Capability commit failed: rollback publishes start/ready after restoring credentials.+ act(() => { authStarted?.(); authReady?.(); });+ await waitFor(() => expect(hook.result.current.snapshot).toBe(original));+ expect(reader).toHaveBeenCalledTimes(3);+ await act(async () => resolveReplacement(replacement));+ expect(hook.result.current.snapshot).toBe(original);+ });+it('does not treat an unrelated scoped clear as a credential replacement', async () => {const accountChanges = new Map<string, (payload: unknown) => void>();const accountA = { ...result, providerId: 'openai-a' };diff --git a/docs/product-rules/model-metadata-precedence.md b/docs/product-rules/model-metadata-precedence.mdindex 12ec308fb8..5c0c10945c 100644--- a/docs/product-rules/model-metadata-precedence.md+++ b/docs/product-rules/model-metadata-precedence.md@@ -108,6 +108,7 @@ Codex 超快是账号发现能力:`service_tiers` / `additional_speed_tiers`同一连接重新登录为不同身份或工作区时,接受登录前必须成功清除旧资格;CAS 冲突、所属用户切换或写入失败时回滚登录,不把撤权放进可忽略失败的展示刷新。原生模型缓存先于凭证提交清除,删除失败保留原身份;取消登录回滚凭证与缓存。+凭证回滚后,仍属于当前用户的连接重新发布账号切换与就绪通知,废弃替换身份的在途额度读取。仅原生 Codex 账号的 Codex 入口可用,API 同名模型及其它引擎不继承。回归见 `custom-provider-store.test.ts` 与 `modelDiscoveryChannels.test.ts`。