From 5d9c31bc4c85919de193bff1a6c0ea5a7fcaca7b Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 11 Nov 2026 03:30:20 -0800 Subject: [PATCH] =?UTF-8?q?fix(cloud):=20setup=20stepper=20matches=20the?= =?UTF-8?q?=20web=20(Account=20=C2=B7=20Team=20=C2=B7=20Plan=20=C2=B7=20Gi?= =?UTF-8?q?tHub);=20agent=20glyph=20in=20the=20header=20(DS-b,=20NS-04=20e?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DS-b: the in-app stepper now lists the web's four steps (stablyai/orca-cloud#730): Team always follows Account (done once signed in, as the web ticks a team made for you; a team switch keeps its own step), and the plan step is always "Plan" (a trial is how it gets done, not a step). GitHub ticks when the repository is readable, unchanged. NS-04 (e): the agent's glyph sits before its name in the header context line, muted (currentColor, never the coloured mark), aria-hidden. NS-04 (c) needs no change: the only skip line was the Agent step's italic aside, and that step no longer renders. Fixtures: CloudSetupPage signedOut, trialPlan, githubLeft. --- .../CloudSetupPage.fixture.tsx | 94 +++++++++++++++++++ .../orca-cloud-setup/CloudSetupPage.tsx | 20 +++- .../orca-cloud-setup/CloudSetupPageLayer.tsx | 1 + .../orca-cloud-setup/cloud-setup-page-copy.ts | 5 +- .../cloud-setup-page-model.test.ts | 44 ++++++++- .../cloud-setup-page-model.ts | 18 +++- src/renderer/src/i18n/locales/en.json | 3 +- 7 files changed, 176 insertions(+), 9 deletions(-) create mode 100644 src/renderer/src/components/orca-cloud-setup/CloudSetupPage.fixture.tsx diff --git a/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.fixture.tsx b/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.fixture.tsx new file mode 100644 index 00000000000..50ba0a85a18 --- /dev/null +++ b/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.fixture.tsx @@ -0,0 +1,94 @@ +import { defineFixture } from '../../component-fixtures/component-fixture' +import type { CloudSetupStep } from '@/components/new-workspace/run-on/cloud-start-model' +import { CloudSetupPage } from './CloudSetupPage' +import { cloudSetupPageModel } from './cloud-setup-page-model' +import type { CloudSetupFlow } from './use-cloud-setup-flow' + +const noop = (): void => {} + +function flow(rows: CloudSetupStep[]): CloudSetupFlow { + return { + ...cloudSetupPageModel(rows), + busy: false, + signingIn: false, + signInDidNotFinish: false, + cancelSignIn: noop, + abandon: noop, + inBrowser: false, + error: null, + canManageBilling: true, + teamAction: null, + continueInBrowser: noop, + startTrial: noop, + fixBilling: noop, + installGitHub: noop, + checkAgain: noop, + copyLink: null, + reopenBrowser: noop + } +} + +function page(rows: CloudSetupStep[], agent: 'claude' | 'codex', label: string) { + return ( +
+ +
+ ) +} + +/** DS-b: signed out. The web's four steps from the first page: Account · Team · Plan · GitHub. */ +export const signedOut = defineFixture({ + width: 1000, + render: () => + page( + [ + { id: 'account', state: 'needed', need: 'sign-in', canFix: true }, + { id: 'plan', state: 'pending', need: 'trial' }, + { id: 'github', state: 'needed', need: 'github', canFix: true }, + { id: 'agent', state: 'optional' } + ], + 'claude', + 'Claude' + ) +}) + +/** DS-b: signed in on a trial-eligible team. Team ticks with Account; the step reads Plan, not Trial. */ +export const trialPlan = defineFixture({ + width: 1000, + render: () => + page( + [ + { id: 'account', state: 'done' }, + { id: 'plan', state: 'needed', need: 'trial', canFix: true, trialSeconds: 7200 }, + { id: 'github', state: 'needed', need: 'github', canFix: true }, + { id: 'agent', state: 'optional' } + ], + 'codex', + 'Codex' + ) +}) + +/** DS-b: only GitHub left. NS-04 (e): the agent's glyph, muted, before its name in the header line. */ +export const githubLeft = defineFixture({ + width: 1000, + render: () => + page( + [ + { id: 'account', state: 'done' }, + { id: 'plan', state: 'done' }, + { id: 'github', state: 'needed', need: 'github', canFix: true }, + { id: 'agent', state: 'optional' } + ], + 'claude', + 'Claude' + ) +}) diff --git a/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.tsx b/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.tsx index 255e7e0e41b..95b90edf2f2 100644 --- a/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.tsx +++ b/src/renderer/src/components/orca-cloud-setup/CloudSetupPage.tsx @@ -8,6 +8,8 @@ import { Button } from '@/components/ui/button' import { Skeleton } from '@/components/ui/skeleton' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' +import type { TerminalAgent } from '../../../../shared/agent-status/identity/terminal-agent' import type { CloudSetupStep, CloudSetupStepId @@ -21,6 +23,8 @@ export type CloudSetupPageProps = { projectName: string | null prompt: string agentLabel: string | null + /** The agent the prompt starts with: its glyph sits before its name in the header line (NS-04). */ + agent?: TerminalAgent | null /** Back from the first step: Create workspace again, with the prompt, project and agent kept. */ onBackToComposer: () => void /** The × in the corner: leave setup, keep the draft (nothing starts). */ @@ -253,6 +257,7 @@ export function CloudSetupPage({ projectName, prompt, agentLabel, + agent = null, onBackToComposer, onExit, starting @@ -304,8 +309,7 @@ export function CloudSetupPage({ prompt.trim() ? t('cloudSetupPage.headerFor', 'Setting up Orca Cloud for {{name}}', { name: prompt.trim() }) : t('cloudSetupPage.header', 'Setting up Orca Cloud'), - projectName, - agentLabel + projectName ] .filter(Boolean) .join(' · ') @@ -326,6 +330,18 @@ export function CloudSetupPage({ data-cloud-setup-context="true" > {context} + {agentLabel ? ( + <> + {' · '} + {/* NS-04 (e): the agent's glyph, muted like the line (never the coloured mark). */} + {agent ? ( + + ) : null} + {agentLabel} + + ) : null}