Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(onboarding): drop the consent gate and run the app tour right after setup

rubenluetke10-beep03e60c1fb9b5
diff --git a/docs/product/start-here/first-run-setup.md b/docs/product/start-here/first-run-setup.md
index 657de31523..2f3894cb0e 100644
--- a/docs/product/start-here/first-run-setup.md
+++ b/docs/product/start-here/first-run-setup.md
@@ -1,14 +1,14 @@
---
title: "Complete First-Run Setup"
slug: first-run-setup
-summary: "Setup runs inside the app. Agree to the terms, add one key on the API Keys page, pick a wake word in Settings, then take the tour."
+summary: "Setup runs inside the app. Add one key on the API Keys page, connect a subscription for your agents, pick a wake word in Settings, then take the tour."
section: "Start here"
section_order: 1
order: 3
diataxis: tutorial
status: active
owner: maintainers
-last_reviewed: 2026-09-30
+last_reviewed: 2026-10-01
phase: "-"
audience: end-user
tags: [setup, onboarding, tour, language, permissions, microphone, wake-word, providers]
@@ -17,8 +17,8 @@ related: [providers-and-api-keys, audio-and-wake-word, permissions, start-your-f
First-run setup happens inside the real app. There is no separate setup
screen: the window dims and a small card with the mascot walks you to the
-places where each thing is really set, and waits there. Everything else is
-explained afterwards by a short tour of the app.
+places where each thing is really set, and waits there. A short tour of the
+app follows straight away and explains everything else.
## Before You Start
@@ -36,21 +36,15 @@ explained afterwards by a short tour of the app.
While setup runs, only the highlighted part of the app and the card can be
used. The dots on the card show where you are. **Back** returns to the
-previous step, never behind the agreement. If the window reloads, setup
-reopens on the step you were on.
+previous step, never to the welcome. If the window reloads, setup reopens on
+the step you were on.
-### 1. Agree to the terms
+### 1. Welcome
-The first card lists what the assistant does on this computer: it runs
-commands and changes files, can see your screen when asked, sends what you say
-to the provider you choose, is billed by that provider, and can make mistakes.
-
-1. Pick **English**, **Deutsch** or **Español** on the card if you want
- another interface language. You can change it later under **Settings >
- Languages**.
-2. Optionally open **Read the full Terms of Use**.
-3. Tick the agreement, then select **Agree and continue**. **Decline and quit**
- closes the app without saving anything; setup asks again next time.
+Pick **English**, **Deutsch** or **Español** on the card if you want another
+interface language (you can change it later under **Settings > Languages**),
+then select **Let's start**. There is nothing to agree to: the app is open
+source.
### 2. Add one API key
@@ -65,29 +59,41 @@ provider card and save it:
**Continue** unlocks once a key is saved. **I'll add a key later** moves on;
chat and voice then stay off until a key exists.
-### 3. Allow access on this Mac (macOS only)
+### 3. Connect a subscription for your agents
+
+Setup switches the API Keys page to its **Agents** tab. Agents do the bigger
+background jobs, and they run best on a subscription you already pay for:
+**Claude** (Pro or Max) or **ChatGPT** (Codex) are recommended. Select
+**Connect** on that row; your browser opens once to sign in. A subscription is
+a flat monthly price, so agent work does not bill your API key per call.
+
+The card lists every subscription that is signed in, and **Continue** unlocks
+once there is one. **I'll connect one later** moves on.
+
+### 4. Allow access on this Mac (macOS only)
Setup opens **Settings > Privacy permissions**. Use **Allow** or **Open
Settings** on each row you want, return, and wait for the row to update. The
restart at the end applies the grants. Windows and Linux skip this step.
-### 4. Choose your wake word
+### 5. Choose your wake word
Setup opens **Settings** at the **Wake Word** group. **Hey** is fixed; type
your own word after it and save. The word also becomes the assistant's name,
for example **Hey Nova** makes an assistant called Nova. The card confirms when
-the wake word is on. Without a wake word, the Call keyboard shortcut starts a
-conversation.
+the wake word is on, and **Continue** unlocks once one is saved. Without a
+wake word, choose **Skip, I'll use the Call shortcut**; the Call keyboard
+shortcut then starts a conversation.
-### 5. All set
+### 6. All set
-The last card reads back the active Brain and how voice starts, and offers
-**Start at login** if your system supports it. **Start** saves the setup and
-restarts the app once so every choice takes effect together.
+The last card reads back the active Brain, the connected agent subscriptions
+and how voice starts, and offers **Start at login** if your system supports
+it. **Show me around** starts the tour.
## Take the Tour
-After the restart the app opens with a short guided tour. It dims the window,
+The tour follows setup straight away. It dims the window,
lights up one part of the real interface at a time, and explains it in a small
card: the voice bar, a new chat, the agents and their world, Voice, Artifacts,
the Agentic IDE, Plugins and the Marketplace, and Settings.
@@ -96,7 +102,10 @@ the Agentic IDE, Plugins and the Marketplace, and Settings.
- The tour navigates by itself where needed (into the agents' world and back)
and ends on the home screen. It never starts a call or any work for you.
- **Skip tour** or **Escape** ends it at any point.
-- Replay it anytime under **Settings > App > App tour**.
+- When the tour ends (or is skipped), setup is saved and the app restarts once
+ so every choice takes effect together.
+- Replay setup and tour anytime under **Settings > App > Setup and app tour**.
+ The replay starts at the API Keys page and never restarts anything.
## Recover a Skipped or Deferred Choice
@@ -111,7 +120,7 @@ the Agentic IDE, Plugins and the Marketplace, and Settings.
## How It Fits Together
-1. The agreement is the only consent moment; the installer asks nothing.
+1. Nothing asks for consent: neither the installer nor setup.
2. Setup never has its own screens: each step uses the page you will use
later, so what you learn on day one is where things live.
3. One key is enough to start. A starter plan points live voice and its
@@ -120,11 +129,12 @@ the Agentic IDE, Plugins and the Marketplace, and Settings.
The Call shortcut starts voice without an always-listening wake engine.
5. Permissions allow an operating-system capability; they do not approve a
later Computer Use action or bypass its safety check.
-6. One restart at the end applies every choice; the tour runs once after it.
+6. Setup and tour run as one flow; one restart after the tour applies every
+ choice.
## Check That It Works
-1. After **Start**, confirm the app reopens and the tour begins.
+1. After the tour, confirm the app restarts and reopens on the home screen.
2. Open **API Keys**, select **Test** on the active Brain card, and look for
**Works**.
3. Start a new chat and send a harmless message. Confirm a reply arrives.
@@ -141,7 +151,7 @@ Desktop-only features report their limits rather than prevent startup.
| A card on the API Keys page reports a failing key | The provider refused the key or the account has no credit | Fix the account at the provider, or save a key from another provider |
| Microphone test reports quiet, missing, or blocked | The input has no usable signal | Check OS access and **Settings > Audio devices** |
| Saved wake word does not respond | Its local model, language, microphone, or activation switch is not ready | Use the Call shortcut; under **Settings > Wake Word**, install the offered model and run **Test wake word** |
-| The tour does not appear after the restart | The app opened in the Agentic IDE, or the tour was already seen | Leave the IDE, or replay it under **Settings > App** |
+| The tour does not appear | The tour was already seen | Replay it under **Settings > App** |
| App does not reopen | The restart could not start a fresh process | Open the app; setup was already saved |
| First-run setup returns every launch | The completion state is not read from the same writable data location | Follow [Troubleshooting](troubleshooting) for data-directory and version checks |
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.test.tsx b/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.test.tsx
index bfcc66511c..7d25b67421 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.test.tsx
@@ -2,8 +2,10 @@ import { act, cleanup, render, screen, waitFor } from "@testing-library/react";
import { afterEach, expect, it, vi } from "vitest";
vi.mock("./setup/SetupTour", () => ({
- SetupTour: ({ preview, startAt }: { preview: boolean; startAt?: string }) => (
- <div data-testid="guide" data-preview={String(preview)} data-start={startAt ?? ""} />
+ SetupTour: ({ preview, startAt, onFinished }: { preview: boolean; startAt?: string; onFinished: () => void }) => (
+ <button type="button" data-testid="guide" data-preview={String(preview)} data-start={startAt ?? ""} onClick={onFinished}>
+ guide
+ </button>
),
}));
vi.mock("./tour/GuidedTour", () => ({
@@ -46,7 +48,7 @@ it("shows the guide while setup is not complete", async () => {
stub({ ...base, completed: false, tour_completed: false });
render(<OnboardingGate />);
await waitFor(() => expect(screen.getByTestId("guide")).toBeDefined());
- // A first run is real: it completes and restarts at its end.
+ // A first run is real: it completes and restarts once its tour ends.
expect(screen.getByTestId("guide").dataset.preview).toBe("false");
expect(screen.queryByTestId("tour")).toBeNull();
});
@@ -147,3 +149,33 @@ it("replays setup from the API Keys page on request from Settings", async () =>
await waitFor(() => expect(screen.getByTestId("guide").dataset.preview).toBe("true"));
expect(screen.getByTestId("guide").dataset.start).toBe("keys");
});
+
+it("goes from setup straight into the tour and completes when the tour ends", async () => {
+ const fetchMock = stub({ ...base, completed: false, tour_completed: false });
+ render(<OnboardingGate activeSection="chats" />);
+ const guide = await screen.findByTestId("guide");
+ act(() => guide.click());
+ const tour = await screen.findByTestId("tour");
+ const urls = () => fetchMock.mock.calls.map((c) => String(c[0]));
+ // Nothing completes (and nothing restarts) while the tour is still showing.
+ expect(urls()).not.toContain("/api/onboarding/complete");
+ act(() => tour.click());
+ await waitFor(() => expect(urls()).toContain("/api/onboarding/complete"));
+ expect(urls().indexOf("/api/onboarding/tour-complete")).toBeLessThan(urls().indexOf("/api/onboarding/complete"));
+});
+
+it("never completes onboarding after a replayed setup", async () => {
+ const fetchMock = stub({ ...base, completed: true, tour_completed: true });
+ render(<OnboardingGate activeSection="chats" />);
+ await new Promise((r) => setTimeout(r, 20));
+ act(() => {
+ window.dispatchEvent(new CustomEvent(SETUP_REPLAY_EVENT));
+ });
+ const guide = await screen.findByTestId("guide");
+ act(() => guide.click());
+ const tour = await screen.findByTestId("tour");
+ act(() => tour.click());
+ await waitFor(() => expect(screen.queryByTestId("tour")).toBeNull());
+ await new Promise((r) => setTimeout(r, 20));
+ expect(fetchMock.mock.calls.map((c) => String(c[0]))).not.toContain("/api/onboarding/complete");
+});
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.tsx b/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.tsx
index c5e95992cb..9f8c4a6cc8 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.tsx
+++ b/jarvis/ui/web/frontend/src/components/onboarding/OnboardingGate.tsx
@@ -50,6 +50,9 @@ export function OnboardingGate({ activeSection }: { activeSection?: string } = {
// Bumped by each Settings replay; > 0 means a setup preview is requested,
// and the value remounts the guide so every replay starts fresh.
const [setupReplay, setSetupReplay] = useState(0);
+ // A real first run ends setup straight into the tour; onboarding is
+ // completed — and the app restarted once — only when that tour ends.
+ const [completeAfterTour, setCompleteAfterTour] = useState(false);
const forced = useMemo(() => param("onboarding") === "force", []);
useEffect(() => {
@@ -93,6 +96,7 @@ export function OnboardingGate({ activeSection }: { activeSection?: string } = {
preview={asked && onb.state.completed}
startAt={replaying && onb.state.completed ? "keys" : undefined}
onFinished={() => {
+ if (!(asked && onb.state?.completed)) setCompleteAfterTour(true);
setSetupReplay(0);
setDismissed(true);
setTourDone(false);
@@ -113,7 +117,17 @@ export function OnboardingGate({ activeSection }: { activeSection?: string } = {
onDone={() => {
setTourDone(true);
setTourRequested(false);
- void onb.completeTour();
+ void (async () => {
+ await onb.completeTour();
+ if (!completeAfterTour) return;
+ setCompleteAfterTour(false);
+ try {
+ await onb.complete();
+ } catch (e) {
+ // The next start resumes setup at its last step, so nothing is lost.
+ console.warn("onboarding: completing after the tour failed", e);
+ }
+ })();
}}
/>
</Suspense>
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.test.tsx b/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.test.tsx
index eeeadf88e6..be87e7fbaf 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.test.tsx
@@ -105,16 +105,18 @@ afterEach(() => {
vi.unstubAllGlobals();
});
-it("asks for the consent first and opens the API Keys page after it", async () => {
+it("starts with a welcome and no consent gate, then opens the API Keys page", async () => {
const onb = fakeOnb();
render(<SetupTour onb={onb} preview={false} onFinished={vi.fn()} />);
const start = (await screen.findByTestId("onboarding-primary")) as HTMLButtonElement;
- expect(start.disabled).toBe(true);
- fireEvent.click(screen.getByTestId("onboarding-accept"));
+ expect(screen.getByTestId("setup-card").dataset.step).toBe("welcome");
+ expect(start.disabled).toBe(false);
+ expect(screen.queryByTestId("onboarding-accept")).toBeNull();
+ expect(screen.queryByTestId("onboarding-decline")).toBeNull();
await act(async () => {
fireEvent.click(start);
});
- expect(onb.acceptTerms).toHaveBeenCalled();
+ expect(onb.acceptTerms).not.toHaveBeenCalled();
await waitFor(() => expect(screen.getByTestId("setup-card").dataset.step).toBe("keys"));
expect(onb.saveStep).toHaveBeenCalledWith("keys", []);
await waitFor(() => expect(useEventStore.getState().activeSection).toBe("apikeys"));
@@ -188,7 +190,7 @@ it("leaves a key that was already there exactly as it is", async () => {
expect(calls.some((c) => c.url.includes("/switch"))).toBe(false);
});
-it("completes onboarding from the last step", async () => {
+it("hands over to the tour from the last step without completing yet", async () => {
const onb = fakeOnb({ ...accepted, current_step: "ready" });
const onFinished = vi.fn();
render(<SetupTour onb={onb} preview={false} onFinished={onFinished} />);
@@ -196,15 +198,24 @@ it("completes onboarding from the last step", async () => {
await act(async () => {
fireEvent.click(start);
});
- expect(onb.complete).toHaveBeenCalled();
- expect(onFinished).not.toHaveBeenCalled();
+ // The gate completes onboarding (and restarts) only once the tour ends.
+ expect(onFinished).toHaveBeenCalled();
+ expect(onb.complete).not.toHaveBeenCalled();
+});
+
+it("keeps the app on the step's page when something else moves it", async () => {
+ render(<SetupTour onb={fakeOnb({ ...accepted, current_step: "keys" })} preview={false} onFinished={vi.fn()} />);
+ await screen.findByTestId("setup-keys-waiting");
+ await waitFor(() => expect(useEventStore.getState().activeSection).toBe("apikeys"));
+ act(() => useEventStore.getState().setActiveSection("profile"));
+ await waitFor(() => expect(useEventStore.getState().activeSection).toBe("apikeys"));
});
it("walks a replay from the start and never writes, completes or restarts", async () => {
const onb = fakeOnb({ ...accepted, completed: true, current_step: "voice" });
const onFinished = vi.fn();
render(<SetupTour onb={onb} preview onFinished={onFinished} />);
- // A replay shows every step, the consent included (already ticked).
+ // A replay from the URL shows every step, the welcome included.
await waitFor(() => expect(screen.getByTestId("setup-card").dataset.step).toBe("welcome"));
await act(async () => {
fireEvent.click(screen.getByTestId("onboarding-primary"));
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.tsx b/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.tsx
index 6efd486b2b..802951d294 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.tsx
+++ b/jarvis/ui/web/frontend/src/components/onboarding/setup/SetupTour.tsx
@@ -1,4 +1,4 @@
-import { AlertTriangle, ArrowLeft, Cloud, CreditCard, Lock, Monitor, Terminal } from "lucide-react";
+import { ArrowLeft, Lock } from "lucide-react";
import { useCallback, useEffect, useMemo, useState, type ReactNode } from "react";
import { MascotGigi, type MascotAction } from "@/components/MascotGigi";
import { Switch } from "@/components/ui/switch";
@@ -14,7 +14,7 @@ import { useEventStore } from "@/store/events";
import { planKeysComplete, slotEffective, startableProviders } from "../brainPlans";
import { ProgressDots } from "../ProgressDots";
import { Spotlight } from "../tour/Spotlight";
-import { CheckLine, PrimaryAction, QuietAction, Status } from "../ui";
+import { PrimaryAction, QuietAction, Status } from "../ui";
import { resumeStep, SETUP_STEPS, stepsFor, type SetupStepId } from "./setupSteps";
import { useAnchorRect } from "./useAnchorRect";
@@ -40,12 +40,13 @@ const LANGS: UiLanguage[] = ["en", "de", "es"];
* Settings, on macOS the permissions —
* and waits there with a small card. The dim takes clicks, the hole does
* not: only the part being set up can be used, so nothing else starts before
- * setup is done. Every step but the consent has a way on without doing it.
+ * setup is done. Every step has a way on without doing it. There is no
+ * consent gate: it is an open-source app, the welcome only picks a language.
*
- * The last step completes onboarding; the backend then restarts the app once
- * and the tour of the app follows. `preview` (a replay) never completes and
- * never restarts — it only walks the steps and hands over to the tour.
- * `startAt` lets a replay from Settings begin past the consent.
+ * The last step hands over to the tour of the app straight away; the gate
+ * completes onboarding (and restarts the app once) when the tour ends.
+ * `preview` (a replay) never writes — it only walks the steps and hands over
+ * to the tour. `startAt` lets a replay from Settings begin at the API Keys.
*/
export function SetupTour({
onb,
@@ -67,7 +68,7 @@ export function SetupTour({
const [stepId, setStepId] = useState<SetupStepId>(() =>
preview
? (startAt ?? "welcome")
- : resumeStep(stepsFor(null), onb.state?.current_step ?? null, Boolean(onb.state?.terms.accepted)),
+ : resumeStep(stepsFor(null), onb.state?.current_step ?? null),
);
const [skipped, setSkipped] = useState<string[]>(() => onb.state?.skipped_steps ?? []);
const [cue, setCue] = useState(0);
@@ -100,6 +101,17 @@ export function SetupTour({
if (nav.activeSection !== step.section) nav.setActiveSection(step.section);
}, [ready, step.section, step.apiKeysTab, stepId]);
+ // Keep the app on this step's place. The dim blocks every click, so a
+ // drift is something else moving the app (a section restored late in
+ // boot) — the card would then describe a page that is not on screen.
+ useEffect(() => {
+ if (!ready || !step.section) return;
+ const target = step.section;
+ return useEventStore.subscribe((state) => {
+ if (state.activeSection !== target) state.setActiveSection(target);
+ });
+ }, [ready, step.section]);
+
// Later visits to the API Keys page open on its own default tab again.
useEffect(() => clearApiKeysTabRequest, []);
@@ -118,7 +130,7 @@ export function SetupTour({
const index = Math.max(0, steps.indexOf(stepId));
const nextId = steps[index + 1] ?? null;
- // Never back behind the consent, nor behind where a replay started.
+ // Never back to the welcome, nor behind where a replay started.
const firstId = preview && startAt ? startAt : steps[1];
const prevId = index > 1 && stepId !== firstId ? steps[index - 1] : null;
@@ -175,12 +187,12 @@ export function SetupTour({
</div>
</div>
<div className="mt-4">
- {stepId === "welcome" && <WelcomeStep onb={onb} preview={preview} onAccepted={() => { cheer(); next(); }} />}
+ {stepId === "welcome" && <WelcomeStep onStart={() => { cheer(); next(); }} />}
{stepId === "keys" && <KeysStep next={next} later={later} cheer={cheer} />}
{stepId === "subscriptions" && <SubscriptionsStep next={next} later={later} />}
{stepId === "voice" && <VoiceStep next={next} later={later} />}
{stepId === "permissions" && <PermissionsStep next={next} />}
- {stepId === "ready" && <ReadyStep onb={onb} preview={preview} onFinished={onFinished} />}
+ {stepId === "ready" && <ReadyStep preview={preview} onFinished={onFinished} />}
</div>
{footer}
</div>
@@ -190,69 +202,9 @@ export function SetupTour({
/* ------------------------------------------------------------------ steps */
-function WelcomeStep({ onb, preview, onAccepted }: { onb: Onb; preview: boolean; onAccepted: () => void }) {
+function WelcomeStep({ onStart }: { onStart: () => void }) {
const t = useT();
const lang = useUiLanguage();
- const [accepted, setAccepted] = useState(Boolean(onb.state?.terms.accepted));
- const [busy, setBusy] = useState(false);
- const [error, setError] = useState<string | null>(null);
- const [declined, setDeclined] = useState(false);
- const [terms, setTerms] = useState<string | null>(null);
- const [showTerms, setShowTerms] = useState(false);
-
- async function toggleTerms() {
- setShowTerms((v) => !v);
- if (terms !== null) return;
- try {
- const res = await fetch("/api/onboarding/terms");
- setTerms(res.ok ? ((await res.json()) as { text: string }).text : "");
- } catch {
- setTerms("");
- }
- }
-
- async function proceed() {
- if (!accepted || busy) return;
- setBusy(true);
- setError(null);
- try {
- if (!preview) await onb.acceptTerms();
- onAccepted();
- } catch {
- setError(t("first_run.welcome.accept_failed"));
- } finally {
- setBusy(false);
- }
- }
-
- async function decline() {
- // The goodbye shows first: the backend ends the process right after it answers.
- setDeclined(true);
- if (preview) return;
- try {
- await fetch("/api/onboarding/decline-terms", { method: "POST" });
- } catch {
- // A warming backend cannot hold the goodbye back; the window closes either way.
- }
- }
-
- if (declined) {
- return (
- <div className="space-y-1" data-testid="onboarding-declined">
- <p className="text-sm font-medium text-foreground">{t("first_run.welcome.declined_title")}</p>
- <p className="text-sm leading-relaxed text-muted-foreground">{t("first_run.welcome.declined_body")}</p>
- </div>
- );
- }
-
- const facts: { key: string; Icon: typeof Terminal }[] = [
- { key: "commands", Icon: Terminal },
- { key: "screen", Icon: Monitor },
- { key: "cloud", Icon: Cloud },
- { key: "costs", Icon: CreditCard },
- { key: "mistakes", Icon: AlertTriangle },
- ];
-
return (
<div className="space-y-4">
<div className="flex items-center gap-0.5 self-start rounded-full border border-border p-0.5" role="radiogroup" aria-label={t("first_run.welcome.language")}>
@@ -273,42 +225,7 @@ function WelcomeStep({ onb, preview, onAccepted }: { onb: Onb; preview: boolean;
</button>
))}
</div>
-
- <ul className="space-y-1.5 rounded-xl border border-border bg-background px-3.5 py-3" data-testid="onboarding-facts">
- {facts.map(({ key, Icon }) => (
- <li key={key} className="flex items-start gap-2.5 text-sm leading-snug text-foreground">
- <Icon aria-hidden className="mt-0.5 h-3.5 w-3.5 shrink-0 text-muted-foreground" />
- <span>{t(`first_run.welcome.fact_${key}`)}</span>
- </li>
- ))}
- </ul>
-
- <div className="space-y-1.5">
- <CheckLine checked={accepted} onChange={setAccepted} testId="onboarding-accept">
- {t("first_run.welcome.accept")}
- </CheckLine>
- <QuietAction onClick={() => void toggleTerms()} className="ml-7 text-xs underline underline-offset-4">
- {showTerms ? t("first_run.welcome.hide_terms") : t("first_run.welcome.read_terms")}
- </QuietAction>
- {showTerms && (
- <pre className="ml-7 max-h-32 overflow-y-auto whitespace-pre-wrap rounded-lg border border-border bg-background p-2.5 font-sans text-xs leading-relaxed text-muted-foreground scrollbar-jarvis">
- {terms || t("first_run.welcome.terms_loading")}
- </pre>
- )}
- </div>
-
- {error && <Status tone="error">{error}</Status>}
-
- <div className="space-y-2">
- <PrimaryAction onClick={() => void proceed()} disabled={!accepted} busy={busy}>
- {t("first_run.welcome.start")}
- </PrimaryAction>
- <div className="text-center">
- <QuietAction onClick={() => void decline()} testId="onboarding-decline" className="text-xs">
- {t("first_run.welcome.decline")}
- </QuietAction>
- </div>
- </div>
+ <PrimaryAction onClick={onStart}>{t("first_run.welcome.start")}</PrimaryAction>
</div>
);
}
@@ -547,18 +464,15 @@ function ReviewRow({ label, value, ok }: { label: string; value: ReactNode; ok:
}
/**
- * What is set up, read back from the app itself, then the start. Completing
- * restarts the app once so every choice takes effect together; the tour of
- * the app follows the restart.
+ * What is set up, read back from the app itself, then on to the tour. The
+ * one restart that switches every choice on comes when the tour ends.
*/
-function ReadyStep({ onb, preview, onFinished }: { onb: Onb; preview: boolean; onFinished: () => void }) {
+function ReadyStep({ preview, onFinished }: { preview: boolean; onFinished: () => void }) {
const t = useT();
const { providers } = useProviders();
const { config } = useWakeWord();
const subscriptions = useConnectedSubscriptions(0);
const [autostart, setAutostart] = useState<{ enabled: boolean; supported: boolean } | null>(null);
- const [busy, setBusy] = useState(false);
- const [error, setError] = useState<string | null>(null);
useEffect(() => {
let cancelled = false;
@@ -589,22 +503,6 @@ function ReadyStep({ onb, preview, onFinished }: { onb: Onb; preview: boolean; o
}
}
- async function start() {
- if (busy) return;
- if (preview) {
- onFinished();
- return;
- }
- setBusy(true);
- setError(null);
- try {
- await onb.complete();
- } catch {
- setError(t("first_run.ready.start_failed"));
- setBusy(false);
- }
- }
-
const brain = providers.find((p) => p.tier === "brain" && p.active);
const brainOk = Boolean(brain && ((brain.secret_keys?.length ?? 0) === 0 || slotEffective(brain)));
const wakeOn = Boolean(config?.enabled && config.phrase.trim());
@@ -639,9 +537,8 @@ function ReadyStep({ onb, preview, onFinished }: { onb: Onb; preview: boolean; o
<p className="text-xs leading-relaxed text-muted-foreground">
{preview ? t("first_run.ready.preview_note") : t("first_run.ready.restart_note")}
</p>
- {error && <Status tone="error">{error}</Status>}
- <PrimaryAction onClick={() => void start()} busy={busy} testId="onboarding-start">
- {busy ? t("first_run.ready.starting") : t("first_run.ready.start")}
+ <PrimaryAction onClick={onFinished} testId="onboarding-start">
+ {t("first_run.ready.start")}
</PrimaryAction>
</div>
);
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.test.ts b/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.test.ts
index 7f595b0393..0aa02d5c23 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.test.ts
+++ b/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.test.ts
@@ -64,17 +64,13 @@ describe("setup steps", () => {
describe("resumeStep", () => {
const steps = stepsFor("win32");
- it("never skips the consent", () => {
- expect(resumeStep(steps, "voice", false)).toBe("welcome");
+ it("returns to the saved step", () => {
+ expect(resumeStep(steps, "voice")).toBe("voice");
+ expect(resumeStep(steps, "subscriptions")).toBe("subscriptions");
});
- it("returns to the saved step once consent exists", () => {
- expect(resumeStep(steps, "voice", true)).toBe("voice");
- });
-
- it("starts after the consent for an unknown or old step id", () => {
- expect(resumeStep(steps, "api-keys", true)).toBe("keys");
- expect(resumeStep(steps, null, true)).toBe("keys");
- expect(resumeStep(steps, "welcome", true)).toBe("keys");
+ it("starts at the welcome for a fresh run or an unknown, old step id", () => {
+ expect(resumeStep(steps, null)).toBe("welcome");
+ expect(resumeStep(steps, "api-keys")).toBe("welcome");
});
});
diff --git a/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.ts b/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.ts
index 95ccc47a5f..272f87c3f5 100644
--- a/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.ts
+++ b/jarvis/ui/web/frontend/src/components/onboarding/setup/setupSteps.ts
@@ -71,14 +71,10 @@ export function stepsFor(platform: string | null): SetupStepId[] {
/**
* Where a resumed setup starts. The backend remembers the last step, so a
- * window reload lands where the user was — never past the consent.
+ * window reload lands where the user was; a fresh start (or an unknown, old
+ * step id) begins at the welcome.
*/
-export function resumeStep(
- steps: readonly SetupStepId[],
- saved: string | null,
- termsAccepted: boolean,
-): SetupStepId {
- if (!termsAccepted) return "welcome";
+export function resumeStep(steps: readonly SetupStepId[], saved: string | null): SetupStepId {
const hit = steps.find((id) => id === saved);
- return hit && hit !== "welcome" ? hit : (steps[1] ?? "welcome");
+ return hit ?? "welcome";
}
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/de.json b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/de.json
index bb38ea2a07..07f1fd1e7b 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/de.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/de.json
@@ -5,25 +5,12 @@
"step_of": "{current} von {total}",
"welcome": {
"title": "Willkommen",
- "lede": "Wir richten deinen Assistenten direkt hier in der App ein. Das dauert etwa zwei Minuten.",
+ "lede": "Wir richten deinen Assistenten direkt hier in der App ein: einen API-Schlüssel, ein Abo für deine Agents und dein Weckwort. Danach zeigt dir eine kurze Tour die App.",
"language": "Sprache",
"lang_en": "English",
"lang_de": "Deutsch",
"lang_es": "Español",
- "fact_commands": "Er führt Befehle aus, öffnet Apps und ändert Dateien für dich.",
- "fact_screen": "Er kann deinen Bildschirm sehen und darauf handeln, wenn du ihn bittest.",
- "fact_cloud": "Was du sagst, geht an den KI-Anbieter, den du wählst.",
- "fact_costs": "Die Nutzung rechnet dieser Anbieter über dein Konto ab.",
- "fact_mistakes": "Er kann Fehler machen, auch solche, die schwer rückgängig zu machen sind.",
- "accept": "Ich habe das verstanden und nutze ihn auf eigenes Risiko.",
- "read_terms": "Die vollständigen Nutzungsbedingungen lesen",
- "hide_terms": "Nutzungsbedingungen ausblenden",
- "terms_loading": "Nutzungsbedingungen werden geladen…",
- "start": "Zustimmen und weiter",
- "decline": "Ablehnen und beenden",
- "accept_failed": "Deine Zustimmung konnte nicht gespeichert werden. Prüfe, ob die App läuft, und versuche es noch einmal.",
- "declined_title": "Die App wird geschlossen",
- "declined_body": "Du hast abgelehnt, also wurde nichts eingerichtet und nichts gespeichert. Starte die App jederzeit neu, dann fragt sie wieder."
+ "start": "Los geht's"
},
"keys": {
"title": "Einen API-Schlüssel eintragen",
@@ -58,7 +45,7 @@
},
"ready": {
"title": "Alles bereit",
- "lede": "Die App startet einmal neu, damit alles eingeschaltet ist. Danach zeigt dir eine kurze Tour die App.",
+ "lede": "Das ist eingerichtet. Als Nächstes zeigt dir eine kurze Tour die App.",
"row_brain": "Gehirn",
"row_agents": "Agents",
"row_voice": "Aktivierung",
@@ -67,11 +54,9 @@
"shortcut": "Anruf-Kürzel",
"autostart": "Bei der Anmeldung starten",
"no_key_note": "Ohne Schlüssel bleiben Chat und Sprache aus, bis du auf der Seite API-Keys einen einträgst.",
- "preview_note": "Das ist eine Wiederholung, deshalb startet nichts neu. Starten öffnet die Tour.",
- "restart_note": "Der Neustart dauert etwa zehn Sekunden.",
- "start_failed": "Die Einrichtung konnte nicht abgeschlossen werden. Prüfe, ob die App läuft, und versuche es noch einmal.",
- "starting": "Startet…",
- "start": "Starten"
+ "preview_note": "Das ist eine Wiederholung, deshalb startet nichts neu.",
+ "restart_note": "Nach der Tour startet die App einmal neu (etwa zehn Sekunden), damit alles eingeschaltet ist.",
+ "start": "Zeig mir die App"
}
},
"app_tour": {
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/en.json b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/en.json
index 3cdb994369..39b528939e 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/en.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/en.json
@@ -5,25 +5,12 @@
"step_of": "{current} of {total}",
"welcome": {
"title": "Welcome",
- "lede": "Let's set up your assistant right here in the app. It takes about two minutes.",
+ "lede": "Let's set up your assistant right here in the app: an API key, a subscription for your agents and your wake word. Then a short tour shows you around.",
"language": "Language",
"lang_en": "English",
"lang_de": "Deutsch",
"lang_es": "Español",
- "fact_commands": "It runs commands, opens apps and changes files for you.",
- "fact_screen": "It can see your screen and act on it when you ask.",
- "fact_cloud": "What you say goes to the AI provider you choose.",
- "fact_costs": "Usage is billed by that provider, on your account.",
- "fact_mistakes": "It can make mistakes, including ones that are hard to undo.",
- "accept": "I understand this and use it at my own risk.",
- "read_terms": "Read the full Terms of Use",
- "hide_terms": "Hide the Terms",
- "terms_loading": "Loading the Terms…",
- "start": "Agree and continue",
- "decline": "Decline and quit",
- "accept_failed": "Your agreement could not be saved. Check that the app is running, then try again.",
- "declined_title": "Closing the app",
- "declined_body": "You declined, so nothing was set up and nothing was saved. Start the app again anytime and it will ask again."
+ "start": "Let's start"
},
"keys": {
"title": "Add one API key",
@@ -58,7 +45,7 @@
},
"ready": {
"title": "All set",
- "lede": "The app restarts once to switch everything on. Then a short tour shows you around.",
+ "lede": "Here is what is set up. Next, a short tour shows you around the app.",
"row_brain": "Brain",
"row_agents": "Agents",
"row_voice": "Activation",
@@ -67,11 +54,9 @@
"shortcut": "Call shortcut",
"autostart": "Start at login",
"no_key_note": "Without a key, chat and voice stay off until you add one on the API Keys page.",
- "preview_note": "This is a replay, so nothing restarts. Start opens the tour.",
- "restart_note": "The restart takes about ten seconds.",
- "start_failed": "Setup could not be finished. Check that the app is running, then try again.",
- "starting": "Starting…",
- "start": "Start"
+ "preview_note": "This is a replay, so nothing restarts.",
+ "restart_note": "When the tour ends, the app restarts once (about ten seconds) to switch everything on.",
+ "start": "Show me around"
}
},
"app_tour": {
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/es.json b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/es.json
index 0e3cca9126..2383663320 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/onboarding/es.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/onboarding/es.json
@@ -5,25 +5,12 @@
"step_of": "{current} de {total}",
"welcome": {
"title": "Bienvenido",
- "lede": "Configuramos tu asistente aquí mismo, en la aplicación. Tarda unos dos minutos.",
+ "lede": "Configuramos tu asistente aquí mismo, en la aplicación: una clave de API, una suscripción para tus agentes y tu palabra de activación. Después, una breve visita te enseña la aplicación.",
"language": "Idioma",
"lang_en": "English",
"lang_de": "Deutsch",
"lang_es": "Español",
- "fact_commands": "Ejecuta comandos, abre aplicaciones y cambia archivos por ti.",
- "fact_screen": "Puede ver tu pantalla y actuar sobre ella cuando se lo pidas.",
- "fact_cloud": "Lo que dices va al proveedor de IA que elijas.",
- "fact_costs": "Ese proveedor cobra el uso en tu cuenta.",
- "fact_mistakes": "Puede equivocarse, también de formas difíciles de deshacer.",
- "accept": "Lo entiendo y lo uso bajo mi propia responsabilidad.",
- "read_terms": "Leer las condiciones de uso completas",
- "hide_terms": "Ocultar las condiciones",
- "terms_loading": "Cargando las condiciones…",
- "start": "Aceptar y continuar",
- "decline": "Rechazar y salir",
- "accept_failed": "No se pudo guardar tu aceptación. Comprueba que la aplicación está en marcha y vuelve a intentarlo.",
- "declined_title": "Cerrando la aplicación",
- "declined_body": "Has rechazado, así que no se configuró ni se guardó nada. Abre la aplicación cuando quieras y volverá a preguntar."
+ "start": "Empezar"
},
"keys": {
"title": "Añade una clave de API",
@@ -58,7 +45,7 @@
},
"ready": {
"title": "Todo listo",
- "lede": "La aplicación se reinicia una vez para activarlo todo. Después, una breve visita te enseña la aplicación.",
+ "lede": "Esto es lo que está configurado. Ahora, una breve visita te enseña la aplicación.",
"row_brain": "Cerebro",
"row_agents": "Agentes",
"row_voice": "Activación",
@@ -67,11 +54,9 @@
"shortcut": "Atajo de llamada",
"autostart": "Iniciar al entrar en la sesión",
"no_key_note": "Sin clave, el chat y la voz siguen apagados hasta que añadas una en la página Claves API.",
- "preview_note": "Esto es una repetición, así que no se reinicia nada. Empezar abre la visita.",
- "restart_note": "El reinicio tarda unos diez segundos.",
- "start_failed": "No se pudo terminar la configuración. Comprueba que la aplicación está en marcha y vuelve a intentarlo.",
- "starting": "Iniciando…",
- "start": "Empezar"
+ "preview_note": "Esto es una repetición, así que no se reinicia nada.",
+ "restart_note": "Al terminar la visita, la aplicación se reinicia una vez (unos diez segundos) para activarlo todo.",
+ "start": "Enséñame la aplicación"
}
},
"app_tour": {