From 2910ea45de5672dc07e716864419dea7c1914b26 Mon Sep 17 00:00:00 2001 From: morgmart <98432065+morgmart@users.noreply.github.com> Date: Wed, 15 Jul 2026 21:08:47 -0700 Subject: [PATCH] Redesign agent AI configuration and defaults (#1935) Signed-off-by: npub1d6t84ajeg9skp2609l2k6axgcme8x7g7u7luj352r03hcwreg7lqnxcsex <6e967af659416160ab4f2fd56d74c8c6f273791ee7bfc9468a1be37c387947be@sprout-oss.stage.blox.sqprod.co> Signed-off-by: npub1s654z6utm59mkg4tjdqw69tlen05y2hrrwajlck4n2ar0jyx7hfsmp60kf <86a9516b8bdd0bbb22ab9340ed157fccdf422ae31bbb2fe2d59aba37c886f5d3@sprout-oss.stage.blox.sqprod.co> Co-authored-by: npub1d6t84ajeg9skp2609l2k6axgcme8x7g7u7luj352r03hcwreg7lqnxcsex <6e967af659416160ab4f2fd56d74c8c6f273791ee7bfc9468a1be37c387947be@sprout-oss.stage.blox.sqprod.co> Co-authored-by: npub1s654z6utm59mkg4tjdqw69tlen05y2hrrwajlck4n2ar0jyx7hfsmp60kf <86a9516b8bdd0bbb22ab9340ed157fccdf422ae31bbb2fe2d59aba37c886f5d3@sprout-oss.stage.blox.sqprod.co> --- .../agents/ui/AgentAiConfigurationMode.tsx | 34 +++ .../features/agents/ui/AgentAiDefaults.tsx | 79 ++---- .../agents/ui/AgentAiDefaultsDialog.tsx | 157 ++++++++++++ .../agents/ui/AgentDefinitionDialog.tsx | 139 +++++++---- .../features/agents/ui/AgentIdentityCard.tsx | 2 +- .../agents/ui/AgentInstanceEditDialog.tsx | 19 +- desktop/src/features/agents/ui/AgentsView.tsx | 55 ++++- .../agents/ui/GlobalAgentConfigEditor.tsx | 230 ++++++++++++++++++ .../agents/ui/GlobalAgentConfigFields.tsx | 27 +- .../agents/ui/UnifiedAgentsSection.tsx | 144 +++-------- .../ui/agentAiConfigurationPolicy.test.mjs | 73 ++++++ .../agents/ui/agentAiConfigurationPolicy.ts | 41 ++++ .../ui/agentDefinitionSubmitPayload.test.mjs | 8 +- .../src/features/agents/ui/bakedEnvHelpers.ts | 63 ++++- .../ui/createAgentLocalModeGate.test.mjs | 52 ++++ .../agents/ui/personaProviderModelFields.tsx | 29 ++- .../agents/ui/useAgentDialogDefaults.ts | 15 +- .../ui/GlobalAgentConfigSettingsCard.tsx | 188 +------------- .../features/settings/ui/SettingsPanels.tsx | 2 +- .../src/features/settings/ui/SettingsView.tsx | 2 +- .../e2e/agent-lifecycle-feedback.spec.ts | 51 +++- .../e2e/agent-provider-dropdowns.spec.ts | 2 + .../e2e/agent-readiness-screenshots.spec.ts | 71 +++--- desktop/tests/e2e/agents.spec.ts | 4 - desktop/tests/e2e/edit-agent.spec.ts | 14 +- .../global-agent-config-screenshots.spec.ts | 36 +-- desktop/tests/e2e/persona-env-vars.spec.ts | 18 +- ...persona-model-combobox-screenshots.spec.ts | 1 + desktop/tests/e2e/smoke.spec.ts | 19 +- .../welcome-agent-modal-screenshots.spec.ts | 1 + 30 files changed, 1041 insertions(+), 535 deletions(-) create mode 100644 desktop/src/features/agents/ui/AgentAiConfigurationMode.tsx create mode 100644 desktop/src/features/agents/ui/AgentAiDefaultsDialog.tsx create mode 100644 desktop/src/features/agents/ui/GlobalAgentConfigEditor.tsx create mode 100644 desktop/src/features/agents/ui/agentAiConfigurationPolicy.test.mjs create mode 100644 desktop/src/features/agents/ui/agentAiConfigurationPolicy.ts diff --git a/desktop/src/features/agents/ui/AgentAiConfigurationMode.tsx b/desktop/src/features/agents/ui/AgentAiConfigurationMode.tsx new file mode 100644 index 000000000..fc29078c5 --- /dev/null +++ b/desktop/src/features/agents/ui/AgentAiConfigurationMode.tsx @@ -0,0 +1,34 @@ +import { Tabs, TabsList, TabsTrigger } from "@/shared/ui/tabs"; +import type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy"; + +export type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy"; + +export function AgentAiConfigurationModeField({ + mode, + onModeChange, +}: { + mode: AgentAiConfigurationMode; + onModeChange: (mode: AgentAiConfigurationMode) => void; +}) { + return ( +
+

AI configuration

+ + onModeChange(value as AgentAiConfigurationMode) + } + value={mode} + > + + Use AI defaults + Customize for this agent + + + {mode === "custom" ? ( +

+ Provider and model changes apply only to this agent. +

+ ) : null} +
+ ); +} diff --git a/desktop/src/features/agents/ui/AgentAiDefaults.tsx b/desktop/src/features/agents/ui/AgentAiDefaults.tsx index 694841d5e..aec10c086 100644 --- a/desktop/src/features/agents/ui/AgentAiDefaults.tsx +++ b/desktop/src/features/agents/ui/AgentAiDefaults.tsx @@ -1,4 +1,4 @@ -import { useAppNavigation } from "@/app/navigation/useAppNavigation"; +import type * as React from "react"; import type { InheritedDefault } from "./bakedEnvHelpers"; import { getPersonaProviderOptions } from "./personaDialogPickers"; import { Button } from "@/shared/ui/button"; @@ -26,78 +26,45 @@ export function formatAiDefaultsSummary({ } export function AgentAiDefaultsNotice({ - confirmNavigation = false, + onEditDefaults, + triggerRef, explicitModel, explicitProvider, inheritedModel, inheritedProvider, }: { - confirmNavigation?: boolean; + onEditDefaults: () => void; + triggerRef?: React.Ref; explicitModel: string; explicitProvider: string; inheritedModel: InheritedDefault; inheritedProvider: InheritedDefault; }) { - const { goSettings } = useAppNavigation(); - const inheritsProvider = explicitProvider.trim().length === 0; - const inheritsModel = explicitModel.trim().length === 0; - - const usesCustomConfig = !inheritsProvider && !inheritsModel; - const requiredProviderMissing = inheritsProvider && !inheritedProvider.value; - - const inheritedParts = [ - inheritsProvider - ? inheritedProvider.value - ? `Provider ${providerLabel(inheritedProvider.value)}` - : "Provider not configured" - : null, - inheritsModel - ? inheritedModel.value - ? `Model ${inheritedModel.value}` - : "Model not configured" - : null, - ].filter((value): value is string => Boolean(value)); + const provider = explicitProvider.trim() || inheritedProvider.value; + const model = explicitModel.trim() || inheritedModel.value; return ( -
-
-

- {usesCustomConfig - ? "Custom AI configuration" - : requiredProviderMissing - ? "AI defaults aren’t configured" - : inheritsProvider && inheritsModel - ? "Uses AI defaults" - : "Partially uses AI defaults"} -

-

- {usesCustomConfig - ? "This agent won’t follow provider or model default changes." - : requiredProviderMissing - ? "Choose a provider in AI defaults to use this agent." - : `${inheritedParts.join(" · ")}. Inherited fields follow future changes.`} -

-
+
+
+
Provider
+
+ {provider ? providerLabel(provider) : "Not configured"} +
+
Model
+
+ {model || "Not configured"} +
+
); diff --git a/desktop/src/features/agents/ui/AgentAiDefaultsDialog.tsx b/desktop/src/features/agents/ui/AgentAiDefaultsDialog.tsx new file mode 100644 index 000000000..bc9f94738 --- /dev/null +++ b/desktop/src/features/agents/ui/AgentAiDefaultsDialog.tsx @@ -0,0 +1,157 @@ +import * as React from "react"; + +import { + GlobalAgentConfigEditor, + type GlobalAgentConfigSaveResult, +} from "./GlobalAgentConfigEditor"; +import { + AlertDialog, + AlertDialogAction, + AlertDialogCancel, + AlertDialogContent, + AlertDialogDescription, + AlertDialogFooter, + AlertDialogHeader, + AlertDialogTitle, +} from "@/shared/ui/alert-dialog"; +import { Button } from "@/shared/ui/button"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, +} from "@/shared/ui/dialog"; + +export function AgentAiDefaultsDialog({ + open, + onOpenChange, + returnFocusRef, +}: { + open: boolean; + onOpenChange: (open: boolean) => void; + returnFocusRef: React.RefObject; +}) { + const [dirty, setDirty] = React.useState(false); + const [saving, setSaving] = React.useState(false); + const [confirmDiscard, setConfirmDiscard] = React.useState(false); + const [restartFailures, setRestartFailures] = React.useState(0); + const secondaryActionRef = React.useRef(null); + const restoreDefaultsFocusRef = React.useRef(false); + + const closeAndRestoreFocus = React.useCallback(() => { + onOpenChange(false); + requestAnimationFrame(() => returnFocusRef.current?.focus()); + }, [onOpenChange, returnFocusRef]); + + const requestClose = React.useCallback(() => { + if (saving) return; + if (dirty) { + setConfirmDiscard(true); + return; + } + closeAndRestoreFocus(); + }, [closeAndRestoreFocus, dirty, saving]); + + function handleSaveSuccess(result: GlobalAgentConfigSaveResult) { + if (result.failed_restart_count > 0) { + setRestartFailures(result.failed_restart_count); + return; + } + closeAndRestoreFocus(); + } + + React.useEffect(() => { + if (open) { + setDirty(false); + setConfirmDiscard(false); + setRestartFailures(0); + } + }, [open]); + + return ( + <> + { + if (!nextOpen) requestClose(); + }} + > + { + event.preventDefault(); + returnFocusRef.current?.focus(); + }} + > + + AI defaults + + These settings are inherited by agents using AI defaults. Saving + may restart affected running agents. + + + 0 ? closeAndRestoreFocus : requestClose + } + size="sm" + type="button" + variant="outline" + > + {restartFailures > 0 ? "Done" : "Cancel"} + + } + /> + + + + + { + if (!restoreDefaultsFocusRef.current) return; + event.preventDefault(); + restoreDefaultsFocusRef.current = false; + requestAnimationFrame(() => secondaryActionRef.current?.focus()); + }} + > + + Discard changes to AI defaults? + + Unsaved changes made to AI defaults will be lost. + + + + { + restoreDefaultsFocusRef.current = true; + }} + > + Keep editing + + + + + + + + + ); +} diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx index 2e0582e07..ab4270b04 100644 --- a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx +++ b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx @@ -38,13 +38,11 @@ import { CUSTOM_PROVIDER_DROPDOWN_VALUE, computeLocalModeGate, formatRuntimeOptionLabel, - getDefaultLlmProviderLabel, getDefaultPersonaRuntime, getPersonaModelOptions, getPersonaProviderOptions, getRuntimePersonaModelOptions, NO_RUNTIME_DROPDOWN_VALUE, - providerRequiresExplicitModel, runtimeSupportsLlmProviderSelection, type PersonaDropdownOption, PERSONA_FIELD_CONTROL_CLASS, @@ -69,12 +67,18 @@ import { usePersonaModelDiscovery, } from "./usePersonaModelDiscovery"; import { useBakedBuildEnvKeysQuery, useRuntimeFileConfigQuery } from "../hooks"; -import { - getBakedModelInheritLabel, - getBakedProviderInheritLabel, -} from "./bakedEnvHelpers"; import { useAgentDialogDefaults } from "./useAgentDialogDefaults"; import { AgentAiDefaultsNotice } from "./AgentAiDefaults"; +import { AgentAiDefaultsDialog } from "./AgentAiDefaultsDialog"; +import { + AgentAiConfigurationModeField, + type AgentAiConfigurationMode, +} from "./AgentAiConfigurationMode"; +import { + agentAiConfigurationModeSatisfied, + agentAiConfigurationPairForMode, + initialAgentAiConfigurationMode, +} from "./agentAiConfigurationPolicy"; import { useProviderApiKeyFieldState } from "./providerApiKeyFieldState"; import { buildRuntimeModelProviderPayload } from "./agentDefinitionSubmitPayload"; @@ -119,12 +123,16 @@ export function AgentDefinitionDialog({ createSubmitBlocked = false, }: AgentDefinitionDialogProps) { const [displayName, setDisplayName] = React.useState(""); + const [aiDefaultsOpen, setAiDefaultsOpen] = React.useState(false); + const aiDefaultsTriggerRef = React.useRef(null); const [avatarUrl, setAvatarUrl] = React.useState(""); const [systemPrompt, setSystemPrompt] = React.useState(""); const [runtime, setRuntime] = React.useState(""); const [model, setModel] = React.useState(""); const [isCustomModelEditing, setIsCustomModelEditing] = React.useState(false); const [provider, setProvider] = React.useState(""); + const [aiConfigurationMode, setAiConfigurationMode] = + React.useState("defaults"); const [isCustomProviderEditing, setIsCustomProviderEditing] = React.useState(false); const [namePoolText, setNamePoolText] = React.useState(""); @@ -172,6 +180,12 @@ export function AgentDefinitionDialog({ setModel(initialValues.model ?? ""); setIsCustomModelEditing(false); setProvider(initialValues.provider ?? ""); + setAiConfigurationMode( + initialAgentAiConfigurationMode({ + provider: initialValues.provider ?? "", + model: initialValues.model ?? "", + }), + ); setIsCustomProviderEditing(false); const nextNamePoolText = "namePool" in initialValues @@ -226,6 +240,7 @@ export function AgentDefinitionDialog({ setModel(""); setIsCustomModelEditing(false); setProvider(""); + setAiConfigurationMode("defaults"); setIsCustomProviderEditing(false); setNamePoolText(""); setEnvVars({}); @@ -251,8 +266,8 @@ export function AgentDefinitionDialog({ provider: providerForSubmit, } = buildRuntimeModelProviderPayload({ runtime, - model, - provider, + model: aiConfigurationMode === "defaults" ? "" : model, + provider: aiConfigurationMode === "defaults" ? "" : provider, isEditMode: "id" in initialValues, isAutoSeeded: isRuntimeAutoSeededRef.current, initialPreviousRuntime: initialValues.runtime?.trim() ?? "", @@ -317,7 +332,6 @@ export function AgentDefinitionDialog({ const { data: runtimeFileConfig, isLoading: fileConfigLoading } = useRuntimeFileConfigQuery(runtime, { enabled: open }); const { - advancedInheritedSummary, globalConfig, inheritedDefaults: { provider: inheritedProviderDefault, @@ -325,6 +339,21 @@ export function AgentDefinitionDialog({ }, inheritedEnvVars: inheritedEnvVarsForAdvanced, } = useAgentDialogDefaults({ open }); + function handleAiConfigurationModeChange(nextMode: AgentAiConfigurationMode) { + setAiConfigurationMode(nextMode); + setIsCustomProviderEditing(false); + setIsCustomModelEditing(false); + const nextPair = agentAiConfigurationPairForMode({ + current: { provider, model }, + inherited: { + provider: inheritedProviderDefault.value, + model: inheritedModelDefault.value, + }, + mode: nextMode, + }); + setProvider(nextPair.provider); + setModel(nextPair.model); + } const { data: bakedEnvKeys, isLoading: bakedLoading } = useBakedBuildEnvKeysQuery({ enabled: open }); const credentialSettled = !fileConfigLoading && !bakedLoading; @@ -391,13 +420,18 @@ export function AgentDefinitionDialog({ // missingNormalizedFields check would flip the asterisk off once a value is // selected, which is incoherent (required means required, not "required until // satisfied"). runtimeSupportsLlmProviderSelection is the authoritative gate. - const providerIsRequired = runtimeSupportsLlmProviderSelection(runtime); + const providerIsRequired = + aiConfigurationMode === "custom" && + runtimeSupportsLlmProviderSelection(runtime); const modelFieldVisible = runtime.trim().length > 0 || blankRuntimeModelProviderEditable; - // Static asterisk on the model label: uses effectiveProvider so a globally- - // set provider correctly marks the model field required. - const isExplicitModelRequired = - modelFieldVisible && providerRequiresExplicitModel(effectiveProvider); + // Customize pins a complete provider/model pair. Shared compute's concrete + // automatic-routing value is the only valid non-model-id choice. + const isExplicitModelRequired = aiConfigurationMode === "custom"; + const customAiPairSatisfied = agentAiConfigurationModeSatisfied( + aiConfigurationMode, + { provider, model }, + ); const isCreateMode = Boolean(initialValues && !("id" in initialValues)); const selectedRuntimeIsAvailable = runtime.trim().length === 0 || @@ -415,6 +449,7 @@ export function AgentDefinitionDialog({ // D1: localModeSatisfied covers both missingNormalizedFields AND // missingEnvKeys — credential env keys now block submit, not just display. localModeSatisfied && + customAiPairSatisfied && !isAvatarUploadPending; // Merge global env as the base layer so credential keys satisfied via global @@ -476,13 +511,6 @@ export function AgentDefinitionDialog({ : "", hideProviderIds, ); - const defaultLlmProviderLabel = - inheritedProviderDefault.source === "build" - ? getBakedProviderInheritLabel( - inheritedProviderDefault.value, - providerOptions, - ) - : getDefaultLlmProviderLabel(runtime, inheritedProviderDefault.value); const providerSelectValue = isCustomProviderEditing ? CUSTOM_PROVIDER_DROPDOWN_VALUE : trimmedProvider || AUTO_PROVIDER_DROPDOWN_VALUE; @@ -525,25 +553,30 @@ export function AgentDefinitionDialog({ }); } const providerDropdownOptions: PersonaDropdownOption[] = [ - ...providerOptions.map((option) => ({ - label: option.id === "" ? defaultLlmProviderLabel : option.label, - value: option.id || AUTO_PROVIDER_DROPDOWN_VALUE, - })), + ...providerOptions + .filter((option) => option.id.trim().length > 0) + .map((option) => ({ + label: option.label, + value: option.id, + })), { label: "Custom provider...", value: CUSTOM_PROVIDER_DROPDOWN_VALUE }, ]; - const inheritedModelLabel = - inheritedModelDefault.source === "build" - ? getBakedModelInheritLabel(inheritedModelDefault.value) - : undefined; const modelDropdownOptions: PersonaDropdownOption[] = buildModelDropdownOptions({ allowCustom: !isRelayMesh, - globalModel: isRelayMesh ? undefined : inheritedModelDefault.value, - globalModelLabel: isRelayMesh ? undefined : inheritedModelLabel, + globalModel: undefined, loading: modelDiscoveryLoading && discoveredModelOptions === null, loadingValue: MODEL_DISCOVERY_LOADING_VALUE, options: modelOptions, - }); + }) + .filter( + (option) => isRelayMesh || option.value !== AUTO_MODEL_DROPDOWN_VALUE, + ) + .map((option) => + isRelayMesh && option.value === AUTO_MODEL_DROPDOWN_VALUE + ? { ...option, label: "Automatic" } + : option, + ); const previewLabel = displayName.trim() || "Agent name"; const previewAvatarUrl = avatarUrl.trim() || null; const runtimeWarning = @@ -778,6 +811,13 @@ export function AgentDefinitionDialog({
{llmProviderFieldVisible ? ( + + ) : null} + + {llmProviderFieldVisible && aiConfigurationMode === "custom" ? (
{showCustomProviderInput ? ( @@ -823,7 +863,9 @@ export function AgentDefinitionDialog({
) : null} - {llmProviderFieldVisible && topLevelSecretEnvVar ? ( + {llmProviderFieldVisible && + aiConfigurationMode === "custom" && + topLevelSecretEnvVar ? ( - {modelFieldVisible ? ( + {modelFieldVisible && aiConfigurationMode === "custom" ? ( - setAiDefaultsOpen(true)} + triggerRef={aiDefaultsTriggerRef} + explicitModel="" + explicitProvider="" + inheritedModel={inheritedModelDefault} + inheritedProvider={inheritedProviderDefault} + /> + ) : null} + + {isCreateMode ? createRunSection : null} @@ -890,12 +941,6 @@ export function AgentDefinitionDialog({ )} /> - {!showAdvancedFields && advancedInheritedSummary ? ( -

- {advancedInheritedSummary} -

- ) : null} - {showAdvancedFields ? ( {modelLabel ? ( - + {modelLabel} ) : null} diff --git a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx index 7100c59b9..7d4aa690b 100644 --- a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx +++ b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx @@ -79,6 +79,7 @@ import { import { getProviderApiKeyEnvVar } from "./personaDialogPickers"; import { useAgentDialogDefaults } from "./useAgentDialogDefaults"; import { AgentAiDefaultsNotice } from "./AgentAiDefaults"; +import { AgentAiDefaultsDialog } from "./AgentAiDefaultsDialog"; import { useProviderApiKeyFieldState } from "./providerApiKeyFieldState"; const ADVANCED_FIELDS_MOTION_TRANSITION = { @@ -111,6 +112,8 @@ export function AgentInstanceEditDialog({ const runtimes = runtimesQuery.data ?? []; const [name, setName] = React.useState(agent.name); + const [aiDefaultsOpen, setAiDefaultsOpen] = React.useState(false); + const aiDefaultsTriggerRef = React.useRef(null); const [relayUrl, setRelayUrl] = React.useState(agent.relayUrl); const [acpCommand, setAcpCommand] = React.useState(agent.acpCommand); const [agentCommand, setAgentCommand] = React.useState(agent.agentCommand); @@ -357,7 +360,6 @@ export function AgentInstanceEditDialog({ ); const { - advancedInheritedSummary, globalConfig, inheritedDefaults: { provider: inheritedProviderDefault, @@ -1089,13 +1091,20 @@ export function AgentInstanceEditDialog({ setAiDefaultsOpen(true)} + triggerRef={aiDefaultsTriggerRef} explicitModel={inheritedSubmission.model ?? ""} explicitProvider={inheritedSubmission.provider ?? ""} inheritedModel={inheritedModelDefault} inheritedProvider={inheritedProviderDefault} /> + + {/* Advanced settings */}
- {!showAdvancedFields && advancedInheritedSummary ? ( -

- {advancedInheritedSummary} -

- ) : null} - {showAdvancedFields ? ( (null); + const aiDefaultsTriggerRef = React.useRef(null); + const [isAiDefaultsOpen, setIsAiDefaultsOpen] = React.useState(false); // Exclusivity: create never sets `personaDialogState` (edit/dup/import do), // so the create-mode and definition-edit AgentDialog mounts never coexist. const [isCreateDialogOpen, setIsCreateDialogOpen] = React.useState(false); @@ -66,6 +68,10 @@ export function AgentsView() { teamActions.createTeamMutation.isPending || teamActions.updateTeamMutation.isPending || teamActions.deleteTeamMutation.isPending; + const runningAgentCount = agents.managedAgents.filter((agent) => + isManagedAgentActive(agent), + ).length; + const configuredGlobalModel = globalConfig.model?.trim(); // biome-ignore lint/correctness/useExhaustiveDependencies: mount-only; personas.handleImportSnapshotFile and teamActions.handleImportTeamSnapshotFile are stable React.useEffect(() => { @@ -100,15 +106,39 @@ export function AgentsView() {
+ + {runningAgentCount > 0 ? ( + + ) : null} +
+ } description="Set up and manage your agents." title="Agents" />
{ - void goSettings("agents"); - }} + defaultModel={inheritedDefaults.model.value} actionErrorMessage={agents.actionErrorMessage} actionNoticeMessage={agents.actionNoticeMessage} agents={agents.managedAgents} @@ -121,9 +151,6 @@ export function AgentsView() { isAgentsLoading={agents.managedAgentsQuery.isLoading} startingAgentPubkey={agents.startingAgentPubkey} startingPersonaIds={agents.startingPersonaIds} - onBulkStopRunning={() => { - void agents.handleBulkStopRunning(); - }} onOpenAgentProfile={(pubkey, options) => { openProfilePanel?.(pubkey, options); }} @@ -211,6 +238,12 @@ export function AgentsView() {
+ + {isCreateDialogOpen ? ( +>; + +type GlobalAgentConfigEditorProps = { + onDirtyChange?: (dirty: boolean) => void; + onSaveSuccess?: (result: GlobalAgentConfigSaveResult) => void; + onSavingChange?: (saving: boolean) => void; + secondaryAction?: React.ReactNode; +}; + +export function GlobalAgentConfigEditor({ + onDirtyChange, + onSaveSuccess, + onSavingChange, + secondaryAction, +}: GlobalAgentConfigEditorProps) { + const [config, setConfig] = + React.useState(EMPTY_GLOBAL_CONFIG); + const configRef = React.useRef(config); + const [dirty, setDirty] = React.useState(false); + const [saveState, setSaveState] = React.useState("idle"); + const [saveError, setSaveError] = React.useState(null); + const [restartedCount, setRestartedCount] = React.useState(0); + const [failedRestartCount, setFailedRestartCount] = React.useState(0); + const [isLoading, setIsLoading] = React.useState(true); + const [loadError, setLoadError] = React.useState(false); + const [configIsValid, setConfigIsValid] = React.useState(true); + const [isCustomProvider, setIsCustomProvider] = React.useState(false); + const [isCustomModelEditing, setIsCustomModelEditing] = React.useState(false); + const savedTimerRef = React.useRef | null>( + null, + ); + const queryClient = useQueryClient(); + const [bakedEnv, setBakedEnv] = React.useState([]); + + React.useEffect(() => { + onDirtyChange?.(dirty); + }, [dirty, onDirtyChange]); + + // Load on mount — seed the shared TanStack Query cache so any dialog that + // opens after this point reads the populated value on first render (no async + // race). The query is also backed by its own queryFn for first-consumer + // scenarios, but this eager seed eliminates the "settings card loaded, user + // opens Create Agent before the lazy query fires" window. + React.useEffect(() => { + let cancelled = false; + getGlobalAgentConfig() + .then((loaded) => { + if (!cancelled) { + configRef.current = loaded; + setConfig(loaded); + setIsLoading(false); + queryClient.setQueryData(globalAgentConfigQueryKey, loaded); + } + }) + .catch(() => { + if (!cancelled) { + setIsLoading(false); + setLoadError(true); + } + }); + return () => { + cancelled = true; + }; + }, [queryClient]); + + // Load baked build env once on mount. OSS builds return [] — the section + // stays hidden. Failures are silently swallowed (non-critical display data). + React.useEffect(() => { + getBakedBuildEnv() + .then(setBakedEnv) + .catch(() => { + // non-critical — leave bakedEnv empty + }); + }, []); + + // Resolve the buzz-agent runtime catalog entry for model discovery. + const runtimesQuery = useAcpRuntimesQuery(); + const buzzAgentRuntime = React.useMemo( + () => (runtimesQuery.data ?? []).find((r) => r.id === "buzz-agent"), + [runtimesQuery.data], + ); + + function handleConfigChange(next: GlobalAgentConfig) { + configRef.current = next; + setConfig(next); + setDirty(true); + setSaveState("idle"); + setSaveError(null); + } + + async function handleSave() { + // Snapshot the config being submitted so we can detect edits that arrive + // during the IPC round-trip and avoid clobbering the user's newer input. + const submittedConfig = config; + onSavingChange?.(true); + setSaveState("saving"); + setSaveError(null); + try { + const result = await setGlobalAgentConfig(submittedConfig); + // Apply the backend's canonical config ONLY if nothing changed during the + // IPC window. If the user edited, keep their newer value and leave dirty=true + // so they can save again. setDirty(false) runs inside the updater so both + // state updates batch into the same render (React 18 automatic batching). + const savedCurrentDraft = configRef.current === submittedConfig; + setConfig((current) => { + if (!savedCurrentDraft) { + // Mid-flight edit detected — do not overwrite newer user input. + return current; + } + configRef.current = result.config; + setDirty(false); + return result.config; + }); + setRestartedCount(result.restarted_count); + setFailedRestartCount(result.failed_restart_count); + setSaveState("saved"); + // Seed the shared TanStack Query cache with the canonical saved value so + // all open dialogs (and any that open afterward) see the new config + // synchronously — no second IPC round-trip needed. + queryClient.setQueryData(globalAgentConfigQueryKey, result.config); + if (savedCurrentDraft) onSaveSuccess?.(result); + if (savedTimerRef.current) clearTimeout(savedTimerRef.current); + // Partial restart failures require an explicit acknowledgment in the + // overlay, so keep their result visible instead of fading it away. + if (result.failed_restart_count === 0) { + savedTimerRef.current = setTimeout(() => setSaveState("idle"), 2500); + } + } catch (err) { + setSaveState("error"); + setSaveError(typeof err === "string" ? err : "Failed to save."); + } finally { + onSavingChange?.(false); + } + } + + return ( +
+ {isLoading ? ( +
+ + Loading… +
+ ) : loadError ? ( +
+ + Failed to load agent defaults. Restart the app to try again. +
+ ) : ( + + )} + + {/* Save bar */} + {!isLoading && !loadError && ( +
+ {saveState === "saved" && ( + + + {restartedCount > 0 + ? `Saved. Restarted ${restartedCount} agent${restartedCount === 1 ? "" : "s"}.${failedRestartCount > 0 ? ` ${failedRestartCount} failed to restart — check the Agents tab.` : ""}` + : failedRestartCount > 0 + ? `Saved. ${failedRestartCount} agent${failedRestartCount === 1 ? "" : "s"} failed to restart — check the Agents tab.` + : "Saved."} + + )} + {saveState === "error" && saveError && ( + + + {saveError} + + )} +
+ {secondaryAction} + +
+
+ )} +
+ ); +} diff --git a/desktop/src/features/agents/ui/GlobalAgentConfigFields.tsx b/desktop/src/features/agents/ui/GlobalAgentConfigFields.tsx index 80e24955d..a5d2335ac 100644 --- a/desktop/src/features/agents/ui/GlobalAgentConfigFields.tsx +++ b/desktop/src/features/agents/ui/GlobalAgentConfigFields.tsx @@ -14,7 +14,10 @@ import type { } from "@/shared/api/types"; import { EnvVarsEditor } from "@/features/agents/ui/EnvVarsEditor"; import type { InheritedEnvRow } from "@/features/agents/ui/EnvVarsEditor"; -import { getBakedProviderInheritLabel } from "@/features/agents/ui/bakedEnvHelpers"; +import { + getBakedProviderInheritLabel, + getGlobalModelFallback, +} from "@/features/agents/ui/bakedEnvHelpers"; import { AUTO_PROVIDER_DROPDOWN_VALUE, BLOCK_BUILD_HIDDEN_PROVIDER_IDS, @@ -57,6 +60,7 @@ export type GlobalAgentConfigFieldsProps = { onConfigChange: (next: GlobalAgentConfig) => void; onCustomModelEditingChange: (value: boolean) => void; onIsCustomProviderChange: (value: boolean) => void; + onValidityChange?: (valid: boolean) => void; }; export function GlobalAgentConfigFields({ @@ -68,15 +72,22 @@ export function GlobalAgentConfigFields({ onConfigChange, onCustomModelEditingChange, onIsCustomProviderChange, + onValidityChange, }: GlobalAgentConfigFieldsProps) { const bakedProvider = React.useMemo( () => bakedEnv.find((e) => e.key === "BUZZ_AGENT_PROVIDER")?.value ?? null, [bakedEnv], ); - const bakedModel = React.useMemo( - () => bakedEnv.find((e) => e.key === "BUZZ_AGENT_MODEL")?.value ?? null, - [bakedEnv], + const effectiveProvider = config.provider?.trim() || bakedProvider || ""; + const fallbackModel = React.useMemo( + () => getGlobalModelFallback(bakedEnv, effectiveProvider, config.env_vars), + [bakedEnv, config.env_vars, effectiveProvider], ); + const modelIsValid = + (config.model?.trim().length ?? 0) > 0 || fallbackModel !== null; + React.useEffect(() => { + onValidityChange?.(modelIsValid); + }, [modelIsValid, onValidityChange]); const bakedEffort = React.useMemo( () => bakedEnv.find((e) => e.key === BUZZ_AGENT_THINKING_EFFORT)?.value ?? null, @@ -229,12 +240,16 @@ export function GlobalAgentConfigFields({ {/* Model field */}
; - onBulkStopRunning: () => void; - onEditAiDefaults: () => void; onOpenAgentProfile: ( pubkey: string, options?: ProfilePanelOpenOptions, @@ -76,16 +66,14 @@ const AGENT_CARD_GRID_CLASS = `${AGENT_CARD_COLUMN_CLASS} grid grid-cols-[repeat export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) { const { actionErrorMessage, - aiDefaultsSummary, actionNoticeMessage, + defaultModel, agents, agentsError, isActionPending, isAgentsLoading, startingAgentPubkey, startingPersonaIds, - onBulkStopRunning, - onEditAiDefaults, onOpenAgentProfile, onOpenPersonaProfile, onStartAgent, @@ -107,9 +95,6 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) { onImportSnapshotFile, } = props; - const runningCount = agents.filter((agent) => - isManagedAgentActive(agent), - ).length; const { groups, ungrouped, unknown } = React.useMemo( () => buildUnifiedGroups(personas, agents), [personas, agents], @@ -162,15 +147,12 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
) : null} - {isLoading ? : null} @@ -196,6 +178,7 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) { /> } agent={profileAgent} + defaultModel={defaultModel} key={group.persona.id} persona={group.persona} startingAgentPubkey={startingAgentPubkey} @@ -220,6 +203,7 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) { ; @@ -298,7 +286,10 @@ function AgentPersonaCard({ onStartPersona: (persona: AgentPersona) => void; }) { const title = persona.displayName; - const modelLabel = formatAgentModelLabel(agent?.model ?? persona.model); + const explicitModel = agent?.model ?? persona.model; + const modelLabel = explicitModel?.trim() + ? formatAgentModelLabel(explicitModel) + : formatDefaultModelLabel(defaultModel); const isActive = agent ? isManagedAgentActive(agent) : false; const profileQuery = useUserProfileQuery(agent?.pubkey); const avatarUrl = agent @@ -344,7 +335,7 @@ function AgentPersonaCard({ avatarUrl={avatarUrl} dataTestId={`persona-agent-row-${persona.id}`} label={title} - modelLabel={agent && isActive ? modelLabel : null} + modelLabel={modelLabel} onClick={() => { if (agent) { onOpenAgentProfile( @@ -369,11 +360,13 @@ function AgentPersonaCard({ function StandaloneAgentCard({ agent, + defaultModel, startingAgentPubkey, onOpenAgentProfile, onStartAgent, }: { agent: ManagedAgent; + defaultModel: string; startingAgentPubkey: string | null; onOpenAgentProfile: ( pubkey: string, @@ -412,7 +405,11 @@ function StandaloneAgentCard({ avatarUrl={profileQuery.data?.avatarUrl} dataTestId={`managed-agent-${agent.pubkey}`} label={title} - modelLabel={isActive ? formatAgentModelLabel(agent.model) : null} + modelLabel={ + agent.model?.trim() + ? formatAgentModelLabel(agent.model) + : formatDefaultModelLabel(defaultModel) + } onClick={() => { onOpenAgentProfile( agent.pubkey, @@ -431,6 +428,11 @@ function StandaloneAgentCard({ ); } +function formatDefaultModelLabel(defaultModel: string) { + const model = defaultModel.trim(); + return model ? `Default model (${model})` : "Default model"; +} + function firstAvatarUrl( ...candidates: Array ): string | null { @@ -441,85 +443,6 @@ function firstAvatarUrl( return null; } -function AgentsListHeader({ - agentCount, - aiDefaultsSummary, - fileInputRef, - handleFileChange, - isActionPending, - runningCount, - onBulkStopRunning, - onEditAiDefaults, -}: { - agentCount: number; - aiDefaultsSummary: string; - fileInputRef: React.RefObject; - handleFileChange: (e: React.ChangeEvent) => void; - isActionPending: boolean; - runningCount: number; - onBulkStopRunning: () => void; - onEditAiDefaults: () => void; -}) { - return ( -
- - - Agents in this community. - - AI defaults: {aiDefaultsSummary} - - - - } - action={ - agentCount > 0 ? ( - - - - - event.preventDefault()} - > - - - Stop all running ({runningCount}) - - - - ) : undefined - } - /> -
- ); -} - function NewAgentCard({ canChooseCatalog, isPersonasPending, @@ -595,6 +518,7 @@ function CollapsibleAgentGroup({ label, agents, collapsed, + defaultModel, startingAgentPubkey, onToggle, onOpenAgentProfile, @@ -604,6 +528,7 @@ function CollapsibleAgentGroup({ label: string; agents: ManagedAgent[]; collapsed: ReadonlySet; + defaultModel: string; startingAgentPubkey: string | null; onToggle: (key: string) => void; onOpenAgentProfile: ( @@ -633,6 +558,7 @@ function CollapsibleAgentGroup({ {agents.map((agent) => ( { + assert.equal( + initialAgentAiConfigurationMode({ provider: "anthropic" }), + "custom", + ); + assert.equal( + initialAgentAiConfigurationMode({ model: "claude-opus" }), + "custom", + ); + assert.equal( + initialAgentAiConfigurationMode({ + provider: "anthropic", + model: "claude-opus", + }), + "custom", + ); + assert.equal(initialAgentAiConfigurationMode({}), "defaults"); +}); + +test("Customize requires a complete explicit pair", () => { + assert.equal( + agentAiConfigurationModeSatisfied("custom", { + provider: "anthropic", + model: "", + }), + false, + ); + assert.equal( + agentAiConfigurationModeSatisfied("custom", { + provider: "", + model: "claude-opus", + }), + false, + ); + assert.equal( + agentAiConfigurationModeSatisfied("custom", { + provider: "anthropic", + model: "claude-opus", + }), + true, + ); +}); + +test("Defaults clears provider and model together", () => { + assert.deepEqual( + agentAiConfigurationPairForMode({ + current: { provider: "anthropic", model: "claude-opus" }, + inherited: { provider: "databricks_v2", model: "llama" }, + mode: "defaults", + }), + { provider: "", model: "" }, + ); +}); + +test("entering Customize pins unresolved fields from the inherited pair", () => { + assert.deepEqual( + agentAiConfigurationPairForMode({ + current: { provider: "anthropic", model: "" }, + inherited: { provider: "databricks_v2", model: "llama" }, + mode: "custom", + }), + { provider: "anthropic", model: "llama" }, + ); +}); diff --git a/desktop/src/features/agents/ui/agentAiConfigurationPolicy.ts b/desktop/src/features/agents/ui/agentAiConfigurationPolicy.ts new file mode 100644 index 000000000..f89d4022c --- /dev/null +++ b/desktop/src/features/agents/ui/agentAiConfigurationPolicy.ts @@ -0,0 +1,41 @@ +export type AgentAiConfigurationMode = "defaults" | "custom"; + +export type AgentAiConfigurationPair = { + provider: string; + model: string; +}; + +export function initialAgentAiConfigurationMode( + pair: Partial, +): AgentAiConfigurationMode { + return pair.provider?.trim() || pair.model?.trim() ? "custom" : "defaults"; +} + +export function agentAiConfigurationPairForMode({ + current, + inherited, + mode, +}: { + current: AgentAiConfigurationPair; + inherited: AgentAiConfigurationPair; + mode: AgentAiConfigurationMode; +}): AgentAiConfigurationPair { + if (mode === "defaults") { + return { provider: "", model: "" }; + } + + return { + provider: current.provider.trim() || inherited.provider, + model: current.model.trim() || inherited.model, + }; +} + +export function agentAiConfigurationModeSatisfied( + mode: AgentAiConfigurationMode, + pair: AgentAiConfigurationPair, +) { + return ( + mode === "defaults" || + (pair.provider.trim().length > 0 && pair.model.trim().length > 0) + ); +} diff --git a/desktop/src/features/agents/ui/agentDefinitionSubmitPayload.test.mjs b/desktop/src/features/agents/ui/agentDefinitionSubmitPayload.test.mjs index 9cf465465..87d5b81b7 100644 --- a/desktop/src/features/agents/ui/agentDefinitionSubmitPayload.test.mjs +++ b/desktop/src/features/agents/ui/agentDefinitionSubmitPayload.test.mjs @@ -33,7 +33,9 @@ test("edit-untouched: model and provider omitted when user changes nothing on au // ── edit-model-only ──────────────────────────────────────────────────────────── // -// User opens a null-runtime builtin with auto-seed and picks a model. +// Transport-level coverage: the serializer remains permissive for legacy and +// non-dialog callers. The separately tested AI configuration mode policy blocks +// a model-only Customize submission in AgentDefinitionDialog. // Expected: model persisted, runtime omitted (auto-seeded, not explicit). test("edit-model-only: chosen model persists, runtime omitted on auto-seeded builtin", () => { @@ -51,7 +53,9 @@ test("edit-model-only: chosen model persists, runtime omitted on auto-seeded bui // ── edit-provider-only ───────────────────────────────────────────────────────── // -// User opens a null-runtime builtin with auto-seed and picks a provider. +// Transport-level coverage: the serializer remains permissive for legacy and +// non-dialog callers. The separately tested AI configuration mode policy blocks +// a provider-only Customize submission in AgentDefinitionDialog. // Expected: provider persisted, model and runtime omitted. test("edit-provider-only: chosen provider persists, runtime omitted on auto-seeded builtin", () => { diff --git a/desktop/src/features/agents/ui/bakedEnvHelpers.ts b/desktop/src/features/agents/ui/bakedEnvHelpers.ts index 1463c2aed..5f3808ad9 100644 --- a/desktop/src/features/agents/ui/bakedEnvHelpers.ts +++ b/desktop/src/features/agents/ui/bakedEnvHelpers.ts @@ -58,6 +58,43 @@ export function getBakedModelInheritLabel(bakedModelId: string): string { return `Inherit build default (${bakedModelId})`; } +function providerModelEnvKey(provider: string): string | null { + switch (provider.trim().toLowerCase()) { + case "databricks": + case "databricks_v2": + case "databricks-v2": + return "DATABRICKS_MODEL"; + case "anthropic": + return "ANTHROPIC_MODEL"; + case "openai": + case "openai-compat": + return "OPENAI_COMPAT_MODEL"; + default: + return null; + } +} + +/** Resolve the concrete model beneath the structured global model override. */ +export function getGlobalModelFallback( + bakedEnv: readonly BakedEnvEntry[] | undefined, + provider: string, + globalEnv: Readonly> = {}, +): string | null { + const universal = bakedEnv?.find( + (entry) => entry.key === "BUZZ_AGENT_MODEL" && !entry.masked, + )?.value; + if (universal?.trim()) return universal.trim(); + + const providerKey = providerModelEnvKey(provider); + if (!providerKey) return provider === "relay-mesh" ? "auto" : null; + const globalProviderModel = globalEnv[providerKey]?.trim(); + if (globalProviderModel) return globalProviderModel; + const providerModel = bakedEnv?.find( + (entry) => entry.key === providerKey && !entry.masked, + )?.value; + return providerModel?.trim() || null; +} + /** * Global env keys are arbitrary user input. Count only ordinary configuration * names in the collapsed summary so it never calls attention to credentials. @@ -117,11 +154,27 @@ export function getInheritedAgentDefaults( bakedEnv, "BUZZ_AGENT_PROVIDER", ), - model: resolveInheritedDefault( - globalConfig.model, - bakedEnv, - "BUZZ_AGENT_MODEL", - ), + model: (() => { + const structured = resolveInheritedDefault( + globalConfig.model, + bakedEnv, + "BUZZ_AGENT_MODEL", + ); + if (structured.value) return structured; + const provider = resolveInheritedDefault( + globalConfig.provider, + bakedEnv, + "BUZZ_AGENT_PROVIDER", + ); + const fallback = getGlobalModelFallback( + bakedEnv, + provider.value, + globalConfig.env_vars, + ); + return fallback + ? { source: "build", value: fallback } + : { source: null, value: "" }; + })(), effort: resolveInheritedDefault( globalConfig.env_vars.BUZZ_AGENT_THINKING_EFFORT, bakedEnv, diff --git a/desktop/src/features/agents/ui/createAgentLocalModeGate.test.mjs b/desktop/src/features/agents/ui/createAgentLocalModeGate.test.mjs index a4f536652..2b5269b8b 100644 --- a/desktop/src/features/agents/ui/createAgentLocalModeGate.test.mjs +++ b/desktop/src/features/agents/ui/createAgentLocalModeGate.test.mjs @@ -36,6 +36,8 @@ import { countNonSecretInheritedEnvVars, getBakedModelInheritLabel, getAdvancedInheritedSummary, + getGlobalModelFallback, + getInheritedAgentDefaults, getBakedProviderInheritLabel, resolveInheritedDefault, } from "./bakedEnvHelpers.ts"; @@ -1390,3 +1392,53 @@ test("localMode_globalEnvSatisfied_agentLocalKeyAbsent_silenced", () => { "gate must be satisfied when global key is not shadowed by an explicit empty", ); }); + +test("global model fallback resolves the selected provider model env", () => { + const bakedEnv = [ + { + key: "DATABRICKS_MODEL", + value: "goose-claude-opus-4-8", + masked: false, + }, + ]; + assert.equal( + getGlobalModelFallback(bakedEnv, "databricks_v2"), + "goose-claude-opus-4-8", + ); +}); + +test("global model fallback gives saved provider env precedence over build env", () => { + const bakedEnv = [ + { key: "ANTHROPIC_MODEL", value: "build-model", masked: false }, + ]; + assert.equal( + getGlobalModelFallback(bakedEnv, "anthropic", { + ANTHROPIC_MODEL: "saved-model", + }), + "saved-model", + ); +}); + +test("global model fallback never uses another provider's model", () => { + const bakedEnv = [ + { key: "DATABRICKS_MODEL", value: "databricks-model", masked: false }, + ]; + assert.equal(getGlobalModelFallback(bakedEnv, "anthropic"), null); +}); + +test("inherited defaults expose a provider-specific model fallback to agent dialogs", () => { + const defaults = getInheritedAgentDefaults( + { env_vars: {}, provider: "databricks_v2", model: null }, + [ + { + key: "DATABRICKS_MODEL", + value: "goose-claude-opus-4-8", + masked: false, + }, + ], + ); + assert.deepEqual(defaults.model, { + source: "build", + value: "goose-claude-opus-4-8", + }); +}); diff --git a/desktop/src/features/agents/ui/personaProviderModelFields.tsx b/desktop/src/features/agents/ui/personaProviderModelFields.tsx index b5f0049e4..7347aa517 100644 --- a/desktop/src/features/agents/ui/personaProviderModelFields.tsx +++ b/desktop/src/features/agents/ui/personaProviderModelFields.tsx @@ -48,6 +48,8 @@ export function AgentModelField({ disabled, discoveredModelOptions, globalModel, + allowDefaultModel = true, + defaultModelLabel, id = "agent-model", isCustomModelEditing, isRequired, @@ -60,8 +62,12 @@ export function AgentModelField({ }: { disabled: boolean; discoveredModelOptions: readonly PersonaModelOption[] | null; - /** Global model default; when set, the zero-value option reads `Inherit global default ()`. */ + /** Known lower-precedence model used when this field is left empty. */ globalModel?: string; + /** Hide the empty/default option when no valid lower-precedence model exists. */ + allowDefaultModel?: boolean; + /** Source-aware label for the empty/default option. */ + defaultModelLabel?: string; /** DOM id for the model select. Defaults to `"agent-model"`. Override in * contexts where multiple instances coexist on the same page (e.g. the * global-config settings card) to avoid duplicate DOM ids. */ @@ -80,20 +86,23 @@ export function AgentModelField({ // Buzz shared compute always has an automatic routing choice, even when // discovery is empty or returns only explicit live model ids. - const staticModelOptions: readonly PersonaModelOption[] = [ - { - id: "", - label: isSharedCompute + const defaultOption: PersonaModelOption = { + id: "", + label: + defaultModelLabel ?? + (isSharedCompute ? "Default (auto)" - : getDefaultLlmModelLabel(globalModel), - }, - ]; + : getDefaultLlmModelLabel(globalModel)), + }; const discoveredWithoutDefault = (discoveredModelOptions ?? []).filter( (option) => option.id.trim() !== "", ); const effectiveModelOptions = isSharedCompute - ? [...staticModelOptions, ...discoveredWithoutDefault] - : (discoveredModelOptions ?? staticModelOptions); + ? [defaultOption, ...discoveredWithoutDefault] + : [ + ...(allowDefaultModel ? [defaultOption] : []), + ...discoveredWithoutDefault, + ]; // isModelCustom: true when the current model isn't in any known option set. // We check discovered options (when available) or runtime-static options so diff --git a/desktop/src/features/agents/ui/useAgentDialogDefaults.ts b/desktop/src/features/agents/ui/useAgentDialogDefaults.ts index b55b8233c..5ede9558f 100644 --- a/desktop/src/features/agents/ui/useAgentDialogDefaults.ts +++ b/desktop/src/features/agents/ui/useAgentDialogDefaults.ts @@ -3,11 +3,7 @@ import * as React from "react"; import { useBakedBuildEnvQuery } from "../hooks"; import { useGlobalAgentConfig } from "../useGlobalAgentConfig"; import { BUZZ_AGENT_THINKING_EFFORT } from "./buzzAgentConfig"; -import { - countNonSecretInheritedEnvVars, - getAdvancedInheritedSummary, - getInheritedAgentDefaults, -} from "./bakedEnvHelpers"; +import { getInheritedAgentDefaults } from "./bakedEnvHelpers"; export function useAgentDialogDefaults({ inheritedEnvVars = {}, @@ -29,16 +25,7 @@ export function useAgentDialogDefaults({ }), [globalConfig.env_vars, inheritedDefaults.effort.value, inheritedEnvVars], ); - const advancedInheritedSummary = getAdvancedInheritedSummary( - inheritedDefaults.effort, - countNonSecretInheritedEnvVars( - globalConfig.env_vars, - BUZZ_AGENT_THINKING_EFFORT, - ), - ); - return { - advancedInheritedSummary, globalConfig, inheritedDefaults, inheritedEnvVars: effectiveInheritedEnvVars, diff --git a/desktop/src/features/settings/ui/GlobalAgentConfigSettingsCard.tsx b/desktop/src/features/settings/ui/GlobalAgentConfigSettingsCard.tsx index 5f1e82db2..56ab13a3d 100644 --- a/desktop/src/features/settings/ui/GlobalAgentConfigSettingsCard.tsx +++ b/desktop/src/features/settings/ui/GlobalAgentConfigSettingsCard.tsx @@ -1,137 +1,7 @@ -/** - * Settings card for global agent configuration defaults. - * - * Lets the user set env vars, provider, and model that apply to ALL local - * agents as the lowest-precedence user layer. Per-agent and persona configs - * always win on collision. - * - * Precedence: baked floor < GLOBAL (this card) < persona < per-agent. - */ -import { AlertCircle, Check, Loader } from "lucide-react"; -import * as React from "react"; - -import { useQueryClient } from "@tanstack/react-query"; - -import { - getGlobalAgentConfig, - setGlobalAgentConfig, -} from "@/shared/api/tauriGlobalAgentConfig"; -import type { GlobalAgentConfig } from "@/shared/api/types"; -import { getBakedBuildEnv, type BakedEnvEntry } from "@/shared/api/tauri"; -import { globalAgentConfigQueryKey } from "@/features/agents/useGlobalAgentConfig"; -import { useAcpRuntimesQuery } from "@/features/agents/hooks"; -import { - GlobalAgentConfigFields, - EMPTY_GLOBAL_CONFIG, -} from "@/features/agents/ui/GlobalAgentConfigFields"; -import { Button } from "@/shared/ui/button"; +import { GlobalAgentConfigEditor } from "@/features/agents/ui/GlobalAgentConfigEditor"; import { SectionHeader } from "@/shared/ui/PageHeader"; -type SaveState = "idle" | "saving" | "saved" | "error"; - export function GlobalAgentConfigSettingsCard() { - const [config, setConfig] = - React.useState(EMPTY_GLOBAL_CONFIG); - const [dirty, setDirty] = React.useState(false); - const [saveState, setSaveState] = React.useState("idle"); - const [saveError, setSaveError] = React.useState(null); - const [restartedCount, setRestartedCount] = React.useState(0); - const [failedRestartCount, setFailedRestartCount] = React.useState(0); - const [isLoading, setIsLoading] = React.useState(true); - const [loadError, setLoadError] = React.useState(false); - const [isCustomProvider, setIsCustomProvider] = React.useState(false); - const [isCustomModelEditing, setIsCustomModelEditing] = React.useState(false); - const savedTimerRef = React.useRef | null>( - null, - ); - const queryClient = useQueryClient(); - const [bakedEnv, setBakedEnv] = React.useState([]); - - // Load on mount — seed the shared TanStack Query cache so any dialog that - // opens after this point reads the populated value on first render (no async - // race). The query is also backed by its own queryFn for first-consumer - // scenarios, but this eager seed eliminates the "settings card loaded, user - // opens Create Agent before the lazy query fires" window. - React.useEffect(() => { - let cancelled = false; - getGlobalAgentConfig() - .then((loaded) => { - if (!cancelled) { - setConfig(loaded); - setIsLoading(false); - queryClient.setQueryData(globalAgentConfigQueryKey, loaded); - } - }) - .catch(() => { - if (!cancelled) { - setIsLoading(false); - setLoadError(true); - } - }); - return () => { - cancelled = true; - }; - }, [queryClient]); - - // Load baked build env once on mount. OSS builds return [] — the section - // stays hidden. Failures are silently swallowed (non-critical display data). - React.useEffect(() => { - getBakedBuildEnv() - .then(setBakedEnv) - .catch(() => { - // non-critical — leave bakedEnv empty - }); - }, []); - - // Resolve the buzz-agent runtime catalog entry for model discovery. - const runtimesQuery = useAcpRuntimesQuery(); - const buzzAgentRuntime = React.useMemo( - () => (runtimesQuery.data ?? []).find((r) => r.id === "buzz-agent"), - [runtimesQuery.data], - ); - - function handleConfigChange(next: GlobalAgentConfig) { - setConfig(next); - setDirty(true); - setSaveState("idle"); - setSaveError(null); - } - - async function handleSave() { - // Snapshot the config being submitted so we can detect edits that arrive - // during the IPC round-trip and avoid clobbering the user's newer input. - const submittedConfig = config; - setSaveState("saving"); - setSaveError(null); - try { - const result = await setGlobalAgentConfig(submittedConfig); - // Apply the backend's canonical config ONLY if nothing changed during the - // IPC window. If the user edited, keep their newer value and leave dirty=true - // so they can save again. setDirty(false) runs inside the updater so both - // state updates batch into the same render (React 18 automatic batching). - setConfig((current) => { - if (current !== submittedConfig) { - // Mid-flight edit detected — do not overwrite newer user input. - return current; - } - setDirty(false); - return result.config; - }); - setRestartedCount(result.restarted_count); - setFailedRestartCount(result.failed_restart_count); - setSaveState("saved"); - // Seed the shared TanStack Query cache with the canonical saved value so - // all open dialogs (and any that open afterward) see the new config - // synchronously — no second IPC round-trip needed. - queryClient.setQueryData(globalAgentConfigQueryKey, result.config); - if (savedTimerRef.current) clearTimeout(savedTimerRef.current); - savedTimerRef.current = setTimeout(() => setSaveState("idle"), 2500); - } catch (err) { - setSaveState("error"); - setSaveError(typeof err === "string" ? err : "Failed to save."); - } - } - return (
- - {isLoading ? ( -
- - Loading… -
- ) : loadError ? ( -
- - Failed to load agent defaults. Restart the app to try again. -
- ) : ( - - )} - - {/* Save bar */} - {!isLoading && !loadError && ( -
- - {saveState === "saved" && ( - - - {restartedCount > 0 - ? `Saved. Restarted ${restartedCount} agent${restartedCount === 1 ? "" : "s"}.${failedRestartCount > 0 ? ` ${failedRestartCount} failed to restart — check the Agents tab.` : ""}` - : failedRestartCount > 0 - ? `Saved. ${failedRestartCount} agent${failedRestartCount === 1 ? "" : "s"} failed to restart — check the Agents tab.` - : "Saved."} - - )} - {saveState === "error" && saveError && ( - - - {saveError} - - )} -
- )} +
); } diff --git a/desktop/src/features/settings/ui/SettingsPanels.tsx b/desktop/src/features/settings/ui/SettingsPanels.tsx index 0abd4ddda..767d75894 100644 --- a/desktop/src/features/settings/ui/SettingsPanels.tsx +++ b/desktop/src/features/settings/ui/SettingsPanels.tsx @@ -715,8 +715,8 @@ export function renderSettingsSection( case "agents": return (
- +
); case "channel-templates": diff --git a/desktop/src/features/settings/ui/SettingsView.tsx b/desktop/src/features/settings/ui/SettingsView.tsx index 1a2dbae2e..d32864c55 100644 --- a/desktop/src/features/settings/ui/SettingsView.tsx +++ b/desktop/src/features/settings/ui/SettingsView.tsx @@ -277,7 +277,7 @@ export function SettingsView({ data-tauri-drag-region />
-
+
{ test.use({ viewport: { width: 1280, height: 900 } }); @@ -126,6 +133,11 @@ test.describe("agent lifecycle feedback screenshots", () => { // restart-count feedback. test("02-save-restarted", async ({ page }) => { await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: {}, + }, globalConfigRestartedCount: 2, }); @@ -134,7 +146,7 @@ test.describe("agent lifecycle feedback screenshots", () => { const card = page.getByTestId("settings-global-agent-config"); // Change the provider to make the card dirty (enables "Save defaults"). - await page.locator("#global-agent-provider").selectOption("anthropic"); + await makeGlobalDefaultsDirty(page); await expect( page.getByRole("button", { name: "Save defaults" }), ).toBeEnabled({ timeout: 5_000 }); @@ -157,14 +169,20 @@ test.describe("agent lifecycle feedback screenshots", () => { // The default mock returns restarted_count=0. The old text // "Running agents keep their current settings until restarted." must be absent. test("03-save-plain", async ({ page }) => { - await installMockBridge(page); + await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: {}, + }, + }); await openAiDefaultsSettings(page); const card = page.getByTestId("settings-global-agent-config"); // Change the provider to make the card dirty. - await page.locator("#global-agent-provider").selectOption("anthropic"); + await makeGlobalDefaultsDirty(page); await expect( page.getByRole("button", { name: "Save defaults" }), ).toBeEnabled({ timeout: 5_000 }); @@ -270,6 +288,11 @@ test.describe("agent lifecycle feedback screenshots", () => { // Shot 06: global config save — singular "Saved. Restarted 1 agent." test("06-save-restarted-singular", async ({ page }) => { await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: {}, + }, globalConfigRestartedCount: 1, }); @@ -277,7 +300,7 @@ test.describe("agent lifecycle feedback screenshots", () => { const card = page.getByTestId("settings-global-agent-config"); - await page.locator("#global-agent-provider").selectOption("anthropic"); + await makeGlobalDefaultsDirty(page); await expect( page.getByRole("button", { name: "Save defaults" }), ).toBeEnabled({ timeout: 5_000 }); @@ -293,6 +316,11 @@ test.describe("agent lifecycle feedback screenshots", () => { // Shot 07: global config save — partial failure "M failed to restart". test("07-save-failed-restart", async ({ page }) => { await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: {}, + }, globalConfigFailedRestartCount: 1, }); @@ -300,7 +328,7 @@ test.describe("agent lifecycle feedback screenshots", () => { const card = page.getByTestId("settings-global-agent-config"); - await page.locator("#global-agent-provider").selectOption("anthropic"); + await makeGlobalDefaultsDirty(page); await expect( page.getByRole("button", { name: "Save defaults" }), ).toBeEnabled({ timeout: 5_000 }); @@ -325,28 +353,33 @@ test.describe("agent lifecycle feedback screenshots", () => { // clobbering it with the older response. test("08-save-race-keeps-newer-edit", async ({ page }) => { await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: {}, + }, globalConfigSaveDelayMs: 2_000, }); await openAiDefaultsSettings(page); const card = page.getByTestId("settings-global-agent-config"); - const provider = page.locator("#global-agent-provider"); + const effort = page.locator("#global-agent-thinking-effort"); const saveButton = page.getByRole("button", { name: "Save defaults" }); - await provider.selectOption("anthropic"); + await makeGlobalDefaultsDirty(page, "high"); await expect(saveButton).toBeEnabled({ timeout: 5_000 }); await saveButton.click(); // While the save is held open by the mock delay, make a newer edit. - await provider.selectOption("openai"); + await effort.selectOption("low"); // The save resolves with the OLD submitted config; the newer edit must // survive and the card must stay dirty so it can be saved again. await expect(card.getByText("Saved.", { exact: true })).toBeVisible({ timeout: 10_000, }); - await expect(provider).toHaveValue("openai"); + await expect(effort).toHaveValue("low"); await expect(saveButton).toBeEnabled(); }); }); diff --git a/desktop/tests/e2e/agent-provider-dropdowns.spec.ts b/desktop/tests/e2e/agent-provider-dropdowns.spec.ts index 09fde8b8f..de4ba9468 100644 --- a/desktop/tests/e2e/agent-provider-dropdowns.spec.ts +++ b/desktop/tests/e2e/agent-provider-dropdowns.spec.ts @@ -169,6 +169,8 @@ test.describe("agent provider dropdown screenshots", () => { timeout: 8_000, }); + await dialog.getByRole("tab", { name: "Customize for this agent" }).click(); + // Regression: the model combobox must appear (modelFieldVisible = true once // runtime is non-empty) and model discovery must have run, populating it. const modelCombobox = dialog.getByRole("combobox", { name: /model/i }); diff --git a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts index 20396cfb2..33d0d8f7a 100644 --- a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts +++ b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts @@ -46,6 +46,7 @@ async function selectProvider( page: import("@playwright/test").Page, providerName: string, ) { + await page.getByRole("tab", { name: "Customize for this agent" }).click(); await selectDropdownOption( page, page.locator("#persona-llm-provider"), @@ -60,6 +61,15 @@ async function setCustomModel( page: import("@playwright/test").Page, modelId: string, ) { + await expect + .poll(() => + page.evaluate( + () => + (window as Window & { __BUZZ_E2E_COMMANDS__?: string[] }) + .__BUZZ_E2E_COMMANDS__ ?? [], + ), + ) + .toContain("discover_agent_models"); await page.locator("#persona-model").click(); await page .getByRole("button", { name: "Custom model...", exact: true }) @@ -119,44 +129,46 @@ test.describe("agent readiness gate screenshots", () => { }); }); - // Shot 01: buzz-agent selected, provider empty → required marker shown, save allowed. - test("01-create-buzzagent-empty-provider-marker", async ({ page }) => { - await installMockBridge(page); + // Shot 01: inherited AI defaults are an explicit, valid choice. Provider and + // model controls stay hidden until the user chooses to customize this agent. + test("01-create-buzzagent-uses-ai-defaults", async ({ page }) => { + await installMockBridge(page, { + globalAgentConfig: { + provider: "anthropic", + model: "claude-opus-4-5", + env_vars: { ANTHROPIC_API_KEY: "sk-ant-test" }, + }, + }); await openCreateDialog(page); - // Wait for buzz-agent to auto-select and the provider field to render. - await expect(page.locator("#persona-llm-provider")).toBeVisible({ - timeout: 10_000, - }); - - // Provider empty + no global provider → save is BLOCKED per the - // provider-default rule. The submit button must be disabled. - await expect(page.getByTestId("persona-dialog-submit")).toBeDisabled({ + await expect( + page.getByRole("tab", { name: "Use AI defaults" }), + ).toHaveAttribute("data-state", "active"); + await expect(page.locator("#persona-llm-provider")).not.toBeVisible(); + await expect(page.locator("#persona-model")).not.toBeVisible(); + await expect(page.getByTestId("persona-dialog-submit")).toBeEnabled({ timeout: 10_000, }); await settleAnimations(page); - const dialog = page.getByRole("dialog"); - await dialog.screenshot({ - path: `${SHOTS}/01-create-buzzagent-empty-provider-marker.png`, + await page.getByRole("dialog").screenshot({ + path: `${SHOTS}/01-create-buzzagent-uses-ai-defaults.png`, }); }); - // Shot 02: buzz-agent + anthropic selected, model empty → required marker - // shown. The unified dialog blocks submit until the explicit model is set - // (anthropic requires one) — stricter than the legacy dialog's save-allowed. - test("02-create-buzzagent-empty-model-marker", async ({ page }) => { + // Shot 02: customized Anthropic configuration uses Automatic model instead + // of presenting an obsolete model-required error. + test("02-create-buzzagent-automatic-model", async ({ page }) => { await installMockBridge(page); await openCreateDialog(page); - await selectProvider(page, "Anthropic"); + await selectProvider(page, "Buzz shared compute"); - // Model still empty → required marker shown; submit blocked until set. - await expect(page.getByTestId("persona-dialog-submit")).toBeDisabled(); + await expect(page.locator("#persona-model")).toContainText("Automatic"); + await expect(page.getByTestId("persona-dialog-submit")).toBeEnabled(); await settleAnimations(page); - const dialog = page.getByRole("dialog"); - await dialog.screenshot({ - path: `${SHOTS}/02-create-buzzagent-empty-model-marker.png`, + await page.getByRole("dialog").screenshot({ + path: `${SHOTS}/02-create-buzzagent-automatic-model.png`, }); }); @@ -252,11 +264,7 @@ test.describe("agent readiness gate screenshots", () => { await openCreateDialog(page); - // Wait for buzz-agent to auto-select (provider field visible), then - // switch to claude. - await expect(page.locator("#persona-llm-provider")).toBeVisible({ - timeout: 10_000, - }); + // Switch the auto-selected buzz-agent runtime to Claude Code. await selectDropdownOption( page, page.locator("#persona-runtime"), @@ -305,8 +313,9 @@ test.describe("agent readiness gate screenshots", () => { await installMockBridge(page); await openCreateDialog(page); - // Buzz-agent auto-selects first; wait for its provider field, then - // switch to goose to confirm its required-marker behavior is identical. + // Opt into per-agent customization, then switch to goose to confirm a + // genuinely incomplete customized configuration remains blocked. + await page.getByRole("tab", { name: "Customize for this agent" }).click(); await expect(page.locator("#persona-llm-provider")).toBeVisible({ timeout: 10_000, }); diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts index c1972794f..543dd830b 100644 --- a/desktop/tests/e2e/agents.spec.ts +++ b/desktop/tests/e2e/agents.spec.ts @@ -246,10 +246,6 @@ test("built-in persona edits persist", async ({ page }) => { const dialog = page.getByTestId("persona-dialog"); await dialog.getByLabel("Agent name").fill("My Fizz"); await dialog.getByLabel("Agent instruction").fill("User-edited instructions"); - await dialog.getByRole("button", { name: "LLM provider" }).click(); - await page - .getByRole("menuitemradio", { name: "Anthropic", exact: true }) - .click(); await dialog.getByRole("button", { name: "Save changes" }).click(); await expect(dialog).toHaveCount(0); diff --git a/desktop/tests/e2e/edit-agent.spec.ts b/desktop/tests/e2e/edit-agent.spec.ts index 216edea7f..e04980aff 100644 --- a/desktop/tests/e2e/edit-agent.spec.ts +++ b/desktop/tests/e2e/edit-agent.spec.ts @@ -174,8 +174,12 @@ test.describe("edit agent dialog", () => { await expect(page.locator("#edit-agent-model")).toHaveText( "Inherit build default (claude-opus-4-8)", ); + const defaults = page.getByTestId("agent-ai-defaults-notice"); await expect( - page.getByText("Using build defaults: effort high"), + defaults.getByText("Anthropic", { exact: true }), + ).toBeVisible(); + await expect( + defaults.getByText("claude-opus-4-8", { exact: true }), ).toBeVisible(); }); @@ -207,7 +211,13 @@ test.describe("edit agent dialog", () => { await expect(page.locator("#edit-agent-model")).toHaveText( "Use AI defaults (claude-opus-4-5)", ); - await expect(page.getByText("Using AI defaults: effort low")).toBeVisible(); + const defaults = page.getByTestId("agent-ai-defaults-notice"); + await expect( + defaults.getByText("Anthropic", { exact: true }), + ).toBeVisible(); + await expect( + defaults.getByText("claude-opus-4-5", { exact: true }), + ).toBeVisible(); }); test("profile Edit routes persona-linked agents to the definition editor", async ({ diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts index 85b15aa7a..36aefa978 100644 --- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts +++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts @@ -42,6 +42,10 @@ async function openCreateDialog(page: import("@playwright/test").Page) { await page.locator("#persona-display-name").fill("Test Agent"); } +async function customizeAgentAi(page: import("@playwright/test").Page) { + await page.getByRole("tab", { name: "Customize for this agent" }).click(); +} + test.describe("global agent config screenshots", () => { test.use({ viewport: { width: 1280, height: 900 } }); @@ -90,6 +94,7 @@ test.describe("global agent config screenshots", () => { }); await openCreateDialog(page); + await customizeAgentAi(page); await expect(page.getByLabel("Anthropic API Key")).toBeVisible({ timeout: 10_000, @@ -110,6 +115,7 @@ test.describe("global agent config screenshots", () => { }); await openCreateDialog(page); + await customizeAgentAi(page); await expect(page.getByLabel("Anthropic API Key")).toHaveAttribute( "placeholder", @@ -151,15 +157,15 @@ test.describe("global agent config screenshots", () => { await openCreateDialog(page); - await expect(page.locator("#persona-llm-provider")).toHaveText( - "Anthropic (inherited from build)", - ); - await expect(page.locator("#persona-model")).toHaveText( - "Inherit build default (claude-opus-4-8)", - ); + const defaults = page.getByTestId("agent-ai-defaults-notice"); await expect( - page.getByText("Using build defaults: effort high"), + defaults.getByText("Anthropic", { exact: true }), ).toBeVisible(); + await expect( + defaults.getByText("claude-opus-4-8", { exact: true }), + ).toBeVisible(); + await expect(page.locator("#persona-llm-provider")).not.toBeVisible(); + await expect(page.locator("#persona-model")).not.toBeVisible(); }); test("07-explicit-global-defaults-override-baked-labels", async ({ @@ -188,13 +194,15 @@ test.describe("global agent config screenshots", () => { await openCreateDialog(page); - await expect(page.locator("#persona-llm-provider")).toHaveText( - "Use AI defaults (anthropic)", - ); - await expect(page.locator("#persona-model")).toHaveText( - "Use AI defaults (claude-opus-4-5)", - ); - await expect(page.getByText("Using AI defaults: effort low")).toBeVisible(); + const defaults = page.getByTestId("agent-ai-defaults-notice"); + await expect( + defaults.getByText("Anthropic", { exact: true }), + ).toBeVisible(); + await expect( + defaults.getByText("claude-opus-4-5", { exact: true }), + ).toBeVisible(); + await expect(page.locator("#persona-llm-provider")).not.toBeVisible(); + await expect(page.locator("#persona-model")).not.toBeVisible(); }); // Shot 04: Create gate BLOCKED — no per-agent provider, no global provider diff --git a/desktop/tests/e2e/persona-env-vars.spec.ts b/desktop/tests/e2e/persona-env-vars.spec.ts index 4ffc5cc8b..b9b828142 100644 --- a/desktop/tests/e2e/persona-env-vars.spec.ts +++ b/desktop/tests/e2e/persona-env-vars.spec.ts @@ -318,13 +318,14 @@ test("persona model options follow the selected LLM provider", async ({ await page.getByRole("menuitem", { name: /^New agent$/ }).click(); const provider = page.locator("#persona-runtime"); + await page.getByRole("tab", { name: "Customize for this agent" }).click(); const llmProvider = page.locator("#persona-llm-provider"); const model = page.locator("#persona-model"); await expect(provider).toContainText("Buzz Agent (default)"); await expect(llmProvider).toBeVisible(); await expect(model).toBeVisible(); - // Without live discovery, the only static option is "Default model". - await expect(model).toContainText("Default model"); + // Custom mode requires a model selection until a provider is chosen. + await expect(model).toContainText("Choose a model"); await selectDropdownOption(page, llmProvider, "OpenAI"); const dialog = page.getByRole("dialog"); @@ -345,11 +346,10 @@ test("persona model options follow the selected LLM provider", async ({ await expect(dialog.getByLabel("OpenAI API Key")).not.toBeVisible(); await expect(model).toBeVisible(); - // Switch to Default (no explicit provider) — required rows disappear, - // model resets to "Default model". - // Provider blank option was renamed from "Default" to "Select a provider\u2026" - // by the global-provider label change in this branch (getDefaultLlmProviderLabel). - await selectDropdownOption(page, llmProvider, "Select a provider\u2026"); - await expect(model).toBeVisible(); - await expect(model).toContainText("Default model"); + // Switch back to inherited defaults — per-agent provider, credential, and + // model controls disappear together. + await page.getByRole("tab", { name: "Use AI defaults" }).click(); + await expect(llmProvider).not.toBeVisible(); + await expect(dialog.getByLabel("Anthropic API Key")).not.toBeVisible(); + await expect(model).not.toBeVisible(); }); diff --git a/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts b/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts index d57c9edb0..e3844bfac 100644 --- a/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts +++ b/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts @@ -40,6 +40,7 @@ async function openNewPersonaDialog(page: import("@playwright/test").Page) { const dialog = page.getByTestId("persona-dialog"); await expect(dialog).toBeVisible({ timeout: 8_000 }); + await dialog.getByRole("tab", { name: "Customize for this agent" }).click(); return dialog; } diff --git a/desktop/tests/e2e/smoke.spec.ts b/desktop/tests/e2e/smoke.spec.ts index 1a84cd42a..8fde554fe 100644 --- a/desktop/tests/e2e/smoke.spec.ts +++ b/desktop/tests/e2e/smoke.spec.ts @@ -99,6 +99,7 @@ test("loads the app shell with mocked channels", async ({ page }) => { async function chooseSharedComputeProvider( page: import("@playwright/test").Page, ) { + await page.getByRole("tab", { name: "Customize for this agent" }).click(); const provider = page.locator("#persona-llm-provider"); await expect(provider).toBeVisible({ timeout: 10_000 }); await provider.press("Enter"); @@ -125,7 +126,7 @@ test("creates a new mocked stream", async ({ page }) => { await expect(page.getByTestId("chat-title")).toContainText(channelName); }); -test("Buzz shared compute explains the empty state without blocking Default auto", async ({ +test("Buzz shared compute explains automatic model selection", async ({ page, }) => { await page.goto("/"); @@ -152,13 +153,12 @@ test("Buzz shared compute explains the empty state without blocking Default auto ), ) .toContain("discover_agent_models"); - await expect(page.locator("#persona-model")).toContainText("Default (auto)"); + await expect(page.locator("#persona-model")).toContainText("Automatic"); await expect( - page.getByTestId("persona-model-discovery-status"), - ).toContainText("No members are sharing compute right now"); - await expect( - page.getByTestId("persona-model-discovery-status"), - ).toContainText("Settings > Compute"); + page.getByText( + "Buzz will choose an available shared model when the agent starts.", + ), + ).toBeVisible(); await expect(page.locator("#persona-custom-model")).toHaveCount(0); }); @@ -176,7 +176,7 @@ test("create agent persists Buzz shared compute with auto model", async ({ await chooseSharedComputeProvider(page); const model = page.locator("#persona-model"); - await expect(model).toContainText("Default (auto)"); + await expect(model).toContainText("Automatic"); await page.getByTestId("persona-dialog-submit").click(); await expect( page.getByRole("heading", { name: "Agent created" }), @@ -222,7 +222,8 @@ test("create agent supports parallelism and system prompt overrides", async ({ .fill("You are concise and parallelize independent work."); // The buzz-agent runtime auto-selects once the ACP runtime catalog loads; - // the LLM provider field renders after that. + // Customize reveals the per-agent LLM provider and model fields. + await page.getByRole("tab", { name: "Customize for this agent" }).click(); const llmProvider = page.locator("#persona-llm-provider"); await expect(llmProvider).toBeVisible({ timeout: 10_000 }); await llmProvider.press("Enter"); diff --git a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts index 69f89dee6..723da25dc 100644 --- a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts +++ b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts @@ -153,6 +153,7 @@ test.describe("welcome and channel agent entry points", () => { await page .locator("#persona-system-prompt") .fill("Research a topic and return a concise brief."); + await page.getByRole("tab", { name: "Customize for this agent" }).click(); const provider = page.locator("#persona-llm-provider"); await provider.press("Enter"); await page