Skip to content

Commit 4d1336a

Browse files
authored
Clarify agent harness defaults in create flow (#2601)
1 parent 9f42f39 commit 4d1336a

33 files changed

Lines changed: 1482 additions & 848 deletions

‎desktop/src/features/agents/AGENTS.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,27 @@ with a TypeScript lookup table or an id comparison in a component.
7979
harnesses always keep the field. Gate: `defaults hides model when optional
8080
harness has empty discovery` (and the failed-discovery counterpart) in
8181
`onboarding-agent-defaults.spec.ts`.
82+
9. **The defaults modal is progressively disclosed.** An unset global config
83+
starts on the Buzz Agent-first deployment fallback and carries that visible
84+
harness into the next saved edit. The `progressive-defaults` disclosure
85+
preset therefore begins at Provider for Buzz Agent, then reveals Model,
86+
Effort, and Advanced only after a provider is configured. Harnesses whose
87+
runtime metadata has no provider field skip that gate. Reveals animate their
88+
height through Motion and become immediate when reduced motion is requested.
89+
Once the Advanced toggle is visible, its expanded state is exclusively
90+
user-controlled: provider, harness, and required-env changes must never
91+
open it automatically in defaults, create, or edit flows. In Create mode,
92+
the defaults summary follows preferred-harness changes saved while the
93+
dialog is open, and its configured state includes required credentials as
94+
well as provider/model values. If no available harness can resolve, Create
95+
starts in Customize and lets unavailable catalog entries be selected only
96+
to expose their setup guidance; submission remains blocked.
97+
Advanced-only required credentials mark the collapsed Advanced toggle
98+
without opening it in Global Defaults and Edit, and block incomplete saves.
99+
Runtime-file credentials satisfy Global Defaults just as they do Create and
100+
Edit. In Edit,
101+
selecting Custom command keeps its required command field beside the harness
102+
picker rather than hiding it in Advanced.
82103

83104
## The tests that enforce this
84105

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { hasMissingRequiredEnvKey } from "./personaRuntimeModel";
2+
3+
export function AdvancedRequiredBadge({
4+
envVars,
5+
requiredEnvKeys,
6+
show,
7+
testId,
8+
}: {
9+
envVars?: Record<string, string>;
10+
requiredEnvKeys?: readonly string[];
11+
show?: boolean;
12+
testId: string;
13+
}) {
14+
const visible =
15+
show ?? hasMissingRequiredEnvKey(requiredEnvKeys ?? [], envVars ?? {});
16+
if (!visible) return null;
17+
return (
18+
<span
19+
aria-hidden="true"
20+
className="rounded-full bg-destructive/10 px-2 py-0.5 text-xs text-destructive"
21+
data-testid={testId}
22+
>
23+
Required
24+
</span>
25+
);
26+
}
Lines changed: 71 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,67 @@
1+
import type * as React from "react";
12
import { Tabs, TabsList, TabsTrigger } from "@/shared/ui/tabs";
23
import type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy";
4+
import { AgentAiDefaultsNotice } from "./AgentAiDefaults";
5+
import type { InheritedDefault } from "./bakedEnvHelpers";
36

47
export type { AgentAiConfigurationMode } from "./agentAiConfigurationPolicy";
58

69
export function HarnessModelDefaultNotice({
10+
harness,
711
model,
812
}: {
13+
harness: string;
914
model?: string | null;
1015
}) {
1116
return (
12-
<div className="text-sm" data-testid="agent-harness-defaults-notice">
13-
<span className="text-muted-foreground">Model</span>{" "}
14-
<span className="text-foreground">
17+
<dl
18+
className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 text-sm"
19+
data-testid="agent-harness-defaults-notice"
20+
>
21+
<dt className="text-muted-foreground">Harness</dt>
22+
<dd className="truncate text-foreground">
23+
{harness || "Not configured"}
24+
</dd>
25+
<dt className="text-muted-foreground">Model</dt>
26+
<dd className="truncate text-foreground">
1527
{model?.trim() || "Harness default"}
16-
</span>
17-
</div>
28+
</dd>
29+
</dl>
30+
);
31+
}
32+
33+
export function AgentCreateAiDefaultsSummary({
34+
canChooseProvider,
35+
harness,
36+
inheritedModel,
37+
inheritedProvider,
38+
isConfigured,
39+
model,
40+
onEditDefaults,
41+
triggerRef,
42+
}: {
43+
canChooseProvider: boolean;
44+
harness: string;
45+
inheritedModel: InheritedDefault;
46+
inheritedProvider: InheritedDefault;
47+
isConfigured: boolean;
48+
model?: string | null;
49+
onEditDefaults: () => void;
50+
triggerRef?: React.Ref<HTMLButtonElement>;
51+
}) {
52+
return canChooseProvider ? (
53+
<AgentAiDefaultsNotice
54+
isConfigured={isConfigured}
55+
onEditDefaults={onEditDefaults}
56+
triggerRef={triggerRef}
57+
explicitModel=""
58+
explicitProvider=""
59+
harness={harness}
60+
inheritedModel={inheritedModel}
61+
inheritedProvider={inheritedProvider}
62+
/>
63+
) : (
64+
<HarnessModelDefaultNotice harness={harness} model={model} />
1865
);
1966
}
2067

@@ -36,22 +83,31 @@ export function AgentAiConfigurationModeField({
3683
}
3784
value={mode}
3885
>
39-
<TabsList>
40-
<TabsTrigger value="defaults">
86+
<TabsList className="relative isolate grid h-9 w-full grid-cols-2 overflow-hidden rounded-lg bg-muted p-0.5">
87+
<div
88+
aria-hidden="true"
89+
className="absolute bottom-0.5 left-0.5 top-0.5 z-0 rounded-md bg-background shadow-sm transition-transform duration-[250ms] ease-out"
90+
style={{
91+
transform: `translateX(${mode === "custom" ? 100 : 0}%)`,
92+
width: "calc((100% - 4px) / 2)",
93+
}}
94+
/>
95+
<TabsTrigger
96+
className="relative z-10 h-full rounded-md bg-transparent text-xs font-medium shadow-none transition-colors data-[state=active]:bg-transparent data-[state=active]:shadow-none"
97+
value="defaults"
98+
>
4199
{needsProviderSelection
42100
? "Use agent defaults"
43101
: "Use harness defaults"}
44102
</TabsTrigger>
45-
<TabsTrigger value="custom">Customize for this agent</TabsTrigger>
103+
<TabsTrigger
104+
className="relative z-10 h-full rounded-md bg-transparent text-xs font-medium shadow-none transition-colors data-[state=active]:bg-transparent data-[state=active]:shadow-none"
105+
value="custom"
106+
>
107+
Customize for this agent
108+
</TabsTrigger>
46109
</TabsList>
47110
</Tabs>
48-
{mode === "custom" ? (
49-
<p className="text-xs text-muted-foreground">
50-
{needsProviderSelection
51-
? "Provider and model changes apply only to this agent."
52-
: "Model changes apply only to this agent."}
53-
</p>
54-
) : null}
55111
</div>
56112
);
57113
}

