Agent Zero AI framework
Unify onboarding provider selection
Alessandro8d887e6f6d01
diff --git a/plugins/_onboarding/webui/assets/cloud-card.webp b/plugins/_onboarding/webui/assets/cloud-card.webpdeleted file mode 100644index 0ad9b2035..000000000Binary files a/plugins/_onboarding/webui/assets/cloud-card.webp and /dev/null differdiff --git a/plugins/_onboarding/webui/assets/local-card.webp b/plugins/_onboarding/webui/assets/local-card.webpdeleted file mode 100644index cf9576ba4..000000000Binary files a/plugins/_onboarding/webui/assets/local-card.webp and /dev/null differdiff --git a/plugins/_onboarding/webui/onboarding-store.js b/plugins/_onboarding/webui/onboarding-store.jsindex c1fb254d4..f0b107962 100644--- a/plugins/_onboarding/webui/onboarding-store.js+++ b/plugins/_onboarding/webui/onboarding-store.js@@ -78,16 +78,15 @@ function safeProviderName(provider) {}export const store = createStore("onboarding", {- step: "path",- pathChoice: "",+ step: "connect",+ providerMode: "cloud",+ presetMode: "",loading: true,saving: false,config: null,providerDetails: {},selectedProviderId: "",selectedProviderOrigin: "cloud",- moreProviderQuery: "",- moreCloudOpen: false,sameAsMain: true,userTouchedModel: {chat_model: false,@@ -109,7 +108,7 @@ export const store = createStore("onboarding", {oauthProviderUi: {},steps: [- { step: "path", label: "Choose path" },+ { step: "connect", label: "Choose provider" },{ step: "setup", label: "Connect" },{ step: "utility", label: "Utility" },{ step: "ready", label: "Ready" },@@ -120,16 +119,15 @@ export const store = createStore("onboarding", {},resetState() {- this.step = "path";- this.pathChoice = "";+ this.step = "connect";+ this.providerMode = ["local", "account"].includes(this.presetMode) ? this.presetMode : "cloud";+ this.presetMode = "";this.loading = true;this.saving = false;this.config = null;this.providerDetails = {};this.selectedProviderId = "";this.selectedProviderOrigin = "cloud";- this.moreProviderQuery = "";- this.moreCloudOpen = false;this.sameAsMain = true;this.userTouchedModel = { chat_model: false, utility_model: false };this.modelDropdown = {@@ -217,22 +215,8 @@ export const store = createStore("onboarding", {};},- topCloudProviders() {- return TOP_CLOUD_IDS.map((id) => this.providerMeta(id));- },-- moreCloudProviders() {- return MORE_CLOUD_IDS.map((id) => this.providerMeta(id));- },-- filteredMoreCloudProviders() {- const query = this.moreProviderQuery.trim().toLowerCase();- const providers = this.moreCloudProviders();- if (!query) return providers;- return providers.filter((provider) => {- const haystack = `${provider.name} ${provider.short_description} ${provider.id}`.toLowerCase();- return haystack.includes(query);- });+ cloudProviders() {+ return [...TOP_CLOUD_IDS, ...MORE_CLOUD_IDS].map((id) => this.providerMeta(id));},localProviderCards() {@@ -315,12 +299,7 @@ export const store = createStore("onboarding", {if (this.step === "setup") return "Choose your main model";if (this.step === "utility") return "Choose your utility model";if (this.step === "ready") return "Agent Zero is ready";- if (this.step === "path") return "Choose how to use AI models in Agent Zero";- if (this.step === "cloud") return "Choose your cloud AI provider";- if (this.step === "local") {- return "Choose your local LLM provider";- }- return "Choose how to use AI models in Agent Zero";+ return "Choose your AI provider";},stepNumber(stepName) {@@ -329,7 +308,6 @@ export const store = createStore("onboarding", {},currentStepNumber() {- if (this.step === "cloud" || this.step === "local") return 1;return this.stepNumber(this.step);},@@ -337,18 +315,13 @@ export const store = createStore("onboarding", {return this.step === name;},- choosePath(path) {- this.pathChoice = path;- this.step = path === "local" ? "local" : "cloud";+ setProviderMode(mode) {+ this.providerMode = ["local", "account"].includes(mode) ? mode : "cloud";},goBack() {- if (this.step === "cloud" || this.step === "local") {- this.step = "path";- return;- }if (this.step === "setup") {- this.step = this.pathChoice === "local" ? "local" : "cloud";+ this.step = "connect";return;}if (this.step === "utility") {@@ -361,7 +334,7 @@ export const store = createStore("onboarding", {},showBackButton() {- return !["path", "ready"].includes(this.step);+ return !["connect", "ready"].includes(this.step);},showPrimaryButton() {@@ -410,7 +383,7 @@ export const store = createStore("onboarding", {async selectProvider(providerId, origin = "cloud") {this.selectedProviderId = providerId;this.selectedProviderOrigin = origin;- this.pathChoice = origin;+ this.providerMode = ["local", "account"].includes(origin) ? origin : "cloud";const meta = this.providerMeta(providerId);this.applyProviderToSlot("chat_model", providerId, meta, { forceApiBase: origin === "local" });if (this.isOAuthProvider(providerId)) {@@ -427,8 +400,7 @@ export const store = createStore("onboarding", {},async selectOAuthProvider(providerId) {- this.pathChoice = "cloud";- await this.selectProvider(providerId, "cloud");+ await this.selectProvider(providerId, "account");},applyProviderToSlot(slotKey, providerId, meta, options = {}) {diff --git a/plugins/_onboarding/webui/onboarding.html b/plugins/_onboarding/webui/onboarding.htmlindex 6f08bac97..018010b0f 100644--- a/plugins/_onboarding/webui/onboarding.html+++ b/plugins/_onboarding/webui/onboarding.html@@ -20,7 +20,7 @@padding: 24px 30px 28px;background: var(--color-panel, #151515);}- .onboarding-content { position: relative; z-index: 1; }+ .onboarding-content { position: relative; z-index: 1; container-type: inline-size; }.onboarding-header {display: flex;align-items: center;@@ -85,63 +85,57 @@box-shadow: 0 18px 55px rgba(0, 0, 0, 0.22);padding: 18px;}- .path-grid {- display: grid;- grid-template-columns: repeat(2, minmax(0, 1fr));- gap: 16px;+ .mode-switch {+ display: flex;+ gap: 6px;+ padding: 6px;+ margin-bottom: 16px;+ border: 1px solid var(--onboard-line);+ border-radius: 16px;+ background: color-mix(in srgb, var(--color-background) 45%, transparent);}- .path-card {- position: relative;- aspect-ratio: 21 / 9;- min-height: 0;- overflow: hidden;- border: 1px solid color-mix(in srgb, var(--onboard-line) 78%, transparent);- border-radius: 18px;- background: var(--onboard-soft);+ .mode-option {+ flex: 1 1 0;+ min-width: 0;+ display: flex;+ align-items: center;+ justify-content: center;+ gap: 11px;+ min-height: 56px;+ padding: 9px 16px;+ border: 1px solid transparent;+ border-radius: 12px;+ background: transparent;+ color: var(--onboard-muted);text-align: left;cursor: pointer;- padding: 0;- color: var(--onboard-ink);font-family: "Rubik", var(--font-family, sans-serif);- transition: border-color 0.18s ease, box-shadow 0.18s ease;+ transition: border-color 0.16s ease, background 0.16s ease, color 0.16s ease;}- .path-card:hover, .path-card:focus-visible {- border-color: var(--color-border);- box-shadow: 0 20px 60px rgba(0, 0, 0, 0.28);+ .mode-option:hover, .mode-option:focus-visible {+ border-color: color-mix(in srgb, var(--onboard-line) 82%, transparent);+ background: color-mix(in srgb, var(--color-background-hover) 44%, transparent);outline: none;}- .path-card img {- position: absolute;- inset: 0;- width: 100%;- height: 100%;- object-fit: cover;- object-position: center;- opacity: 0.92;+ .mode-option.active {+ color: var(--onboard-ink);+ border-color: color-mix(in srgb, #d9ad68 42%, var(--onboard-line));+ background: color-mix(in srgb, #d9ad68 9%, var(--color-panel));}- .path-card::after {- content: "";- position: absolute;- inset: 0;- background: linear-gradient(180deg, rgba(0,0,0,0.06), rgba(0,0,0,0.58));+ .mode-option .material-symbols-outlined {+ font-size: 22px;}- .path-card-copy {- position: absolute;- left: 20px;- right: 20px;- bottom: 18px;- z-index: 1;- color: #f8f4ec;- text-shadow: 0 1px 18px rgba(0,0,0,0.45);+ .mode-option.active .material-symbols-outlined {+ color: #d9ad68;}- .path-card-title {- display: block;- font-size: clamp(1.18rem, 2.4vw, 1.65rem);- font-weight: 700;- letter-spacing: -0.02em;- margin-bottom: 5px;+ .mode-copy { display: grid; gap: 1px; min-width: 0; }+ .mode-title { font-weight: 900; line-height: 1.15; }+ .mode-sub { font-size: 0.78rem; line-height: 1.3; color: var(--onboard-muted); }+ .pane-note { margin-top: 14px; }+ @container (max-width: 700px) {+ .mode-switch { flex-direction: column; }+ .mode-option { justify-content: flex-start; }}- .path-card-text { display: block; max-width: 38ch; line-height: 1.45; }.account-strip {display: flex;align-items: center;@@ -175,35 +169,6 @@.section-title { color: var(--onboard-ink); font-weight: 900; }.setup-hero .section-title { font-weight: 720; }.account-subtitle, .section-description { color: var(--onboard-muted); line-height: 1.45; }- .oauth-account-section {- display: grid;- gap: 10px;- margin-top: 14px;- }- .path-oauth-account-section {- margin-top: 24px;- }- .path-oauth-account-section .oauth-account-section-head {- justify-content: center;- text-align: center;- }- .path-oauth-account-section .oauth-account-section-head span {- font-weight: 760;- }- .oauth-account-section-head {- display: flex;- align-items: baseline;- justify-content: space-between;- gap: 12px;- color: var(--onboard-ink);- }- .oauth-account-section-head span {- font-weight: 900;- }- .oauth-account-section-head small {- color: var(--onboard-muted);- font-weight: 650;- }.oauth-account-grid {display: grid;grid-template-columns: repeat(2, minmax(0, 1fr));@@ -307,40 +272,6 @@margin-bottom: 0;}.provider-name { font-weight: 900; line-height: 1.18; }- .more-providers {- margin: 10px 0 14px;- padding: 0;- overflow: hidden;- border: 0;- background: transparent;- box-shadow: none;- }- .more-provider-toggle {- width: 100%;- min-height: 44px;- display: flex;- align-items: center;- justify-content: center;- gap: 8px;- border: 0;- background: transparent;- color: var(--onboard-ink);- cursor: pointer;- font-weight: 900;- }- .more-provider-toggle .material-symbols-outlined {- transition: transform 0.18s ease;- }- .more-provider-toggle.open .material-symbols-outlined {- transform: rotate(180deg);- }- .more-provider-list {- display: grid;- grid-template-columns: repeat(5, minmax(0, 1fr));- gap: 10px;- padding: 0;- margin-top: 8px;- }.local-grid {display: grid;grid-template-columns: repeat(3, minmax(0, 1fr));@@ -623,7 +554,6 @@.status-pill.connected { color: #8fd8a8; border-color: color-mix(in srgb, #8fd8a8 44%, var(--onboard-line)); }@media (max-width: 980px) {.provider-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }- .more-provider-list { grid-template-columns: repeat(3, minmax(0, 1fr)); }.oauth-account-grid { grid-template-columns: 1fr; }.setup-layout { grid-template-columns: 1fr; }}@@ -631,10 +561,10 @@.onboarding-shell { padding: 18px 14px 22px; }.onboarding-header { align-items: flex-start; flex-direction: column; }.onboarding-progress { justify-content: flex-start; }- .path-grid, .local-grid { grid-template-columns: 1fr; }+ .local-grid { grid-template-columns: 1fr; }.provider-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }- .more-provider-list { grid-template-columns: repeat(2, minmax(0, 1fr)); }- .path-card { aspect-ratio: 21 / 10; }+ .mode-switch { flex-direction: column; }+ .mode-option { justify-content: flex-start; }.account-strip { align-items: flex-start; flex-direction: column; }.oauth-account-card { grid-template-columns: auto minmax(0, 1fr); }.oauth-account-action { grid-column: 2; justify-self: start; }@@ -647,43 +577,8 @@}@media (max-width: 480px) {.provider-grid { grid-template-columns: 1fr; }- .more-provider-list { grid-template-columns: 1fr; }.provider-card, .local-card { min-height: auto; }}-- .more-providers.onboarding-panel {- border: 0 !important;- background: transparent !important;- box-shadow: none !important;- }-- .more-provider-toggle,- .more-provider-toggle.open {- border: 0 !important;- border-top: 0 !important;- border-bottom: 0 !important;- box-shadow: none !important;- background: transparent !important;- }-- .more-provider-toggle:focus,- .more-provider-toggle:focus-visible,- .more-provider-toggle.open:focus,- .more-provider-toggle.open:focus-visible {- outline: none !important;- text-decoration: underline;- text-decoration-thickness: 1px;- text-underline-offset: 5px;- text-decoration-color: color-mix(in srgb, #d9ad68 62%, transparent);- }-- .more-provider-toggle,- .more-provider-toggle:focus,- .more-provider-toggle:focus-visible,- .more-provider-toggle.open:focus,- .more-provider-toggle.open:focus-visible {- text-decoration: none !important;- }</style></head><body>@@ -712,62 +607,64 @@<template x-if="!$store.onboarding.loading && $store.onboarding.config"><div>- <section x-show="$store.onboarding.isStep('path')" x-transition.opacity>- <div class="path-grid">- <button type="button" class="path-card" @click="$store.onboarding.choosePath('cloud')" aria-label="Choose Cloud provider setup">- <img src="/plugins/_onboarding/webui/assets/cloud-card.webp" alt="">- <span class="path-card-copy">- <span class="path-card-title">Cloud</span>- <span class="path-card-text">Use an online provider with an API key or account connection.</span>+ <section x-show="$store.onboarding.isStep('connect')" x-transition.opacity>+ <div class="mode-switch" role="tablist" aria-label="Where should your AI model run?">+ <button type="button"+ class="mode-option"+ role="tab"+ :class="{ active: $store.onboarding.providerMode === 'cloud' }"+ :aria-selected="$store.onboarding.providerMode === 'cloud' ? 'true' : 'false'"+ @click="$store.onboarding.setProviderMode('cloud')">+ <span class="material-symbols-outlined" aria-hidden="true">cloud</span>+ <span class="mode-copy">+ <span class="mode-title">Cloud</span>+ <span class="mode-sub">Connect with an API key</span></span></button>- <button type="button" class="path-card" @click="$store.onboarding.choosePath('local')" aria-label="Choose Local model setup">- <img src="/plugins/_onboarding/webui/assets/local-card.webp" alt="">- <span class="path-card-copy">- <span class="path-card-title">Local</span>- <span class="path-card-text">Use a local LLM running on your own machine, with more control over where requests go.</span>+ <button type="button"+ class="mode-option"+ role="tab"+ x-show="$store.onboarding.oauthProviderCards().length"+ :class="{ active: $store.onboarding.providerMode === 'account' }"+ :aria-selected="$store.onboarding.providerMode === 'account' ? 'true' : 'false'"+ @click="$store.onboarding.setProviderMode('account')">+ <span class="material-symbols-outlined" aria-hidden="true">account_circle</span>+ <span class="mode-copy">+ <span class="mode-title">Account</span>+ <span class="mode-sub">Codex, Copilot, Gemini, Grok</span>+ </span>+ </button>+ <button type="button"+ class="mode-option"+ role="tab"+ :class="{ active: $store.onboarding.providerMode === 'local' }"+ :aria-selected="$store.onboarding.providerMode === 'local' ? 'true' : 'false'"+ @click="$store.onboarding.setProviderMode('local')">+ <span class="material-symbols-outlined" aria-hidden="true">memory</span>+ <span class="mode-copy">+ <span class="mode-title">Local</span>+ <span class="mode-sub">Runs on your machine</span></span></button></div>- <div class="oauth-account-section path-oauth-account-section" x-show="$store.onboarding.oauthProviderCards().length">- <div class="oauth-account-section-head">- <span>or connect your AI account</span>- </div>- <div class="oauth-account-grid">- <template x-for="provider in $store.onboarding.oauthProviderCards()" :key="`path-${provider.provider_id}`">- <button type="button" class="oauth-account-card" :class="{ connected: provider.connected }" @click="$store.onboarding.selectOAuthProvider(provider.provider_id)">- <span class="oauth-account-mark" :class="{ connected: provider.connected }">- <span class="material-symbols-outlined" x-text="$store.onboarding.oauthMark(provider)"></span>- </span>- <span class="oauth-account-copy">- <span class="oauth-account-title" x-text="$store.onboarding.oauthCardTitle(provider)"></span>- <span class="oauth-account-subtitle" x-text="$store.onboarding.oauthCardSubtitle(provider)"></span>++ <div x-show="$store.onboarding.providerMode === 'local'" x-transition.opacity>+ <div class="local-grid">+ <template x-for="provider in $store.onboarding.localProviderCards()" :key="provider.id + provider.name">+ <button type="button" class="local-card" @click="$store.onboarding.selectProvider(provider.id, 'local')">+ <span class="provider-card-top">+ <img class="provider-logo" :src="provider.logo" :alt="provider.name + ' logo'" @error="$el.style.display='none'">+ <span class="provider-name" x-text="provider.name"></span></span>- <span class="oauth-account-action" x-text="$store.onboarding.oauthAccountActionLabel(provider.provider_id)"></span></button></template></div>+ <div class="soft-note pane-note">Pick the app you use to run models on this machine. No API key needed — Agent Zero connects to it directly.</div></div>- </section>- <section x-show="$store.onboarding.isStep('cloud')" x-transition.opacity>- <div class="provider-grid" aria-label="Cloud providers">- <template x-for="provider in $store.onboarding.topCloudProviders()" :key="provider.id">- <button type="button" class="provider-card" @click="$store.onboarding.selectProvider(provider.id, 'cloud')">- <span class="provider-card-top">- <img class="provider-logo" :src="provider.logo" :alt="provider.name + ' logo'" @error="$el.style.display='none'">- <span class="provider-name" x-text="provider.name"></span>- </span>- </button>- </template>- </div>- <div class="oauth-account-section" x-show="$store.onboarding.oauthProviderCards().length">- <div class="oauth-account-section-head">- <span>Accounts</span>- <small>Account-backed providers can be used without API keys.</small>- </div>+ <div x-show="$store.onboarding.providerMode === 'account'" x-transition.opacity><div class="oauth-account-grid">- <template x-for="provider in $store.onboarding.oauthProviderCards()" :key="`cloud-${provider.provider_id}`">+ <template x-for="provider in $store.onboarding.oauthProviderCards()" :key="`account-${provider.provider_id}`"><button type="button" class="oauth-account-card" :class="{ connected: provider.connected }" @click="$store.onboarding.selectOAuthProvider(provider.provider_id)"><span class="oauth-account-mark" :class="{ connected: provider.connected }"><span class="material-symbols-outlined" x-text="$store.onboarding.oauthMark(provider)"></span>@@ -780,18 +677,12 @@</button></template></div>+ <div class="soft-note pane-note">Sign in with a subscription you already have — no API key needed.</div></div>- <div class="more-providers onboarding-panel">- <button type="button"- class="more-provider-toggle"- :class="{ open: $store.onboarding.moreCloudOpen }"- @click="$store.onboarding.moreCloudOpen = !$store.onboarding.moreCloudOpen"- :aria-expanded="$store.onboarding.moreCloudOpen ? 'true' : 'false'">- <span>Click here if you don't see your provider</span>- <span class="material-symbols-outlined">keyboard_arrow_down</span>- </button>- <div class="more-provider-list" x-show="$store.onboarding.moreCloudOpen" x-transition.opacity>- <template x-for="provider in $store.onboarding.moreCloudProviders()" :key="provider.id">++ <div x-show="$store.onboarding.providerMode === 'cloud'" x-transition.opacity>+ <div class="provider-grid" aria-label="Cloud providers">+ <template x-for="provider in $store.onboarding.cloudProviders()" :key="provider.id"><button type="button" class="provider-card" @click="$store.onboarding.selectProvider(provider.id, 'cloud')"><span class="provider-card-top"><img class="provider-logo" :src="provider.logo" :alt="provider.name + ' logo'" @error="$el.style.display='none'">@@ -803,19 +694,6 @@</div></section>- <section x-show="$store.onboarding.isStep('local')" x-transition.opacity>- <div class="local-grid">- <template x-for="provider in $store.onboarding.localProviderCards()" :key="provider.id + provider.name">- <button type="button" class="local-card" @click="$store.onboarding.selectProvider(provider.id, 'local')">- <span class="provider-card-top">- <img class="provider-logo" :src="provider.logo" :alt="provider.name + ' logo'" @error="$el.style.display='none'">- <span class="provider-name" x-text="provider.name"></span>- </span>- </button>- </template>- </div>- </section>-<section x-show="$store.onboarding.isStep('setup')" x-transition.opacity><div class="setup-layout"><div class="setup-hero">@@ -984,7 +862,7 @@<x-extension id="onboarding-success-end"></x-extension></section>- <div class="onboarding-advanced-link" x-show="!$store.onboarding.isStep('ready') && !$store.onboarding.isStep('cloud') && !$store.onboarding.isStep('local')">+ <div class="onboarding-advanced-link" x-show="!$store.onboarding.isStep('ready')"><button type="button" class="advanced-settings-toggle" @click="$store.onboarding.openAdvancedSettings()"><span>Advanced Settings</span><span class="material-symbols-outlined">keyboard_arrow_right</span>diff --git a/tests/test_onboarding_static.py b/tests/test_onboarding_static.pyindex 6666363a2..52813bef9 100644--- a/tests/test_onboarding_static.py+++ b/tests/test_onboarding_static.py@@ -5,25 +5,56 @@ import yamlPROJECT_ROOT = Path(__file__).resolve().parents[1]-def test_onboarding_contains_guided_cloud_local_flow():+def test_onboarding_contains_unified_provider_step():html = (PROJECT_ROOT / "plugins/_onboarding/webui/onboarding.html").read_text(encoding="utf-8")store = (PROJECT_ROOT / "plugins/_onboarding/webui/onboarding-store.js").read_text(encoding="utf-8")+ gate_store = (PROJECT_ROOT / "webui/components/chat/model-gate-store.js").read_text(encoding="utf-8")assert "Cloud" in htmlassert "Local" in htmlassert "Welcome to Agent Zero" in html- assert "Choose how to use AI models in Agent Zero" in html + store- assert "Choose your cloud AI provider" in html + store- assert "Choose your local LLM provider" in html + store- assert "cloud-card.webp" in html- assert "local-card.webp" in html+ assert "Choose your AI provider" in store++ # The illustrated Cloud/Local path screen is gone: one merged provider step.+ assert "Choose how to use AI models in Agent Zero" not in html + store+ assert "path-card" not in html+ assert "cloud-card.webp" not in html+ assert "local-card.webp" not in html+ assert not (PROJECT_ROOT / "plugins/_onboarding/webui/assets/cloud-card.webp").exists()+ assert not (PROJECT_ROOT / "plugins/_onboarding/webui/assets/local-card.webp").exists()+ assert "choosePath" not in html + store + gate_store+ assert "isStep('connect')" in html+ assert "isStep('path')" not in html+ assert "isStep('cloud')" not in html+ assert "isStep('local')" not in html++ # Cloud/Account/Local segmented switch on the merged step.+ assert "mode-switch" in html+ assert "setProviderMode('cloud')" in html+ assert "setProviderMode('account')" in html+ assert "setProviderMode('local')" in html+ assert "providerMode === 'cloud'" in html+ assert "providerMode === 'account'" in html+ assert "providerMode === 'local'" in html+ assert html.index("setProviderMode('cloud')") < html.index("setProviderMode('account')") < html.index("setProviderMode('local')")+ assert '{ step: "connect", label: "Choose provider" }' in store++ # Cloud pane lists every provider directly and only mentions API keys;+ # accounts live in their own pane.+ assert "Connect with an API key" in html+ assert "cloudProviders()" in html+ assert "Click here if you don't see your provider" not in html+ assert "moreCloudOpen" not in html + store+ assert "API key or account connection" not in html++ # The chat model gate presets the mode before the modal opens (no flash).+ assert "presetMode" in store+ assert "onboardingStore.presetMode = this.choice;" in gate_store+ assert "applyOnboardingChoice" not in gate_store+assert "oauthProviderCards()" in html + storeassert "selectOAuthProvider(provider.provider_id)" in html- assert "path-oauth-account-section" in html- assert "or connect your AI account" in htmlassert "Connect one or more account-backed providers." not in html- assert ".path-oauth-account-section .oauth-account-section-head" in html- assert "font-weight: 760;" in htmlassert "Connect ChatGPT/Codex Account" not in htmlassert "Main model" in htmlassert "Refresh model list" in html@@ -37,10 +68,7 @@ def test_onboarding_contains_guided_cloud_local_flow():assert "submitOAuthManualCallback" in html + storeassert 'const OAUTH_START_API = "/plugins/_oauth/start_login";' in storeassert "/plugins/_oauth/start_device_login" not in store- assert "Click here if you don't see your provider" in htmlassert "provider-description" not in html- assert "!$store.onboarding.isStep('cloud')" in html- assert "!$store.onboarding.isStep('local')" in htmlassert "main-model-field" in htmlassert "wide-inline-field" in htmlassert "utility-panel" in htmldiff --git a/tests/test_welcome_composer_static.py b/tests/test_welcome_composer_static.pyindex 4f17b6d8b..bde0b8628 100644--- a/tests/test_welcome_composer_static.py+++ b/tests/test_welcome_composer_static.py@@ -123,13 +123,16 @@ def test_welcome_composer_can_create_a_chat_before_sending() -> None:assert "const currentContext = globalThis.getContext?.();" in gate_storeassert "bypassModelGate: true" in gate_storeassert 'openPluginConfig("_model_config", "Advanced model configuration")' in gate_store- assert 'openPluginConfig("_oauth", "OAuth Connections")' in gate_store+ assert 'openPluginConfig("_oauth"' not in gate_storeassert "Your message sends automatically once a model is connected." in gate_componentassert "openOnboarding('cloud')" in gate_component+ assert "openOnboarding('account')" in gate_componentassert "openOnboarding('local')" in gate_component- assert "openOauthConfiguration()" in gate_component+ assert gate_component.index("openOnboarding('cloud')") < gate_component.index("openOnboarding('account')") < gate_component.index("openOnboarding('local')")+ assert "openOauthConfiguration" not in gate_component+ assert "Show accounts" not in gate_component+ assert "model-gate-accounts" not in gate_componentassert "Choose models" in gate_component- assert "Connected account:" in gate_componentassert "Advanced model configuration" in gate_componentassert "Advanced settings" not in gate_componentassert "model-gate-fields" not in gate_componentdiff --git a/webui/components/chat/model-gate-store.js b/webui/components/chat/model-gate-store.jsindex 4837d6649..0980f0f54 100644--- a/webui/components/chat/model-gate-store.js+++ b/webui/components/chat/model-gate-store.js@@ -134,31 +134,17 @@ export const store = createStore("modelGate", {},openOnboarding(choice) {- this.choice = choice === "local" ? "local" : "cloud";+ this.choice = ["local", "account"].includes(choice) ? choice : "cloud";this.savePending();+ onboardingStore.presetMode = this.choice;const modalPromise = window.openModal?.(ONBOARDING_MODAL_PATH);- void this.applyOnboardingChoice(this.choice);void Promise.resolve(modalPromise).then(() => this.dispatchPendingIfConfigured());},- async applyOnboardingChoice(choice) {- for (let attempt = 0; attempt < 40; attempt += 1) {- if (onboardingStore.config && !onboardingStore.loading) {- onboardingStore.choosePath(choice);- return;- }- await new Promise((resolve) => setTimeout(resolve, 50));- }- },-async openAdvancedModelConfiguration() {await this.openPluginConfig("_model_config", "Advanced model configuration");},- async openOauthConfiguration() {- await this.openPluginConfig("_oauth", "OAuth Connections");- },-async openPluginConfig(pluginName, title) {try {await pluginSettingsStore.openConfig(pluginName);@@ -239,7 +225,7 @@ export const store = createStore("modelGate", {this.connected = false;this.pending = { message, attachments: [], messageId, context };this.gateMessageId = String(saved?.gateMessageId || `model-gate-${messageId}`);- this.choice = saved?.choice === "local" || saved?.choice === "cloud" ? saved.choice : "";+ this.choice = ["local", "cloud", "account"].includes(saved?.choice) ? saved.choice : "";},clearSavedPending() {diff --git a/webui/components/chat/model-setup-gate.html b/webui/components/chat/model-setup-gate.htmlindex a2d24b2c8..a0e5c7bce 100644--- a/webui/components/chat/model-setup-gate.html+++ b/webui/components/chat/model-setup-gate.html@@ -41,7 +41,17 @@<span class="material-symbols-outlined" aria-hidden="true">cloud</span><span>Cloud provider</span></span>- <span class="model-gate-option-sub">API key or account connection</span>+ <span class="model-gate-option-sub">Connect with an API key</span>+ </button>+ <button type="button"+ class="model-gate-option"+ :class="{ selected: $store.modelGate.choice === 'account' }"+ @click="$store.modelGate.openOnboarding('account')">+ <span class="model-gate-option-title">+ <span class="material-symbols-outlined" aria-hidden="true">account_circle</span>+ <span>AI account</span>+ </span>+ <span class="model-gate-option-sub">Codex, Copilot, Gemini, Grok</span></button><button type="button"class="model-gate-option"@@ -54,13 +64,6 @@<span class="model-gate-option-sub">Runs on your machine</span></button></div>-- <div class="model-gate-accounts">- <span x-text="$store.modelGate.accountConnected ? `Connected account: ${$store.modelGate.accountLabel || 'ready'}` : 'Or connect an account: Codex, Copilot, Gemini, Grok'"></span>- <button type="button" @click="$store.modelGate.openOauthConfiguration()">- <span>Show accounts</span>- </button>- </div></div><p class="model-gate-footnote">@@ -83,6 +86,7 @@.model-gate-body {display: grid;gap: 0.65rem;+ container-type: inline-size;}.model-gate-intro {@@ -97,13 +101,19 @@}.model-gate-fork {- display: grid;- grid-template-columns: repeat(2, minmax(0, 1fr));+ display: flex;gap: 0.6rem;}- .model-gate-fork.is-single {- grid-template-columns: 1fr;+ .model-gate-fork .model-gate-option {+ flex: 1 1 0;+ min-width: 0;+ }++ @container (max-width: 30rem) {+ .model-gate-fork {+ flex-direction: column;+ }}.model-gate-option {@@ -149,7 +159,6 @@line-height: 1.35;}- .model-gate-accounts,.model-gate-footnote {display: flex;align-items: center;@@ -158,7 +167,6 @@flex-wrap: wrap;}- .model-gate-accounts button,.model-gate-footnote button {border: 0;background: transparent;@@ -187,7 +195,7 @@@media (max-width: 480px) {.model-gate-fork {- grid-template-columns: 1fr;+ flex-direction: column;}}</style>