Skip to content

perf(pi): 缓存超限包结果并回收会话临时目录 #3524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lizzjin wants to merge 5 commits into
base: main
Choose a base branch
from
Open

perf(pi): 缓存超限包结果并回收会话临时目录 #3524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
091b2cd
perf(pi): cache package limits and reclaim session homes
lizzjin Aug 27, 2026
c605a5c
Merge remote-tracking branch 'upstream/main' into codex/issue-3468
lizzjin Aug 27, 2026
ab5b6ac
fix(pi): bound package negative cache reuse
lizzjin Aug 27, 2026
40e62cb
fix(pi): preserve markerless legacy config homes
lizzjin Aug 27, 2026
b65a38b
fix(pi): scope limit caching and reuse owner probes
lizzjin Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 71 additions & 18 deletions apps/desktop/src/main/cindy-brain/__tests__/ghostOauthFlow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,25 @@ function jsonResponse(body: unknown, status = 200): Response {
}

/** 从 openExternal 捕获的授权 URL 中提取回调地址与 state,模拟浏览器完成授权。 */
function browserRedirect(authorizeUrl: string, params: (u: URL) => Record<string, string>): void {
function browserRedirect(
authorizeUrl: string,
params: (u: URL) => Record<string, string>,
callbackFetch: typeof fetch = fetch,
): Promise<void> {
const url = new URL(authorizeUrl);
const redirectUri = url.searchParams.get('redirect_uri');
if (!redirectUri) throw new Error('authorize URL 缺 redirect_uri');
const cb = new URL(redirectUri);
for (const [k, v] of Object.entries(params(url))) cb.searchParams.set(k, v);
// 不 await:引擎在 race 回调,fire-and-forget 即可;失败让测试超时暴露。
setImmediate(() => {
void fetch(cb.toString()).catch(() => undefined);
// openExternal 会 await 本 Promise:loopback 传输失败必须原样暴露,不能吞掉后
// 让 OAuth flow 等到 Vitest 的外层超时。消费 body 后再结算,避免连接悬空。
return new Promise((resolve, reject) => {
setImmediate(() => {
void (async () => {
const response = await callbackFetch(cb.toString());
await response.arrayBuffer();
})().then(resolve, reject);
});
});
}

Expand Down Expand Up @@ -93,6 +103,19 @@ function isListenFailed(value: unknown): boolean {
}

describe('startGhostOauthFlow', () => {
it('browserRedirect 把 loopback callback 传输失败直接交给调用方', async () => {
const authorizeUrl = new URL(BASE_CONFIG.authorizeUrl);
authorizeUrl.searchParams.set('redirect_uri', 'http://127.0.0.1:1/callback');
const callbackFailure = new Error('loopback callback unavailable');
const callbackFetch = vi.fn(async () => {
throw callbackFailure;
}) as unknown as typeof fetch;

await expect(
browserRedirect(authorizeUrl.toString(), () => ({ code: 'c0', state: 's0' }), callbackFetch),
).rejects.toBe(callbackFailure);
});

it('happy path:PKCE + state 校验 + code 换 token', async () => {
let capturedAuthorizeUrl = '';
const fetchImpl = vi.fn(async (input: string | URL | Request, init?: RequestInit) => {
Expand Down Expand Up @@ -130,7 +153,7 @@ describe('startGhostOauthFlow', () => {
expect(u.searchParams.get('response_type')).toBe('code');
expect(u.searchParams.get('scope')).toBe('read:a write:b');
expect(u.searchParams.get('code_challenge_method')).toBe('S256');
browserRedirect(url, (au) => ({
return browserRedirect(url, (au) => ({
code: 'code-abc',
state: au.searchParams.get('state') ?? '',
}));
Expand Down Expand Up @@ -174,7 +197,7 @@ describe('startGhostOauthFlow', () => {
// 保留参数不被意识声明顶掉。
expect(u.searchParams.get('client_id')).toBe('client-123');
expect(u.searchParams.get('state')).not.toBe('EVIL-STATE');
browserRedirect(url, (au) => ({
return browserRedirect(url, (au) => ({
code: 'c2',
state: au.searchParams.get('state') ?? '',
}));
Expand All @@ -201,7 +224,10 @@ describe('startGhostOauthFlow', () => {
fetchImpl: fetchImpl as unknown as typeof fetch,
openExternal: (url) => {
expect(new URL(url).searchParams.get('code_challenge')).toBeNull();
browserRedirect(url, (au) => ({ code: 'c3', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c3',
state: au.searchParams.get('state') ?? '',
}));
},
});
expect(result.ok).toBe(true);
Expand Down Expand Up @@ -246,7 +272,7 @@ describe('startGhostOauthFlow', () => {
fetchImpl: vi.fn() as unknown as typeof fetch,
openExternal: (url) => {
// state 先行校验后,error 参数只在 state 匹配时才结算(与 grok 同口径)。
browserRedirect(url, (au) => ({
return browserRedirect(url, (au) => ({
error: 'access_denied',
state: au.searchParams.get('state') ?? '',
}));
Expand Down Expand Up @@ -314,7 +340,10 @@ describe('startGhostOauthFlow', () => {
config: BASE_CONFIG,
fetchImpl: vi.fn(async () => jsonResponse({ access_token: 'at-6' })) as unknown as typeof fetch,
openExternal: (url2) => {
browserRedirect(url2, (au) => ({ code: 'c6', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url2, (au) => ({
code: 'c6',
state: au.searchParams.get('state') ?? '',
}));
},
});
},
Expand All @@ -330,7 +359,10 @@ describe('startGhostOauthFlow', () => {
jsonResponse({ error: 'invalid_client', error_description: 'bad client' }, 401),
) as unknown as typeof fetch,
openExternal: (url) => {
browserRedirect(url, (au) => ({ code: 'c7', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c7',
state: au.searchParams.get('state') ?? '',
}));
},
});
expect(result).toMatchObject({ ok: false, error: 'EXCHANGE_FAILED' });
Expand All @@ -348,7 +380,10 @@ describe('startGhostOauthFlow', () => {
openExternal: (url) => {
const u = new URL(url);
expect(u.searchParams.get('redirect_uri')).toBe(`http://127.0.0.1:${freePort}/callback`);
browserRedirect(url, (au) => ({ code: 'c-fixed', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c-fixed',
state: au.searchParams.get('state') ?? '',
}));
},
}),
]);
Expand Down Expand Up @@ -395,7 +430,10 @@ describe('startGhostOauthFlow', () => {
config: { ...BASE_CONFIG, pkce: false, redirectPort: fixedPort },
fetchImpl: vi.fn(async () => jsonResponse({ access_token: 'at-heal' })) as unknown as typeof fetch,
openExternal: (url2) => {
browserRedirect(url2, (au) => ({ code: 'c-heal', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url2, (au) => ({
code: 'c-heal',
state: au.searchParams.get('state') ?? '',
}));
},
});
},
Expand Down Expand Up @@ -429,7 +467,10 @@ describe('startGhostOauthFlow', () => {
config: { ...BASE_CONFIG, pkce: false, redirectPort: fixedPort },
fetchImpl: vi.fn(async () => jsonResponse({ access_token: 'at-third' })) as unknown as typeof fetch,
openExternal: (url3) => {
browserRedirect(url3, (au) => ({ code: 'c-third', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url3, (au) => ({
code: 'c-third',
state: au.searchParams.get('state') ?? '',
}));
},
});
},
Expand Down Expand Up @@ -461,7 +502,10 @@ describe('startGhostOauthFlow', () => {
config: { ...BASE_CONFIG, pkce: false, redirectPort: heldPort },
fetchImpl: vi.fn(async () => jsonResponse({ access_token: 'at-reclaim' })) as unknown as typeof fetch,
openExternal: (url) => {
browserRedirect(url, (au) => ({ code: 'c-reclaim', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c-reclaim',
state: au.searchParams.get('state') ?? '',
}));
},
reclaimPort,
});
Expand Down Expand Up @@ -528,7 +572,10 @@ describe('startGhostOauthFlow', () => {
openExternal: (url) => {
challengeFromUrl = new URL(url).searchParams.get('code_challenge');
expect(challengeFromUrl).toBeTruthy();
browserRedirect(url, (au) => ({ code: 'c-broker', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c-broker',
state: au.searchParams.get('state') ?? '',
}));
},
});
expect(result).toMatchObject({ ok: true });
Expand All @@ -551,7 +598,7 @@ describe('startGhostOauthFlow', () => {
fetchImpl: vi.fn() as unknown as typeof fetch,
broker,
openExternal: (url) => {
browserRedirect(url, (authorizeUrl) => ({
return browserRedirect(url, (authorizeUrl) => ({
code: 'c-unavailable',
state: authorizeUrl.searchParams.get('state') ?? '',
}));
Expand Down Expand Up @@ -580,7 +627,10 @@ describe('startGhostOauthFlow', () => {
broker,
openExternal: (url) => {
expect(new URL(url).searchParams.get('code_challenge')).toBeNull();
browserRedirect(url, (au) => ({ code: 'c-np', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c-np',
state: au.searchParams.get('state') ?? '',
}));
},
});
expect(result).toMatchObject({ ok: true });
Expand Down Expand Up @@ -826,7 +876,10 @@ describe('startGhostOauthFlow', () => {
fetchImpl: vi.fn(async () => jsonResponse({ access_token: 'at-sd' })) as unknown as typeof fetch,
openExternal: (url) => {
expect(new URL(url).searchParams.get('scope')).toBe('read:a,write:b');
browserRedirect(url, (au) => ({ code: 'c-sd', state: au.searchParams.get('state') ?? '' }));
return browserRedirect(url, (au) => ({
code: 'c-sd',
state: au.searchParams.get('state') ?? '',
}));
},
});
expect(result).toMatchObject({ ok: true });
Expand Down
Loading
Loading