@@ -75,6 +75,12 @@ interface DraftState {
7575 /** Not editable in the dialog, but preserved so editing an agent-created task keeps its modes. */
7676 readonly runtimeMode : RuntimeMode ;
7777 readonly interactionMode : ProviderInteractionMode ;
78+ /**
79+ * The task's original model selection. The picker only edits
80+ * `instanceId:model`; keeping the source object preserves provider options
81+ * (reasoning, temperature, …) when the model itself is left unchanged.
82+ */
83+ readonly baseModelSelection : ModelSelection | null ;
7884}
7985
8086/** JS day-of-week (0 = Sunday) rendered Monday-first, matching how people read a week. */
@@ -106,6 +112,7 @@ const EMPTY_DRAFT: DraftState = {
106112 modelKey : "" ,
107113 runtimeMode : "full-access" ,
108114 interactionMode : "default" ,
115+ baseModelSelection : null ,
109116} ;
110117
111118/** Labelled field: a caption sitting above its control. */
@@ -179,10 +186,24 @@ export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
179186 return `${ days } at ${ schedule . timeOfDay } ` ;
180187}
181188
189+ /**
190+ * Human label for a run timestamp. `formatRelativeTime` only handles the
191+ * past, and `nextRunAt` is a future instant — render "in 5m" style labels
192+ * for upcoming runs instead of a misleading "just now".
193+ */
182194export function relativeLabel ( value : string | null ) : string {
183195 if ( ! value ) return "Not scheduled" ;
184- const relative = formatRelativeTime ( value ) ;
185- return relative . suffix ? `${ relative . value } ${ relative . suffix } ` : relative . value ;
196+ const diffMs = new Date ( value ) . getTime ( ) - Date . now ( ) ;
197+ if ( diffMs <= 0 ) {
198+ const relative = formatRelativeTime ( value ) ;
199+ return relative . suffix ? `${ relative . value } ${ relative . suffix } ` : relative . value ;
200+ }
201+ const minutes = Math . ceil ( diffMs / 60_000 ) ;
202+ if ( minutes < 2 ) return "in under a minute" ;
203+ if ( minutes < 60 ) return `in ${ minutes } m` ;
204+ const hours = Math . round ( minutes / 60 ) ;
205+ if ( hours < 24 ) return `in ${ hours } h` ;
206+ return `in ${ Math . round ( hours / 24 ) } d` ;
186207}
187208
188209function taskToDraft ( task : ScheduledTask ) : DraftState {
@@ -214,6 +235,7 @@ function taskToDraft(task: ScheduledTask): DraftState {
214235 modelKey : modelKey ( task . modelSelection ) ,
215236 runtimeMode : task . runtimeMode ,
216237 interactionMode : task . interactionMode ,
238+ baseModelSelection : task . modelSelection ,
217239 } ;
218240}
219241
@@ -258,6 +280,7 @@ export function ScheduledTasksSettings() {
258280 ) ;
259281 const [ draft , setDraft ] = useState < DraftState > ( ( ) => EMPTY_DRAFT ) ;
260282 const [ dialogOpen , setDialogOpen ] = useState ( false ) ;
283+ const [ saving , setSaving ] = useState ( false ) ;
261284 const tasks = tasksQuery . data ?. tasks ?? [ ] ;
262285 const selectedProjectTitle = projects . find ( ( project ) => project . id === draft . projectId ) ?. title ;
263286
@@ -302,12 +325,20 @@ export function ScheduledTasksSettings() {
302325 } ;
303326
304327 const submit = useCallback ( async ( ) => {
305- if ( ! environment ) return ;
328+ if ( ! environment || saving ) return ;
306329 const selection = splitModelKey ( draft . modelKey || defaultModelKey ) ;
307330 if ( ! draft . title . trim ( ) || ! draft . prompt . trim ( ) || ! draft . projectId || selection === null ) {
308331 reportFailure ( "Schedule task is incomplete" , "Add a title, prompt, project, and model." ) ;
309332 return ;
310333 }
334+ // Keep the original selection object (with provider options) when the
335+ // picker still points at the same instance+model.
336+ const modelSelection =
337+ draft . baseModelSelection !== null &&
338+ draft . baseModelSelection . instanceId === selection . instanceId &&
339+ draft . baseModelSelection . model === selection . model
340+ ? draft . baseModelSelection
341+ : selection ;
311342 const workspaceStrategy : OrchestrationV2ThreadLaunchWorkspaceStrategy =
312343 draft . workspaceMode === "root"
313344 ? { type : "root" }
@@ -323,20 +354,22 @@ export function ScheduledTasksSettings() {
323354 projectId : draft . projectId as ProjectId ,
324355 threadId : draft . threadId ? ( draft . threadId as ThreadId ) : null ,
325356 workspaceStrategy,
326- modelSelection : selection ,
357+ modelSelection,
327358 runtimeMode : draft . runtimeMode ,
328359 interactionMode : draft . interactionMode ,
329360 creationSource : "web" ,
330361 } ;
362+ setSaving ( true ) ;
331363 const result = await upsertTask ( { environmentId : environment . environmentId , input } ) ;
364+ setSaving ( false ) ;
332365 if ( result . _tag === "Failure" ) {
333366 if ( ! isAtomCommandInterrupted ( result ) ) {
334367 reportFailure ( "Could not save schedule task" , squashAtomCommandFailure ( result ) ) ;
335368 }
336369 return ;
337370 }
338371 setDialogOpen ( false ) ;
339- } , [ defaultModelKey , draft , environment , upsertTask ] ) ;
372+ } , [ defaultModelKey , draft , environment , saving , upsertTask ] ) ;
340373
341374 const handleDelete = useCallback (
342375 async ( task : ScheduledTask ) => {
@@ -644,8 +677,14 @@ export function ScheduledTasksSettings() {
644677 onClick = { ( ) =>
645678 setDraft ( ( current ) => {
646679 const weekdays = new Set ( current . weekdays ) ;
647- if ( weekdays . has ( day ) ) weekdays . delete ( day ) ;
648- else weekdays . add ( day ) ;
680+ if ( weekdays . has ( day ) ) {
681+ // Keep at least one day selected: an empty set
682+ // would silently persist as a daily schedule.
683+ if ( weekdays . size === 1 ) return current ;
684+ weekdays . delete ( day ) ;
685+ } else {
686+ weekdays . add ( day ) ;
687+ }
649688 return { ...current , weekdays } ;
650689 } )
651690 }
@@ -690,7 +729,7 @@ export function ScheduledTasksSettings() {
690729
691730 < DialogFooter >
692731 < DialogClose render = { < Button variant = "outline" size = "sm" /> } > Cancel</ DialogClose >
693- < Button size = "sm" onClick = { ( ) => void submit ( ) } >
732+ < Button size = "sm" disabled = { saving } onClick = { ( ) => void submit ( ) } >
694733 { draft . editingId ? "Save task" : "Create task" }
695734 </ Button >
696735 </ DialogFooter >
0 commit comments