From a50c18246326bf9c78443c166e39cc28c056f584 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 10 Nov 2026 17:02:36 -0800 Subject: [PATCH 1/2] feat(settings): one Agent accounts page and a sentence-case settings nav AI provider accounts becomes Agent accounts: a page whose first part is This computer (or the selected host), holding the existing provider accounts, switching and usage. renderAccountsSettingsSection takes additionalSections so other parts can be added below it with AgentAccountsSubsection. The section id stays 'accounts', so every deep link keeps working. The Settings nav, its group labels and the matching section titles move to sentence case (Orca account, Computer use, SSH hosts, ...). In-app, CLI and docs references to 'AI Provider Accounts' now say 'Agent accounts'. --- .../docs/agents/antigravity-accounts.mdx | 2 +- .../content/docs/agents/codex-hot-swap.mdx | 4 +- docs/site/content/docs/settings.mdx | 2 +- src/cli/handlers/account-list-format.ts | 2 +- src/cli/handlers/account-selection.ts | 2 +- src/cli/specs/account.ts | 2 +- .../components/ClaudeAccountSwitchDialog.tsx | 2 +- .../accounts/AgentAccountsSubsection.tsx | 30 ++++ .../settings-navigation-foundations.ts | 8 +- .../settings-capability-section-renderers.tsx | 140 +++++++++--------- ...ings-remote-security-section-renderers.tsx | 2 +- ...tings-setup-workflow-section-renderers.tsx | 4 +- .../components/status-bar/usage-error-copy.ts | 2 +- ...settings-navigation-capability-sections.ts | 8 +- .../settings-navigation-interface-sections.ts | 4 +- .../settings-navigation-remote-sections.ts | 10 +- .../settings-navigation-workflow-sections.ts | 14 +- .../src/i18n/en-runtime-required.json | 8 +- src/renderer/src/i18n/locales/en.json | 57 +++---- .../startup/host-account-launch-env.ts | 2 +- src/shared/global-settings-types.ts | 2 +- tests/e2e/ssh-host-form-modal.spec.ts | 4 +- 22 files changed, 174 insertions(+), 137 deletions(-) create mode 100644 src/renderer/src/components/settings/accounts/AgentAccountsSubsection.tsx diff --git a/docs/site/content/docs/agents/antigravity-accounts.mdx b/docs/site/content/docs/agents/antigravity-accounts.mdx index 53354a7e801..c300a122c87 100644 --- a/docs/site/content/docs/agents/antigravity-accounts.mdx +++ b/docs/site/content/docs/agents/antigravity-accounts.mdx @@ -8,7 +8,7 @@ Orca can remember more than one Antigravity CLI (`agy`) account and switch betwe ## Save accounts 1. Run `agy` in a terminal on the machine that runs your agents and complete its browser sign-in. -1. Open **Settings → AI Provider Accounts → Antigravity** and click **Save current account**. +1. Open **Settings → Agent accounts → Antigravity** and click **Save current account**. 1. To add another account, run `/logout` inside `agy`, sign in with the next account, click **Refresh accounts**, then **Save current account** again. 1. Repeat for each account. diff --git a/docs/site/content/docs/agents/codex-hot-swap.mdx b/docs/site/content/docs/agents/codex-hot-swap.mdx index bc66a569409..299a7f94cfb 100644 --- a/docs/site/content/docs/agents/codex-hot-swap.mdx +++ b/docs/site/content/docs/agents/codex-hot-swap.mdx @@ -6,7 +6,7 @@ Running multiple Codex accounts to maximize tokens is common. Orca lets you add ## Add accounts -1. Open [Settings → AI Provider Accounts → Codex](/docs/settings#ai-provider-accounts). +1. Open [Settings → Agent accounts → Codex](/docs/settings#agent-accounts). 1. Click **Add Account** and finish the Codex sign-in in your browser. 1. Repeat for each account. Every account Orca adds keeps its own sign-in context, so adding one never signs another out. @@ -38,5 +38,5 @@ For managed Codex accounts, Orca mirrors settings from your real `~/.codex/confi ## Other providers -- **Claude Code** accounts are added the same way under **Settings → AI Provider Accounts → Claude**, and switching applies to the next Claude you start. +- **Claude Code** accounts are added the same way under **Settings → Agent accounts → Claude**, and switching applies to the next Claude you start. - **Antigravity** works differently: it switches one shared `agy` login rather than running isolated accounts. See [Antigravity accounts](/docs/agents/antigravity-accounts). diff --git a/docs/site/content/docs/settings.mdx b/docs/site/content/docs/settings.mdx index 7d71631f1c5..d4e618935bc 100644 --- a/docs/site/content/docs/settings.mdx +++ b/docs/site/content/docs/settings.mdx @@ -65,7 +65,7 @@ Settings are grouped into panes. Everything here is searchable with `Cmd-,` then - **Keep computer awake** — **On** (stay awake continuously), **Agent** (stay awake while an agent is working), or **Off**. The same control lives on the desktop status bar as **Caffeinate** (coffee icon). Hidden on paired web clients. - **Skill freshness** — the Agents pane and skill cards still show full status. Sidebar navigation only badges skills that need action (**Update available**, **Needs attention** / review); healthy, loading, and optional not-installed rows stay quiet. Use **Update** in the dialog to refresh global skills in the background (no terminal). Progress appears on the status bar; closing the dialog does not cancel the run. See [Orca skills](/docs/cli/skills#keep-skills-up-to-date). -## AI Provider Accounts +## Agent accounts - Optional saved accounts per provider. Without any, Orca uses your existing logins. - **Claude** and **Codex** — **Add Account** signs in a separate, isolated account; switching applies to new sessions. See [Hot-swap Codex accounts](/docs/agents/codex-hot-swap). diff --git a/src/cli/handlers/account-list-format.ts b/src/cli/handlers/account-list-format.ts index a4e4e6a2d23..747b46ff6ed 100644 --- a/src/cli/handlers/account-list-format.ts +++ b/src/cli/handlers/account-list-format.ts @@ -38,7 +38,7 @@ export function formatAccountsBlock(label: string, block: AccountsBlock): string const lines = block.accounts.map( (account) => ` ${account.id} ${account.email}${activeAccountIds.has(account.id) ? ' (active)' : ''}${ - account.needsSignIn ? ' (sign in again in Orca Settings > AI Provider Accounts)' : '' + account.needsSignIn ? ' (sign in again in Orca Settings > Agent accounts)' : '' }` ) return `Managed ${label} accounts (${block.accounts.length}):\n${system}\n${lines.join('\n')}` diff --git a/src/cli/handlers/account-selection.ts b/src/cli/handlers/account-selection.ts index bce8995f3b0..9030fbbbfe3 100644 --- a/src/cli/handlers/account-selection.ts +++ b/src/cli/handlers/account-selection.ts @@ -295,7 +295,7 @@ export async function selectAgentAccount(ctx: HandlerContext): Promise { if (agent === 'claude' && query === 'system' && getWslAccountTarget(ctx.cwd)) { throw new RuntimeClientError( 'invalid_argument', - 'Select the Claude system default for a WSL distro in Orca Settings > AI Provider Accounts.' + 'Select the Claude system default for a WSL distro in Orca Settings > Agent accounts.' ) } const provider = providerAccounts(ctx, agent) diff --git a/src/cli/specs/account.ts b/src/cli/specs/account.ts index 1b93df78f2f..248e4e5741d 100644 --- a/src/cli/specs/account.ts +++ b/src/cli/specs/account.ts @@ -15,7 +15,7 @@ export const ACCOUNT_COMMAND_SPECS: CommandSpec[] = [ 'OpenCode 2 uses `opencode auth login --standalone` in private XDG directories. Devin uses `devin auth login --force-manual-token-flow`.', 'Use --integration to skip the OpenCode integration picker; --label names the saved OpenCode or Devin profile.', 'Use --method and repeated --answer to pass OpenCode its login method and form answers, so sign-in can finish without an interactive terminal.', - 'Antigravity accounts are saved from the current `agy` login in Orca Settings > AI Provider Accounts.', + 'Antigravity accounts are saved from the current `agy` login in Orca Settings > Agent accounts.', 'OpenCode and Devin profiles apply to new explicit host agent launches. Direct SSH relay and Windows-hosted WSL selection are not supported; run the command on a headless Orca runtime on that host.', 'Sign in with the account you want to add (e.g. use a private/incognito browser window for a second account).', '--agent defaults to claude. Requires the Orca runtime to be running on this machine.' diff --git a/src/renderer/src/components/ClaudeAccountSwitchDialog.tsx b/src/renderer/src/components/ClaudeAccountSwitchDialog.tsx index 4b0d67fd7e1..7834da8db07 100644 --- a/src/renderer/src/components/ClaudeAccountSwitchDialog.tsx +++ b/src/renderer/src/components/ClaudeAccountSwitchDialog.tsx @@ -102,7 +102,7 @@ function SwitchPromptDialog({ prompt }: { prompt: ClaudeAccountSwitchPrompt }): {t( 'accounts.claude.switchSessions.dontAskAgainHint', - 'You can turn this off in Settings → AI Provider Accounts.' + 'You can turn this off in Settings → Agent accounts.' )} diff --git a/src/renderer/src/components/settings/accounts/AgentAccountsSubsection.tsx b/src/renderer/src/components/settings/accounts/AgentAccountsSubsection.tsx new file mode 100644 index 00000000000..1b5e925067d --- /dev/null +++ b/src/renderer/src/components/settings/accounts/AgentAccountsSubsection.tsx @@ -0,0 +1,30 @@ +import type React from 'react' + +type AgentAccountsSubsectionProps = { + id: string + title: React.ReactNode + description?: React.ReactNode + children: React.ReactNode +} + +/** One part of Settings → Agent accounts (this computer, other hosts, …). Builds can add their own + * parts through renderAccountsSettingsSection's `additionalSections`. */ +export function AgentAccountsSubsection({ + id, + title, + description, + children +}: AgentAccountsSubsectionProps): React.JSX.Element { + const titleId = `${id}-title` + return ( +
+
+

