diff --git a/desktop/src/features/agents/ui/AgentConfigFields.tsx b/desktop/src/features/agents/ui/AgentConfigFields.tsx
index 61382ea4cf..e9c795a339 100644
--- a/desktop/src/features/agents/ui/AgentConfigFields.tsx
+++ b/desktop/src/features/agents/ui/AgentConfigFields.tsx
@@ -200,8 +200,16 @@ export function AgentConfigFields({
() => getGlobalModelFallback(bakedEnv, effectiveProvider, config.env_vars),
[bakedEnv, config.env_vars, effectiveProvider],
);
+ const modelField = fieldModel.fields.find(
+ (field) => field.kind === "model" && field.render === "control",
+ );
+ // CLI-login harnesses apply this setting through ACP rather than an env var
+ // and provide their own default when no model override is persisted.
+ const modelIsOptional = modelField?.targetApplication.kind === "acpNative";
const modelIsValid =
- (config.model?.trim().length ?? 0) > 0 || fallbackModel !== null;
+ modelIsOptional ||
+ (config.model?.trim().length ?? 0) > 0 ||
+ fallbackModel !== null;
React.useEffect(() => {
onValidityChange?.(modelIsValid);
}, [modelIsValid, onValidityChange]);
@@ -653,6 +661,7 @@ export function AgentConfigFields({
isCustomModelEditing={isCustomModelEditing}
isRequired={
showRequiredIndicators &&
+ !modelIsOptional &&
fallbackModel === null &&
!dependentFieldsDisabled
}
diff --git a/desktop/src/features/agents/ui/AgentDefaultsEditor.tsx b/desktop/src/features/agents/ui/AgentDefaultsEditor.tsx
index f1056931bc..52cd01dd3a 100644
--- a/desktop/src/features/agents/ui/AgentDefaultsEditor.tsx
+++ b/desktop/src/features/agents/ui/AgentDefaultsEditor.tsx
@@ -20,6 +20,13 @@ 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 {
+ formatRuntimeOptionLabel,
+ getDefaultPersonaRuntime,
+ resetConfigForHarnessChange,
+ sortPersonaRuntimes,
+} from "@/features/agents/ui/agentConfigOptions";
+import { AgentDropdownSelect } from "@/features/agents/ui/agentConfigControls";
import {
AgentConfigFields,
EMPTY_GLOBAL_CONFIG,
@@ -105,17 +112,36 @@ export function AgentDefaultsEditor({
});
}, []);
- // 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"),
+ const sortedRuntimes = React.useMemo(
+ () => sortPersonaRuntimes(runtimesQuery.data ?? []),
[runtimesQuery.data],
);
+ // A missing/stale preference displays the same effective fallback the backend
+ // would use; it is persisted only after the user edits and saves this form.
+ // Keep persona ordering here so this shared editor matches agent dialogs.
+ const selectedRuntime = React.useMemo(
+ () =>
+ sortedRuntimes.find(
+ (runtime) => runtime.id === config.preferred_runtime,
+ ) ??
+ getDefaultPersonaRuntime(sortedRuntimes) ??
+ sortedRuntimes[0],
+ [config.preferred_runtime, sortedRuntimes],
+ );
+ const harnessOptions = React.useMemo(
+ () =>
+ sortedRuntimes.map((runtime) => ({
+ label: formatRuntimeOptionLabel(runtime),
+ value: runtime.id,
+ })),
+ [sortedRuntimes],
+ );
const configSurfaceLoading = isLoading || runtimesQuery.isLoading;
const configSurfaceError =
loadError ||
runtimesQuery.isError ||
- (!configSurfaceLoading && buzzAgentRuntime === undefined);
+ (!configSurfaceLoading && selectedRuntime === undefined);
function handleConfigChange(next: GlobalAgentConfig) {
configRef.current = next;
@@ -125,6 +151,12 @@ export function AgentDefaultsEditor({
setSaveError(null);
}
+ function handleHarnessChange(runtimeId: string) {
+ handleConfigChange(resetConfigForHarnessChange(config, runtimeId));
+ setIsCustomModelEditing(false);
+ setIsCustomProvider(false);
+ }
+
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.
@@ -183,18 +215,36 @@ export function AgentDefaultsEditor({
Couldn't load agent defaults. Restart the app to try again.
) : (
-
+ <>
+
+
+
+