@@ -40,10 +40,13 @@ function formatHarnessLabel(runtime: AcpRuntimeCatalogEntry | undefined) {
4040}
4141
4242function AgentDefaultsSection ( {
43- onHasDefaultRuntimeChange ,
43+ onPersistenceStateChange ,
4444 readyRuntimeIds,
4545} : {
46- onHasDefaultRuntimeChange : ( hasDefaultRuntime : boolean ) => void ;
46+ onPersistenceStateChange : ( state : {
47+ canComplete : boolean ;
48+ flush : ( ) => Promise < void > ;
49+ } ) => void ;
4750 readyRuntimeIds : readonly string [ ] ;
4851} ) {
4952 const runtimesQuery = useAcpRuntimesQuery ( ) ;
@@ -55,8 +58,10 @@ function AgentDefaultsSection({
5558 const [ bakedEnv , setBakedEnv ] = React . useState < BakedEnvEntry [ ] > ( [ ] ) ;
5659 const coalescerRef = React . useRef < {
5760 enqueue : ( value : GlobalAgentConfig ) => void ;
61+ flush : ( ) => Promise < void > ;
5862 cancel : ( ) => void ;
5963 } | null > ( null ) ;
64+ const [ isSaving , setIsSaving ] = React . useState ( false ) ;
6065
6166 React . useEffect ( ( ) => {
6267 let unmounted = false ;
@@ -87,7 +92,9 @@ function AgentDefaultsSection({
8792 // set_global_agent_config returns a save result (config + restart
8893 // counts); the coalescer round-trips the persisted config only.
8994 async ( next ) => ( await setGlobalAgentConfig ( next ) ) . config ,
90- ( ) => undefined , // saving state not surfaced in this autosave UX
95+ ( saving ) => {
96+ if ( ! unmounted ) setIsSaving ( saving ) ;
97+ } ,
9198 ( saved ) => {
9299 if ( ! unmounted ) setConfig ( saved ) ;
93100 } ,
@@ -157,9 +164,16 @@ function AgentDefaultsSection({
157164 selectedRuntimeId ,
158165 ] ) ;
159166
167+ const flushPersistence = React . useCallback (
168+ ( ) => coalescerRef . current ?. flush ( ) ?? Promise . resolve ( ) ,
169+ [ ] ,
170+ ) ;
160171 React . useEffect ( ( ) => {
161- onHasDefaultRuntimeChange ( selectedRuntimeId . length > 0 ) ;
162- } , [ onHasDefaultRuntimeChange , selectedRuntimeId ] ) ;
172+ onPersistenceStateChange ( {
173+ canComplete : selectedRuntimeId . length > 0 && ! isSaving ,
174+ flush : flushPersistence ,
175+ } ) ;
176+ } , [ flushPersistence , isSaving , onPersistenceStateChange , selectedRuntimeId ] ) ;
163177
164178 return (
165179 < section className = "w-full space-y-4 text-left text-sm" >
@@ -230,7 +244,26 @@ export function DefaultConfigStep({
230244 direction,
231245 readyRuntimeIds,
232246} : DefaultConfigStepProps ) {
233- const [ hasDefaultRuntime , setHasDefaultRuntime ] = React . useState ( false ) ;
247+ const [ persistenceState , setPersistenceState ] = React . useState < {
248+ canComplete : boolean ;
249+ flush : ( ) => Promise < void > ;
250+ } > ( { canComplete : false , flush : ( ) => Promise . resolve ( ) } ) ;
251+ const [ completionError , setCompletionError ] = React . useState < string | null > (
252+ null ,
253+ ) ;
254+ const [ isCompleting , setIsCompleting ] = React . useState ( false ) ;
255+
256+ const handleComplete = React . useCallback ( async ( ) => {
257+ setIsCompleting ( true ) ;
258+ setCompletionError ( null ) ;
259+ try {
260+ await persistenceState . flush ( ) ;
261+ actions . complete ( ) ;
262+ } catch {
263+ setCompletionError ( "Couldn't save your default harness. Try again." ) ;
264+ setIsCompleting ( false ) ;
265+ }
266+ } , [ actions , persistenceState ] ) ;
234267
235268 return (
236269 < OnboardingSlideTransition
@@ -253,18 +286,26 @@ export function DefaultConfigStep({
253286 < div className = "flex w-full flex-1 items-center justify-center py-10" >
254287 < div className = "w-full max-w-[328px]" >
255288 < AgentDefaultsSection
256- onHasDefaultRuntimeChange = { setHasDefaultRuntime }
289+ onPersistenceStateChange = { setPersistenceState }
257290 readyRuntimeIds = { readyRuntimeIds }
258291 />
292+ { completionError ? (
293+ < p
294+ className = "mt-3 text-center text-xs text-destructive"
295+ role = "alert"
296+ >
297+ { completionError }
298+ </ p >
299+ ) : null }
259300 </ div >
260301 </ div >
261302
262303 < OnboardingFooter >
263304 < Button
264305 className = { `${ ONBOARDING_PRIMARY_CTA_CLASS } text-sm` }
265306 data-testid = "onboarding-finish"
266- disabled = { ! hasDefaultRuntime }
267- onClick = { actions . complete }
307+ disabled = { ! persistenceState . canComplete || isCompleting }
308+ onClick = { ( ) => void handleComplete ( ) }
268309 type = "button"
269310 >
270311 Next
0 commit comments