diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index f640e779c0d..3ba4f821685 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -8,6 +8,7 @@ import { BrowserExtensionInstallDialog } from './components/browser-extension-in
import { PlansDialogHost } from './components/billing/plans/PlansDialogHost'
import { CloudMoveToComputerDialogMount } from './components/orca-cloud/CloudMoveToComputerDialogMount'
import { CloudSecretsAskDialogHost } from './components/cloud-secrets-ask/CloudSecretsMissingNotice'
+import { OrcaCloudSignInSheet } from './components/settings/agent-accounts/sign-in-sheet/OrcaCloudSignInSheet'
import { AgentHostPanel } from './components/agent-host-panel/AgentHostPanel'
import { SecretRequestUnseenNotifier } from './components/agent-pane/SecretRequestUnseenNotifier'
import { TeamDialogHost } from './components/billing/team/TeamDialogHost'
@@ -129,6 +130,7 @@ function App(): React.JSX.Element {
+
diff --git a/src/renderer/src/app-shell/AppWorkspaceShell.tsx b/src/renderer/src/app-shell/AppWorkspaceShell.tsx
index cddedd2a414..3b58c35221f 100644
--- a/src/renderer/src/app-shell/AppWorkspaceShell.tsx
+++ b/src/renderer/src/app-shell/AppWorkspaceShell.tsx
@@ -11,6 +11,7 @@ import { FloatingTerminalToggleButton } from '../components/floating-terminal/Fl
import { TerminalWorkbenchContainer } from '../components/TerminalWorkbenchContainer'
import { WorkspaceLowDiskBanner } from '../components/low-disk/WorkspaceLowDiskBanner'
import { CloudSetupPageLayer } from '../components/orca-cloud-setup/CloudSetupPageLayer'
+import { CloudOpenCoverLayer } from '../components/worktree-creation/CloudOpenCoverLayer'
import type { VirtualizedScrollAnchor } from '../hooks/useVirtualizedScrollAnchor'
import { TitlebarLeftControls } from './TitlebarLeftControls'
import { RightSidebarToggle, TitlebarMainStrip } from './TitlebarMainStrip'
@@ -248,6 +249,9 @@ export function AppWorkspaceShell(props: {
+
{floatingWorkspace.showToggleButton && !capturingPluginShot ? (
{
switch (action.kind) {
case 'renew':
- openSettings('accounts', 'orca-cloud')
+ openOrcaCloudSignInSheet()
return
case 'signIn':
gateActions.signIn()
diff --git a/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx b/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx
index 4c4de67f66f..5c0ed699d05 100644
--- a/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx
+++ b/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx
@@ -2,8 +2,8 @@
// Later" hint: it says how the composer's agent will sign in, links to the one-time setup in
// Settings → Agent accounts, and never blocks Start or signs in per sandbox.
import { useEffect } from 'react'
+import { openOrcaCloudSignInSheet } from '@/components/settings/agent-accounts/sign-in-sheet/orca-cloud-sign-in-sheet-store'
import { CircleCheck, CircleDashed, Info, TriangleAlert } from 'lucide-react'
-import { useAppStore } from '@/store/index'
import { useTranslate, type Translate } from '@/i18n/use-translate'
import { Button } from '@/components/ui/button'
import { Skeleton } from '@/components/ui/skeleton'
@@ -19,12 +19,9 @@ import { noteComposerAgentCoverage } from '@/lib/orca-cloud/cloud-first-start-ag
import type { OrcaCloudRunTargetAccess } from './orca-cloud-run-target-access'
import { agentName, keySourceLabel } from '../settings/agent-accounts/orca-cloud-accounts-copy'
-/** Settings → Agent accounts, scrolled to the Orca Cloud section (S0). The composer stays open. */
+/** The focused Orca Cloud sign-in sheet (JA-04), over the composer, which stays open. */
export function openOrcaCloudAgentAccounts(): void {
- const state = useAppStore.getState()
- state.openSettingsTarget({ pane: 'accounts', repoId: null, sectionId: 'orca-cloud' })
- // The target alone only pre-selects the pane; the page has to open too (Neil, P0: "does nothing").
- state.openSettingsPage()
+ openOrcaCloudSignInSheet()
}
export function orcaCloudAgentCoveredLabel(
diff --git a/src/renderer/src/components/orca-cloud/CloudAgentRowSignInTarget.tsx b/src/renderer/src/components/orca-cloud/CloudAgentRowSignInTarget.tsx
index daba491c714..03c6030286a 100644
--- a/src/renderer/src/components/orca-cloud/CloudAgentRowSignInTarget.tsx
+++ b/src/renderer/src/components/orca-cloud/CloudAgentRowSignInTarget.tsx
@@ -1,7 +1,6 @@
// The status (dot and text) of a cloud agent row that needs sign-in: clicking it opens
// Settings → Agent accounts, where the fix lives. The rest of the row still opens the pane.
import React, { useCallback } from 'react'
-import { useAppStore } from '@/store'
import { cn } from '@/lib/utils'
import { AgentStateDot } from '@/components/AgentStateDot'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -11,10 +10,9 @@ import { openOrcaCloudAgentAccounts } from '@/components/new-workspace/OrcaCloud
/** What the status shows: its label, the agent's catalog name, and the tooltip naming the fix. */
export type CloudAgentRowStatusText = { label: string; agentName: string; tooltip: string | null }
-/** The composer's "Set up once" target, plus opening Settings, which the sidebar has closed. */
+/** The sidebar row's "Set up once": the focused Orca Cloud sign-in sheet (JA-04). */
export function openCloudAgentAccountsSettings(): void {
openOrcaCloudAgentAccounts()
- useAppStore.getState().openSettingsPage()
}
/**
diff --git a/src/renderer/src/components/orca-cloud/CloudSetupNotices.tsx b/src/renderer/src/components/orca-cloud/CloudSetupNotices.tsx
index 4cf89f612cd..3868562512b 100644
--- a/src/renderer/src/components/orca-cloud/CloudSetupNotices.tsx
+++ b/src/renderer/src/components/orca-cloud/CloudSetupNotices.tsx
@@ -185,6 +185,18 @@ export function CloudSetupNotices({
)
}
+/** Bottom right, above the floating-terminal button: top right would cover the prompt's first row. */
+export function CloudSetupNoticesDock({ workspaceId }: { workspaceId: string }): React.JSX.Element {
+ return (
+
{t('orcaCloud.setupNotices.label', 'Workspace setup')}
diff --git a/src/renderer/src/components/orca-cloud/OrcaCloudWorkspaceSurface.tsx b/src/renderer/src/components/orca-cloud/OrcaCloudWorkspaceSurface.tsx
index f2223d64523..6d86e12acc1 100644
--- a/src/renderer/src/components/orca-cloud/OrcaCloudWorkspaceSurface.tsx
+++ b/src/renderer/src/components/orca-cloud/OrcaCloudWorkspaceSurface.tsx
@@ -22,7 +22,7 @@ import type { CloudWakeProgressEvent } from '../../../../shared/hosted-sandbox/c
import { CloudArchivedWorkspaceView, type ArchiveLoad } from './CloudArchivedWorkspaceView'
import { CloudWakingOverlay } from './CloudWakingOverlay'
import { CloudWorkspaceNotice } from './CloudWorkspaceNotice'
-import { CloudSetupNotices } from './CloudSetupNotices'
+import { CloudSetupNoticesDock } from './CloudSetupNotices'
import { useConfirmedRestart } from './use-cloud-panel-actions'
import { useCloudVersionSkewNotice } from './use-cloud-version-skew-notice'
import { CloudWorkspaceOfflineView } from './offline/CloudWorkspaceOfflineView'
@@ -339,10 +339,8 @@ function CloudSurface({ workspaceId }: { workspaceId: string }): React.JSX.Eleme
if (layer === null && versionSkewNotice) {
notices.push(versionSkewNotice)
}
- if (layer === null && view.state !== 'sleeping' && view.state !== 'archived') {
- // What the environment check found that didn't need to stop the create (env-check-ux).
- notices.push()
- }
+ // What the environment check found that didn't need to stop the create (env-check-ux).
+ const showSetupNotices = layer === null && view.state !== 'sleeping' && view.state !== 'archived'
if (layer === null && view.oom) {
notices.push(
) : null}
+ {showSetupNotices ? : null}
{notices.length > 0 ? (
{
@@ -99,18 +100,31 @@ describe('useWakeAttachHold', () => {
expect(result.current.wake).toBeUndefined()
})
- it('a pane that never takes input becomes "Couldn’t reconnect the terminal"; Try again reconnects it', () => {
+ it('at the cap reconnects the pane once on its own, and only then shows the card', () => {
+ const retry = vi.fn(() => true)
+ const { result, rerender } = hook(() => false, retry)
+ rerender({ wake: { ...waking, phase: 'ready' } })
+ expect(result.current.wake?.phase).toBe('connecting')
+ act(() => vi.advanceTimersByTime(PAST_CAP))
+ // The quiet retry: still Connecting…, no card yet.
+ expect(retry).toHaveBeenCalledTimes(1)
+ expect(result.current.terminalStalled).toBe(false)
+ expect(result.current.wake?.phase).toBe('connecting')
+ act(() => vi.advanceTimersByTime(PAST_CAP))
+ expect(retry).toHaveBeenCalledTimes(1)
+ expect(result.current.terminalStalled).toBe(true)
+ expect(result.current.wake?.phase).toBe('failed')
+ })
+
+ it('Try again re-runs the attach (not a wake) and waits for the pane once more', () => {
let attached: boolean | null = false
const retry = vi.fn(() => true)
const { result, rerender } = hook(() => attached, retry)
rerender({ wake: { ...waking, phase: 'ready' } })
- expect(result.current.wake?.phase).toBe('connecting')
- act(() => vi.advanceTimersByTime(WAKE_ATTACH_HOLD_MAX_MS + WAKE_ATTACH_POLL_MS))
+ act(() => vi.advanceTimersByTime(PAST_CAP * 2))
expect(result.current.terminalStalled).toBe(true)
- expect(result.current.wake?.phase).toBe('failed')
- // Try again: the pane reconnects and the pill waits for it once more.
act(() => result.current.retry())
- expect(retry).toHaveBeenCalledWith('ws')
+ expect(retry).toHaveBeenLastCalledWith('ws')
expect(result.current.terminalStalled).toBe(false)
expect(result.current.wake?.phase).toBe('connecting')
attached = true
@@ -118,6 +132,48 @@ describe('useWakeAttachHold', () => {
expect(result.current.wake).toBeUndefined()
})
+ it('the card clears by itself once the pane attaches through any path', () => {
+ let attached: boolean | null = false
+ const retry = vi.fn(() => true)
+ const { result, rerender } = hook(() => attached, retry)
+ rerender({ wake: { ...waking, phase: 'ready' } })
+ act(() => vi.advanceTimersByTime(PAST_CAP * 2))
+ expect(result.current.terminalStalled).toBe(true)
+ // A restore or account restart brings the pane back; nobody pressed Try again.
+ attached = true
+ act(() => vi.advanceTimersByTime(WAKE_ATTACH_POLL_MS))
+ expect(result.current.terminalStalled).toBe(false)
+ expect(result.current.wake).toBeUndefined()
+ expect(retry).toHaveBeenCalledTimes(1)
+ })
+
+ it('a restart with no wake in flight never shows the card', () => {
+ const retry = vi.fn(() => true)
+ const { result } = renderHook(() => useWakeAttachHold('ws', undefined, () => false, retry))
+ // The restored pane takes its time to attach; no wake, so nothing holds or fails over it.
+ act(() => vi.advanceTimersByTime(PAST_CAP * 3))
+ expect(result.current.wake).toBeUndefined()
+ expect(result.current.terminalStalled).toBe(false)
+ expect(retry).not.toHaveBeenCalled()
+ })
+
+ it('an account restart (no wake ready from main) never shows the card', () => {
+ const retry = vi.fn(() => true)
+ const { result, rerender } = hook(() => false, retry)
+ // A wake entry that never settles through main goes away (stale, quiet failure, Dismiss)
+ // while the pane respawns for its new account: no hold, no card.
+ rerender({ wake: undefined })
+ act(() => vi.advanceTimersByTime(PAST_CAP * 3))
+ expect(result.current.wake).toBeUndefined()
+ expect(result.current.terminalStalled).toBe(false)
+ // Nor a `ready` from a different wake than the one seen in flight.
+ rerender({ wake: { ...waking, startedAt: T0 } })
+ rerender({ wake: { ...waking, startedAt: T0 + 1, phase: 'ready' } })
+ act(() => vi.advanceTimersByTime(PAST_CAP * 3))
+ expect(result.current.wake).toBeUndefined()
+ expect(retry).not.toHaveBeenCalled()
+ })
+
it('counts only visible time toward the reconnect cap', () => {
let visibility: DocumentVisibilityState = 'visible'
const descriptor = Object.getOwnPropertyDescriptor(document, 'visibilityState')
@@ -142,6 +198,9 @@ describe('useWakeAttachHold', () => {
act(() => vi.advanceTimersByTime(WAKE_ATTACH_HOLD_MAX_MS / 2 - WAKE_ATTACH_POLL_MS * 2))
expect(result.current.terminalStalled).toBe(false)
act(() => vi.advanceTimersByTime(WAKE_ATTACH_POLL_MS * 3))
+ // The cap's quiet reconnect, counted in visible time too; the card waits one more cap.
+ expect(result.current.terminalStalled).toBe(false)
+ act(() => vi.advanceTimersByTime(PAST_CAP))
expect(result.current.terminalStalled).toBe(true)
} finally {
if (descriptor) {
@@ -155,7 +214,8 @@ describe('useWakeAttachHold', () => {
it('Dismiss clears the reconnect card', () => {
const { result, rerender } = hook(() => false)
rerender({ wake: { ...waking, phase: 'ready' } })
- act(() => vi.advanceTimersByTime(WAKE_ATTACH_HOLD_MAX_MS + WAKE_ATTACH_POLL_MS))
+ act(() => vi.advanceTimersByTime(PAST_CAP * 2))
+ expect(result.current.terminalStalled).toBe(true)
act(() => result.current.dismiss())
expect(result.current.wake).toBeUndefined()
})
diff --git a/src/renderer/src/components/orca-cloud/use-wake-attach-hold.ts b/src/renderer/src/components/orca-cloud/use-wake-attach-hold.ts
index b2578c9ef83..aec9abdd74a 100644
--- a/src/renderer/src/components/orca-cloud/use-wake-attach-hold.ts
+++ b/src/renderer/src/components/orca-cloud/use-wake-attach-hold.ts
@@ -8,7 +8,7 @@ import type { CloudWakeProgressEvent } from '../../../../shared/hosted-sandbox/c
/** How often the hold checks the pane in front while it waits. */
export const WAKE_ATTACH_POLL_MS = 100
-/** A pane that hasn't re-attached by now gets the "Couldn't reconnect the terminal" card. */
+/** A pane that hasn't re-attached by now is reconnected once; after a second cap it gets the card. */
export const WAKE_ATTACH_HOLD_MAX_MS = 8_000
type Track = {
@@ -38,8 +38,11 @@ export type WakeAttachHold = {
* A wake reports ready once the server answers; the pane in front re-attaches to its terminal a
* moment later. Until it takes input (attached, with nothing it was given still unsent), this
* returns the wake as still `connecting` (same start time and source, so the pill keeps counting
- * from the wake's start). A pane that hasn't by the cap becomes a failed card with Try again,
- * never a silent dead pane. Then `undefined` hands back to the store's wake.
+ * from the wake's start). A pane that hasn't by the cap is reconnected once quietly; one that
+ * still hasn't by the next cap becomes a failed card with Try again (re-runs the attach), never a
+ * silent dead pane, and the card clears itself if the pane attaches after all. Only main's `ready`
+ * for a wake seen in flight arms this: a restart or an account restart with no wake never does.
+ * Then `undefined` hands back to the store's wake.
*/
export function useWakeAttachHold(
workspaceId: string,
@@ -65,43 +68,61 @@ export function useWakeAttachHold(
if (track.last || track.held || track.stalled) {
setTrack({ ...IDLE, attempt: track.attempt })
}
- } else if (track.last && (!wake || wake.startedAt === track.last.startedAt)) {
- // Ready, or the settled entry already dropped: hold only a wake that was in flight here.
+ } else if (track.last) {
+ // Only main's own `ready` for the wake seen in flight here holds the pane. An entry that just
+ // goes away (a stale or quietly failed wake dropped by the store, a Dismiss) never does: no
+ // wake brought the pane back, so there is nothing to wait for.
+ const settled = wake?.phase === 'ready' && wake.startedAt === track.last.startedAt
const held =
- isAttached(workspaceId) === false
+ settled && isAttached(workspaceId) === false
? { ...track.last, phase: 'connecting' as const }
: undefined
setTrack({ ...IDLE, attempt: track.attempt + 1, held })
}
- // Release once the pane takes input; at the cap, fail visibly. The store dropping the settled
- // wake doesn't cancel this: it is keyed on the hold only.
- const holding = track.held !== undefined
+ // Release once the pane takes input; at the cap, reconnect it once quietly, then fail visibly.
+ // The card keeps watching too: a pane that attaches later (restore, account restart, a slow
+ // wake) clears it on its own. The store dropping the settled wake doesn't cancel this.
+ const waiting = track.held !== undefined || track.stalled !== undefined
const attempt = track.attempt
useEffect(() => {
- if (!holding) {
+ if (!waiting) {
return
}
// Only visible time counts toward the cap: a hidden window pauses this poll (and the pane's
// own re-attach), so time spent hidden must not turn a healthy wake into a stalled card.
let visibleMs = 0
let lastAt = Date.now()
+ let quietRetryDone = false
+ let shownStalled = false
const check = (): void => {
const attached = isAttached(workspaceId)
- if (attached === false && visibleMs < WAKE_ATTACH_HOLD_MAX_MS) {
+ if (attached === false && (shownStalled || visibleMs < WAKE_ATTACH_HOLD_MAX_MS)) {
return
}
+ if (attached === false && !quietRetryDone) {
+ // One reconnect on its own before the card: a pane whose attach got lost usually comes
+ // back from this, and the person never sees a failure for it.
+ quietRetryDone = true
+ visibleMs = 0
+ retryPane(workspaceId)
+ return
+ }
+ shownStalled = attached === false
setTrack((current) => {
- if (current.attempt !== attempt || !current.held) {
+ if (current.attempt !== attempt || (!current.held && !current.stalled)) {
return current
}
- return attached === false
+ if (attached !== false) {
+ return { ...current, held: undefined, stalled: undefined }
+ }
+ return current.held
? {
...current,
held: undefined,
stalled: { ...current.held, phase: 'failed', at: Date.now() }
}
- : { ...current, held: undefined }
+ : current
})
}
return installWindowVisibilityInterval({
@@ -118,7 +139,7 @@ export function useWakeAttachHold(
},
intervalMs: WAKE_ATTACH_POLL_MS
})
- }, [holding, attempt, workspaceId, isAttached])
+ }, [waiting, attempt, workspaceId, isAttached, retryPane])
const retry = useCallback(() => {
retryPane(workspaceId)
diff --git a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx
index 893a54ebcd9..66c70cab1ec 100644
--- a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx
+++ b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx
@@ -153,8 +153,8 @@ export function OrcaCloudAccountsView({
)}
diff --git a/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx b/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx
index 362ca159749..74951c2e387 100644
--- a/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx
+++ b/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx
@@ -1,11 +1,9 @@
-// Wires S3 to the renderer's host list, the per-host sign-in probes and the Orca account. Rows open
-// the A16 panel; the Orca Cloud row scrolls to S0 below (one row stands for every cloud workspace).
-import React, { useEffect, useMemo, useState } from 'react'
+// Wires S3 to the renderer's host list and the per-host sign-in probes. Rows open the A16 panel.
+// No Orca Cloud row (JA-04): the page's own Orca Cloud part right below is the one place for it.
+import React, { useMemo } from 'react'
import { useAppStore } from '@/store'
import { useTranslate } from '@/i18n/use-translate'
-import { useOrcaCloudAgentAccounts } from '@/lib/orca-cloud/orca-cloud-agent-accounts-store'
import { openAgentHostPanel } from '../../../agent-host-panel/agent-host-panel-store'
-import { ORCA_CLOUD_ACCOUNTS_SECTION_ID } from '../OrcaCloudAccounts'
import {
overviewRows,
type OverviewAction,
@@ -22,28 +20,6 @@ function openSettings(pane: 'accounts', sectionId?: string): void {
store.openSettingsPage()
}
-/** A member can't change team keys: their key cells say "set by your team". */
-function useIsCloudMember(enabled: boolean): boolean {
- const [member, setMember] = useState(false)
- useEffect(() => {
- if (!enabled) {
- return
- }
- let cancelled = false
- void (window.api.cloudSecrets?.effective({}) ?? Promise.resolve(null))
- .catch(() => null)
- .then((result) => {
- if (!cancelled && result?.ok) {
- setMember(!result.value.caller.canWrite.org)
- }
- })
- return () => {
- cancelled = true
- }
- }, [enabled])
- return member
-}
-
export function AgentAccountsOverviewSection({
hideHeader = false
}: {
@@ -52,28 +28,11 @@ export function AgentAccountsOverviewSection({
const t = useTranslate()
const hosts = useOverviewHosts()
const { probes, checkAgain, firstPassDone } = useOverviewProbes(hosts)
- const accounts = useOrcaCloudAgentAccounts()
- const ready = accounts.load.kind === 'ready'
- const member = useIsCloudMember(ready)
- const signedOutOfOrca = accounts.load.kind === 'failed' && accounts.load.error === 'signed_out'
- const rows = useMemo(
- () =>
- overviewRows({
- hosts,
- probes,
- cloud:
- accounts.load.kind === 'ready'
- ? { status: accounts.load.status, keyKinds: accounts.keyKinds, member }
- : null
- }),
- [hosts, probes, accounts.load, accounts.keyKinds, member]
- )
+ const rows = useMemo(() => overviewRows({ hosts, probes, cloud: null }), [hosts, probes])
const hostById = new Map(hosts.map((host) => [host.hostId, host]))
const open = (row: OverviewRow, focus?: 'claude' | 'codex'): void => {
const host = row.hostId ? hostById.get(row.hostId) : undefined
if (!host) {
- // Orca Cloud: S0 below owns setup and the Source for every cloud workspace.
- document.getElementById(ORCA_CLOUD_ACCOUNTS_SECTION_ID)?.scrollIntoView({ block: 'start' })
return
}
openAgentHostPanel({
@@ -111,7 +70,7 @@ export function AgentAccountsOverviewSection({
return (
open(row)}
diff --git a/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/OrcaCloudSignInSheet.tsx b/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/OrcaCloudSignInSheet.tsx
new file mode 100644
index 00000000000..ebec6ee976d
--- /dev/null
+++ b/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/OrcaCloudSignInSheet.tsx
@@ -0,0 +1,75 @@
+// JA-04: the focused Orca Cloud sign-in sheet. Only Claude and Codex, each with its one action and
+// status (S0's rows), so "Set up once" never lands on this computer's provider accounts.
+import React from 'react'
+import { useAppStore } from '@/store'
+import { useTranslate } from '@/i18n/use-translate'
+import {
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetHeader,
+ SheetTitle
+} from '@/components/ui/sheet'
+import { OrcaCloudAccountsSection } from '../OrcaCloudAccountsSection'
+import {
+ closeOrcaCloudSignInSheet,
+ useOrcaCloudSignInSheetOpen
+} from './orca-cloud-sign-in-sheet-store'
+
+function openAllAgentAccounts(): void {
+ closeOrcaCloudSignInSheet()
+ const store = useAppStore.getState()
+ store.openSettingsTarget({ pane: 'accounts', repoId: null, sectionId: 'orca-cloud' })
+ store.openSettingsPage()
+}
+
+/** The sheet's contents; the host owns the Sheet so fixtures can render it open. */
+export function OrcaCloudSignInSheetView({
+ body
+}: {
+ /** S0's rows; fixtures pass a fixed view. */
+ body: React.ReactNode
+}): React.JSX.Element {
+ const t = useTranslate()
+ const titleId = React.useId()
+ return (
+
+
+
+
+ {t('orcaCloudSignInSheet.title', 'Agents in Orca Cloud')}
+
+
+ {t(
+ 'orcaCloudSignInSheet.description',
+ 'Set up Claude and Codex once. Every cloud workspace uses them, including new, cloned and restarted ones.'
+ )}
+
+
+
+
{body}
+
+
+ )
+}
+
+/** Mounted once in App; opened by openOrcaCloudSignInSheet(). */
+export function OrcaCloudSignInSheet(): React.JSX.Element {
+ const open = useOrcaCloudSignInSheetOpen()
+ return (
+ !next && closeOrcaCloudSignInSheet()}>
+ {open ? } /> : null}
+
+ )
+}
diff --git a/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/orca-cloud-sign-in-sheet-store.ts b/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/orca-cloud-sign-in-sheet-store.ts
new file mode 100644
index 00000000000..4c5c9c5e1e0
--- /dev/null
+++ b/src/renderer/src/components/settings/agent-accounts/sign-in-sheet/orca-cloud-sign-in-sheet-store.ts
@@ -0,0 +1,37 @@
+// JA-04: every "Set up once" / "Renew" for Orca Cloud opens one focused sheet (Claude and Codex
+// only) instead of Settings, so nobody scrolls past this computer's provider accounts to reach it.
+import { useSyncExternalStore } from 'react'
+
+let open = false
+const listeners = new Set<() => void>()
+
+function set(next: boolean): void {
+ if (open === next) {
+ return
+ }
+ open = next
+ for (const listener of listeners) {
+ listener()
+ }
+}
+
+export function openOrcaCloudSignInSheet(): void {
+ set(true)
+}
+
+export function closeOrcaCloudSignInSheet(): void {
+ set(false)
+}
+
+function subscribe(listener: () => void): () => void {
+ listeners.add(listener)
+ return () => listeners.delete(listener)
+}
+
+export function useOrcaCloudSignInSheetOpen(): boolean {
+ return useSyncExternalStore(
+ subscribe,
+ () => open,
+ () => false
+ )
+}
diff --git a/src/renderer/src/components/settings/cloud-api/CloudRoutineRow.tsx b/src/renderer/src/components/settings/cloud-api/CloudRoutineRow.tsx
index af301a4084e..aad30e0e498 100644
--- a/src/renderer/src/components/settings/cloud-api/CloudRoutineRow.tsx
+++ b/src/renderer/src/components/settings/cloud-api/CloudRoutineRow.tsx
@@ -127,17 +127,14 @@ export function RoutineRow({
setNotice(null)
const failure = await onRunNow()
setRunning(false)
- setNotice(
- failure
- ? { tone: 'error', text: failure }
- : {
- tone: 'ok',
- text: t(
- 'auto.components.settings.cloudRoutines.queued',
- 'Run queued. It shows up in the history below.'
- )
- }
- )
+ if (failure) {
+ setNotice({ tone: 'error', text: failure })
+ return
+ }
+ // The new run's status lives in the pill and the history; open the history so it is in view.
+ if (!expanded) {
+ onToggleHistory()
+ }
}
return (
@@ -218,7 +215,7 @@ export function RoutineRow({
variant="ghost"
size="xs"
aria-disabled={running && !active}
- aria-busy={running || active}
+ aria-busy={running}
aria-expanded={active ? expanded : undefined}
aria-controls={active ? historyId : undefined}
onClick={() => void runNow()}
@@ -246,14 +243,9 @@ export function RoutineRow({
: undefined
}
>
- {running || active ? (
-
- ) : (
-
- )}
- {active
- ? t('auto.components.settings.cloudRoutines.runningNow', 'Running…')
- : t('auto.components.settings.cloudRoutines.runNow', 'Run now')}
+ {/* Spins only while the request is in flight; the run's own status is the pill's job. */}
+ {running ? : }
+ {t('auto.components.settings.cloudRoutines.runNow', 'Run now')}
diff --git a/src/renderer/src/components/settings/cloud-api/CloudRoutinesView.fixture.tsx b/src/renderer/src/components/settings/cloud-api/CloudRoutinesView.fixture.tsx
index 6bb25768433..44422f66bdc 100644
--- a/src/renderer/src/components/settings/cloud-api/CloudRoutinesView.fixture.tsx
+++ b/src/renderer/src/components/settings/cloud-api/CloudRoutinesView.fixture.tsx
@@ -283,6 +283,41 @@ export const runHistory = defineFixture({
render: () =>
})
+/** Right after Run now: the pill and history say Queued; the button is back to Run now. */
+export const justQueued = defineFixture({
+ width: 820,
+ render: () => (
+
+ r.id === 'rt_triage'
+ ? { ...r, lastRun: { id: 'run_q', status: 'queued', finishedAt: null } }
+ : r
+ )
+ }}
+ loadRuns={async () => ({
+ ok: true,
+ data: {
+ runs: [
+ run({
+ id: 'run_q',
+ status: 'queued',
+ trigger: 'manual',
+ createdAt: NOW - 3_000,
+ startedAt: null
+ }),
+ ...RUNS.runs.slice(1)
+ ],
+ nextBefore: null
+ }
+ })}
+ initial={{ historyFor: 'rt_triage' }}
+ />
+ )
+})
+
export const runHistoryEmpty = defineFixture({
width: 820,
render: () => (
diff --git a/src/renderer/src/components/settings/cloud-api/cloud-api-format.test.ts b/src/renderer/src/components/settings/cloud-api/cloud-api-format.test.ts
index 38137b52967..86ef124bba5 100644
--- a/src/renderer/src/components/settings/cloud-api/cloud-api-format.test.ts
+++ b/src/renderer/src/components/settings/cloud-api/cloud-api-format.test.ts
@@ -10,6 +10,7 @@ import {
describeRoutineTrigger,
formatCountdown,
formatKeyPrefix,
+ formatRelativeFromNow,
formatRunDuration,
presetForScopes,
scopesForPreset,
@@ -65,6 +66,15 @@ describe('formatting', () => {
).toMatch(/^Weekdays at 9:00.* E[SD]T$/)
})
+ it('says "just now" for the last minute, not "this minute"', () => {
+ const now = 1_000_000_000
+ expect(formatRelativeFromNow(now - 3_000, now, 'en')).toBe('just now')
+ expect(formatRelativeFromNow(now - 59_000, now, 'en')).toBe('just now')
+ expect(formatRelativeFromNow(now - 5 * 60_000, now, 'en')).toBe('5 minutes ago')
+ // Future times (next scheduled run) keep Intl wording.
+ expect(formatRelativeFromNow(now + 10 * 60_000, now, 'en')).toBe('in 10 minutes')
+ })
+
it('offers the local zone first', () => {
const zones = timeZoneOptions('Asia/Tokyo')
expect(zones[0]).toBe('Asia/Tokyo')
diff --git a/src/renderer/src/components/settings/cloud-api/cloud-api-format.ts b/src/renderer/src/components/settings/cloud-api/cloud-api-format.ts
index daa7e17d258..15b98d6df4c 100644
--- a/src/renderer/src/components/settings/cloud-api/cloud-api-format.ts
+++ b/src/renderer/src/components/settings/cloud-api/cloud-api-format.ts
@@ -51,6 +51,10 @@ export function formatKeyPrefix(prefix: string): string {
}
export function formatRelativeFromNow(timestamp: number, now: number, intlLocale?: string): string {
+ // Under a minute ago reads "just now", like the other cloud screens (not Intl's "this minute").
+ if (timestamp <= now && now - timestamp < 60_000) {
+ return translate('auto.components.cloudWorkspaces.justNow', 'just now')
+ }
return formatUiRelativeTime(timestamp - now, intlLocale)
}
diff --git a/src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx b/src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx
index 81d7aa181ec..71222c6103b 100644
--- a/src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx
+++ b/src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx
@@ -30,8 +30,8 @@ export function orcaCloudAgentAccountsParts(
id: 'accounts-orca-cloud',
title: t('orcaCloudAccounts.title', 'Orca Cloud'),
description: t(
- 'orcaCloudAccounts.help',
- 'Set up once on this computer. Every cloud workspace uses it, including new, cloned and restarted ones.'
+ 'orcaCloudAccounts.helpAccountWide',
+ 'Set up once. Every cloud workspace uses it, including new, cloned and restarted ones.'
),
content:
}
diff --git a/src/renderer/src/components/sidebar/SetupScriptPromptCard.tsx b/src/renderer/src/components/sidebar/SetupScriptPromptCard.tsx
index 8361dd84216..3a05eca01c6 100644
--- a/src/renderer/src/components/sidebar/SetupScriptPromptCard.tsx
+++ b/src/renderer/src/components/sidebar/SetupScriptPromptCard.tsx
@@ -1,5 +1,8 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useCloudRecoveryContext } from '@/lib/orca-cloud/use-cloud-recovery-context'
+import { useIsCloudWorkspace } from '@/lib/orca-cloud/orca-cloud-workspace-store'
+import { useCloudSetupPageRequest } from '@/lib/orca-cloud/cloud-setup-page-store'
+import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/worktree-creation-surface'
import { toast } from 'sonner'
import { useAppStore } from '@/store'
import { track } from '@/lib/telemetry'
@@ -71,9 +74,18 @@ function SetupScriptPromptCard(): React.JSX.Element | null {
// An asleep Orca Cloud workspace can't be inspected: wait until it's awake instead of showing
// "Couldn't verify this repo's setup script" with Retry (RA-12).
const asleepCloud = useCloudRecoveryContext(activeWorktreeId)?.asleep === true
+ // Orca Cloud never shows this nudge: a cloud workspace reports a setup script that hasn't run in
+ // its own notice, and while a create is setting up, starting or stopped on a check the card would
+ // flip between states under the start screen (JA-12, PC-7).
+ const cloudWorkspace = useIsCloudWorkspace(activeWorktreeId)
+ const creationShown = useAppStore(selectWorktreeCreationSurfaceShown)
+ const cloudSetupOpen = useCloudSetupPageRequest() !== null
const isDismissed =
provisionedByEnvironmentBuild ||
asleepCloud ||
+ cloudWorkspace ||
+ creationShown ||
+ cloudSetupOpen ||
(activeRepoHostIdentity
? isSetupScriptPromptDismissed(activeRepoHostIdentity, dismissedRepoIds)
: false)
diff --git a/src/renderer/src/components/worktree-creation/CloudOpenCoverBody.tsx b/src/renderer/src/components/worktree-creation/CloudOpenCoverBody.tsx
new file mode 100644
index 00000000000..a0ed4499be9
--- /dev/null
+++ b/src/renderer/src/components/worktree-creation/CloudOpenCoverBody.tsx
@@ -0,0 +1,44 @@
+import React from 'react'
+import type { CloudOpenCover } from '@/lib/orca-cloud/cloud-open-cover-store'
+import WorktreeCreationTabStrip from './WorktreeCreationTabStrip'
+import { VmBuildSheet } from './VmBuildSheet'
+
+const noop = (): void => {}
+
+/** The creation panel's last frame, laid out exactly like WorktreeCreationPanel. */
+export default function CloudOpenCoverBody({
+ cover,
+ now,
+ reserveCollapsedSidebarHeaderSpace
+}: {
+ cover: CloudOpenCover
+ now: number
+ reserveCollapsedSidebarHeaderSpace: boolean
+}): React.JSX.Element {
+ const { entry } = cover
+ return (
+
+
+ {/* A picture of the last frame: nothing in it is interactive. */}
+
+
+
+
+ )
+}
diff --git a/src/renderer/src/components/worktree-creation/CloudOpenCoverLayer.tsx b/src/renderer/src/components/worktree-creation/CloudOpenCoverLayer.tsx
new file mode 100644
index 00000000000..5d8808e91d8
--- /dev/null
+++ b/src/renderer/src/components/worktree-creation/CloudOpenCoverLayer.tsx
@@ -0,0 +1,80 @@
+import React, { useEffect, useSyncExternalStore } from 'react'
+import { useAppStore } from '@/store'
+import { useNow } from '@/hooks/use-now'
+import {
+ CLOUD_OPEN_COVER_MAX_MS,
+ releaseCloudOpenCover,
+ useCloudOpenCover,
+ workspaceHasAttachedPty
+} from '@/lib/orca-cloud/cloud-open-cover-store'
+import type CloudOpenCoverBodyComponent from './CloudOpenCoverBody'
+
+// The body pulls in the build sheet, which the shell must not load at boot. The creation panel
+// preloads it, so it is ready (no Suspense frame) by the time a create hands over.
+let Body: typeof CloudOpenCoverBodyComponent | null = null
+let loading: Promise | null = null
+const bodyListeners = new Set<() => void>()
+
+export function preloadCloudOpenCover(): Promise {
+ loading ??= import('./CloudOpenCoverBody')
+ .then((module) => {
+ Body = module.default
+ for (const listener of bodyListeners) {
+ listener()
+ }
+ })
+ .catch(() => {
+ loading = null
+ })
+ return loading
+}
+
+function useBody(): typeof CloudOpenCoverBodyComponent | null {
+ return useSyncExternalStore(
+ (listener) => {
+ bodyListeners.add(listener)
+ return () => bodyListeners.delete(listener)
+ },
+ () => Body
+ )
+}
+
+/**
+ * Keeps the Orca Cloud start screen over a just-created workspace until its terminal's PTY is
+ * attached (JA-12), so "Open workspace" goes straight to a live prompt with no blank pane between.
+ */
+export function CloudOpenCoverLayer({
+ reserveCollapsedSidebarHeaderSpace
+}: {
+ reserveCollapsedSidebarHeaderSpace: boolean
+}): React.JSX.Element | null {
+ const worktreeId = useAppStore((s) => (s.activeView === 'terminal' ? s.activeWorktreeId : null))
+ const cover = useCloudOpenCover(worktreeId)
+ const attached = useAppStore((s) =>
+ cover ? workspaceHasAttachedPty(s, cover.worktreeId) : false
+ )
+ const BodyComponent = useBody()
+ const now = useNow(1_000, cover !== null)
+ useEffect(() => {
+ if (!cover) {
+ return
+ }
+ if (attached) {
+ releaseCloudOpenCover(cover.worktreeId)
+ return
+ }
+ void preloadCloudOpenCover()
+ const left = Math.max(0, cover.heldAt + CLOUD_OPEN_COVER_MAX_MS - Date.now())
+ const timer = window.setTimeout(() => releaseCloudOpenCover(cover.worktreeId), left)
+ return () => window.clearTimeout(timer)
+ }, [attached, cover])
+ if (!cover || attached || !BodyComponent) {
+ return null
+ }
+ // The body is a module-level component loaded once, not one made during render.
+ return React.createElement(BodyComponent, {
+ cover,
+ now: Math.max(now, cover.heldAt),
+ reserveCollapsedSidebarHeaderSpace
+ })
+}
diff --git a/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx b/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
index d77200a36ad..eb2489b4bf8 100644
--- a/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
+++ b/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
@@ -209,51 +209,54 @@ export function VmBuildSheet({
return (
-
-
-
- {building ? (
-
- ) : state === 'ready' ? (
-
- ) : gated ? (
-
- ) : (
-
+ {/* JA-24: on Orca Cloud a failure card carries the one title; no page title above it. */}
+ {cloud && failure ? null : (
+
+
+
+ {building ? (
+
+ ) : state === 'ready' ? (
+
+ ) : gated ? (
+
+ ) : (
+
+ )}
+
+ {/* Retry lands focus here once the failure card collapses. The card announces failures. */}
+
+ {/* Orca Cloud: each step carries its own timer, so the header has none. */}
+ {gated || cloud ? null : (
+ {elapsedLabel}
)}
-
- {/* Retry lands focus here once the failure card collapses. The card announces failures. */}
-