-
-
- {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. */}
+
+ {headerTitle(state, cloud, t, failure?.kind === 'create')}
+
+ {/* 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. */}
-
- {headerTitle(state, cloud, t, failure?.kind === 'create')}
-
- {/* Orca Cloud: each step carries its own timer, so the header has none. */}
- {gated || cloud ? null : (
-
{elapsedLabel}
- )}
+
+ {building ? (
+
+ {t(
+ 'auto.components.worktree.creation.WorktreeCreationPanel.cancelProvisioning',
+ 'Cancel'
+ )}
+
+ ) : null}
- {building ? (
-
- {t(
- 'auto.components.worktree.creation.WorktreeCreationPanel.cancelProvisioning',
- 'Cancel'
- )}
-
- ) : null}
-
+ )}
{/* An account refusal happens before anything starts, so there are no steps to show. */}
diff --git a/src/renderer/src/components/worktree-creation/WorktreeCreationPanel.tsx b/src/renderer/src/components/worktree-creation/WorktreeCreationPanel.tsx
index e5770626f92..056300b2d23 100644
--- a/src/renderer/src/components/worktree-creation/WorktreeCreationPanel.tsx
+++ b/src/renderer/src/components/worktree-creation/WorktreeCreationPanel.tsx
@@ -16,6 +16,7 @@ import {
} from './worktree-creation-clock'
import { VmBuildSheet } from './VmBuildSheet'
import { VmDeleteConfirmDialog } from './VmDeleteConfirmDialog'
+import { preloadCloudOpenCover } from './CloudOpenCoverLayer'
import { composerDataFromRefusedCreate } from './vm-build-composer-return'
/** Debounced in-frame creation placeholder: tab strip names the workspace while body shows status, enabling same-frame handoff without duplicating labels. */
@@ -35,6 +36,13 @@ export default function WorktreeCreationPanel({
const now = useWorktreeCreationClock(
entry?.status === 'creating' && entry.waitingSince === undefined
)
+ const cloudCreate = entry?.request.ephemeralVmRecipe?.provider === 'orca-cloud'
+ React.useEffect(() => {
+ // The open cover takes over from this panel when the create finishes (JA-12).
+ if (cloudCreate) {
+ void preloadCloudOpenCover()
+ }
+ }, [cloudCreate])
if (!entry) {
return null
}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 0d1e058e6ce..c7b3c5dba1a 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2290,7 +2290,9 @@
"preparingCloudEnvironment": "Preparing environment…",
"startingSandbox": "Starting sandbox…",
"cloningRepository": "Cloning the repository…",
- "updatingRepository": "Updating the repository…"
+ "updatingRepository": "Updating the repository…",
+ "cloudBlockedAsleep": "Asleep",
+ "cloudCouldNotOpen": "Couldn’t open"
},
"duplicatePairedServers": {
"ambiguousSameServer": "{{value0}} and {{value1}} are the same server paired twice. Remove one in Settings > Remote Orca Servers."
diff --git a/src/renderer/src/lib/ephemeral-vm-worktree-creation.test.ts b/src/renderer/src/lib/ephemeral-vm-worktree-creation.test.ts
new file mode 100644
index 00000000000..f94f1ffff1e
--- /dev/null
+++ b/src/renderer/src/lib/ephemeral-vm-worktree-creation.test.ts
@@ -0,0 +1,113 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+// JA-01 tail: Delete sandbox on a create stopped by its environment check must delete THAT sandbox
+// (its runtime, hence its control-plane record), and the restart path must delete it before retrying.
+
+const { state, gate, cleanup, retry } = vi.hoisted(() => {
+ const entries: Record> = {}
+ return {
+ state: {
+ entries,
+ repos: [
+ {
+ id: 'repo-src',
+ displayName: 'Hello-World',
+ gitRemoteIdentity: { remoteUrl: 'https://github.com/octocat/Hello-World.git' }
+ }
+ ]
+ },
+ gate: vi.fn(),
+ cleanup: vi.fn(async () => true),
+ retry: vi.fn()
+ }
+})
+
+vi.mock('@/store', () => ({
+ useAppStore: {
+ getState: () => ({
+ pendingWorktreeCreations: state.entries,
+ repos: state.repos,
+ projects: [],
+ activePendingCreationId: 'c1',
+ updatePendingWorktreeCreation: (id: string, patch: Record) => {
+ if (state.entries[id]) {
+ Object.assign(state.entries[id], patch)
+ }
+ },
+ setRuntimeEnvironments: vi.fn(),
+ setupProjectExistingFolder: vi.fn(),
+ deleteProjectHostSetup: vi.fn()
+ })
+ }
+}))
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn() } }))
+vi.mock('@/lib/ephemeral-vm-environment-check', () => ({ gateVmCreateOnEnvironmentCheck: gate }))
+vi.mock('@/lib/ephemeral-vm-failed-create-cleanup', () => ({
+ cleanupFailedEphemeralVmWorkspace: cleanup
+}))
+vi.mock('@/lib/vm-create-hidden-checkouts', () => ({
+ hideVmCreateCheckout: vi.fn(),
+ settleVmCreateCheckoutAfterCleanup: vi.fn()
+}))
+vi.mock('@/lib/workspace/creation/worktree-creation-flow', () => ({
+ retryBackgroundWorktreeCreation: retry
+}))
+vi.mock('@/lib/ephemeral-vm-workspace-target', () => ({
+ prepareEphemeralVmWorkspaceTarget: vi.fn(async () => ({
+ ok: true,
+ setup: {
+ repo: { id: 'repo-vm', path: '/vercel/orca/workspaces/Hello-World/project' },
+ setup: { id: 'setup-1', projectId: 'p1', hostId: 'runtime:env-1' }
+ },
+ runtimeId: 'rt-blocked',
+ checkoutMode: 'provisioned-root',
+ environmentId: 'env-1',
+ stderr: '',
+ warnings: []
+ }))
+}))
+
+import { prepareRequestForCreate } from './ephemeral-vm-worktree-creation'
+import type { WorktreeCreationRequest } from '@/lib/workspace/creation/pending-worktree-creation'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the create path reads only these fields.
+const request = {
+ name: 'elephantfish',
+ setupDecision: 'inherit',
+ ephemeralVmRecipe: {
+ sourceRepoId: 'repo-src',
+ recipeId: 'cloud',
+ projectId: 'p1',
+ checkoutMode: 'provisioned-root',
+ provider: 'orca-cloud'
+ }
+} as unknown as WorktreeCreationRequest
+
+describe('prepareRequestForCreate on a create stopped by its environment check', () => {
+ beforeEach(() => {
+ state.entries.c1 = { request }
+ vi.stubGlobal('window', {
+ api: { ephemeralVm: {}, runtimeEnvironments: { list: async () => [] } }
+ })
+ })
+ afterEach(() => {
+ vi.unstubAllGlobals()
+ vi.clearAllMocks()
+ })
+
+ it('Delete sandbox removes that very sandbox and creates nothing', async () => {
+ gate.mockResolvedValue('stop')
+ await expect(prepareRequestForCreate('c1', request)).resolves.toBeNull()
+ expect(cleanup).toHaveBeenCalledOnce()
+ expect(cleanup.mock.calls[0][0]).toMatchObject({ ephemeralVmRuntimeId: 'rt-blocked' })
+ expect(retry).not.toHaveBeenCalled()
+ })
+
+ it('Start again deletes the blocked sandbox before starting a new one', async () => {
+ gate.mockResolvedValue('restart')
+ await expect(prepareRequestForCreate('c1', request)).resolves.toBeNull()
+ expect(cleanup.mock.calls[0][0]).toMatchObject({ ephemeralVmRuntimeId: 'rt-blocked' })
+ expect(retry).toHaveBeenCalledWith('c1')
+ expect(cleanup.mock.invocationCallOrder[0]).toBeLessThan(retry.mock.invocationCallOrder[0])
+ })
+})
diff --git a/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.test.ts b/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.test.ts
new file mode 100644
index 00000000000..83b6cac5ee9
--- /dev/null
+++ b/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.test.ts
@@ -0,0 +1,36 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import type { PendingWorktreeCreation } from '@/lib/workspace/creation/pending-worktree-creation'
+import {
+ getCloudOpenCover,
+ holdCloudOpenCover,
+ releaseCloudOpenCover,
+ resetCloudOpenCovers,
+ workspaceHasAttachedPty
+} from './cloud-open-cover-store'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the store only keeps the entry.
+const entry = { creationId: 'c1' } as PendingWorktreeCreation
+
+afterEach(resetCloudOpenCovers)
+
+describe('cloud open cover', () => {
+ it('holds the start screen for one workspace until released', () => {
+ holdCloudOpenCover('w1', entry, 1_000)
+ expect(getCloudOpenCover('w1')).toMatchObject({ worktreeId: 'w1', heldAt: 1_000 })
+ expect(getCloudOpenCover('w2')).toBeNull()
+ releaseCloudOpenCover('w1')
+ expect(getCloudOpenCover('w1')).toBeNull()
+ })
+
+ it('counts the workspace as open only once one of its terminals has a PTY', () => {
+ const state = {
+ tabsByWorktree: { w1: [{ id: 't1' }, { id: 't2' }] },
+ ptyIdsByTabId: { t1: [] as string[] }
+ }
+ expect(workspaceHasAttachedPty(state, 'w1')).toBe(false)
+ expect(
+ workspaceHasAttachedPty({ ...state, ptyIdsByTabId: { t1: [], t2: ['pty-1'] } }, 'w1')
+ ).toBe(true)
+ expect(workspaceHasAttachedPty(state, 'missing')).toBe(false)
+ })
+})
diff --git a/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.ts b/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.ts
new file mode 100644
index 00000000000..d170d38e3e1
--- /dev/null
+++ b/src/renderer/src/lib/orca-cloud/cloud-open-cover-store.ts
@@ -0,0 +1,73 @@
+// JA-12: a just-created Orca Cloud workspace showed a blank pane for ~1 s between the start screen
+// and its terminal (the create finishes, then the terminal's PTY attaches over the network). The
+// start screen's last frame stays up over the new workspace until its PTY is attached, or a cap.
+import { useSyncExternalStore } from 'react'
+import type { PendingWorktreeCreation } from '@/lib/workspace/creation/pending-worktree-creation'
+
+/** Never cover longer than this: a terminal that is slow to attach shows its own state. */
+export const CLOUD_OPEN_COVER_MAX_MS = 6_000
+
+export type CloudOpenCover = {
+ worktreeId: string
+ /** The start screen as it was when the create finished ("Open workspace" running). */
+ entry: PendingWorktreeCreation
+ heldAt: number
+}
+
+let covers: Readonly> = {}
+const listeners = new Set<() => void>()
+
+function emit(next: Readonly>): void {
+ covers = next
+ for (const listener of listeners) {
+ listener()
+ }
+}
+
+export function holdCloudOpenCover(
+ worktreeId: string,
+ entry: PendingWorktreeCreation,
+ now = Date.now()
+): void {
+ emit({ ...covers, [worktreeId]: { worktreeId, entry, heldAt: now } })
+}
+
+export function releaseCloudOpenCover(worktreeId: string): void {
+ if (!covers[worktreeId]) {
+ return
+ }
+ const { [worktreeId]: _released, ...rest } = covers
+ emit(rest)
+}
+
+export function getCloudOpenCover(worktreeId: string | null): CloudOpenCover | null {
+ return worktreeId ? (covers[worktreeId] ?? null) : null
+}
+
+export function useCloudOpenCover(worktreeId: string | null): CloudOpenCover | null {
+ return useSyncExternalStore(
+ (listener) => {
+ listeners.add(listener)
+ return () => listeners.delete(listener)
+ },
+ () => getCloudOpenCover(worktreeId)
+ )
+}
+
+/** True once any terminal of the workspace has a PTY attached. */
+export function workspaceHasAttachedPty(
+ state: {
+ tabsByWorktree: Readonly>
+ ptyIdsByTabId: Readonly>
+ },
+ worktreeId: string
+): boolean {
+ return (state.tabsByWorktree[worktreeId] ?? []).some(
+ (tab) => (state.ptyIdsByTabId[tab.id]?.length ?? 0) > 0
+ )
+}
+
+/** Test seam. */
+export function resetCloudOpenCovers(): void {
+ emit({})
+}
diff --git a/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts b/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
index e0857e3bf00..5bdd5cb0571 100644
--- a/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
+++ b/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
@@ -323,6 +323,12 @@ export function getCreationProgressLabel(
}
if (entry.phase === 'provisioning-vm') {
if (entry.environmentCheck?.status === 'failed') {
+ // Orca Cloud stops only on an unusable sandbox; the row says what the card says.
+ if (entry.request.ephemeralVmRecipe?.provider === 'orca-cloud') {
+ return entry.environmentCheck.sandbox === 'asleep'
+ ? t('auto.lib.pendingWorktreeCreation.cloudBlockedAsleep', 'Asleep')
+ : t('auto.lib.pendingWorktreeCreation.cloudCouldNotOpen', 'Couldn’t open')
+ }
return t('auto.lib.pendingWorktreeCreation.vmChecksFailed', 'Environment checks failed')
}
// Glossary: an Orca Cloud machine is a sandbox; "VM" stays only for bring-your-own recipes.
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts
index 87579aeeca0..4fb4bf1f71f 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts
@@ -2,6 +2,7 @@ import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-ag
import { parseExecutionHostId } from '../../../../../shared/execution-host'
import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
import { useAppStore } from '@/store/index'
+import { holdCloudOpenCover } from '@/lib/orca-cloud/cloud-open-cover-store'
import { ensureAgentStartupInTerminal } from '@/lib/new-workspace'
import { queueWorkspaceActivationTerminalFocus } from '@/lib/workspace/activation/workspace-activation-terminal-focus'
import { seedAgentTabStateAfterWorktreeCreate } from '@/lib/workspace/creation/worktree-creation-agent-seeds'
@@ -23,6 +24,16 @@ export async function completeWorktreeCreation(args: {
focusOnCompletion: boolean
}): Promise {
const { request } = args
+ // Orca Cloud: the start screen stays over the new workspace until its PTY attaches (JA-12).
+ const pending = useAppStore.getState().pendingWorktreeCreations[args.creationId]
+ if (
+ pending &&
+ args.focusOnCompletion &&
+ !args.structuredLaunchAccepted &&
+ request.ephemeralVmRecipe?.provider === 'orca-cloud'
+ ) {
+ holdCloudOpenCover(args.worktreeId, pending)
+ }
// Why: clearing synchronously after activation lets React commit the panel-to-terminal swap in one frame.
useAppStore.getState().removePendingWorktreeCreation(args.creationId, { cleanupVm: false })
// Why: an agent the host planned but did not start has no tab to seed and is not the window's to start.