+ {title} +

+ {description ?

{description}

: null} +
+ {children} +
+ ) +} diff --git a/src/renderer/src/components/settings/navigation/settings-navigation-foundations.ts b/src/renderer/src/components/settings/navigation/settings-navigation-foundations.ts index 733fbd684f6..7feb43641be 100644 --- a/src/renderer/src/components/settings/navigation/settings-navigation-foundations.ts +++ b/src/renderer/src/components/settings/navigation/settings-navigation-foundations.ts @@ -11,9 +11,9 @@ export const SETTINGS_NAV_GROUPS = [ { id: 'capabilities', titleKey: 'auto.components.settings.Settings.23c6874fdf', - titleDefault: 'AI Capabilities' + titleDefault: 'AI capabilities' }, - { id: 'setup', titleKey: 'auto.components.settings.Settings.9abb9be3bc', titleDefault: 'Set Up' }, + { id: 'setup', titleKey: 'auto.components.settings.Settings.9abb9be3bc', titleDefault: 'Set up' }, { id: 'orca-cloud', titleKey: 'settings.groups.orcaCloud', @@ -32,12 +32,12 @@ export const SETTINGS_NAV_GROUPS = [ { id: 'remote', titleKey: 'auto.components.settings.Settings.23931df7e8', - titleDefault: 'Remote Hosts' + titleDefault: 'Remote hosts' }, { id: 'security', titleKey: 'auto.components.settings.Settings.084d8fac5b', - titleDefault: 'Privacy & Security' + titleDefault: 'Privacy & security' }, { id: 'advanced', 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 24c99681503..932f2544b46 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 @@ -1,9 +1,8 @@ import { AccountsPane } from '../accounts/AccountsPane' +import { AgentAccountsSubsection } from '../accounts/AgentAccountsSubsection' import { getProviderAccountsOwnerKey } from '@/runtime/provider-accounts/observations/runtime-provider-accounts-client' import { AgentsPane } from '../agents/AgentsPane' import { AgentApiKeysSection } from '../agent-api-keys/AgentApiKeysSection' -import { OrcaCloudAccountsSection } from '../agent-accounts/OrcaCloudAccountsSection' -import { AgentAccountsOverviewSection } from '../agent-accounts/overview/AgentAccountsOverviewSection' import { AgentApiKeysCloudDescription } from '../agent-api-keys/AgentApiKeysCloudDescription' import { AgentDefaultSurfaceSection } from '../agents/surfaces/AgentDefaultSurfaceSection' import { ComputerUsePane } from '../computer-use/ComputerUsePane' @@ -54,87 +53,92 @@ export function renderAgentsSettingsSection( ) } +/** + * Settings → Agent accounts: one page for agent sign-ins. "This computer" (or the host picked in the + * scope picker) holds provider accounts, switching and usage; `additionalSections` lets a build add + * more parts below it, each an AgentAccountsSubsection. + */ export function renderAccountsSettingsSection( context: SettingsRenderContext, - t: Translate = translate + t: Translate = translate, + additionalSections?: React.ReactNode ): React.JSX.Element { - const { model, navigation, terminal, view } = context - const wslHostDistro = wslHostDistroForTarget( - model.settingsHostScope.target, - model.runtimeEnvironments - ) + const { model, navigation, view } = context + const isLocalScope = model.settingsHostScope.target.kind === 'local' return ( - {!view.isSectionMounted('accounts') ? null : !model.settingsHostScope.available ? ( - - ) : wslHostDistro ? ( - // A WSL host's orcad has no account services; this desktop owns its distro's accounts. - - ) : ( - - )} + {view.isSectionMounted('accounts') ? ( + <> + + {renderProviderAccountsPane(context)} + + {additionalSections} + + ) : null} ) } -export function renderAgentAccountsSettingsSection( - context: SettingsRenderContext, - t: Translate = translate -): React.JSX.Element | null { - const { model, navigation, view } = context - return model.showDesktopOnlySettings && model.orcaCloudApiAvailable ? ( - - {view.isSectionMounted('agent-accounts') ? ( - <> - - - - ) : null} - - ) : null +function renderProviderAccountsPane(context: SettingsRenderContext): React.JSX.Element { + const { model, terminal } = context + const wslHostDistro = wslHostDistroForTarget( + model.settingsHostScope.target, + model.runtimeEnvironments + ) + return !model.settingsHostScope.available ? ( + + ) : wslHostDistro ? ( + // A WSL host's orcad has no account services; this desktop owns its distro's accounts. + + ) : ( + + ) } export function renderAgentApiKeysSettingsSection( diff --git a/src/renderer/src/components/settings/page/settings-remote-security-section-renderers.tsx b/src/renderer/src/components/settings/page/settings-remote-security-section-renderers.tsx index 47972d3b4e9..224627ac5f5 100644 --- a/src/renderer/src/components/settings/page/settings-remote-security-section-renderers.tsx +++ b/src/renderer/src/components/settings/page/settings-remote-security-section-renderers.tsx @@ -111,7 +111,7 @@ export function renderDeveloperPermissionsSettingsSection( AI Provider Accounts, or choose System default.' + 'The selected Claude account needs you to sign in again. Open Settings > Agent accounts, or choose System default.' ) case 'server': case 'parse': diff --git a/src/renderer/src/hooks/settings-navigation-capability-sections.ts b/src/renderer/src/hooks/settings-navigation-capability-sections.ts index 758162b0609..e23d7e8f24a 100644 --- a/src/renderer/src/hooks/settings-navigation-capability-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-capability-sections.ts @@ -77,10 +77,10 @@ export function buildCapabilitySettingsSections( : []), { id: 'accounts', - title: t('auto.hooks.useSettingsNavigationMetadata.f70ac54d38', 'AI Provider Accounts'), + title: t('auto.hooks.useSettingsNavigationMetadata.f70ac54d38', 'Agent accounts'), description: t( 'auto.hooks.useSettingsNavigationMetadata.b1c2f8b0ac', - 'Optional account switching and usage setup for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.' + 'Sign-ins, account switching and usage for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.' ), icon: UserCog, searchEntries: getAccountsPaneSearchEntries(), @@ -142,7 +142,7 @@ export function buildCapabilitySettingsSections( ? [ { id: 'computer-use', - title: t('auto.hooks.useSettingsNavigationMetadata.b35e92364b', 'Computer Use'), + title: t('auto.hooks.useSettingsNavigationMetadata.b35e92364b', 'Computer use'), description: t( 'auto.hooks.useSettingsNavigationMetadata.0059bd17f3', 'Enable agents to control any app on your computer.' @@ -177,7 +177,7 @@ export function buildSetupSettingsSections( ? [ { id: 'orca-account', - title: t('auto.components.settings.orcaAccount.title', 'Orca Account'), + title: t('auto.components.settings.orcaAccount.title', 'Orca account'), description: isOrcaCloudApiAvailable ? t( 'settings.orcaAccount.descriptionWithCloud', diff --git a/src/renderer/src/hooks/settings-navigation-interface-sections.ts b/src/renderer/src/hooks/settings-navigation-interface-sections.ts index d33a106164b..802aaa87267 100644 --- a/src/renderer/src/hooks/settings-navigation-interface-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-interface-sections.ts @@ -66,7 +66,7 @@ export function buildInterfaceSettingsSections( }, { id: 'input', - title: t('auto.hooks.useSettingsNavigationMetadata.0c6ee88a5f', 'Input & Editing'), + title: t('auto.hooks.useSettingsNavigationMetadata.0c6ee88a5f', 'Input & editing'), description: t( 'auto.hooks.useSettingsNavigationMetadata.1f452cbd4c', 'Selection and editing behavior.' @@ -106,7 +106,7 @@ export function buildInterfaceSettingsSections( }, { id: 'stats', - title: t('auto.hooks.useSettingsNavigationMetadata.d72a58b5b9', 'Stats & Usage'), + title: t('auto.hooks.useSettingsNavigationMetadata.d72a58b5b9', 'Stats & usage'), description: t( 'auto.hooks.useSettingsNavigationMetadata.b351014180', 'Orca stats plus Claude, Codex, OpenCode, Muse token analytics and Grok subscription usage.' diff --git a/src/renderer/src/hooks/settings-navigation-remote-sections.ts b/src/renderer/src/hooks/settings-navigation-remote-sections.ts index 07fc43977b0..677480f78ac 100644 --- a/src/renderer/src/hooks/settings-navigation-remote-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-remote-sections.ts @@ -48,7 +48,7 @@ export function buildRemoteSettingsSections( ? [ { id: 'ssh', - title: t('auto.hooks.useSettingsNavigationMetadata.94a5afe910', 'SSH Hosts'), + title: t('auto.hooks.useSettingsNavigationMetadata.94a5afe910', 'SSH hosts'), description: t( 'auto.hooks.useSettingsNavigationMetadata.31e57d1c70', 'Use existing machines over SSH for files, terminals, Git, and workspaces.' @@ -61,7 +61,7 @@ export function buildRemoteSettingsSections( : []), { id: 'servers', - title: t('auto.hooks.useSettingsNavigationMetadata.de0c2907a1', 'Remote Orca Servers'), + title: t('auto.hooks.useSettingsNavigationMetadata.de0c2907a1', 'Remote Orca servers'), description: isWebClient ? 'Connect this browser to a saved Orca server.' : 'Run Orca on another machine and work on it from here.', @@ -88,7 +88,7 @@ export function buildRemoteSettingsSections( ? [ { id: 'developer-permissions', - title: t('auto.hooks.useSettingsNavigationMetadata.d91ae31fbd', 'macOS Permissions'), + title: t('auto.hooks.useSettingsNavigationMetadata.d91ae31fbd', 'macOS permissions'), description: t( 'auto.hooks.useSettingsNavigationMetadata.65ec7d1968', 'macOS privacy access for terminal-launched developer tools.' @@ -101,7 +101,7 @@ export function buildRemoteSettingsSections( : []), { id: 'privacy', - title: t('auto.hooks.useSettingsNavigationMetadata.3618579df6', 'Privacy & Telemetry'), + title: t('auto.hooks.useSettingsNavigationMetadata.3618579df6', 'Privacy & telemetry'), description: t( 'auto.hooks.useSettingsNavigationMetadata.8400cfe1c1', 'Anonymous usage data and telemetry controls.' @@ -130,7 +130,7 @@ export function buildRemoteSettingsSections( ? [ { id: 'dev', - title: t('auto.hooks.useSettingsNavigationMetadata.dev', 'Dev Tools'), + title: t('auto.hooks.useSettingsNavigationMetadata.dev', 'Dev tools'), description: t( 'auto.hooks.useSettingsNavigationMetadata.devDescription', 'Dev-only tools for exercising UI states.' diff --git a/src/renderer/src/hooks/settings-navigation-workflow-sections.ts b/src/renderer/src/hooks/settings-navigation-workflow-sections.ts index 980ceed7f80..fbc510626f5 100644 --- a/src/renderer/src/hooks/settings-navigation-workflow-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-workflow-sections.ts @@ -59,7 +59,7 @@ export function buildWorkflowSettingsSections( }, { id: 'share-skills', - title: t('auto.hooks.useSettingsNavigationMetadata.shareSkillsTitle', 'Share Skills'), + title: t('auto.hooks.useSettingsNavigationMetadata.shareSkillsTitle', 'Share skills'), description: t( 'auto.hooks.useSettingsNavigationMetadata.shareSkillsDescription', 'Share your skills with an unlisted link. Anyone who has it can install them.' @@ -72,7 +72,7 @@ export function buildWorkflowSettingsSections( }, { id: 'session-history', - title: t('sessionHistory.settings.title', 'Agent Session Search'), + title: t('sessionHistory.settings.title', 'Agent session search'), description: t( 'sessionHistory.settings.description', 'Search everything your agents have said and done, on this computer and on any paired Orca server.' @@ -91,7 +91,7 @@ export function buildWorkflowSettingsSections( }, { id: 'git', - title: t('auto.hooks.useSettingsNavigationMetadata.09607cb0fe', 'Git & Source Control'), + title: t('auto.hooks.useSettingsNavigationMetadata.09607cb0fe', 'Git & source control'), description: t( 'auto.hooks.useSettingsNavigationMetadata.ab4b21b58e', 'Branch naming, base refs, and Git AI Author.' @@ -107,7 +107,7 @@ export function buildWorkflowSettingsSections( }, { id: 'tasks', - title: t('auto.hooks.useSettingsNavigationMetadata.85f4fd7710', 'Task Sources'), + title: t('auto.hooks.useSettingsNavigationMetadata.85f4fd7710', 'Task sources'), description: t( 'auto.hooks.useSettingsNavigationMetadata.tasksDescription', 'Connect providers, install the Linear skill, and choose what appears in Tasks.' @@ -129,7 +129,7 @@ export function buildWorkflowSettingsSections( }, { id: 'quick-commands', - title: t('auto.hooks.useSettingsNavigationMetadata.3fc3db144f', 'Quick Commands'), + title: t('auto.hooks.useSettingsNavigationMetadata.3fc3db144f', 'Quick commands'), description: t( 'auto.hooks.useSettingsNavigationMetadata.42ae40842f', 'Saved terminal commands, scoped globally or per project.' @@ -157,7 +157,7 @@ export function buildWorkflowSettingsSections( ? [ { id: 'mobile-emulator', - title: t('auto.hooks.useSettingsNavigationMetadata.1e761cff2b', 'Mobile Emulator'), + title: t('auto.hooks.useSettingsNavigationMetadata.1e761cff2b', 'Mobile emulator'), description: t( 'auto.hooks.useSettingsNavigationMetadata.3d65d3f1b9', 'Configure mobile emulator support for Orca and coding agents.' @@ -170,7 +170,7 @@ export function buildWorkflowSettingsSections( : []), { id: 'floating-workspace', - title: t('auto.hooks.useSettingsNavigationMetadata.65b19f5bde', 'Floating Workspace'), + title: t('auto.hooks.useSettingsNavigationMetadata.65b19f5bde', 'Floating workspace'), description: showDesktopOnlySettings ? t( 'auto.hooks.useSettingsNavigationMetadata.2d0659f6f0', diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json index 1c77fc3db33..57070f86d45 100644 --- a/src/renderer/src/i18n/en-runtime-required.json +++ b/src/renderer/src/i18n/en-runtime-required.json @@ -772,11 +772,11 @@ "hourlyWarning": "Hourly builds ship straight from main with no test gate, and the Windows ones are unsigned. Keep a stable build handy." }, "Settings": { - "084d8fac5b": "Privacy & Security", - "23931df7e8": "Remote Hosts", - "23c6874fdf": "AI Capabilities", + "084d8fac5b": "Privacy & security", + "23931df7e8": "Remote hosts", + "23c6874fdf": "AI capabilities", "8bd117d669": "Interface", - "9abb9be3bc": "Set Up", + "9abb9be3bc": "Set up", "e1578cd4bc": "Workflows" }, "SshPane": { diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 9772895488e..51cbf7556a4 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -1409,7 +1409,10 @@ "setupToken": "setup-token" }, "title": "Agent accounts", - "hubDescription": "Where Claude and Codex are signed in: Orca Cloud, this computer and your hosts." + "hubDescription": "Where Claude and Codex are signed in: Orca Cloud, this computer and your hosts.", + "pageDescription": "Sign-ins, account switching and usage for your agents.", + "thisComputer": "This computer", + "selectedHost": "Selected host" } }, "menu": { @@ -2415,38 +2418,38 @@ "e338c507c1": "Low-level compatibility settings for troubleshooting.", "580a04cd81": "Advanced", "8400cfe1c1": "Anonymous usage data and telemetry controls.", - "3618579df6": "Privacy & Telemetry", + "3618579df6": "Privacy & telemetry", "65ec7d1968": "macOS privacy access for terminal-launched developer tools.", - "d91ae31fbd": "macOS Permissions", + "d91ae31fbd": "macOS permissions", "95a1886d94": "Control terminals and agents from your phone.", "1cd25673df": "Mobile", "31e57d1c70": "Use existing machines over SSH for files, terminals, Git, and workspaces.", - "94a5afe910": "SSH Hosts", + "94a5afe910": "SSH hosts", "40d80bad8a": "Beta", - "de0c2907a1": "Remote Orca Servers", + "de0c2907a1": "Remote Orca servers", "b351014180": "Orca stats plus Claude, Codex, OpenCode, Muse token analytics and Grok subscription usage.", - "d72a58b5b9": "Stats & Usage", + "d72a58b5b9": "Stats & usage", "dcd0d9b74f": "Keyboard shortcuts for common actions.", "94295ebfb3": "Shortcuts", "7682607591": "Native desktop notifications for agent and terminal events.", "2eece16ad1": "Notifications", "1f452cbd4c": "Selection and editing behavior.", - "0c6ee88a5f": "Input & Editing", + "0c6ee88a5f": "Input & editing", "b11a5a48a2": "Theme, zoom, app and terminal appearance, sidebars, and status bar.", "93d88d20bf": "Appearance", "2d0659f6f0": "Global terminal, browser, and markdown tabs.", - "65b19f5bde": "Floating Workspace", + "65b19f5bde": "Floating workspace", "3d65d3f1b9": "Configure mobile emulator support for Orca and coding agents.", - "1e761cff2b": "Mobile Emulator", + "1e761cff2b": "Mobile emulator", "e815fd01bd": "Home page, link routing, and session cookies.", "8c197f74a1": "Browser", "42ae40842f": "Saved terminal commands, scoped globally or per project.", - "3fc3db144f": "Quick Commands", + "3fc3db144f": "Quick commands", "c33bfd664c": "Shells, renderer, sessions, and terminal behavior.", "a9fb10afca": "Terminal", - "85f4fd7710": "Task Sources", + "85f4fd7710": "Task sources", "ab4b21b58e": "Branch naming, base refs, and Git AI Author.", - "09607cb0fe": "Git & Source Control", + "09607cb0fe": "Git & source control", "33a5e1d597": "Connect GitHub, GitLab, Linear, and source-hosting services.", "2b043783ef": "Integrations", "2cd4ea75da": "Workspace defaults, app setup, and maintenance.", @@ -2460,15 +2463,15 @@ "8ac3de82f5": "Local speech-to-text dictation with on-device models.", "6a50cdcd7c": "Voice", "0059bd17f3": "Enable agents to control any app on your computer.", - "b35e92364b": "Computer Use", + "b35e92364b": "Computer use", "cd50cec5d7": "Coordinate multiple coding agents through Orca.", "58a868e8e4": "Orchestration", "7c79d3b7bf": "Optional", - "b1c2f8b0ac": "Optional account switching and usage setup for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.", - "f70ac54d38": "AI Provider Accounts", + "b1c2f8b0ac": "Sign-ins, account switching and usage for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.", + "f70ac54d38": "Agent accounts", "4121f7a0a2": "Manage AI agents, set a default, and customize commands.", "b49abbd2f7": "Agents", - "dev": "Dev Tools", + "dev": "Dev tools", "devDescription": "Dev-only tools for exercising UI states.", "devBadge": "Dev", "devSearchNotificationPlayground": "Notification playground", @@ -2488,7 +2491,7 @@ "artifactsDescription": "Share HTML and Markdown files with your team and manage their public links.", "automationsTitle": "Automations", "automationsDescription": "Schedule agent work and choose whether Automations appears in the sidebar.", - "shareSkillsTitle": "Share Skills", + "shareSkillsTitle": "Share skills", "shareSkillsDescription": "Share your skills with an unlisted link. Anyone who has it can install them.", "floatingWorkspaceWebDescription": "Global terminal and markdown tabs.", "portsTitle": "Ports", @@ -9650,7 +9653,7 @@ "1c87f8d024": "Advanced", "c1b43dc4e2": "Anonymous usage data and telemetry controls.", "9b83cc62c2": "macOS privacy access for terminal-launched developer tools.", - "65660d4548": "macOS Permissions", + "65660d4548": "macOS permissions", "c6c01ac209": "Control terminals and agents from your phone.", "c40dadaac8": "Mobile", "c2ee313198": "Use existing machines over SSH for files, terminals, Git, and workspaces.", @@ -9688,12 +9691,12 @@ "acc7bbdefd": "Press ESC again to exit settings", "43b68e10f0": "You have unsaved AI settings. Leaving will discard them.", "17bdee4ff1": "Discard unsaved AI settings?", - "084d8fac5b": "Privacy & Security", - "23931df7e8": "Remote Hosts", + "084d8fac5b": "Privacy & security", + "23931df7e8": "Remote hosts", "8bd117d669": "Interface", "e1578cd4bc": "Workflows", - "9abb9be3bc": "Set Up", - "23c6874fdf": "AI Capabilities", + "9abb9be3bc": "Set up", + "23c6874fdf": "AI capabilities", "65358016ea": "Discard", "devDescription": "Dev-only tools for exercising UI states.", "linearTitle": "Linear", @@ -9707,7 +9710,7 @@ "022effa46f": "Remote Orca servers", "d09b9d8f00": "Git & source control", "3eac6fb97f": "Dev tools", - "4198aae333": "AI provider accounts", + "4198aae333": "Agent accounts", "3f3e11cb5d": "Computer use", "084f34826d": "Stats & usage", "742ca66ea6": "Privacy & telemetry", @@ -13097,7 +13100,7 @@ "signOut": "Sign out", "signInAgain": "Sign in again", "signIn": "Sign in to Orca", - "title": "Orca Account", + "title": "Orca account", "description": "Share work instantly and reach your desktop from Orca Mobile wherever you are.", "searchDescription": "Sign in or out of the account used by Artifacts and Orca Relay.", "benefitsTitle": "Included with your account", @@ -24228,7 +24231,7 @@ "cleared": "Search data cleared.", "clearError": "Could not clear search data. Try again.", "webUnsupported": "Turn on session search from the Orca desktop app on that computer.", - "title": "Agent Session Search", + "title": "Agent session search", "description": "Search everything your agents have said and done, on this computer and on any paired Orca server.", "searchDescription": "Turn on session search for this computer and paired servers, or clear search data.", "indexComputers": "Search inside sessions", @@ -24566,7 +24569,7 @@ "signInRequired": "Sign in again to use this account", "signInAgain": "Sign in again", "usageSignInLabel": "Sign in again", - "usageSignInMessage": "The selected Claude account needs you to sign in again. Open Settings > AI Provider Accounts, or choose System default.", + "usageSignInMessage": "The selected Claude account needs you to sign in again. Open Settings > Agent accounts, or choose System default.", "signIn": "Sign in", "moreSignInOptions": "More sign-in options", "copySignInLink": "Copy sign-in link instead", @@ -24575,7 +24578,7 @@ "switchSessions": { "title": "Switched to {{account}}", "dontAskAgain": "Don't ask again (restart automatically)", - "dontAskAgainHint": "You can turn this off in Settings → AI Provider Accounts.", + "dontAskAgainHint": "You can turn this off in Settings → Agent accounts.", "keep": "Keep as is", "restartOne": "Restart session", "listLabel": "Claude sessions to restart", diff --git a/src/shared/agent-launch/startup/host-account-launch-env.ts b/src/shared/agent-launch/startup/host-account-launch-env.ts index 8f8fdb4f905..2d210d6b758 100644 --- a/src/shared/agent-launch/startup/host-account-launch-env.ts +++ b/src/shared/agent-launch/startup/host-account-launch-env.ts @@ -28,5 +28,5 @@ export function hostAccountLaunchEnvFor( } export function hostAccountsManagedByDesktopMessage(wslDistro: string): string { - return `Accounts for this WSL host are managed in the Orca desktop app: Settings → AI Provider Accounts, with the ${wslDistro} (WSL) host selected.` + return `Accounts for this WSL host are managed in the Orca desktop app: Settings → Agent accounts, with the ${wslDistro} (WSL) host selected.` } diff --git a/src/shared/global-settings-types.ts b/src/shared/global-settings-types.ts index 244efd6d9d0..bd6030e4c9a 100644 --- a/src/shared/global-settings-types.ts +++ b/src/shared/global-settings-types.ts @@ -372,7 +372,7 @@ export type GlobalSettings = GlobalSettingsBase & { minimaxUsageModels: string /** MiniMax account region; defaults to overseas for existing users. */ minimaxEndpoint: MiniMaxEndpoint - /** GLM Coding Plan site whose API key is saved in AI Provider Accounts; defaults to the international Z.AI console. */ + /** GLM Coding Plan site whose API key is saved in Agent accounts; defaults to the international Z.AI console. */ zcodePlanSite?: ZcodePlanSite /** Extract OAuth credentials from the local Gemini CLI for rate-limit fetching. Off by default (explicit opt-in). */ geminiCliOAuthEnabled: boolean diff --git a/tests/e2e/ssh-host-form-modal.spec.ts b/tests/e2e/ssh-host-form-modal.spec.ts index 7865b173fc2..f723dc25f98 100644 --- a/tests/e2e/ssh-host-form-modal.spec.ts +++ b/tests/e2e/ssh-host-form-modal.spec.ts @@ -76,8 +76,8 @@ async function openSshHostSettings(page: Page): Promise { await dismissTransientAnnouncement(page) const sshSection = page.locator('[data-settings-section="ssh"]') await expect(sshSection).toBeVisible({ timeout: 10_000 }) - // Why: section chrome uses "SSH Hosts"; the pane body catalog string is "Targets". - await expect(sshSection.getByRole('heading', { name: 'SSH Hosts' })).toBeVisible() + // Why: section chrome uses "SSH hosts"; the pane body catalog string is "Targets". + await expect(sshSection.getByRole('heading', { name: 'SSH hosts' })).toBeVisible() await expect(sshSection.getByRole('button', { name: 'Add host' })).toBeVisible({ timeout: 10_000 }) From 53284ee79f8a1ab24fdd1b8a056f4eb428b8d90a Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 10 Nov 2026 17:20:08 -0800 Subject: [PATCH 2/2] feat(cloud): fold Agent accounts into the one Agent accounts page (Hosts, Orca Cloud parts) Drops the separate cloud 'agent-accounts' settings entry. The upstream 'accounts' page (now Agent accounts) gets Hosts (S3) and Orca Cloud (S0) through renderAccountsSettingsSection's additionalSections; deep links move to pane 'accounts' with sectionId orca-cloud / accounts-hosts. In Orca Cloud builds the entry loses its Optional badge and gains the cloud search entries. --- .../open-agent-host-settings.ts | 4 +- .../CloudAgentSignInStripPortals.tsx | 4 +- .../new-workspace/OrcaCloudAgentSetupRow.tsx | 2 +- .../agent-accounts/OrcaCloudAccounts.tsx | 19 +++++---- .../OrcaCloudAccountsSection.tsx | 16 ++++++- .../orca-cloud-accounts-types.ts | 2 + .../overview/AgentAccountsOverview.tsx | 16 +++---- .../overview/AgentAccountsOverviewSection.tsx | 15 ++++--- ...ngs-orca-cloud-agent-accounts-sections.tsx | 42 +++++++++++++++++++ .../settings/page/settings-page-renderer.tsx | 9 ++-- .../VmBuildCloudAgentsRow.tsx | 6 +-- ...settings-navigation-capability-sections.ts | 30 +++++-------- src/renderer/src/i18n/locales/en.json | 5 +-- .../src/lib/settings-navigation-types.ts | 1 - 14 files changed, 114 insertions(+), 57 deletions(-) create mode 100644 src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx diff --git a/src/renderer/src/components/agent-host-panel/open-agent-host-settings.ts b/src/renderer/src/components/agent-host-panel/open-agent-host-settings.ts index 1647a47a87b..3585214c722 100644 --- a/src/renderer/src/components/agent-host-panel/open-agent-host-settings.ts +++ b/src/renderer/src/components/agent-host-panel/open-agent-host-settings.ts @@ -6,12 +6,12 @@ import { closeAgentHostPanel } from './agent-host-panel-store' const TARGET = { accounts: { pane: 'accounts' }, - agentAccounts: { pane: 'agent-accounts', sectionId: 'orca-cloud' }, + agentAccounts: { pane: 'accounts', sectionId: 'orca-cloud' }, agentApiKeys: { pane: 'agent-api-keys' }, cloudSecrets: { pane: 'cloud-secrets' }, customEnvironments: { pane: 'servers' }, // S3 (Settings › Agent accounts) is the overview across hosts. - allHosts: { pane: 'agent-accounts' } + allHosts: { pane: 'accounts', sectionId: 'accounts-hosts' } } as const satisfies Record export function openAgentHostSettings(link: AgentHostFooterLink): void { diff --git a/src/renderer/src/components/agent-sign-in-strip/CloudAgentSignInStripPortals.tsx b/src/renderer/src/components/agent-sign-in-strip/CloudAgentSignInStripPortals.tsx index 70df82854de..4e0818f16fe 100644 --- a/src/renderer/src/components/agent-sign-in-strip/CloudAgentSignInStripPortals.tsx +++ b/src/renderer/src/components/agent-sign-in-strip/CloudAgentSignInStripPortals.tsx @@ -54,7 +54,7 @@ export function useCloudGatePaneKeys(controller: TerminalPaneController): Readon return new Set(joined ? joined.split('\u0000') : []) } -function openSettings(pane: 'agent-accounts' | 'cloud-secrets', sectionId?: string): void { +function openSettings(pane: 'accounts' | 'cloud-secrets', sectionId?: string): void { const store = useAppStore.getState() store.openSettingsTarget({ pane, repoId: null, ...(sectionId ? { sectionId } : {}) }) store.openSettingsPage() @@ -115,7 +115,7 @@ function CloudStripPortal({ primary: (action) => { switch (action.kind) { case 'renew': - openSettings('agent-accounts', 'orca-cloud') + openSettings('accounts', 'orca-cloud') 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 b53bee011cf..e3d3b0efcd9 100644 --- a/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx +++ b/src/renderer/src/components/new-workspace/OrcaCloudAgentSetupRow.tsx @@ -23,7 +23,7 @@ import { agentName, keySourceLabel } from '../settings/agent-accounts/orca-cloud export function openOrcaCloudAgentAccounts(): void { useAppStore .getState() - .openSettingsTarget({ pane: 'agent-accounts', repoId: null, sectionId: 'orca-cloud' }) + .openSettingsTarget({ pane: 'accounts', repoId: null, sectionId: 'orca-cloud' }) } export function orcaCloudAgentCoveredLabel( diff --git a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx index 3088d192c18..893a54ebcd9 100644 --- a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx +++ b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccounts.tsx @@ -78,7 +78,8 @@ export function OrcaCloudAccountsView({ actions, now, initialConfirmRemove, - initialRowError + initialRowError, + hideHeader = false }: OrcaCloudAccountsViewProps): React.JSX.Element | null { const t = useTranslate() const announcement = rows ? setupAnnouncement(rows, t) : '' @@ -148,13 +149,15 @@ export function OrcaCloudAccountsView({ } return (
- + {hideHeader ? null : ( + + )}
{body}
diff --git a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccountsSection.tsx b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccountsSection.tsx index 731dc3391e6..5f837a0efee 100644 --- a/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccountsSection.tsx +++ b/src/renderer/src/components/settings/agent-accounts/OrcaCloudAccountsSection.tsx @@ -14,7 +14,11 @@ import { import { ORCA_CLOUD_ACCOUNT_AGENTS } from '../../../../../shared/orca-cloud-agents/orca-cloud-agents-wire' import { OrcaCloudAccountsView, type OrcaCloudAccountsActions } from './OrcaCloudAccounts' -export function OrcaCloudAccountsSection(): React.JSX.Element | null { +export function OrcaCloudAccountsSection({ + hideHeader = false +}: { + hideHeader?: boolean +}): React.JSX.Element | null { const t = useTranslate() const { load, setups, keyKinds } = useOrcaCloudAgentAccounts() const running = ORCA_CLOUD_ACCOUNT_AGENTS.some((agent) => @@ -86,5 +90,13 @@ export function OrcaCloudAccountsSection(): React.JSX.Element | null { .then(() => reloadOrcaCloudAgentAccounts()) } }, [t]) - return + return ( + + ) } diff --git a/src/renderer/src/components/settings/agent-accounts/orca-cloud-accounts-types.ts b/src/renderer/src/components/settings/agent-accounts/orca-cloud-accounts-types.ts index 89e4559bdf0..488a40a61dc 100644 --- a/src/renderer/src/components/settings/agent-accounts/orca-cloud-accounts-types.ts +++ b/src/renderer/src/components/settings/agent-accounts/orca-cloud-accounts-types.ts @@ -32,4 +32,6 @@ export type OrcaCloudAccountsViewProps = { /** Fixtures: open a row's Remove confirmation or a row-level save error. */ initialConfirmRemove?: OrcaCloudAccountAgent initialRowError?: { agent: OrcaCloudAccountAgent; error: OrcaCloudAgentsErrorCode } + /** Inside Settings → Agent accounts the page's Orca Cloud part already titles it. */ + hideHeader?: boolean } diff --git a/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverview.tsx b/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverview.tsx index e1fdadf2e00..69f7f6d88e2 100644 --- a/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverview.tsx +++ b/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverview.tsx @@ -22,6 +22,8 @@ export type AgentAccountsOverviewProps = { /** True until the host list is known (first render only). */ loading?: boolean signedOutOfOrca: boolean + /** Inside Settings → Agent accounts the page's Hosts part already titles it. */ + hideHeader?: boolean /** "Checked 4 hosts. 2 need attention." after the first pass; empty before. */ summary: string onOpenRow: (row: OverviewRow) => void @@ -113,7 +115,7 @@ export function AgentAccountsOverview(props: AgentAccountsOverviewProps): React. return (
-
+

{t('agentAccountsOverview.title', 'Sign-ins by host')}

@@ -123,12 +125,6 @@ export function AgentAccountsOverview(props: AgentAccountsOverviewProps): React. 'Where Claude and Codex are signed in, and which key they use. Orca never copies a sign-in between machines.' )}

- {/* One Sign in button lives in the Orca Cloud card above; this is only a muted note. */} - {props.signedOutOfOrca ? ( -

- {t('agentAccountsOverview.signedOutNote', 'Sign in to Orca to see Orca Cloud here.')} -

- ) : null}
+ {/* The page's one Sign in button is in the Orca Cloud part; this is only a muted note. */} + {props.signedOutOfOrca ? ( +

+ {t('agentAccountsOverview.signedOutNote', 'Sign in to Orca to see Orca Cloud here.')} +

+ ) : null}
{props.loading ? (
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 744545b9db8..362ca159749 100644 --- a/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx +++ b/src/renderer/src/components/settings/agent-accounts/overview/AgentAccountsOverviewSection.tsx @@ -1,5 +1,5 @@ // 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 opens S0 above (one row stands for every cloud workspace). +// 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' import { useAppStore } from '@/store' import { useTranslate } from '@/i18n/use-translate' @@ -16,7 +16,7 @@ import { AgentAccountsOverview } from './AgentAccountsOverview' import { overviewProbeTargets, useOverviewProbes } from './use-overview-probes' import { useOverviewHosts } from './use-overview-hosts' -function openSettings(pane: 'accounts' | 'agent-accounts', sectionId?: string): void { +function openSettings(pane: 'accounts', sectionId?: string): void { const store = useAppStore.getState() store.openSettingsTarget({ pane, repoId: null, ...(sectionId ? { sectionId } : {}) }) store.openSettingsPage() @@ -44,7 +44,11 @@ function useIsCloudMember(enabled: boolean): boolean { return member } -export function AgentAccountsOverviewSection(): React.JSX.Element { +export function AgentAccountsOverviewSection({ + hideHeader = false +}: { + hideHeader?: boolean +}): React.JSX.Element { const t = useTranslate() const hosts = useOverviewHosts() const { probes, checkAgain, firstPassDone } = useOverviewProbes(hosts) @@ -68,7 +72,7 @@ export function AgentAccountsOverviewSection(): React.JSX.Element { const open = (row: OverviewRow, focus?: 'claude' | 'codex'): void => { const host = row.hostId ? hostById.get(row.hostId) : undefined if (!host) { - // Orca Cloud: S0 above owns setup and the Source for every cloud workspace. + // Orca Cloud: S0 below owns setup and the Source for every cloud workspace. document.getElementById(ORCA_CLOUD_ACCOUNTS_SECTION_ID)?.scrollIntoView({ block: 'start' }) return } @@ -91,7 +95,7 @@ export function AgentAccountsOverviewSection(): React.JSX.Element { return } case 'accounts': - openSettings('accounts') + openSettings('accounts', 'accounts-this-host') return case 'manage': open(row) @@ -108,6 +112,7 @@ export function AgentAccountsOverviewSection(): React.JSX.Element { open(row)} onAction={onAction} 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 new file mode 100644 index 00000000000..b281d409fb6 --- /dev/null +++ b/src/renderer/src/components/settings/page/settings-orca-cloud-agent-accounts-sections.tsx @@ -0,0 +1,42 @@ +import { AgentAccountsSubsection } from '../accounts/AgentAccountsSubsection' +import { OrcaCloudAccountsSection } from '../agent-accounts/OrcaCloudAccountsSection' +import { AgentAccountsOverviewSection } from '../agent-accounts/overview/AgentAccountsOverviewSection' +import { translate } from '@/i18n/i18n' +import type { Translate } from '@/i18n/use-translate' +import type { SettingsRenderContext } from './settings-render-context' + +/** Settings → Agent accounts, after "This computer": Hosts (S3) and Orca Cloud (S0). Desktop only, + * and only in builds with an Orca Cloud control plane. */ +export function renderOrcaCloudAgentAccountsSections( + context: SettingsRenderContext, + t: Translate = translate +): React.JSX.Element | null { + const { model } = context + if (!model.showDesktopOnlySettings || !model.orcaCloudApiAvailable) { + return null + } + return ( + <> + + + + + + + + ) +} 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 3eb5143228e..3e303a4ddf2 100644 --- a/src/renderer/src/components/settings/page/settings-page-renderer.tsx +++ b/src/renderer/src/components/settings/page/settings-page-renderer.tsx @@ -12,7 +12,6 @@ import type { SettingsInteractionController } from './use-settings-interaction-c import type { SettingsRenderContext } from './settings-render-context' import { renderAccountsSettingsSection, - renderAgentAccountsSettingsSection, renderAgentApiKeysSettingsSection, renderAgentsSettingsSection, renderDesktopCapabilitySettingsSections, @@ -65,6 +64,7 @@ import { import { renderProjectSettingsSections } from './settings-project-section-renderer' import { renderCloudApiSettingsSections } from './settings-cloud-api-section-renderers' import { renderOrcaCloudSettingsSections } from './settings-orca-cloud-section-renderers' +import { renderOrcaCloudAgentAccountsSections } from './settings-orca-cloud-agent-accounts-sections' import { SettingsHostScopePicker, shouldShowSettingsHostScopePicker @@ -170,8 +170,11 @@ export function renderSettingsPage( value={model.highlightedSettingsTarget?.id ?? null} > {renderAgentsSettingsSection(context, t)} - {renderAgentAccountsSettingsSection(context, t)} - {renderAccountsSettingsSection(context, t)} + {renderAccountsSettingsSection( + context, + t, + renderOrcaCloudAgentAccountsSections(context, t) + )} {renderAgentApiKeysSettingsSection(context, t)} {renderOrchestrationSettingsSection(context, t)} {renderLinearSettingsSection(context, t)} diff --git a/src/renderer/src/components/worktree-creation/cloud-agents-row/VmBuildCloudAgentsRow.tsx b/src/renderer/src/components/worktree-creation/cloud-agents-row/VmBuildCloudAgentsRow.tsx index c38850f0594..b61d73246f0 100644 --- a/src/renderer/src/components/worktree-creation/cloud-agents-row/VmBuildCloudAgentsRow.tsx +++ b/src/renderer/src/components/worktree-creation/cloud-agents-row/VmBuildCloudAgentsRow.tsx @@ -32,7 +32,7 @@ import { VmBuildAgentSignInRow } from '../VmBuildAgentSignInRow' import { VmBuildCloudAgentsMenu, type WorkspaceSourcesLoad } from './VmBuildCloudAgentsMenu' import { VmBuildCloudAgentsRowView, type DesktopKeySave } from './VmBuildCloudAgentsRowView' -function openSettings(pane: 'agent-accounts' | 'cloud-secrets', sectionId?: string): void { +function openSettings(pane: 'accounts' | 'cloud-secrets', sectionId?: string): void { const store = useAppStore.getState() store.openSettingsTarget({ pane, repoId: null, ...(sectionId ? { sectionId } : {}) }) store.openSettingsPage() @@ -156,7 +156,7 @@ export function VmBuildCloudAgentsRow({ sources={sources} onOpen={readSources} onChoose={choose} - onManage={() => openSettings('agent-accounts', 'orca-cloud')} + onManage={() => openSettings('accounts', 'orca-cloud')} onUseKey={() => openSettings('cloud-secrets')} /> ) @@ -184,7 +184,7 @@ export function VmBuildCloudAgentsRow({ void api?.acknowledge({ agent }) }, retryLoad: () => void reloadOrcaCloudAgentAccounts(), - manage: () => openSettings('agent-accounts', 'orca-cloud'), + manage: () => openSettings('accounts', 'orca-cloud'), saveDesktopKey: saveKey, signInHere: (agent) => { nextRequest.current += 1 diff --git a/src/renderer/src/hooks/settings-navigation-capability-sections.ts b/src/renderer/src/hooks/settings-navigation-capability-sections.ts index e23d7e8f24a..a8f1a273ebc 100644 --- a/src/renderer/src/hooks/settings-navigation-capability-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-capability-sections.ts @@ -16,7 +16,6 @@ import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' import type { SettingsNavSection } from '@/lib/settings-navigation-types' import { - BadgeCheck, Blocks, Bot, CircleUserRound, @@ -58,23 +57,6 @@ export function buildCapabilitySettingsSections( }), group: 'capabilities' }, - // S0 + S3: the one place for agent sign-ins (Orca Cloud, this computer, your hosts); desktop only. - // Listed before the upstream "accounts" entry, which stays the account-switching page it links to. - ...(showDesktopOnlySettings && isOrcaCloudApiAvailable - ? [ - { - id: 'agent-accounts', - title: t('settings.agentAccounts.title', 'Agent accounts'), - description: t( - 'settings.agentAccounts.hubDescription', - 'Where Claude and Codex are signed in: Orca Cloud, this computer and your hosts.' - ), - icon: BadgeCheck, - searchEntries: getAgentAccountsSearchEntries(), - group: 'capabilities' as const - } - ] - : []), { id: 'accounts', title: t('auto.hooks.useSettingsNavigationMetadata.f70ac54d38', 'Agent accounts'), @@ -83,9 +65,17 @@ export function buildCapabilitySettingsSections( 'Sign-ins, account switching and usage for Claude, Codex, Gemini, OpenCode Go, MiniMax, and Grok.' ), icon: UserCog, - searchEntries: getAccountsPaneSearchEntries(), + // Orca Cloud builds add the Hosts and Orca Cloud parts to this page, so it isn't optional there. + searchEntries: [ + ...getAccountsPaneSearchEntries(), + ...(showDesktopOnlySettings && isOrcaCloudApiAvailable + ? getAgentAccountsSearchEntries() + : []) + ], group: 'capabilities', - badge: t('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional') + ...(showDesktopOnlySettings && isOrcaCloudApiAvailable + ? {} + : { badge: t('auto.hooks.useSettingsNavigationMetadata.7c79d3b7bf', 'Optional') }) }, // Desktop-owned vault: a web client can neither read nor fill it. ...(showDesktopOnlySettings diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 51cbf7556a4..442df28e368 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -1408,11 +1408,10 @@ "chatgpt": "chatgpt", "setupToken": "setup-token" }, - "title": "Agent accounts", - "hubDescription": "Where Claude and Codex are signed in: Orca Cloud, this computer and your hosts.", "pageDescription": "Sign-ins, account switching and usage for your agents.", "thisComputer": "This computer", - "selectedHost": "Selected host" + "selectedHost": "Selected host", + "hostsTitle": "Hosts" } }, "menu": { diff --git a/src/renderer/src/lib/settings-navigation-types.ts b/src/renderer/src/lib/settings-navigation-types.ts index 85988b08629..fe2c5ee41a5 100644 --- a/src/renderer/src/lib/settings-navigation-types.ts +++ b/src/renderer/src/lib/settings-navigation-types.ts @@ -17,7 +17,6 @@ const SETTINGS_NAV_TARGETS = [ 'general', 'integrations', 'accounts', - 'agent-accounts', 'agent-api-keys', 'browser', 'git',