‎desktop/src/features/agents/ui/AgentAiDefaults.tsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,62 @@ export function formatAiDefaultsSummary({
2626
}
2727

2828
export function AgentAiDefaultsNotice({
29+
isConfigured = true,
2930
onEditDefaults,
3031
triggerRef,
3132
explicitModel,
3233
explicitProvider,
34+
harness,
3335
inheritedModel,
3436
inheritedProvider,
3537
}: {
38+
isConfigured?: boolean;
3639
onEditDefaults: () => void;
3740
triggerRef?: React.Ref<HTMLButtonElement>;
3841
explicitModel: string;
3942
explicitProvider: string;
43+
harness?: string;
4044
inheritedModel: InheritedDefault;
4145
inheritedProvider: InheritedDefault;
4246
}) {
4347
const provider = explicitProvider.trim() || inheritedProvider.value;
4448
const model = explicitModel.trim() || inheritedModel.value;
4549

50+
if (!isConfigured) {
51+
return (
52+
<div
53+
className="flex items-center justify-between gap-3 rounded-xl border border-border/70 bg-muted/30 px-3 py-2.5"
54+
data-testid="agent-ai-defaults-notice"
55+
>
56+
<p className="text-sm font-medium text-foreground">
57+
Global defaults not set
58+
</p>
59+
<Button
60+
className="shrink-0"
61+
data-testid="set-ai-defaults"
62+
onClick={onEditDefaults}
63+
ref={triggerRef}
64+
size="sm"
65+
type="button"
66+
variant="outline"
67+
>
68+
Set
69+
</Button>
70+
</div>
71+
);
72+
}
73+
4674
return (
4775
<div className="space-y-1" data-testid="agent-ai-defaults-notice">
4876
<dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 text-sm">
77+
{harness !== undefined ? (
78+
<>
79+
<dt className="text-muted-foreground">Harness</dt>
80+
<dd className="truncate text-foreground">
81+
{harness || "Not configured"}
82+
</dd>
83+
</>
84+
) : null}
4985
<dt className="text-muted-foreground">Provider</dt>
5086
<dd className="truncate text-foreground">
5187
{provider ? providerLabel(provider) : "Not configured"}

0 commit comments

Comments
 (0)