Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(chat): 隐藏的报错横幅不响应 Esc
Dashe614c12f37d9
diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsxindex 41d5a93fc7..b0826ef404 100644--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx@@ -18,7 +18,7 @@ import { useProviders } from '@/hooks/useProviders';* (auth 缺失场景 Retry 立刻重发等于撞同一个 401,所以同步前先把 Retry 隐藏。)*/-import { useEffect, useState } from 'react';+import { useEffect, useRef, useState } from 'react';import { isCodexResumeNotReadyProjectionError } from '@cindy/maker-shared/agent-input-projection';import { canOfferCodexHistoryRecovery, isCindyGatewayProxyTokenInvalidError, isResponsesLiteParallelToolCallsError, parseAgentErrorCode, redactSensitiveText } from '@cindy/maker-shared/error-redaction';import { chatRemoteErrorGuidanceKey } from '@/lib/autoReviewUnavailableGuidance';@@ -161,6 +161,7 @@ export function ErrorBanner({className,}: ErrorBannerProps) {const { t, i18n } = useTranslation();+ const bannerRef = useRef<HTMLDivElement>(null);useEffect(() => {if (!dismissOnEscape || !onCancel) return;const onKeyDown = (event: KeyboardEvent) => {@@ -179,6 +180,8 @@ export function ErrorBanner({) {return;}+ // 右栏最大化等布局会用 CSS 隐藏仍挂载的聊天区;隐藏的报错不认领 Esc。+ if (!bannerRef.current?.checkVisibility({ checkVisibilityCSS: true })) return;// 弹层优先;MorphPopover 关闭时不 preventDefault,但会保留到收合动画结束。if (document.querySelector(@@ -657,6 +660,7 @@ export function ErrorBanner({// **API mode 不在 hide 列表里** — gateway key 自动 refresh, retry 大概率成功。return (<div+ ref={bannerRef}className={cn('mx-auto flex items-start gap-2 border px-3 py-2',isOpenAiConnectionExpireddiff --git a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsxindex 08a46180b4..d07c7cdf89 100644--- a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx+++ b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx@@ -15,6 +15,18 @@ import {CLAUDE_SUBSCRIPTION_OPUS_PLAN_MISMATCH_REASON,} from '../../../../shared/claudeGatewayError';+// jsdom 没有布局引擎,也尚未实现 checkVisibility;只补本组需要的 CSS 显隐语义。+Object.defineProperty(HTMLElement.prototype, 'checkVisibility', {+ configurable: true,+ value(this: HTMLElement) {+ for (let element: HTMLElement | null = this; element; element = element.parentElement) {+ const style = getComputedStyle(element);+ if (style.display === 'none' || style.visibility === 'hidden') return false;+ }+ return true;+ },+});+type AuthStateChangedPayload = {agentKind: 'claude-code' | 'codex';authenticated: boolean;@@ -94,6 +106,29 @@ describe('ErrorBanner OpenAI connection recovery', () => {expect(recover).toHaveBeenCalledOnce();});+ it.each(['live', 'persisted'])('preserves a hidden %s error when Escape exits sidebar maximize', (kind) => {+ const dismiss = vi.fn();+ const retry = vi.fn();+ const exitMaximize = vi.fn();+ const banner = kind === 'live'+ ? <ErrorBanner error="hidden error" onRetry={retry} onCancel={dismiss} dismissOnEscape />+ : <ErrorTailErrorBanner errorText="hidden error" onContinue={retry} onDismiss={dismiss} dismissOnEscape />;+ const { rerender } = render(<main style={{ display: 'none' }}>{banner}</main>);+ // 与 MainLayout 一样,退出最大化的监听不 preventDefault,且晚于横幅注册。+ window.addEventListener('keydown', exitMaximize);+ try {+ fireEvent.keyDown(window, { key: 'Escape' });+ expect(exitMaximize).toHaveBeenCalledOnce();+ expect(dismiss).not.toHaveBeenCalled();+ expect(retry).not.toHaveBeenCalled();+ } finally {+ window.removeEventListener('keydown', exitMaximize);+ }+ rerender(<main>{banner}</main>);+ fireEvent.keyDown(window, { key: 'Escape' });+ expect(dismiss).toHaveBeenCalledOnce();+ });+it.each([{ isRecoverable: true }, { remoteHostId: 'ssh' }, { agentDeviceId: 'hosted' },{ deviceLinkDeviceId: sharedTaskHostPeer('shared-task', 'owner-device') },