Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

fix(ui): toasts sit above the notification cards; the Codex ~/.codex notice is a card (#36167)

Neil400266a9ce25
diff --git a/src/renderer/src/app-shell/AppRootSurfaces.tsx b/src/renderer/src/app-shell/AppRootSurfaces.tsx
index 8c38acd7189..ce2e8691941 100644
--- a/src/renderer/src/app-shell/AppRootSurfaces.tsx
+++ b/src/renderer/src/app-shell/AppRootSurfaces.tsx
@@ -14,6 +14,7 @@ import { MarkdownTemplatePicker } from '../components/editor/MarkdownTemplatePic
import RecentTabSwitcher from '../components/tab-bar/RecentTabSwitcher'
import { SkillFreshnessUpdateDialog } from '../components/skills/SkillFreshnessUpdateDialog'
import { StarNagCard } from '../components/StarNagCard'
+import { CodexSharedSettingsNoticeCard } from '../components/CodexSharedSettingsNoticeCard'
import { NativeChatResumeOnRestartModal } from '../components/NativeChatResumeRuntimeModal'
import { StarNagAgentValueMomentObserver } from '../components/star-nag/StarNagAgentValueMomentObserver'
import { StarNagToastHost } from '../components/star-nag/StarNagToastHost'
@@ -303,6 +304,9 @@ export const AppRootSurfaces = memo(function AppRootSurfaces(props: {
<OverlayBoundary boundaryId="overlay.star-nag" resetKey={activeView}>
<StarNagCard />
</OverlayBoundary>
+ <OverlayBoundary boundaryId="overlay.codex-shared-settings-notice" resetKey={activeView}>
+ <CodexSharedSettingsNoticeCard />
+ </OverlayBoundary>
</NotificationCardStack>
<OverlayBoundary boundaryId="overlay.native-chat-resume-on-restart" resetKey={activeView}>
<NativeChatResumeOnRestartModal />
diff --git a/src/renderer/src/app-shell/use-app-shell-services.ts b/src/renderer/src/app-shell/use-app-shell-services.ts
index f7f832ba43e..268bf0c932f 100644
--- a/src/renderer/src/app-shell/use-app-shell-services.ts
+++ b/src/renderer/src/app-shell/use-app-shell-services.ts
@@ -21,7 +21,6 @@ import { useTerminalViewerColorPublication } from './use-terminal-viewer-color-p
import { useBrowserIdentityMigrationNotice } from '../components/browser-pane/browser-user-agent-migration-notice'
import { useBrowserClientHostedDownloadNotices } from '../components/browser-pane/browser-client-hosted-download-notices'
import { useCodexTerminalServerIsolationNotice } from '../components/terminal-pane/codex-terminal-server-isolation-notice'
-import { useCodexSharedSettingsNotice } from '../components/terminal-pane/codex-shared-settings-notice'
import { useVisibleHostedReviewRefresh } from './use-visible-hosted-review-refresh'
import { useProfileStateSaveDelayNotice } from './use-profile-state-save-delay-notice'
@@ -54,5 +53,4 @@ export function useAppShellServices(): void {
useBrowserIdentityMigrationNotice()
useBrowserClientHostedDownloadNotices()
useCodexTerminalServerIsolationNotice()
- useCodexSharedSettingsNotice()
}
diff --git a/src/renderer/src/components/CodexSharedSettingsNoticeCard.tsx b/src/renderer/src/components/CodexSharedSettingsNoticeCard.tsx
new file mode 100644
index 00000000000..ece9c206dc1
--- /dev/null
+++ b/src/renderer/src/components/CodexSharedSettingsNoticeCard.tsx
@@ -0,0 +1,46 @@
+import { Info, X } from 'lucide-react'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from './ui/card'
+import { Button } from './ui/button'
+import { translate } from '@/i18n/i18n'
+import { useCodexSharedSettingsNotice } from './terminal-pane/codex-shared-settings-notice'
+
+/** A persistent one-time notice, so it sits with the other cards rather than as a sticky toast. */
+export function CodexSharedSettingsNoticeCard(): React.JSX.Element | null {
+ const { visible, dismiss } = useCodexSharedSettingsNotice()
+ if (!visible) {
+ return null
+ }
+ return (
+ <Card role="complementary" aria-labelledby="codex-shared-settings-notice-heading">
+ <CardHeader>
+ <div className="flex items-start justify-between gap-2">
+ <div className="flex items-center gap-2">
+ <Info className="size-4 text-muted-foreground" />
+ <CardTitle id="codex-shared-settings-notice-heading">
+ {translate(
+ 'terminal.codexSharedSettingsNotice.title',
+ 'Codex in Orca now uses ~/.codex'
+ )}
+ </CardTitle>
+ </div>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ onClick={dismiss}
+ aria-label={translate('terminal.codexSharedSettingsNotice.dismiss', 'Dismiss')}
+ >
+ <X />
+ </Button>
+ </div>
+ </CardHeader>
+ <CardContent>
+ <CardDescription>
+ {translate(
+ 'terminal.codexSharedSettingsNotice.description',
+ 'Codex may ask again to trust folders or approve commands. Re-add any MCP servers you added only in Orca.'
+ )}
+ </CardDescription>
+ </CardContent>
+ </Card>
+ )
+}
diff --git a/src/renderer/src/components/NotificationCardStack.test.tsx b/src/renderer/src/components/NotificationCardStack.test.tsx
new file mode 100644
index 00000000000..11e4ad0c3a1
--- /dev/null
+++ b/src/renderer/src/components/NotificationCardStack.test.tsx
@@ -0,0 +1,56 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { NOTIFICATION_CARD_STACK_HEIGHT_VAR } from '@/lib/notification-card-stack-height'
+import { NotificationCardStack } from './NotificationCardStack'
+
+let resize: (() => void) | null = null
+let height = 0
+let root: Root | null = null
+
+const published = (): string =>
+ document.documentElement.style.getPropertyValue(NOTIFICATION_CARD_STACK_HEIGHT_VAR)
+
+beforeEach(() => {
+ height = 0
+ vi.stubGlobal(
+ 'ResizeObserver',
+ class {
+ constructor(callback: () => void) {
+ resize = callback
+ }
+ observe(): void {}
+ disconnect(): void {}
+ }
+ )
+ vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(() => height)
+ root = createRoot(document.body.appendChild(document.createElement('div')))
+})
+
+afterEach(() => {
+ act(() => root?.unmount())
+ vi.unstubAllGlobals()
+ vi.restoreAllMocks()
+})
+
+describe('NotificationCardStack', () => {
+ it('publishes its height plus the gap so toasts sit above the cards, and clears it when empty', () => {
+ height = 120
+ act(() => root?.render(<NotificationCardStack>card</NotificationCardStack>))
+ expect(published()).toBe('calc(120px + 0.5rem)')
+
+ height = 0
+ act(() => resize?.())
+ expect(published()).toBe('')
+ })
+
+ it('clears its height on unmount, so the toaster returns to its own offset', () => {
+ height = 80
+ act(() => root?.render(<NotificationCardStack>card</NotificationCardStack>))
+ act(() => root?.unmount())
+ root = null
+ expect(published()).toBe('')
+ })
+})
diff --git a/src/renderer/src/components/NotificationCardStack.tsx b/src/renderer/src/components/NotificationCardStack.tsx
index a27ace1ed00..3349170ac2f 100644
--- a/src/renderer/src/components/NotificationCardStack.tsx
+++ b/src/renderer/src/components/NotificationCardStack.tsx
@@ -1,8 +1,38 @@
-import type { ReactNode } from 'react'
+import { useEffect, useRef, type ReactNode } from 'react'
+import { NOTIFICATION_CARD_STACK_HEIGHT_VAR } from '@/lib/notification-card-stack-height'
export function NotificationCardStack({ children }: { children: ReactNode }): React.JSX.Element {
+ const stackRef = useRef<HTMLDivElement>(null)
+
+ useEffect(() => {
+ const stack = stackRef.current
+ if (!stack) {
+ return
+ }
+ const root = stack.ownerDocument.documentElement
+ // Why publish: toasts share this corner and would otherwise render behind the cards (z-50).
+ const publish = (): void => {
+ const height = stack.offsetHeight
+ if (height > 0) {
+ root.style.setProperty(NOTIFICATION_CARD_STACK_HEIGHT_VAR, `calc(${height}px + 0.5rem)`)
+ } else {
+ root.style.removeProperty(NOTIFICATION_CARD_STACK_HEIGHT_VAR)
+ }
+ }
+ publish()
+ const observer = new ResizeObserver(publish)
+ observer.observe(stack)
+ return () => {
+ observer.disconnect()
+ root.style.removeProperty(NOTIFICATION_CARD_STACK_HEIGHT_VAR)
+ }
+ }, [])
+
return (
- <div className="pointer-events-none fixed bottom-10 right-4 z-50 flex max-h-[calc(100vh-80px)] w-[360px] max-w-[calc(100vw-32px)] flex-col-reverse gap-2 overflow-y-auto scrollbar-sleek [&>*]:pointer-events-auto [&>*]:shrink-0 max-[480px]:left-4 max-[480px]:right-4 max-[480px]:w-auto">
+ <div
+ ref={stackRef}
+ className="pointer-events-none fixed bottom-10 right-4 z-50 flex max-h-[calc(100vh-80px)] w-[360px] max-w-[calc(100vw-32px)] flex-col-reverse gap-2 overflow-y-auto scrollbar-sleek [&>*]:pointer-events-auto [&>*]:shrink-0 max-[480px]:left-4 max-[480px]:right-4 max-[480px]:w-auto"
+ >
{children}
</div>
)
diff --git a/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.test.ts b/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.test.ts
index a9de1beb870..39b47cbb1d4 100644
--- a/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.test.ts
+++ b/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.test.ts
@@ -1,5 +1,6 @@
// @vitest-environment happy-dom
+import { act } from 'react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
mountHook,
@@ -9,11 +10,14 @@ import {
} from './codex-notice-test-harness'
import { useCodexSharedSettingsNotice } from './codex-shared-settings-notice'
-const { toastInfoMock } = vi.hoisted(() => ({ toastInfoMock: vi.fn() }))
-
-vi.mock('sonner', () => ({ toast: { info: toastInfoMock } }))
vi.mock('@/store', () => import('./codex-notice-test-harness'))
+let notice: ReturnType<typeof useCodexSharedSettingsNotice> | null = null
+function useNoticeProbe(): void {
+ notice = useCodexSharedSettingsNotice()
+}
+const isVisible = (): boolean => notice?.visible === true
+
const codexTab = { 'wt-1': [{ id: 'tab-1', launchAgent: 'codex' }] }
function resetStore(overrides: Record<string, unknown> = {}): void {
@@ -35,7 +39,7 @@ const isSeen = (): unknown => noticeTestStore.getState().codexSharedSettingsNoti
describe('useCodexSharedSettingsNotice', () => {
beforeEach(() => {
- toastInfoMock.mockReset()
+ notice = null
vi.stubGlobal('navigator', { userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)' })
resetStore()
})
@@ -46,44 +50,48 @@ describe('useCodexSharedSettingsNotice', () => {
})
it('shows once on Windows when a Codex terminal appears, and marks it seen', async () => {
- await mountHook(useCodexSharedSettingsNotice)
- expect(toastInfoMock).not.toHaveBeenCalled()
+ await mountHook(useNoticeProbe)
+ expect(isVisible()).toBe(false)
await setNoticeState({ tabsByWorktree: codexTab })
await setNoticeState({ agentStatusByPaneKey: { 'tab-1:leaf': { agentType: 'codex' } } })
- expect(toastInfoMock).toHaveBeenCalledTimes(1)
- expect(toastInfoMock).toHaveBeenCalledWith('Codex in Orca now uses ~/.codex', {
- id: 'codex-shared-settings-notice',
- description:
- 'Codex may ask again to trust folders or approve commands. Re-add any MCP servers you added only in Orca.',
- duration: Infinity
- })
+ expect(isVisible()).toBe(true)
+ expect(isSeen()).toBe(true)
+ })
+
+ it('hides for good once dismissed', async () => {
+ resetStore({ tabsByWorktree: codexTab })
+ await mountHook(useNoticeProbe)
+ expect(isVisible()).toBe(true)
+
+ await act(async () => notice?.dismiss())
+ expect(isVisible()).toBe(false)
expect(isSeen()).toBe(true)
})
it('stays quiet off Windows', async () => {
vi.stubGlobal('navigator', { userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)' })
resetStore({ tabsByWorktree: codexTab })
- await mountHook(useCodexSharedSettingsNotice)
- expect(toastInfoMock).not.toHaveBeenCalled()
+ await mountHook(useNoticeProbe)
+ expect(isVisible()).toBe(false)
expect(isSeen()).toBe(false)
})
it('stays quiet in a paired web client window', async () => {
vi.stubGlobal('__ORCA_WEB_CLIENT__', true)
resetStore({ tabsByWorktree: codexTab })
- await mountHook(useCodexSharedSettingsNotice)
- expect(toastInfoMock).not.toHaveBeenCalled()
+ await mountHook(useNoticeProbe)
+ expect(isVisible()).toBe(false)
})
it('shows once the persisted seen flag loads after mount', async () => {
// Why seen: true: the store's default until persisted UI arrives.
resetStore({ codexSharedSettingsNoticeSeen: true, tabsByWorktree: codexTab })
- await mountHook(useCodexSharedSettingsNotice)
- expect(toastInfoMock).not.toHaveBeenCalled()
+ await mountHook(useNoticeProbe)
+ expect(isVisible()).toBe(false)
await setNoticeState({ codexSharedSettingsNoticeSeen: false })
- expect(toastInfoMock).toHaveBeenCalledTimes(1)
+ expect(isVisible()).toBe(true)
})
})
diff --git a/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.ts b/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.ts
index db05a38d4e7..9c356199e15 100644
--- a/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.ts
+++ b/src/renderer/src/components/terminal-pane/codex-shared-settings-notice.ts
@@ -1,37 +1,26 @@
-import { useEffect } from 'react'
-import { toast } from 'sonner'
-import { translate } from '@/i18n/i18n'
+import { useCallback, useEffect, useState } from 'react'
import { useAppStore } from '@/store'
import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
import { whenCodexTerminalAppears } from './codex-terminal-presence'
-function showCodexSharedSettingsNotice(): void {
- // Why mark before showing: seen means shown, so a quit or reload never repeats it.
- useAppStore.getState().markCodexSharedSettingsNoticeSeen()
- toast.info(
- translate('terminal.codexSharedSettingsNotice.title', 'Codex in Orca now uses ~/.codex'),
- {
- // Why a stable id: a late sync that resets the flag can't stack a second toast.
- id: 'codex-shared-settings-notice',
- description: translate(
- 'terminal.codexSharedSettingsNotice.description',
- 'Codex may ask again to trust folders or approve commands. Re-add any MCP servers you added only in Orca.'
- ),
- // Why no timeout: it is marked seen before showing, so an auto-close would lose it for good.
- duration: Infinity
- }
- )
-}
-
-export function useCodexSharedSettingsNotice(): void {
+/** Whether to show the one-time "Codex now uses ~/.codex" card this session, and its dismiss. */
+export function useCodexSharedSettingsNotice(): { visible: boolean; dismiss: () => void } {
// Why no hydration check: the flag defaults to true until the persisted value arrives.
const seen = useAppStore((s) => s.codexSharedSettingsNoticeSeen)
+ const [visible, setVisible] = useState(false)
useEffect(() => {
// Why skip paired web clients: the change is on the host, whose own window shows this.
if (seen || !isLocalWindowsDesktopClient()) {
return
}
- return whenCodexTerminalAppears(showCodexSharedSettingsNotice)
+ return whenCodexTerminalAppears(() => {
+ // Why mark before showing: seen means shown, so a quit or reload never repeats it.
+ useAppStore.getState().markCodexSharedSettingsNoticeSeen()
+ setVisible(true)
+ })
}, [seen])
+
+ const dismiss = useCallback(() => setVisible(false), [])
+ return { visible, dismiss }
}
diff --git a/src/renderer/src/components/ui/sonner.tsx b/src/renderer/src/components/ui/sonner.tsx
index cb0d5347253..fe9d346c452 100644
--- a/src/renderer/src/components/ui/sonner.tsx
+++ b/src/renderer/src/components/ui/sonner.tsx
@@ -9,6 +9,7 @@ import type { SyntheticEvent } from 'react'
import { Toaster as Sonner, type ToasterProps } from 'sonner'
import { useAppStore } from '@/store'
import { MODAL_OVERLAY_CHILD_SELECTOR } from '@/lib/body-overlay-attributes'
+import { NOTIFICATION_CARD_STACK_HEIGHT_VAR } from '@/lib/notification-card-stack-height'
// Why: a short outcome reads best with its action beside it; the toaster's default wraps actions below.
export const INLINE_ACTION_CLASS_NAMES = {
@@ -34,6 +35,12 @@ function blockModalToastInteraction(event: SyntheticEvent): void {
}
}
+const TOASTER_OFFSET = {
+ bottom: `calc(2.5rem + env(safe-area-inset-bottom, 0px) + var(${NOTIFICATION_CARD_STACK_HEIGHT_VAR}, 0px))`,
+ // Why 1rem: the cards' right edge, so a toast above them lines up instead of jutting left.
+ right: '1rem'
+}
+
const Toaster = ({ ...props }: ToasterProps) => {
const theme = useAppStore((s) => s.settings?.theme) || 'system'
@@ -59,9 +66,9 @@ const Toaster = ({ ...props }: ToasterProps) => {
<Sonner
theme={theme as ToasterProps['theme']}
position="bottom-right"
- // Reserve status-bar clearance at both normal and sub-600px mobileOffset breakpoints.
- offset={{ bottom: 'calc(2.5rem + env(safe-area-inset-bottom, 0px))' }}
- mobileOffset={{ bottom: 'calc(2.5rem + env(safe-area-inset-bottom, 0px))' }}
+ // Clear the status bar, then any notification cards in this corner, at both breakpoints.
+ offset={TOASTER_OFFSET}
+ mobileOffset={TOASTER_OFFSET}
className="toaster group"
icons={{
success: <CircleCheckIcon className="size-4" />,
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json
index b4c6074d225..c01f3526d13 100644
--- a/src/renderer/src/i18n/locales/de.json
+++ b/src/renderer/src/i18n/locales/de.json
@@ -20730,7 +20730,8 @@
},
"codexSharedSettingsNotice": {
"title": "Codex in Orca verwendet jetzt ~/.codex",
- "description": "Codex fordert möglicherweise erneut dazu auf, Ordnern zu vertrauen oder Befehle zu genehmigen. MCP-Server, die nur in Orca hinzugefügt wurden, erneut hinzufügen."
+ "description": "Codex fordert möglicherweise erneut dazu auf, Ordnern zu vertrauen oder Befehle zu genehmigen. MCP-Server, die nur in Orca hinzugefügt wurden, erneut hinzufügen.",
+ "dismiss": "Ausblenden"
},
"codexSharedServerBanner": {
"title": "Dieser Codex teilt sich einen Server mit den anderen Codex-Tabs",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 5baad1c2f84..2accb96328f 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -21207,7 +21207,8 @@
},
"codexSharedSettingsNotice": {
"title": "Codex in Orca now uses ~/.codex",
- "description": "Codex may ask again to trust folders or approve commands. Re-add any MCP servers you added only in Orca."
+ "description": "Codex may ask again to trust folders or approve commands. Re-add any MCP servers you added only in Orca.",
+ "dismiss": "Dismiss"
},
"codexSharedServerBanner": {
"title": "This Codex is sharing a server with your other Codex tabs",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 91541897a59..6c92ed81878 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -21237,7 +21237,8 @@
},
"codexSharedSettingsNotice": {
"title": "Codex en Orca ahora usa ~/.codex",
- "description": "Codex puede volver a pedir que confíes en carpetas o apruebes comandos. Vuelve a agregar los servidores MCP que agregaste solo en Orca."
+ "description": "Codex puede volver a pedir que confíes en carpetas o apruebes comandos. Vuelve a agregar los servidores MCP que agregaste solo en Orca.",
+ "dismiss": "Descartar"
},
"paneMove": {
"failed": "No se pudo mover el panel a una pestaña nueva."
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 0e6d9223226..05951e8cb73 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -21533,7 +21533,8 @@
},
"codexSharedSettingsNotice": {
"title": "Le Codex dans Orca utilise désormais ~/.codex",
- "description": "Le Codex peut demander à nouveau de faire confiance aux dossiers ou d'approuver les commandes. Ajoutez à nouveau tous les serveurs MCP que vous avez ajoutés uniquement dans Orca."
+ "description": "Le Codex peut demander à nouveau de faire confiance aux dossiers ou d'approuver les commandes. Ajoutez à nouveau tous les serveurs MCP que vous avez ajoutés uniquement dans Orca.",
+ "dismiss": "Ignorer"
},
"codexSharedServerBanner": {
"title": "Ce Codex partage un serveur avec vos autres onglets Codex",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index c138e0dc776..ca3b286a1cb 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -20875,7 +20875,8 @@
},
"codexSharedSettingsNotice": {
"title": "Orca の Codex は ~/.codex を使用するようになりました",
- "description": "Codex は、フォルダーを信頼するか、コマンドを承認するかを再度要求する場合があります。 Orca のみに追加した MCP サーバーを再度追加します。"
+ "description": "Codex は、フォルダーを信頼するか、コマンドを承認するかを再度要求する場合があります。 Orca のみに追加した MCP サーバーを再度追加します。",
+ "dismiss": "閉じる"
},
"codexSharedServerBanner": {
"title": "この Codex は他の Codex タブとサーバーを共有しています",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 6581c93e14d..7f468f81979 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -20875,7 +20875,8 @@
},
"codexSharedSettingsNotice": {
"title": "Orca의 Codex는 이제 ~/.codex를 사용합니다",
- "description": "Codex는 폴더를 신뢰하거나 명령을 승인하도록 다시 요청할 수 있습니다. ORCA에서만 추가한 MCP 서버를 다시 추가합니다."
+ "description": "Codex는 폴더를 신뢰하거나 명령을 승인하도록 다시 요청할 수 있습니다. ORCA에서만 추가한 MCP 서버를 다시 추가합니다.",
+ "dismiss": "닫기"
},
"codexSharedServerBanner": {
"title": "이 Codex는 다른 Codex 탭과 서버를 공유합니다",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 4ee7e06499e..55c80ec1e1e 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -21177,7 +21177,8 @@
},
"codexSharedSettingsNotice": {
"title": "O Codex no Orca agora usa ~/.codex",
- "description": "O Codex pode pedir novamente para confiar em pastas ou aprovar comandos. Adicione novamente os servidores MCP que você adicionou apenas no Orca."
+ "description": "O Codex pode pedir novamente para confiar em pastas ou aprovar comandos. Adicione novamente os servidores MCP que você adicionou apenas no Orca.",
+ "dismiss": "Descartar"
},
"codexSharedServerBanner": {
"title": "Este Codex está compartilhando um servidor com suas outras abas do Codex",
diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json
index efe4d9f607b..fda2f5a4267 100644
--- a/src/renderer/src/i18n/locales/ru.json
+++ b/src/renderer/src/i18n/locales/ru.json
@@ -21429,7 +21429,8 @@
},
"codexSharedSettingsNotice": {
"title": "Codex в Orca теперь использует ~/.codex",
- "description": "Codex может снова запросить доверие к папкам или одобрение команд. Заново добавьте MCP-серверы, которые добавляли только в Orca."
+ "description": "Codex может снова запросить доверие к папкам или одобрение команд. Заново добавьте MCP-серверы, которые добавляли только в Orca.",
+ "dismiss": "Скрыть"
},
"codexSharedServerBanner": {
"title": "Этот Codex использует общий сервер с другими вкладками Codex",
diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json
index 7f8d3b00a51..f16139f160c 100644
--- a/src/renderer/src/i18n/locales/tr.json
+++ b/src/renderer/src/i18n/locales/tr.json
@@ -20713,7 +20713,8 @@
},
"codexSharedSettingsNotice": {
"title": "Orca'daki Codex artık ~/.codex kullanıyor",
- "description": "Codex, klasörlere güvenmenizi veya komutları onaylamanızı yeniden isteyebilir. Yalnızca Orca'ya eklediğiniz MCP sunucularını yeniden ekleyin."
+ "description": "Codex, klasörlere güvenmenizi veya komutları onaylamanızı yeniden isteyebilir. Yalnızca Orca'ya eklediğiniz MCP sunucularını yeniden ekleyin.",
+ "dismiss": "Kapat"
},
"codexSharedServerBanner": {
"title": "Bu Codex, diğer Codex sekmelerinizle aynı sunucuyu paylaşıyor",
diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json
index 21de7db391f..01437e38e09 100644
--- a/src/renderer/src/i18n/locales/zh-Hant.json
+++ b/src/renderer/src/i18n/locales/zh-Hant.json
@@ -20409,7 +20409,8 @@
},
"codexSharedSettingsNotice": {
"title": "Orca 中的 Codex 現在使用 ~/.codex",
- "description": "Codex 可能會再次要求信任資料夾或批准命令。重新新增您僅在 Orca 中新增的所有 MCP 伺服器。"
+ "description": "Codex 可能會再次要求信任資料夾或批准命令。重新新增您僅在 Orca 中新增的所有 MCP 伺服器。",
+ "dismiss": "關閉"
},
"codexSharedServerBanner": {
"title": "此 Codex 與您的其他 Codex 分頁共享伺服器",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 14a2e32e80f..47ffcbabea2 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -20876,7 +20876,8 @@
},
"codexSharedSettingsNotice": {
"title": "Orca 中的 Codex 现在使用 ~/.codex",
- "description": "Codex 可能会再次要求信任文件夹或批准命令。重新添加您仅在 Orca 中添加的所有 MCP 服务器。"
+ "description": "Codex 可能会再次要求信任文件夹或批准命令。重新添加您仅在 Orca 中添加的所有 MCP 服务器。",
+ "dismiss": "关闭"
},
"codexSharedServerBanner": {
"title": "此 Codex 与您的其他 Codex 选项卡共享服务器",
diff --git a/src/renderer/src/lib/notification-card-stack-height.ts b/src/renderer/src/lib/notification-card-stack-height.ts
new file mode 100644
index 00000000000..ad43f208ae2
--- /dev/null
+++ b/src/renderer/src/lib/notification-card-stack-height.ts
@@ -0,0 +1,2 @@
+/** The notification card stack's height plus its gap, unset while empty; the toaster sits above it. */
+export const NOTIFICATION_CARD_STACK_HEIGHT_VAR = '--notification-card-stack-height'