diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.fixture.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.fixture.tsx
index e54d3b3b8be..9539eb98148 100644
--- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.fixture.tsx
+++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.fixture.tsx
@@ -1,3 +1,4 @@
+import type { OrcaCloudDropReason } from '@/hooks/useEphemeralVmRecipeOptions'
import { useState } from 'react'
import { defineFixture } from '../../component-fixtures/component-fixture'
import type { NewWorkspaceProjectOption } from '@/lib/workspace/creation/new-workspace-project-options'
@@ -113,9 +114,12 @@ const handoffCloudStart = (githubHandoff: 'waiting' | 'timed-out'): CloudStartVi
function ProjectAndHostPreview({
folderOnly = false,
orcaCloud,
- githubHandoff
+ githubHandoff,
+ cloudDropped
}: {
folderOnly?: boolean
+ /** RUNON-STICKY: a picked Orca Cloud didn't carry over to this project. */
+ cloudDropped?: OrcaCloudDropReason
/** Back from GitHub's access page (REPO-ACCESS-REFRESH). */
githubHandoff?: 'waiting' | 'timed-out'
/** Offers Orca Cloud with this entitlement. */
@@ -155,6 +159,7 @@ function ProjectAndHostPreview({
selectedEphemeralVmRecipeId={recipe}
onEphemeralVmRecipeChange={setRecipe}
{...(orcaCloud ? { orcaCloudAccess: orcaCloud } : {})}
+ {...(cloudDropped ? { orcaCloudDropped: cloudDropped } : {})}
{...(githubHandoff ? { cloudStart: handoffCloudStart(githubHandoff) } : {})}
handleAddSshHost={() => {}}
handleAddRemoteServer={() => {}}
@@ -251,3 +256,13 @@ export const githubHandoffTimedOut = defineFixture({
...closed,
render: () =>
})
+
+// RUNON-STICKY: Orca Cloud was picked, then a project that can't run on it.
+export const cloudDroppedElsewhere = defineFixture({
+ ...closed,
+ render: () =>
+})
+export const cloudDroppedUnavailable = defineFixture({
+ ...closed,
+ render: () =>
+})
diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx
index 551bfef169a..e01ee19dde1 100644
--- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx
+++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx
@@ -1,4 +1,5 @@
import { OrcaCloudNeedsRepoLine } from './run-on/OrcaCloudNeedsRepoLine'
+import { OrcaCloudDroppedLine } from './run-on/OrcaCloudDroppedLine'
import { GitHubHandoffLine } from './run-on/GitHubHandoffLine'
import { ORCA_CLOUD_NEEDS_REPO_ID } from './run-on/cloud-start-view'
import React, { useMemo } from 'react'
@@ -46,6 +47,7 @@ type NewWorkspaceComposerProjectSectionProps = Pick<
| 'selectedEphemeralVmRecipeId'
| 'ephemeralVmRecipeError'
| 'orcaCloudAvailability'
+ | 'orcaCloudDropped'
| 'cloudStart'
> & {
disabled?: boolean
@@ -98,6 +100,7 @@ export function NewWorkspaceComposerProjectSection({
handleSetLocation,
ephemeralVmRecipeError,
orcaCloudAvailability = 'unavailable',
+ orcaCloudDropped = null,
selectedRepoRequiresConnection,
selectedRepoConnectionId,
selectedRepoConnectInProgress,
@@ -303,6 +306,8 @@ export function NewWorkspaceComposerProjectSection({
{ephemeralVmRecipeError}
+ ) : orcaCloudDropped ? (
+
) : null}
) : null}
diff --git a/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts b/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
index 93a113f614b..ed57d9f5ca8 100644
--- a/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
+++ b/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
@@ -1,3 +1,4 @@
+import type { OrcaCloudDropReason } from '@/hooks/useEphemeralVmRecipeOptions'
import type { CloudStartView } from './run-on/use-cloud-start-composer'
import type {
AgentPickerDraft,
@@ -79,6 +80,8 @@ export type NewWorkspaceComposerCardProps = {
ephemeralVmRecipeError?: string | null
/** Orca Cloud for the selected project, from main; drives the picker's sign-in/upsell row. */
orcaCloudAvailability?: OrcaCloudAvailability
+ /** RUNON-STICKY: a picked Orca Cloud didn't carry over to this project; Run on says why. */
+ orcaCloudDropped?: OrcaCloudDropReason | null
repoBackedSearchRepos?: readonly RepoOption[]
repoBackedSourcesDisabled?: boolean
allowSmartNameAddProject?: boolean
diff --git a/src/renderer/src/components/new-workspace/run-on/OrcaCloudDroppedLine.tsx b/src/renderer/src/components/new-workspace/run-on/OrcaCloudDroppedLine.tsx
new file mode 100644
index 00000000000..b1cc510331e
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/run-on/OrcaCloudDroppedLine.tsx
@@ -0,0 +1,36 @@
+import React from 'react'
+import { useTranslate } from '@/i18n/use-translate'
+import type { OrcaCloudDropReason } from '@/hooks/useEphemeralVmRecipeOptions'
+
+/**
+ * RUNON-STICKY: a picked Orca Cloud stays picked across project changes. Only when the newly picked
+ * project can't run on it does Run on fall back to this project's own target, and this line says why
+ * instead of the switch happening silently. It goes away with the next pick.
+ */
+export function OrcaCloudDroppedLine({
+ reason
+}: {
+ reason: OrcaCloudDropReason
+}): React.JSX.Element {
+ const t = useTranslate()
+ const text =
+ reason === 'elsewhere'
+ ? t(
+ 'components.newWorkspace.runOn.cloudDroppedElsewhere',
+ 'Orca Cloud can’t run this project: it lives on another machine. Running it there instead.'
+ )
+ : reason === 'unreachable'
+ ? t(
+ 'components.newWorkspace.runOn.cloudDroppedUnreachable',
+ 'Couldn’t reach Orca Cloud for this project, so Run on switched back. Pick Orca Cloud again to retry.'
+ )
+ : t(
+ 'components.newWorkspace.runOn.cloudDroppedUnavailable',
+ 'Orca Cloud isn’t available for this project, so Run on switched back.'
+ )
+ return (
+
+ {text}
+
+ )
+}
diff --git a/src/renderer/src/components/new-workspace/use-composer-quick-agent.test.tsx b/src/renderer/src/components/new-workspace/use-composer-quick-agent.test.tsx
index 57cd9c4b308..4227620e03b 100644
--- a/src/renderer/src/components/new-workspace/use-composer-quick-agent.test.tsx
+++ b/src/renderer/src/components/new-workspace/use-composer-quick-agent.test.tsx
@@ -8,7 +8,9 @@ import { ORCA_CLOUD_IMAGE_AGENTS } from '../../../../shared/hosted-sandbox/orca-
import type { EphemeralVmRecipeOption } from './new-workspace-composer-card-props'
vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } }))
-vi.mock('@/lib/agent-session/launch/inventory/host-chat-program', () => ({ agentChoicePending: () => false }))
+vi.mock('@/lib/agent-session/launch/inventory/host-chat-program', () => ({
+ agentChoicePending: () => false
+}))
// This desktop has aider and claude; the host offers exactly what it detected.
vi.mock('@/lib/agent-session/launch/inventory/host-chat-program-acquisition', () => ({
useAgentsOfferedForLaunch: (_workspace: unknown, detected: ReadonlySet | null) =>
diff --git a/src/renderer/src/hooks/composer-state/composer-card-contract.ts b/src/renderer/src/hooks/composer-state/composer-card-contract.ts
index 72bbbf5511a..526699d5cfc 100644
--- a/src/renderer/src/hooks/composer-state/composer-card-contract.ts
+++ b/src/renderer/src/hooks/composer-state/composer-card-contract.ts
@@ -14,6 +14,7 @@ export type ComposerCardSourceProps = Pick<
| 'selectedEphemeralVmRecipeId'
| 'ephemeralVmRecipeError'
| 'orcaCloudAvailability'
+ | 'orcaCloudDropped'
| 'name'
| 'branchNameOverride'
| 'parentWorktreeId'
diff --git a/src/renderer/src/hooks/composer-state/composer-card-props.ts b/src/renderer/src/hooks/composer-state/composer-card-props.ts
index 164dd8ba003..ad06496a17f 100644
--- a/src/renderer/src/hooks/composer-state/composer-card-props.ts
+++ b/src/renderer/src/hooks/composer-state/composer-card-props.ts
@@ -39,6 +39,7 @@ export function buildComposerCardProps(state: ComposerModel) {
ephemeralVmRecipes,
ephemeralVmsEnabled,
orcaCloudAvailability,
+ orcaCloudDropped,
filteredLinkItems,
folderDetectedAgentIds,
folderSourceRepos,
@@ -163,6 +164,7 @@ export function buildComposerCardProps(state: ComposerModel) {
isProjectGroupTarget || !ephemeralVmsEnabled ? null : selectedEphemeralVmRecipeId,
onEphemeralVmRecipeChange: setSelectedEphemeralVmRecipeId,
orcaCloudAvailability,
+ orcaCloudDropped,
ephemeralVmRecipeError:
isProjectGroupTarget || !ephemeralVmsEnabled ? null : ephemeralVmRecipeError,
repoBackedSearchRepos: isProjectGroupTarget ? folderSourceRepos : undefined,
diff --git a/src/renderer/src/hooks/composer-state/runtime-target-model.ts b/src/renderer/src/hooks/composer-state/runtime-target-model.ts
index 5b322ca02fc..ee78c6f8579 100644
--- a/src/renderer/src/hooks/composer-state/runtime-target-model.ts
+++ b/src/renderer/src/hooks/composer-state/runtime-target-model.ts
@@ -5,6 +5,7 @@ import type { Repo } from '../../../../shared/repo-types'
import type { SshConnectionState, SshConnectionStatus } from '../../../../shared/ssh-types'
import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
import type { OrcaCloudAvailability, OrcaVmRecipe } from '../../../../shared/orca-yaml-hook-types'
+import type { OrcaCloudDropReason } from '@/hooks/useEphemeralVmRecipeOptions'
import type { AgentStartupShell } from '../../../../shared/agent-launch/startup/tui-agent-startup-shell'
import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact'
import type { NewWorkspaceProjectOption } from '@/lib/workspace/creation/new-workspace-project-options'
@@ -54,6 +55,8 @@ export type ComposerRuntimeTargetModel = {
ephemeralVmsEnabled: boolean
/** Orca Cloud for this project, from main; drives the picker's sign-in/upsell row. */
orcaCloudAvailability: OrcaCloudAvailability
+ /** RUNON-STICKY: why a picked Orca Cloud didn't carry over to the newly picked project. */
+ orcaCloudDropped: OrcaCloudDropReason | null
ephemeralVmRecipes: OrcaVmRecipe[]
selectedEphemeralVmRecipeId: string | null
setSelectedEphemeralVmRecipeId: (recipeId: string | null) => void
diff --git a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
index d1d61952ffb..242272428db 100644
--- a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
+++ b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
@@ -257,7 +257,8 @@ export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSe
setSelectedRecipeId: setSelectedEphemeralVmRecipeId,
error: ephemeralVmRecipeError,
offered: ephemeralVmsEnabled,
- orcaCloud: orcaCloudAvailability
+ orcaCloud: orcaCloudAvailability,
+ orcaCloudDropped
} = useEphemeralVmRecipeOptions({
// Only probe enabled experiments or hidden features can raise setup errors.
customRecipesEnabled: settings?.experimentalEphemeralVms === true,
@@ -277,9 +278,7 @@ export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSe
)
: null
const selectedRepoConnectionId = selectedRepoSshGateInput?.connectionId ?? null
- const selectedRepoSshState = selectedRepoConnectionId
- ? (sshConnectionStates.get(selectedRepoConnectionId) ?? null)
- : null
+ const selectedRepoSshState = sshConnectionStates.get(selectedRepoConnectionId ?? '') ?? null
const { selectedRepoSshStatus, selectedRepoRequiresConnection, selectedRepoConnectInProgress } =
getSelectedRepoSshGate({
@@ -329,6 +328,7 @@ export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSe
selectedRecipeRepoConnectionId,
ephemeralVmsEnabled,
orcaCloudAvailability,
+ orcaCloudDropped,
ephemeralVmRecipes,
selectedEphemeralVmRecipeId,
setSelectedEphemeralVmRecipeId,
diff --git a/src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx b/src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx
index 38ee7bcae34..164a8dd39c6 100644
--- a/src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx
+++ b/src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx
@@ -4,6 +4,7 @@ import { StrictMode, act } from 'react'
import { createRoot, type Root } from 'react-dom/client'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { useEphemeralVmRecipeOptions } from './useEphemeralVmRecipeOptions'
+import { ORCA_CLOUD_RECIPE_ID } from '../../../shared/hosted-sandbox/orca-cloud-recipe-id'
import { useAppStore } from '@/store'
import { requestOrcaCloudSelectionAfterSignIn } from '@/lib/orca-cloud-select-after-sign-in'
@@ -63,20 +64,22 @@ function Harness({
initialRecipeId,
enabled = true,
customRecipesEnabled = true,
- repoExecutionHostId = 'local'
+ repoExecutionHostId = 'local',
+ repoConnectionId = null
}: {
repoId: string
initialRecipeId?: string
enabled?: boolean
customRecipesEnabled?: boolean
repoExecutionHostId?: 'local' | `runtime:${string}`
+ repoConnectionId?: string | null
}): React.JSX.Element {
const state = useEphemeralVmRecipeOptions({
enabled,
customRecipesEnabled,
repoId,
repoIsGit: true,
- repoConnectionId: null,
+ repoConnectionId,
repoExecutionHostId,
projectGroupTarget: false,
initialRecipeId
@@ -87,6 +90,17 @@ function Harness({
{state.recipes.map((recipe) => recipe.id).join(',')}{state.selectedRecipeId ?? 'none'}{state.error ?? 'none'}
+ {state.orcaCloudDropped ?? 'none'}
+