+ )}
+
+ )
+}
+
+export function OrcaCloudMcpPane(): React.JSX.Element {
+ return {() => }
+}
diff --git a/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts b/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts
new file mode 100644
index 00000000000..41619f41ea1
--- /dev/null
+++ b/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts
@@ -0,0 +1,83 @@
+import { createLocalizedCatalog } from '@/i18n/localized-catalog'
+import { translate } from '@/i18n/i18n'
+import { translateSearchKeyword } from '../search/settings-search-keywords'
+
+export const getOrcaCloudBillingSearchEntries = createLocalizedCatalog(() => [
+ {
+ title: translate('auto.components.billing.title', 'Plan & billing'),
+ description: translate(
+ 'settings.orcaCloud.billing.searchDescription',
+ 'Your Orca Cloud plan, sandbox hours, overage and payment.'
+ ),
+ keywords: [
+ ...translateSearchKeyword('settings.orcaCloud.billing.keywordPlan', 'plan'),
+ ...translateSearchKeyword('settings.orcaCloud.billing.keywordBilling', 'billing'),
+ ...translateSearchKeyword('settings.orcaCloud.billing.keywordInvoice', 'invoice'),
+ ...translateSearchKeyword('settings.orcaCloud.billing.keywordUsage', 'usage'),
+ ...translateSearchKeyword('settings.orcaCloud.billing.keywordOverage', 'overage')
+ ]
+ }
+])
+
+export const getOrcaCloudTeamSearchEntries = createLocalizedCatalog(() => [
+ {
+ title: translate('auto.components.billing.team.title', 'Team'),
+ description: translate(
+ 'settings.orcaCloud.team.searchDescription',
+ 'Members, invites and seats for your Orca Cloud team.'
+ ),
+ keywords: [
+ ...translateSearchKeyword('settings.orcaCloud.team.keywordMembers', 'members'),
+ ...translateSearchKeyword('settings.orcaCloud.team.keywordInvite', 'invite'),
+ ...translateSearchKeyword('settings.orcaCloud.team.keywordSeats', 'seats')
+ ]
+ }
+])
+
+export const getOrcaCloudSecretsSearchEntries = createLocalizedCatalog(() => [
+ {
+ title: translate('cloudSecrets.title', 'Cloud secrets'),
+ description: translate(
+ 'cloudSecrets.searchDescription',
+ 'Environment variables and agent keys for Orca Cloud workspaces: personal, shared with your team, or per repository.'
+ ),
+ keywords: [
+ ...translateSearchKeyword('cloudSecrets.keywordSecret', 'secret'),
+ ...translateSearchKeyword('cloudSecrets.keywordEnv', 'environment variable'),
+ ...translateSearchKeyword('cloudSecrets.keywordDotenv', '.env'),
+ ...translateSearchKeyword('cloudSecrets.keywordApiKey', 'api key'),
+ ...translateSearchKeyword('cloudSecrets.keywordGateway', 'ai gateway')
+ ]
+ }
+])
+
+export const getOrcaCloudEnvironmentsSearchEntries = createLocalizedCatalog(() => [
+ {
+ title: translate('settings.orcaCloud.environments.title', 'Cloud environments'),
+ description: translate(
+ 'settings.orcaCloud.environments.searchDescription',
+ 'Repositories and install script built into a snapshot, and waking cloud workspaces before you open them.'
+ ),
+ keywords: [
+ ...translateSearchKeyword('settings.orcaCloud.environments.keywordSnapshot', 'snapshot'),
+ ...translateSearchKeyword('settings.orcaCloud.environments.keywordInstall', 'install script'),
+ ...translateSearchKeyword('settings.orcaCloud.environments.keywordWake', 'wake'),
+ ...translateSearchKeyword('settings.orcaCloud.environments.keywordSandbox', 'sandbox')
+ ]
+ }
+])
+
+export const getOrcaCloudMcpSearchEntries = createLocalizedCatalog(() => [
+ {
+ title: translate('cloudMcpSync.title', 'MCP servers'),
+ description: translate(
+ 'settings.orcaCloud.mcp.searchDescription',
+ 'Choose which MCP servers from this computer sync to your cloud workspaces.'
+ ),
+ keywords: [
+ ...translateSearchKeyword('settings.orcaCloud.mcp.keywordMcp', 'mcp'),
+ ...translateSearchKeyword('settings.orcaCloud.mcp.keywordSync', 'sync'),
+ ...translateSearchKeyword('settings.orcaCloud.mcp.keywordCloud', 'cloud')
+ ]
+ }
+])
diff --git a/src/renderer/src/components/settings/page/settings-capability-section-renderers.tsx b/src/renderer/src/components/settings/page/settings-capability-section-renderers.tsx
index 97c87b773bb..708791c1cc5 100644
--- a/src/renderer/src/components/settings/page/settings-capability-section-renderers.tsx
+++ b/src/renderer/src/components/settings/page/settings-capability-section-renderers.tsx
@@ -2,6 +2,7 @@ import { AccountsPane } from '../accounts/AccountsPane'
import { getProviderAccountsOwnerKey } from '@/runtime/provider-accounts/observations/runtime-provider-accounts-client'
import { AgentsPane } from '../agents/AgentsPane'
import { AgentApiKeysSection } from '../agent-api-keys/AgentApiKeysSection'
+import { AgentApiKeysCloudDescription } from '../agent-api-keys/AgentApiKeysCloudDescription'
import { AgentDefaultSurfaceSection } from '../agents/surfaces/AgentDefaultSurfaceSection'
import { ComputerUsePane } from '../computer-use/ComputerUsePane'
import { LinearAgentSkillPane } from '../skills/linear/LinearAgentSkillPane'
@@ -113,15 +114,23 @@ export function renderAgentApiKeysSettingsSection(
context: SettingsRenderContext,
t: Translate = translate
): React.JSX.Element | null {
- const { model, navigation, view } = context
+ const { model, navigation, view, actions } = context
return model.showDesktopOnlySettings ? (
void actions.scrollToSection('cloud-secrets')}
+ />
+ ) : (
+ t(
+ 'auto.components.settings.agentApiKeys.description',
+ 'Optional. Give an agent an API key on every host, or only some, instead of signing in on each machine.'
+ )
+ )
+ }
badge={t('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional')}
searchEntries={navigation.getSectionSearchEntries('agent-api-keys')}
>
diff --git a/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx b/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx
new file mode 100644
index 00000000000..840d6004b42
--- /dev/null
+++ b/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx
@@ -0,0 +1,51 @@
+import {
+ OrcaCloudBillingPane,
+ OrcaCloudEnvironmentsPane,
+ OrcaCloudMcpPane,
+ OrcaCloudSecretsPane,
+ OrcaCloudTeamPane
+} from '../orca-cloud/OrcaCloudSettingsPanes'
+import { SettingsSection } from '../section-layout/SettingsSection'
+import { translate } from '@/i18n/i18n'
+import type { Translate } from '@/i18n/use-translate'
+import type { SettingsRenderContext } from './settings-render-context'
+
+const BARE_BODY = 'rounded-none border-0 bg-transparent p-0 shadow-none'
+
+/** Settings › Orca Cloud: the account-backed panes. Orca API keys and Routines follow them. */
+export function renderOrcaCloudSettingsSections(
+ context: SettingsRenderContext,
+ t: Translate = translate
+): React.JSX.Element | null {
+ const { model, navigation, view } = context
+ if (!model.showDesktopOnlySettings || !model.orcaCloudApiAvailable) {
+ return null
+ }
+ // Titles and descriptions come from the nav metadata so the pane and the sidebar never disagree.
+ const sections = [
+ { id: 'cloud-billing', pane: },
+ { id: 'cloud-team', pane: },
+ { id: 'cloud-secrets', pane: },
+ { id: 'cloud-environments', pane: },
+ { id: 'cloud-mcp', pane: }
+ ]
+ return (
+ <>
+ {sections.map(({ id, pane }) => {
+ const meta = navigation.navSections.find((section) => section.id === id)
+ return (
+
+ {view.isSectionMounted(id) ? pane : null}
+
+ )
+ })}
+ >
+ )
+}
diff --git a/src/renderer/src/components/settings/page/settings-page-renderer.tsx b/src/renderer/src/components/settings/page/settings-page-renderer.tsx
index b3301a9b50e..05b5fb4cb7f 100644
--- a/src/renderer/src/components/settings/page/settings-page-renderer.tsx
+++ b/src/renderer/src/components/settings/page/settings-page-renderer.tsx
@@ -63,6 +63,7 @@ import {
} from './settings-advanced-section-renderers'
import { renderProjectSettingsSections } from './settings-project-section-renderer'
import { renderCloudApiSettingsSections } from './settings-cloud-api-section-renderers'
+import { renderOrcaCloudSettingsSections } from './settings-orca-cloud-section-renderers'
import {
SettingsHostScopePicker,
shouldShowSettingsHostScopePicker
@@ -174,11 +175,12 @@ export function renderSettingsPage(
{renderLinearSettingsSection(context, t)}
{renderDesktopCapabilitySettingsSections(context, t)}
{renderOrcaAccountSettingsSection(context, t)}
- {renderCloudApiSettingsSections(context, t)}
{renderSetupGuideSettingsSection(context, t)}
{renderGeneralSettingsSection(context, t)}
{renderIntegrationsSettingsSection(context, t)}
{renderMobileSettingsSection(context, t)}
+ {renderOrcaCloudSettingsSections(context, t)}
+ {renderCloudApiSettingsSections(context, t)}
{renderAutomationsSettingsSection(context, t)}
{renderArtifactsSettingsSection(context, t)}
{renderShareSkillsSettingsSection(context, t)}
diff --git a/src/renderer/src/components/settings/page/settings-setup-workflow-section-renderers.tsx b/src/renderer/src/components/settings/page/settings-setup-workflow-section-renderers.tsx
index e142e9f9201..71033af0482 100644
--- a/src/renderer/src/components/settings/page/settings-setup-workflow-section-renderers.tsx
+++ b/src/renderer/src/components/settings/page/settings-setup-workflow-section-renderers.tsx
@@ -22,10 +22,17 @@ export function renderOrcaAccountSettingsSection(
{view.isSectionMounted('orca-account') ? : null}
diff --git a/src/renderer/src/components/settings/runtime-environments/cloud-mcp/CloudMcpSyncSection.tsx b/src/renderer/src/components/settings/runtime-environments/cloud-mcp/CloudMcpSyncSection.tsx
index dec1fb686bb..c1aefd8ea82 100644
--- a/src/renderer/src/components/settings/runtime-environments/cloud-mcp/CloudMcpSyncSection.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/cloud-mcp/CloudMcpSyncSection.tsx
@@ -9,13 +9,16 @@ import { CloudMcpSyncPanel, CloudMcpSyncSkeleton } from './CloudMcpSyncPanel'
/** Renders only for Orca Cloud workspaces; main answers null for every other host. */
export function CloudMcpSyncSection({
- environmentId
+ environmentId,
+ defaultExpanded = false
}: {
environmentId: string
+ /** Settings › Orca Cloud › MCP servers opens the list when there is only one workspace. */
+ defaultExpanded?: boolean
}): React.JSX.Element | null {
const t = useTranslate()
const status = useCloudMcpSyncStatus(environmentId, true)
- const [expanded, setExpanded] = useState(false)
+ const [expanded, setExpanded] = useState(defaultExpanded)
if (status === undefined) {
return
}
diff --git a/src/renderer/src/components/settings/virtual-machines/runtimes/EphemeralVmRuntimeRow.tsx b/src/renderer/src/components/settings/virtual-machines/runtimes/EphemeralVmRuntimeRow.tsx
index 9dac8d49a88..fd72f82673c 100644
--- a/src/renderer/src/components/settings/virtual-machines/runtimes/EphemeralVmRuntimeRow.tsx
+++ b/src/renderer/src/components/settings/virtual-machines/runtimes/EphemeralVmRuntimeRow.tsx
@@ -1,11 +1,11 @@
-import { AlertTriangle, Copy, Loader2, Square, Trash2, X } from 'lucide-react'
+import { AlertTriangle, ChevronRight, Copy, Loader2, Square, Trash2, X } from 'lucide-react'
import type { EphemeralVmRuntimeRecord } from '../../../../../../shared/ephemeral-vm-runtimes'
import { getEphemeralVmRecipeResultProjectRoot } from '../../../../../../shared/ephemeral-vm-recipes'
import { useTranslate } from '@/i18n/use-translate'
import { ephemeralVmCleanupErrorText } from '@/lib/ephemeral-vm-error-copy'
import { cn } from '@/lib/utils'
import { Button } from '../../../ui/button'
-import { CloudMcpSyncSection } from '../../runtime-environments/cloud-mcp/CloudMcpSyncSection'
+import { useAppStore } from '@/store'
type EphemeralVmRuntimeRowProps = {
runtime: EphemeralVmRuntimeRecord
@@ -38,10 +38,12 @@ export function EphemeralVmRuntimeRow({
const isProvisioning = runtime.status === 'provisioning'
// Write-ahead rows never got a recipe result, so destroy only knows the instance id.
const isUntracked = !runtime.recipeResult && !isProvisioning
- const cloudEnvironmentId =
- runtime.recipe?.provider === 'orca-cloud' && runtime.status === 'running'
- ? (runtime.runtimeEnvironmentId ?? null)
- : null
+ const openSettingsTarget = useAppStore((state) => state.openSettingsTarget)
+ // MCP sync lives in Settings › Orca Cloud › MCP servers; a running cloud VM links there.
+ const showMcpLink =
+ runtime.recipe?.provider === 'orca-cloud' &&
+ runtime.status === 'running' &&
+ Boolean(runtime.runtimeEnvironmentId)
return (
@@ -149,9 +151,20 @@ export function EphemeralVmRuntimeRow({
)}
- {cloudEnvironmentId ? (
-
-
+ {showMcpLink ? (
+
+
) : null}
diff --git a/src/renderer/src/components/ui/tabs.tsx b/src/renderer/src/components/ui/tabs.tsx
index 9547930591b..2edfc31edd0 100644
--- a/src/renderer/src/components/ui/tabs.tsx
+++ b/src/renderer/src/components/ui/tabs.tsx
@@ -76,11 +76,17 @@ function TabsTrigger({ className, ...props }: React.ComponentProps) {
return (
)
diff --git a/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx b/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
index fc95e9fd68e..6d2c98219df 100644
--- a/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
+++ b/src/renderer/src/components/worktree-creation/VmBuildSheet.tsx
@@ -299,7 +299,7 @@ export function VmBuildSheet({
onOpenBilling: () => {
const store = useAppStore.getState()
store.openSettingsTarget({
- pane: 'orca-account',
+ pane: 'cloud-billing',
repoId: null,
// "Turn on overage" / "Raise spend cap" land on the overage card itself; the
// payment notice is at the top of the section already.
diff --git a/src/renderer/src/hooks/settings-navigation-capability-sections.ts b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
index 5ea0fe51c9d..6f041632f0b 100644
--- a/src/renderer/src/hooks/settings-navigation-capability-sections.ts
+++ b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
@@ -8,10 +8,6 @@ import { getIntegrationsPaneSearchEntries } from '@/components/settings/integrat
import { getLinearAgentSkillPaneSearchEntries } from '@/components/settings/skills/linear/linear-agent-skill-search'
import { getMobileSettingsPaneSearchEntries } from '@/components/settings/mobile/mobile-settings-search'
import { getOrcaAccountSettingsSearchEntries } from '@/components/settings/accounts/orca/orca-account-settings-search'
-import {
- getCloudApiKeysSearchEntries,
- getCloudRoutinesSearchEntries
-} from '@/components/settings/cloud-api/cloud-api-search'
import { OrcaLogoSettingsIcon } from '@/components/settings/page/orca-logo-settings-icon'
import { getOrchestrationPaneSearchEntries } from '@/components/settings/orchestration/orchestration-search'
import { getVoicePaneSearchEntries } from '@/components/settings/voice/voice-pane-search'
@@ -23,19 +19,22 @@ import {
Bot,
CircleUserRound,
KeyRound,
- KeySquare,
Mic,
MousePointerClick,
Network,
SlidersHorizontal,
Smartphone,
- UserCog,
- Workflow
+ UserCog
} from 'lucide-react'
import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
export function buildCapabilitySettingsSections(
- { isLocalWindowsHost, isWebClient, isLinearConnected }: SettingsNavigationBuildOptions,
+ {
+ isLocalWindowsHost,
+ isWebClient,
+ isLinearConnected,
+ isOrcaCloudApiAvailable
+ }: SettingsNavigationBuildOptions,
t: Translate = translate
): SettingsNavSection[] {
const showDesktopOnlySettings = !isWebClient
@@ -74,11 +73,16 @@ export function buildCapabilitySettingsSections(
? [
{
id: 'agent-api-keys',
- title: t('auto.components.settings.agentApiKeys.title', 'Agent API Keys'),
- description: t(
- 'auto.components.settings.agentApiKeys.description',
- 'Optional. Give an agent an API key on every host, or only some, instead of signing in on each machine.'
- ),
+ title: t('settings.agentApiKeys.title', 'Agent API keys'),
+ description: isOrcaCloudApiAvailable
+ ? t(
+ 'settings.agentApiKeys.descriptionCloudSecrets',
+ 'Keys here work on this computer and your SSH and paired hosts. To use a key in cloud workspaces, save it to your Orca account in Cloud secrets.'
+ )
+ : t(
+ 'auto.components.settings.agentApiKeys.description',
+ 'Optional. Give an agent an API key on every host, or only some, instead of signing in on each machine.'
+ ),
icon: KeyRound,
searchEntries: getAgentApiKeysSearchEntries(),
group: 'capabilities' as const,
@@ -155,42 +159,21 @@ export function buildSetupSettingsSections(
{
id: 'orca-account',
title: t('auto.components.settings.orcaAccount.title', 'Orca Account'),
- description: t(
- 'auto.components.settings.orcaAccount.description',
- 'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
- ),
+ description: isOrcaCloudApiAvailable
+ ? t(
+ 'settings.orcaAccount.descriptionWithCloud',
+ 'Sign-in, plan, team and Orca Cloud settings.'
+ )
+ : t(
+ 'auto.components.settings.orcaAccount.description',
+ 'Share work instantly and reach your desktop from Orca Mobile wherever you are.'
+ ),
icon: CircleUserRound,
searchEntries: getOrcaAccountSettingsSearchEntries(),
group: 'setup'
}
]
: []),
- ...(showDesktopOnlySettings && isOrcaCloudApiAvailable
- ? [
- {
- id: 'cloud-api-keys',
- title: t('auto.components.settings.cloudApi.sectionTitle', 'Orca API keys'),
- description: t(
- 'auto.components.settings.cloudApi.sectionDescription',
- 'For the Orca Cloud API, the orca CLI and MCP clients. Claude or Codex keys go in Cloud secrets.'
- ),
- icon: KeySquare,
- searchEntries: getCloudApiKeysSearchEntries(),
- group: 'setup' as const
- },
- {
- id: 'cloud-routines',
- title: t('auto.components.settings.cloudRoutines.sectionTitle', 'Routines'),
- description: t(
- 'auto.components.settings.cloudRoutines.sectionDescription',
- 'Agents that run in Orca Cloud on a schedule, on GitHub events or from a webhook.'
- ),
- icon: Workflow,
- searchEntries: getCloudRoutinesSearchEntries(),
- group: 'setup' as const
- }
- ]
- : []),
{
id: 'setup-guide',
title: t('auto.hooks.useSettingsNavigationMetadata.ded9e9032f', 'Onboarding checklist'),
diff --git a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts
new file mode 100644
index 00000000000..de57a415f0f
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest'
+import { buildSetupSettingsSections } from './settings-navigation-capability-sections'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+import { buildOrcaCloudSettingsSections } from './settings-navigation-orca-cloud-sections'
+
+function options(patch: Partial): SettingsNavigationBuildOptions {
+ return {
+ isMac: true,
+ isWindows: false,
+ isLocalWindowsHost: false,
+ isWindowsTerminalHost: false,
+ isWebClient: false,
+ hostQueuesMessages: false,
+ managedBrowserCreationEnabled: true,
+ mobileEmulatorCreationEnabled: true,
+ isDev: false,
+ isLinearConnected: false,
+ isOrcaCloudApiAvailable: true,
+ repos: [],
+ ...patch
+ }
+}
+
+describe('Orca Cloud settings group', () => {
+ it('holds every Orca Cloud pane, in order, when the build has a control plane', () => {
+ const sections = buildOrcaCloudSettingsSections(options({}))
+ expect(sections.map((section) => section.id)).toEqual([
+ 'cloud-billing',
+ 'cloud-team',
+ 'cloud-secrets',
+ 'cloud-environments',
+ 'cloud-mcp',
+ 'cloud-api-keys',
+ 'cloud-routines'
+ ])
+ expect(new Set(sections.map((section) => section.group))).toEqual(new Set(['orca-cloud']))
+ })
+
+ it('is absent without a control plane and on the web client', () => {
+ expect(buildOrcaCloudSettingsSections(options({ isOrcaCloudApiAvailable: false }))).toEqual([])
+ expect(buildOrcaCloudSettingsSections(options({ isWebClient: true }))).toEqual([])
+ })
+
+ it('leaves Set Up with the account, and describes it by what it now holds', () => {
+ const setup = buildSetupSettingsSections(options({}))
+ expect(setup.some((section) => section.id.startsWith('cloud-'))).toBe(false)
+ expect(setup.find((section) => section.id === 'orca-account')?.description).toBe(
+ 'Sign-in, plan, team and Orca Cloud settings.'
+ )
+ const local = buildSetupSettingsSections(options({ isOrcaCloudApiAvailable: false }))
+ expect(local.find((section) => section.id === 'orca-account')?.description).not.toMatch(
+ /Orca Cloud/
+ )
+ })
+})
diff --git a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts
new file mode 100644
index 00000000000..8384c60f7d1
--- /dev/null
+++ b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts
@@ -0,0 +1,106 @@
+import {
+ getCloudApiKeysSearchEntries,
+ getCloudRoutinesSearchEntries
+} from '@/components/settings/cloud-api/cloud-api-search'
+import {
+ getOrcaCloudBillingSearchEntries,
+ getOrcaCloudEnvironmentsSearchEntries,
+ getOrcaCloudMcpSearchEntries,
+ getOrcaCloudSecretsSearchEntries,
+ getOrcaCloudTeamSearchEntries
+} from '@/components/settings/orca-cloud/orca-cloud-settings-search'
+import { translate } from '@/i18n/i18n'
+import type { Translate } from '@/i18n/use-translate'
+import type { SettingsNavSection } from '@/lib/settings-navigation-types'
+import { Boxes, CreditCard, KeySquare, LockKeyhole, Plug, Users, Workflow } from 'lucide-react'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+/** One home for everything Orca Cloud; only builds with a control plane show it. */
+export function buildOrcaCloudSettingsSections(
+ { isWebClient, isOrcaCloudApiAvailable }: SettingsNavigationBuildOptions,
+ t: Translate = translate
+): SettingsNavSection[] {
+ if (isWebClient || !isOrcaCloudApiAvailable) {
+ return []
+ }
+ const group = 'orca-cloud'
+ return [
+ {
+ id: 'cloud-billing',
+ title: t('auto.components.billing.title', 'Plan & billing'),
+ description: t(
+ 'settings.orcaCloud.billing.description',
+ 'Your Orca Cloud plan, sandbox hours and payment.'
+ ),
+ icon: CreditCard,
+ searchEntries: getOrcaCloudBillingSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-team',
+ title: t('auto.components.billing.team.title', 'Team'),
+ description: t(
+ 'auto.components.billing.team.createHint',
+ 'Share one Orca Cloud plan with your teammates.'
+ ),
+ icon: Users,
+ searchEntries: getOrcaCloudTeamSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-secrets',
+ title: t('cloudSecrets.title', 'Cloud secrets'),
+ description: t(
+ 'cloudSecrets.description',
+ 'API keys you add to Orca are never written to the sandbox. Agents and terminals get them as environment variables.'
+ ),
+ icon: LockKeyhole,
+ searchEntries: getOrcaCloudSecretsSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-environments',
+ title: t('settings.orcaCloud.environments.title', 'Cloud environments'),
+ description: t(
+ 'cloudEnvironment.descriptionTeam',
+ 'Your team’s repos and install script, built once into a snapshot so every cloud workspace starts with dependencies installed.'
+ ),
+ icon: Boxes,
+ searchEntries: getOrcaCloudEnvironmentsSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-mcp',
+ title: t('cloudMcpSync.title', 'MCP servers'),
+ description: t(
+ 'settings.orcaCloud.mcp.description',
+ 'MCP servers from Claude Code and Codex on this computer, synced to your cloud workspaces.'
+ ),
+ icon: Plug,
+ searchEntries: getOrcaCloudMcpSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-api-keys',
+ title: t('auto.components.settings.cloudApi.sectionTitle', 'Orca API keys'),
+ description: t(
+ 'auto.components.settings.cloudApi.sectionDescription',
+ 'For the Orca Cloud API, the orca CLI and MCP clients. Claude or Codex keys go in Cloud secrets.'
+ ),
+ icon: KeySquare,
+ searchEntries: getCloudApiKeysSearchEntries(),
+ group
+ },
+ {
+ id: 'cloud-routines',
+ title: t('auto.components.settings.cloudRoutines.sectionTitle', 'Routines'),
+ description: t(
+ 'auto.components.settings.cloudRoutines.sectionDescription',
+ 'Agents that run in Orca Cloud on a schedule, on GitHub events or from a webhook.'
+ ),
+ icon: Workflow,
+ searchEntries: getCloudRoutinesSearchEntries(),
+ group
+ }
+ ]
+}
diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
index ec8fa595cee..5f8a00fc898 100644
--- a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
+++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
@@ -31,6 +31,7 @@ import {
buildSetupSettingsSections
} from './settings-navigation-capability-sections'
import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+import { buildOrcaCloudSettingsSections } from './settings-navigation-orca-cloud-sections'
import { buildInterfaceSettingsSections } from './settings-navigation-interface-sections'
import { buildRemoteSettingsSections } from './settings-navigation-remote-sections'
import { buildWorkflowSettingsSections } from './settings-navigation-workflow-sections'
@@ -112,6 +113,7 @@ export function buildSettingsNavigationMetadata(
return [
...buildCapabilitySettingsSections(options, t),
...buildSetupSettingsSections(options, t),
+ ...buildOrcaCloudSettingsSections(options, t),
...buildWorkflowSettingsSections(options, terminalPaneSearchEntries, t),
...buildInterfaceSettingsSections(options, t),
...buildRemoteSettingsSections(options, runtimeEnvironmentsSearchEntry, reposById, t)
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 62b06b498fd..c6a29c49f91 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -1342,6 +1342,62 @@
"settings": "Settings",
"label": "Settings breadcrumb",
"close": "Close settings"
+ },
+ "agentApiKeys": {
+ "descriptionCloudSecretsLink": "Keys here work on this computer and your SSH and paired hosts. To use a key in cloud workspaces, save it to your Orca account in Cloud secrets.",
+ "searchTitle": "Agent API keys",
+ "title": "Agent API keys",
+ "descriptionCloudSecrets": "Keys here work on this computer and your SSH and paired hosts. To use a key in cloud workspaces, save it to your Orca account in Cloud secrets."
+ },
+ "orcaCloud": {
+ "mcp": {
+ "loadFailed": "Couldn’t list your cloud workspaces",
+ "emptyTitle": "No cloud workspace is running",
+ "emptyBody": "MCP servers sync to a cloud workspace while it runs. Start or wake one to choose which servers it gets.",
+ "unnamed": "Cloud workspace",
+ "workspaceLabel": "MCP servers in {{name}}",
+ "searchDescription": "Choose which MCP servers from this computer sync to your cloud workspaces.",
+ "keywordMcp": "mcp",
+ "keywordSync": "sync",
+ "keywordCloud": "cloud",
+ "openFor": "MCP servers for {{name}}",
+ "description": "MCP servers from Claude Code and Codex on this computer, synced to your cloud workspaces."
+ },
+ "environments": {
+ "title": "Cloud environments",
+ "unavailable": "Cloud environments aren’t available for this account yet.",
+ "searchDescription": "Repositories and install script built into a snapshot, and waking cloud workspaces before you open them.",
+ "keywordSnapshot": "snapshot",
+ "keywordInstall": "install script",
+ "keywordWake": "wake",
+ "keywordSandbox": "sandbox"
+ },
+ "signedOut": {
+ "reconnectTitle": "Sign in again",
+ "body": "Orca Cloud settings belong to your Orca account. Sign in to manage them."
+ },
+ "team": {
+ "unavailable": "Teams aren’t available for this account yet.",
+ "searchDescription": "Members, invites and seats for your Orca Cloud team.",
+ "keywordMembers": "members",
+ "keywordInvite": "invite",
+ "keywordSeats": "seats"
+ },
+ "billing": {
+ "searchDescription": "Your Orca Cloud plan, sandbox hours, overage and payment.",
+ "keywordPlan": "plan",
+ "keywordBilling": "billing",
+ "keywordInvoice": "invoice",
+ "keywordUsage": "usage",
+ "keywordOverage": "overage",
+ "description": "Your Orca Cloud plan, sandbox hours and payment."
+ }
+ },
+ "groups": {
+ "orcaCloud": "Orca Cloud"
+ },
+ "orcaAccount": {
+ "descriptionWithCloud": "Sign-in, plan, team and Orca Cloud settings."
}
},
"menu": {
@@ -14229,14 +14285,12 @@
"addKey": "Add key",
"anotherAgent": "Add a key for another agent",
"search": {
- "title": "Agent API Keys",
"description": "Give agents an API key on every host or only some, without signing in on each machine.",
"apiKey": "api key",
"secret": "secret",
"env": "environment",
"bedrock": "bedrock"
},
- "title": "Agent API Keys",
"description": "Optional. Give an agent an API key on every host, or only some, instead of signing in on each machine."
},
"ports": {
@@ -20752,7 +20806,8 @@
"trialOneTime": "Trial hours are a one-time allowance and don’t reset. When they’re used up, choose a plan to keep going. No card needed until then.",
"trialProduct": "Orca Cloud",
"trialRowChoosePlan": "{{trial}}. Choose plan",
- "trialUsedUpTitle": "Your trial is used up"
+ "trialUsedUpTitle": "Your trial is used up",
+ "unconfigured": "Billing isn’t available in this build of Orca."
},
"ports": {
"RuntimePortAutoForwarder": {
@@ -26414,7 +26469,6 @@
"memberAsk": "Ask an owner or admin to set it up."
},
"loading": "Loading environment…",
- "title": "Cloud environment",
"descriptionTeam": "Your team’s repos and install script, built once into a snapshot so every cloud workspace starts with dependencies installed.",
"you": "You",
"loadFailed": "Couldn’t load the cloud environment",
@@ -26736,7 +26790,6 @@
"openaiKey": "OpenAI API key",
"gatewayKey": "AI Gateway API key",
"claudeModel": "Claude model (optional)",
- "gatewayModelHint": "Free gateway accounts can’t use anthropic/* models; try moonshotai/kimi-k2.",
"codexModel": "Codex model (optional)",
"gatewayCodexHint": "A gateway model id, such as openai/gpt-5.",
"baseUrl": "Base URL",
@@ -26782,7 +26835,6 @@
"composerHint": "Claude and Codex need access in Orca Cloud. Add it now, or sign in once the workspace starts.",
"later": "Later",
"skippedTitle": "Agent setup skipped",
- "skippedDetail": "Set it up any time from Settings › Orca Account › Cloud secrets.",
"signInPending": "Agent sign-in",
"signInPendingDetail": "Opens when the sandbox is ready. Keep Orca open until then.",
"signInCancelled": "Sign-in cancelled",
@@ -26808,7 +26860,9 @@
"failed": "Couldn’t save {{name}}. Nothing was changed.",
"rowSaved": "{{agent}}: your API key ••••{{hint}}",
"scopeNote": "Not used in Orca Cloud. Save a key to your Orca account to use it in cloud workspaces."
- }
+ },
+ "gatewayModelDefaultHint": "Leave empty to use the gateway’s default model.",
+ "skippedDetailCloudGroup": "Set it up any time from Settings → Orca Cloud → Cloud secrets."
},
"cloudSecrets": {
"editor": {
@@ -26923,7 +26977,9 @@
"lineName": "line {{line}}",
"skippedLine": "Line {{line}} · skipped",
"renamed": "Renamed from {{name}}",
- "normalized": "Spaces and dashes become underscores"
+ "normalized": "Spaces and dashes become underscores",
+ "valueLabel": "Value for {{name}}",
+ "valueLabelLine": "Value, line {{line}}"
},
"value": {
"hide": "Hide value",
@@ -26960,7 +27016,9 @@
"vm": {
"badge": "Stored on workspace",
"warning": "Orca can’t swap this key at the network edge, so cloud workspaces get the real value. Anything running in the workspace can read it."
- }
+ },
+ "loading": "Loading cloud secrets…",
+ "unavailable": "Cloud secrets aren’t available for this account yet."
},
"cloudMcpSync": {
"appliesEverywhere": "Applies to every cloud workspace",
diff --git a/src/renderer/src/lib/settings-navigation-types.ts b/src/renderer/src/lib/settings-navigation-types.ts
index 7f14e520989..fe2c5ee41a5 100644
--- a/src/renderer/src/lib/settings-navigation-types.ts
+++ b/src/renderer/src/lib/settings-navigation-types.ts
@@ -46,6 +46,11 @@ const SETTINGS_NAV_TARGETS = [
'share-skills',
'automations',
'orca-account',
+ 'cloud-billing',
+ 'cloud-team',
+ 'cloud-secrets',
+ 'cloud-environments',
+ 'cloud-mcp',
'cloud-api-keys',
'cloud-routines',
'linear',