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(auth): recover failed skip and preserve pending consent

Dash7ce6c97c8861
diff --git a/apps/desktop/src/renderer/components/login/LoginPage.tsx b/apps/desktop/src/renderer/components/login/LoginPage.tsx
index bdce35fd4b..bfdc722d41 100644
--- a/apps/desktop/src/renderer/components/login/LoginPage.tsx
+++ b/apps/desktop/src/renderer/components/login/LoginPage.tsx
@@ -205,9 +205,8 @@ export function LoginPage({
persistPrivacyConsent();
} catch (error) {
// 两个调用点都是 requireConsent(() => void openLocalMode()):抛出去没人接,
- // 会变成 unhandled rejection。IPC 失败(main 未就绪/通道异常)时停在登录页
- // 就是正确兜底——用户可重试或改走正常登录;这里只记日志,不自造错误 UI
- // (登录页的 errorCode 归 main 的 loginFlowState 所有,renderer 不旁路写)。
+ // 会变成 unhandled rejection。AuthContext 在 IPC 失败时保留可用表单,
+ // 或把已废弃请求的准备态转成既有错误页;这里仅记录失败,允许用户重试。
log.error('enter not-signed-in session failed', error);
} finally {
markLocalModeTransition(false);
@@ -236,7 +235,19 @@ export function LoginPage({
stamp: ConsentStamp;
// true = 同意时不在弹窗回调里落同意记录,由 action 自己落(见 requireConsent)
deferConsentPersist: boolean;
+ // Only a skip opened during provider loading may survive its completion.
+ awaitingProviders: boolean;
} | null>(null);
+ const pendingConsent = pendingConsentAction.current;
+ const providerLoadSettled =
+ pendingConsent?.awaitingProviders &&
+ !credentialStoreFailed &&
+ (canLeaveProviderLoad || loginState?.step === 'identifier');
+ const currentConsentStamp = makeConsentStamp(
+ providerLoadSettled ? pendingConsent.stamp.step : loginState?.step,
+ isLoading && !(pendingConsent?.deferConsentPersist && (canLeaveProviderLoad || providerLoadSettled)),
+ loginState?.step === 'completed',
+ );
/* 把「用户明示同意《隐私政策》」这个事实落到 main。
它是 TapDB 采集的前置条件(见 main/analytics-settings-store.ts):没有这条
@@ -289,6 +300,7 @@ export function LoginPage({
loginState?.step === 'completed',
),
deferConsentPersist,
+ awaitingProviders: deferConsentPersist && canLeaveProviderLoad && isLoading,
};
setConsentDialogOpen(true);
};
@@ -305,12 +317,8 @@ export function LoginPage({
if (!pending?.deferConsentPersist) persistPrivacyConsent();
if (!pending) return;
// 复验:弹窗期间 auth 状态被异步推进(登录完成/步骤切换/in-flight)则丢弃动作
- const current = makeConsentStamp(
- loginState?.step,
- isLoading && !(pending.deferConsentPersist && canLeaveProviderLoad),
- loginState?.step === 'completed',
- );
- if (canResumePendingConsent(pending.stamp, current)) pending.action();
+ if (pending.deferConsentPersist && credentialStoreFailed) return;
+ if (canResumePendingConsent(pending.stamp, currentConsentStamp)) pending.action();
};
const dismissConsent = () => {
// 不同意 = 退回登录页,radio 保持未勾选
@@ -321,12 +329,13 @@ export function LoginPage({
useEffect(() => {
if (!consentDialogOpen) return;
const pending = pendingConsentAction.current;
- const step = loginState?.step ?? 'unknown';
- if (step === 'completed' || (pending && step !== pending.stamp.step)) {
+ const step = currentConsentStamp.step;
+ if (step === 'completed' || (pending && step !== pending.stamp.step) ||
+ (pending?.deferConsentPersist && credentialStoreFailed)) {
pendingConsentAction.current = null;
setConsentDialogOpen(false);
}
- }, [consentDialogOpen, loginState?.step]);
+ }, [consentDialogOpen, currentConsentStamp.step, credentialStoreFailed]);
const openLegalLink = (kind: 'terms' | 'privacy') => {
// 链接经系统默认浏览器打开(shell:open-external 只放行 http(s),未登录可用);
// URL 按构建区域分流(国内 protocol.xd.cn / 国际 protocol.xd.com)。
diff --git a/apps/desktop/src/renderer/components/login/__tests__/LoginPage.consent.test.tsx b/apps/desktop/src/renderer/components/login/__tests__/LoginPage.consent.test.tsx
index 7fe720325b..1aae624a69 100644
--- a/apps/desktop/src/renderer/components/login/__tests__/LoginPage.consent.test.tsx
+++ b/apps/desktop/src/renderer/components/login/__tests__/LoginPage.consent.test.tsx
@@ -404,6 +404,37 @@ describe('consent guard(未勾选拦截个人登录链路)', () => {
expect(screen.getByTestId('login-local-mode')).toBeTruthy();
});
+ it.each([null, errorState])('keeps pending skip consent when providers finish from %j', async (initial) => {
+ const view = mount(initial, { isLoading: true });
+ fireEvent.click(screen.getByTestId('login-local-mode'));
+ loginHook.value.loginState = await identifierState('providers:cn-social');
+ loginHook.value.isLoading = false;
+ view.rerender(<LoginPage />);
+ expect(screen.getByTestId('login-consent-dialog')).toBeTruthy();
+ expect(acceptPrivacyConsent).not.toHaveBeenCalled();
+ await act(async () => { fireEvent.click(screen.getByTestId('login-consent-agree')); });
+ expect(enterLocalMode).toHaveBeenCalledOnce();
+ expect(acceptPrivacyConsent).toHaveBeenCalledOnce();
+ expect(enterLocalMode.mock.invocationCallOrder[0]).toBeLessThan(
+ acceptPrivacyConsent.mock.invocationCallOrder[0],
+ );
+ });
+
+ it.each([
+ { step: 'completed' },
+ { step: 'browser-redirect', label: 'SSO' },
+ { step: 'error', code: 'CREDENTIAL_STORE_UNAVAILABLE', recoverTo: 'identifier' },
+ ])('abandons pending skip consent on an unrelated transition to %j', (state) => {
+ const view = mount(null, { isLoading: true });
+ fireEvent.click(screen.getByTestId('login-local-mode'));
+ loginHook.value.loginState = state;
+ loginHook.value.isLoading = false;
+ view.rerender(<LoginPage />);
+ expect(screen.queryByTestId('login-consent-dialog')).toBeNull();
+ expect(enterLocalMode).not.toHaveBeenCalled();
+ expect(acceptPrivacyConsent).not.toHaveBeenCalled();
+ });
+
it('旧游客圆钮入口已删除(圆钮行不再渲染 login-social-guest)', async () => {
mount(await identifierState('providers:cn-social'));
expect(screen.queryByTestId('login-social-guest')).toBeNull();
diff --git a/apps/desktop/src/renderer/contexts/AuthContext.tsx b/apps/desktop/src/renderer/contexts/AuthContext.tsx
index c8b06c035b..317d62dd28 100644
--- a/apps/desktop/src/renderer/contexts/AuthContext.tsx
+++ b/apps/desktop/src/renderer/contexts/AuthContext.tsx
@@ -610,12 +610,23 @@ export function AuthProvider({
}, []);
const enterLocalMode = useCallback(async () => {
- loginOperationRef.current += 1;
+ const operation = ++loginOperationRef.current;
// 本地模式也是一次 dataOwnerId 切换。必须走 applyIncomingState,不能自己拼半套
// setter:漏接草稿 / prompt / 模型可见性 / 记忆分区会让跳过登录进主界面后仍读写
// signed-out 槽(2026-08-21 #3201 Codex P1)。
- const state = await runDataOwnerBoundary(() => authServiceRef.current!.enterLocalMode());
- applyIncomingState(state);
+ try {
+ const state = await runDataOwnerBoundary(() => authServiceRef.current!.enterLocalMode());
+ applyIncomingState(state);
+ } catch (error) {
+ // The abandoned provider load can no longer settle preparing. Preserve any
+ // usable form or newer operation, otherwise expose the existing retry screen.
+ if (operation === loginOperationRef.current) {
+ setLoginState((current) => current ?? {
+ step: 'error', code: 'AUTH_REQUEST_FAILED', recoverTo: 'identifier',
+ });
+ }
+ throw error;
+ }
}, [applyIncomingState, runDataOwnerBoundary]);
const exitLocalMode = useCallback(async () => {
diff --git a/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx b/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
index db8e8a2be7..fa683f4de3 100644
--- a/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
+++ b/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
@@ -23,6 +23,7 @@ const mocks = vi.hoisted(() => ({
beginAddAccount: vi.fn<() => Promise<DesktopLoginActionResult>>(),
cancelAddAccount: vi.fn(async () => {}),
logout: vi.fn(async () => {}),
+ enterLocalMode: vi.fn<() => Promise<never>>(),
},
logError: vi.fn(),
unhandled: [] as unknown[],
@@ -87,6 +88,52 @@ afterEach(() => {
});
describe('login recovery ignores abandoned IPC results', () => {
+ it.each(['resolve', 'reject'] as const)(
+ 'recovers a failed skip while the abandoned provider request later %ss',
+ async (settlement) => {
+ mocks.service.initialize.mockResolvedValue({ isAuthenticated: false, isCanary: false });
+ let finishLoad!: (result: DesktopLoginActionResult) => void;
+ let failLoad!: (error: Error) => void;
+ mocks.service.getLoginState.mockReturnValueOnce(new Promise((resolve, reject) => {
+ finishLoad = resolve;
+ failLoad = reject;
+ }));
+ const hook = renderHook(() => ({ auth: useAuth(), login: useLogin() }), {
+ wrapper: AuthProvider,
+ });
+ await waitFor(() => expect(hook.result.current.auth.isInitializing).toBe(false));
+ expect(hook.result.current.login.isLoading).toBe(true);
+ mocks.service.enterLocalMode.mockRejectedValueOnce(new Error('IPC unavailable'));
+ await act(async () => {
+ await expect(hook.result.current.login.enterLocalMode()).rejects.toThrow('IPC unavailable');
+ });
+ expect(hook.result.current.auth.loginState).toEqual({
+ step: 'error', code: 'AUTH_REQUEST_FAILED', recoverTo: 'identifier',
+ });
+ expect(hook.result.current.login.isLoading).toBe(false);
+
+ let finishRetry!: (result: DesktopLoginActionResult) => void;
+ mocks.service.dispatchLoginAction.mockReturnValueOnce(new Promise((resolve) => {
+ finishRetry = resolve;
+ }));
+ let retry!: Promise<boolean>;
+ act(() => { retry = hook.result.current.login.dispatch({ type: 'reset' }); });
+ await act(async () => {
+ if (settlement === 'resolve') finishLoad({ success: true, state: { step: 'entry' } });
+ else failLoad(new Error('late failure'));
+ });
+ expect(hook.result.current.auth.loginState?.step).toBe('error');
+ expect(hook.result.current.login.errorCode).toBeNull();
+ expect(hook.result.current.login.isLoading).toBe(true);
+ await act(async () => {
+ finishRetry({ success: true, state: { step: 'entry' } });
+ await retry;
+ });
+ expect(hook.result.current.auth.loginState?.step).toBe('entry');
+ expect(hook.result.current.login.isLoading).toBe(false);
+ },
+ );
+
it.each(['load', 'reset', 'add-account'] as const)(
'keeps the entry and the new loading state when an earlier %s finishes',
async (kind) => {
@@ -181,6 +228,31 @@ describe('login recovery ignores abandoned IPC results', () => {
});
expect(hook.result.current.loginState).toBeNull();
});
+
+ it('preserves a usable form when skipping fails and ignores a superseded skip failure', async () => {
+ mocks.service.initialize.mockResolvedValue({ isAuthenticated: false, isCanary: false });
+ const hook = renderHook(() => useAuth(), { wrapper: AuthProvider });
+ await waitFor(() => expect(hook.result.current.isInitializing).toBe(false));
+ const form = { step: 'verification-code', kind: 'email', identifier: '[email protected]' } as const;
+ mocks.service.dispatchLoginAction.mockResolvedValueOnce({ success: true, state: form });
+ await act(async () => { await hook.result.current.dispatchLoginAction({ type: 'reset' }); });
+ mocks.service.enterLocalMode.mockRejectedValueOnce(new Error('skip failed'));
+ await act(async () => {
+ await expect(hook.result.current.enterLocalMode()).rejects.toThrow('skip failed');
+ });
+ expect(hook.result.current.loginState).toEqual(form);
+
+ let failSkip!: (error: Error) => void;
+ mocks.service.enterLocalMode.mockReturnValueOnce(new Promise((_, reject) => { failSkip = reject; }));
+ let skip!: Promise<void>;
+ act(() => { skip = hook.result.current.enterLocalMode(); });
+ await act(async () => { await hook.result.current.cancelAddAccount(); });
+ await act(async () => {
+ failSkip(new Error('old skip failed'));
+ await expect(skip).rejects.toThrow('old skip failed');
+ });
+ expect(hook.result.current.loginState).toBeNull();
+ });
});
describe('AuthContext initialize .catch 归一未登录', () => {
diff --git a/apps/desktop/src/renderer/hooks/useLogin.ts b/apps/desktop/src/renderer/hooks/useLogin.ts
index 4591d2c280..80140d0611 100644
--- a/apps/desktop/src/renderer/hooks/useLogin.ts
+++ b/apps/desktop/src/renderer/hooks/useLogin.ts
@@ -41,7 +41,7 @@ export function useLogin({ autoLoad = true }: { autoLoad?: boolean } = {}): UseL
getAccountDeletionStatus,
clearAccountDeletionReceipt,
listAccounts,
- enterLocalMode,
+ enterLocalMode: enterLocalModeFromAuth,
} = useAuth();
const [isLoading, setIsLoading] = useState(false);
const [errorCode, setErrorCode] = useState<string | null>(null);
@@ -107,6 +107,21 @@ export function useLogin({ autoLoad = true }: { autoLoad?: boolean } = {}): UseL
[dispatchWithResult],
);
+ const enterLocalMode = useCallback(async () => {
+ const operation = ++operationRef.current;
+ loadingRef.current = true;
+ setIsLoading(true);
+ setErrorCode(null);
+ try {
+ await enterLocalModeFromAuth();
+ } finally {
+ if (operation === operationRef.current) {
+ loadingRef.current = false;
+ setIsLoading(false);
+ }
+ }
+ }, [enterLocalModeFromAuth]);
+
return {
isLoading,
errorCode,
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index 067473aade..7bbcaa7137 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -2026,7 +2026,7 @@ and media position (`ui/media-scrubber`, seconds in/out). Native media controls
- **颜色**:底 `--login-deletion-bubble-bg`(#FFFFFF / #1F1F1E)、描边 `--login-deletion-bubble-border`(#D7D7D4 / #3C3C3A),均为**固定亮 / 暗二值**——与 §16.2「`--login-*` 只分 light / dark、不随扩展主题」一致,**不得**改用 `var(--surface)` / `var(--chat-input-*)` 等会被扩展主题 override 的 alias(同 `--login-bg-base` 的改判先例);移动端色板逐值一致。
- **状态与文案**:`pending`(预计删除日期 + 重新登录可取消)/ `processing`(等待期结束、正在删除)/ `completed`(已删除 + 「我知道了」)三态;`cancelled` 在轮询侧拦截、不渲染气泡(改为登录后的一次性「注销已取消」提示)。五语言(zh-CN / zh-TW / en / ja / ko)× light / dark 全覆盖。
-桌面登录恢复:准备态、错误态及离线入口的返回与「跳过登录」不因登录方式请求仍在等待而禁用;重试仍单次执行。凭证存储错误保留原有的检查与帮助流程,不绕过存储恢复限制。返回使旧请求失效,迟到结果不得覆盖新入口;「跳过登录」保留协议同意门与先切换本地会话、再保存同意的顺序。覆盖见 `LoginPage.initialization.test.tsx`、`LoginPage.consent.test.tsx` 与 `authLoginBack.test.ts`。
+桌面登录恢复:准备态、错误态及离线入口的返回与「跳过登录」不因登录方式请求仍在等待而禁用;重试仍单次执行。凭证存储错误保留原有的检查与帮助流程,不绕过存储恢复限制。返回使旧请求失效,迟到结果不得覆盖新入口;「跳过登录」保留协议同意门与先切换本地会话、再保存同意的顺序。等待登录方式期间打开的跳过协议弹窗,在方式加载完成后仍可同意续接;登录完成、进入其他登录步骤或凭证存储故障仍取消续接。切换本地模式失败时保留可用表单,无表单的准备态进入可重试错误页,旧请求不得重新覆盖页面或解除新请求的等待。覆盖见 `LoginPage.initialization.test.tsx`、`LoginPage.consent.test.tsx`、`AuthContextInitializeCatch.test.tsx` 与 `authLoginBack.test.ts`。
### 16.5 深色模式与主题跟随