Agent Zero AI framework
Inline OAuth pending controls under provider cards
Alessandro3facd68797aa
diff --git a/plugins/_oauth/AGENTS.md b/plugins/_oauth/AGENTS.mdindex 0719993b1..02f807262 100644--- a/plugins/_oauth/AGENTS.md+++ b/plugins/_oauth/AGENTS.md@@ -25,6 +25,7 @@- Add OAuth model providers in `_oauth/conf/model_providers.yaml`, not `_model_config/provider_metadata.yaml`.- Provider cards and model slot actions must be driven by backend provider status. Do not reintroduce hardcoded frontend provider lists or fallback provider catalogs.- OAuth account surfaces in settings, discovery, and onboarding must use the provider registry/status summary rather than Codex-only frontend state.+- OAuth settings pending-auth controls such as device codes, manual callback input, and provider setup fields must render inline under the relevant provider row, not as a detached section below all providers.- OAuth settings model slots must keep provider choice editable per slot, list only connected OAuth account providers, and persist the selected provider IDs into `chat_model.provider` and `utility_model.provider`.- `helpers/providers/registry.py` is the source of truth for connectable OAuth providers.- OAuth provider config must not expose the dummy `oauth` API key in `conf/model_providers.yaml`; the dummy key is a runtime-only shim supplied by the `get_api_key` extension after the account provider reports connected.diff --git a/plugins/_oauth/webui/config.html b/plugins/_oauth/webui/config.htmlindex e14270d8a..c6153d7be 100644--- a/plugins/_oauth/webui/config.html+++ b/plugins/_oauth/webui/config.html@@ -89,117 +89,91 @@</div></template></div>++ <div class="oauth-provider-row-detail" x-show="$store.oauthConfig.providerDetailOpen(card.provider_id)" @click.stop>+ <div class="oauth-detail-grid">+ <label class="oauth-provider-input" x-show="$store.oauthConfig.providerShowSetupFields(card.provider_id) && card.supports_enterprise_domain">+ <span>Enterprise domain</span>+ <input+ type="text"+ x-model="$store.oauthConfig.providerUiFor(card.provider_id).enterprise_domain"+ name="enterprise_domain"+ placeholder="github.com"+ />+ </label>++ <div class="oauth-provider-fields" x-show="$store.oauthConfig.providerShowSetupFields(card.provider_id) && card.supports_oauth_client_config">+ <label class="oauth-provider-input">+ <span>OAuth client ID</span>+ <input+ type="text"+ x-model="$store.oauthConfig.providerUiFor(card.provider_id).client_id"+ name="oauth_client_id"+ placeholder="Google Cloud OAuth client ID"+ />+ </label>+ <label class="oauth-provider-input">+ <span>OAuth client secret</span>+ <input+ type="password"+ x-model="$store.oauthConfig.providerUiFor(card.provider_id).client_secret"+ name="oauth_client_secret"+ autocomplete="off"+ placeholder="Google Cloud OAuth client secret"+ />+ </label>+ <label class="oauth-provider-input" x-show="card.supports_quota_project">+ <span>Quota project</span>+ <input+ type="text"+ x-model="$store.oauthConfig.providerUiFor(card.provider_id).quota_project_id"+ name="quota_project_id"+ placeholder="Optional Google Cloud project ID"+ />+ </label>+ </div>++ <div class="oauth-device" x-show="$store.oauthConfig.providerDevice(card.provider_id)?.user_code">+ <span>Enter this code</span>+ <strong x-text="$store.oauthConfig.providerDevice(card.provider_id)?.user_code"></strong>+ <button class="text-button" type="button" @click="$store.oauthConfig.cancelConnect(card.provider_id)">+ <span class="material-symbols-outlined">close</span>+ <span>Cancel</span>+ </button>+ </div>++ <div class="oauth-manual-callback" x-show="card.supports_manual_callback && $store.oauthConfig.providerDevice(card.provider_id)?.flow === 'browser_pkce' && !card.connected">+ <input+ type="text"+ x-model="$store.oauthConfig.providerUiFor(card.provider_id).manualCallback"+ placeholder="Paste callback URL, query string, or code"+ />+ <button type="button" class="oauth-connect secondary" @click="$store.oauthConfig.submitManualCallback(card.provider_id)">+ <span class="material-symbols-outlined">check</span>+ <span>Submit</span>+ </button>+ <button type="button" class="oauth-connect secondary" @click="$store.oauthConfig.cancelConnect(card.provider_id)">+ <span class="material-symbols-outlined">close</span>+ <span>Cancel</span>+ </button>+ </div>++ <div class="oauth-auth-attempt" x-show="$store.oauthConfig.providerDevice(card.provider_id) && !$store.oauthConfig.providerDevice(card.provider_id)?.user_code && !card.supports_manual_callback">+ <span>Sign-in started</span>+ <button class="text-button" type="button" @click="$store.oauthConfig.cancelConnect(card.provider_id)">+ <span class="material-symbols-outlined">close</span>+ <span>Cancel</span>+ </button>+ </div>++ <p class="oauth-provider-note" x-show="$store.oauthConfig.providerShowNote(card.provider_id)" x-text="card.warning || card.note"></p>+ </div>+ </div></article></template></div></section>- <template x-if="$store.oauthConfig.selectedProvider() && !$store.oauthConfig.selectedProvider().connected">- <section class="oauth-provider-detail">- <div class="oauth-provider-detail-head">- <div class="oauth-provider-head">- <div class="oauth-mark" :class="{ connected: $store.oauthConfig.selectedProvider().connected }">- <span class="material-symbols-outlined" x-text="$store.oauthConfig.selectedProvider().connected ? 'check' : $store.oauthConfig.selectedProvider().mark"></span>- </div>- <div class="oauth-copy">- <h2 x-text="$store.oauthConfig.selectedProvider().display_name"></h2>- <p x-text="$store.oauthConfig.providerStatusLabel($store.oauthConfig.selectedProviderId)"></p>- </div>- </div>- <div class="oauth-primary">- <button- class="oauth-connect"- type="button"- @click="$store.oauthConfig.connectProvider($store.oauthConfig.selectedProviderId)"- :disabled="$store.oauthConfig.providerPrimaryDisabled($store.oauthConfig.selectedProviderId) || !$store.oauthConfig.providerSetupReady($store.oauthConfig.selectedProviderId)"- x-show="!$store.oauthConfig.selectedProvider().connected"- >- <span class="material-symbols-outlined" x-text="$store.oauthConfig.connectingProvider === $store.oauthConfig.selectedProviderId ? 'progress_activity' : 'login'"></span>- <span x-text="$store.oauthConfig.providerPrimaryLabel($store.oauthConfig.selectedProviderId)"></span>- </button>- </div>- </div>-- <div class="oauth-detail-grid">- <label class="oauth-provider-input" x-show="$store.oauthConfig.selectedProvider().supports_enterprise_domain && !$store.oauthConfig.selectedProvider().connected">- <span>Enterprise domain</span>- <input- type="text"- x-model="$store.oauthConfig.providerUiFor($store.oauthConfig.selectedProviderId).enterprise_domain"- name="enterprise_domain"- placeholder="github.com"- />- </label>-- <div class="oauth-provider-fields" x-show="$store.oauthConfig.selectedProvider().supports_oauth_client_config && !$store.oauthConfig.selectedProvider().connected">- <label class="oauth-provider-input">- <span>OAuth client ID</span>- <input- type="text"- x-model="$store.oauthConfig.providerUiFor($store.oauthConfig.selectedProviderId).client_id"- name="oauth_client_id"- placeholder="Google Cloud OAuth client ID"- />- </label>- <label class="oauth-provider-input">- <span>OAuth client secret</span>- <input- type="password"- x-model="$store.oauthConfig.providerUiFor($store.oauthConfig.selectedProviderId).client_secret"- name="oauth_client_secret"- autocomplete="off"- placeholder="Google Cloud OAuth client secret"- />- </label>- <label class="oauth-provider-input" x-show="$store.oauthConfig.selectedProvider().supports_quota_project">- <span>Quota project</span>- <input- type="text"- x-model="$store.oauthConfig.providerUiFor($store.oauthConfig.selectedProviderId).quota_project_id"- name="quota_project_id"- placeholder="Optional Google Cloud project ID"- />- </label>- </div>-- <div class="oauth-device" x-show="$store.oauthConfig.devices[$store.oauthConfig.selectedProviderId]?.user_code">- <span>Enter this code</span>- <strong x-text="$store.oauthConfig.devices[$store.oauthConfig.selectedProviderId]?.user_code"></strong>- <button class="text-button" type="button" @click="$store.oauthConfig.cancelConnect($store.oauthConfig.selectedProviderId)">- <span class="material-symbols-outlined">close</span>- <span>Cancel</span>- </button>- </div>-- <div class="oauth-manual-callback" x-show="$store.oauthConfig.selectedProvider().supports_manual_callback && $store.oauthConfig.devices[$store.oauthConfig.selectedProviderId]?.flow === 'browser_pkce' && !$store.oauthConfig.selectedProvider().connected">- <input- type="text"- x-model="$store.oauthConfig.providerUiFor($store.oauthConfig.selectedProviderId).manualCallback"- placeholder="Paste callback URL, query string, or code"- />- <button type="button" class="oauth-connect secondary" @click="$store.oauthConfig.submitManualCallback($store.oauthConfig.selectedProviderId)">- <span class="material-symbols-outlined">check</span>- <span>Submit</span>- </button>- <button type="button" class="oauth-connect secondary" @click="$store.oauthConfig.cancelConnect($store.oauthConfig.selectedProviderId)">- <span class="material-symbols-outlined">close</span>- <span>Cancel</span>- </button>- </div>-- <div class="oauth-auth-attempt" x-show="$store.oauthConfig.devices[$store.oauthConfig.selectedProviderId] && !$store.oauthConfig.devices[$store.oauthConfig.selectedProviderId]?.user_code && !$store.oauthConfig.selectedProvider().supports_manual_callback">- <span>Sign-in started</span>- <button class="text-button" type="button" @click="$store.oauthConfig.cancelConnect($store.oauthConfig.selectedProviderId)">- <span class="material-symbols-outlined">close</span>- <span>Cancel</span>- </button>- </div>-- <p class="oauth-provider-note" x-show="$store.oauthConfig.selectedProvider().warning || $store.oauthConfig.selectedProvider().note" x-text="$store.oauthConfig.selectedProvider().warning || $store.oauthConfig.selectedProvider().note"></p>- </div>- </section>- </template>-<section class="oauth-model-config"><div class="oauth-section-head"><div>@@ -375,8 +349,7 @@color: var(--color-text);}- .oauth-provider-list,- .oauth-provider-detail {+ .oauth-provider-list {display: grid;gap: 12px;padding: 0;@@ -477,11 +450,11 @@padding: 4px 0 0;}- .oauth-provider-detail-head {- display: flex;- align-items: center;- justify-content: space-between;- gap: 12px;+ .oauth-provider-row-detail {+ display: grid;+ grid-column: 1 / -1;+ min-width: 0;+ padding-top: 2px;}.oauth-detail-grid {@@ -1154,6 +1127,7 @@@media (max-width: 720px) {.oauth-device,+ .oauth-provider-row-detail,.oauth-provider-usage,.oauth-status-row,.oauth-model-grid,@@ -1162,15 +1136,10 @@.oauth-details div,.oauth-manual-callback,.oauth-auth-attempt,- .oauth-provider-row,- .oauth-provider-detail-head {+ .oauth-provider-row {grid-template-columns: 1fr;}- .oauth-provider-detail-head {- display: grid;- }-.oauth-section-head {flex-direction: column;}diff --git a/plugins/_oauth/webui/oauth-config-store.js b/plugins/_oauth/webui/oauth-config-store.jsindex 5e2b45695..9b5279d54 100644--- a/plugins/_oauth/webui/oauth-config-store.js+++ b/plugins/_oauth/webui/oauth-config-store.js@@ -299,6 +299,34 @@ export const store = createStore("oauthConfig", {return status.account_label || status.email || "Connected";},+ providerDevice(providerId) {+ return this.devices[String(providerId || "")] || null;+ },++ providerShowSetupFields(providerId) {+ if (this.providerConnected(providerId)) return false;+ if (this.providerDevice(providerId)) return false;+ return this.selectedProviderId === providerId;+ },++ providerShowNote(providerId) {+ if (this.providerConnected(providerId)) return false;+ const status = this.providerStatus(providerId);+ return this.selectedProviderId === providerId && Boolean(status.warning || status.note);+ },++ providerDetailOpen(providerId) {+ if (!this.isOauthProvider(providerId) || this.providerConnected(providerId)) return false;+ if (this.providerDevice(providerId)) return true;+ const status = this.providerStatus(providerId);+ return this.selectedProviderId === providerId && Boolean(+ status.supports_enterprise_domain+ || status.supports_oauth_client_config+ || status.warning+ || status.note+ );+ },+providerReadinessLabel(providerId) {const status = this.providerStatus(providerId);if (this.loadingStatus) return "Checking";diff --git a/tests/test_oauth_static.py b/tests/test_oauth_static.pyindex 0cdc2d394..fe9eb0b7d 100644--- a/tests/test_oauth_static.py+++ b/tests/test_oauth_static.py@@ -52,9 +52,14 @@ def test_oauth_settings_exposes_provider_specific_controls_and_generic_copy():assert "supports_quota_project" in config_html + store_jsassert "OAuth client ID" in config_htmlassert "quota_project_id" in config_html + store_js- assert "submitManualCallback($store.oauthConfig.selectedProviderId)" in config_html- assert "cancelConnect($store.oauthConfig.selectedProviderId)" in config_html+ assert "providerDetailOpen(card.provider_id)" in config_html + store_js+ assert "providerDevice(card.provider_id)?.user_code" in config_html+ assert "submitManualCallback(card.provider_id)" in config_html+ assert "cancelConnect(card.provider_id)" in config_html+ assert "selectedProvider()" not in config_htmlassert "oauth-auth-attempt" in config_html+ assert "oauth-provider-row-detail" in config_html+ assert "oauth-provider-detail" not in config_htmlassert "oauth-detail-metrics" not in config_htmlassert "Codex/ChatGPT Account" not in config_html + store_jsassert "activeModelsDescription()" in config_html + store_js@@ -88,7 +93,8 @@ def test_oauth_available_models_list_sits_above_advanced_without_borders():assert config_html.index("<h3>Providers</h3>") < config_html.index("<summary>Advanced</summary>")assert config_html.index("Available models") < config_html.index("<summary>Advanced</summary>")assert ".oauth-models-panel {\n display: grid;\n gap: 10px;\n padding: 0;\n border: 0;\n }" in config_html- assert ".oauth-provider-list,\n .oauth-provider-detail {\n display: grid;\n gap: 12px;\n padding: 0;\n border: 0;" in config_html+ assert ".oauth-provider-list {\n display: grid;\n gap: 12px;\n padding: 0;\n border: 0;" in config_html+ assert ".oauth-provider-row-detail {\n display: grid;\n grid-column: 1 / -1;" in config_htmlassert ".oauth-advanced {\n border: 0;\n border-radius: 0;\n padding: 0;\n }" in config_htmlmodel_chip_rule = config_html.split(".oauth-models span {", 1)[1].split("}", 1)[0]assert "border:" not in model_chip_rule