@@ -208,9 +208,13 @@ export class ScheduledTaskService extends Context.Service<
208208 ) => Effect . Effect < ScheduledTaskDeleteResult , ScheduledTaskError > ;
209209 /** Deletes only tasks that still target this thread, including their webhook deliveries. */
210210 readonly deleteForThread : ( threadId : ThreadId ) => Effect . Effect < void , ScheduledTaskError > ;
211+ /** The dispatched thread, or null if dispatch failed; leaves the task's binding unchanged. */
211212 readonly runNow : (
212213 input : ScheduledTaskRunNowInput ,
213- ) => Effect . Effect < ScheduledTaskRunNowResult , ScheduledTaskError > ;
214+ ) => Effect . Effect <
215+ ScheduledTaskRunNowResult & { readonly threadId : ThreadId | null } ,
216+ ScheduledTaskError
217+ > ;
214218 readonly rotateWebhookToken : (
215219 input : ScheduledTaskRotateWebhookTokenInput ,
216220 ) => Effect . Effect < ScheduledTaskMutationResult , ScheduledTaskError > ;
@@ -688,7 +692,7 @@ export const layer = Layer.effect(
688692 if ( trigger !== "scheduled" ) {
689693 return yield * taskError ( "Schedule task is already running." , { taskId : task . id } ) ;
690694 }
691- return task ;
695+ return { task, threadId : null } ;
692696 }
693697
694698 return yield * Effect . gen ( function * ( ) {
@@ -708,7 +712,7 @@ export const layer = Layer.effect(
708712 if ( trigger !== "scheduled" ) {
709713 return yield * taskError ( "Schedule task not found." , { taskId : task . id } ) ;
710714 }
711- return task ;
715+ return { task, threadId : null } ;
712716 }
713717 const parsedNextRunAt =
714718 active . nextRunAt === null ? Option . none ( ) : DateTime . make ( active . nextRunAt ) ;
@@ -718,7 +722,7 @@ export const layer = Layer.effect(
718722 Option . isNone ( parsedNextRunAt ) ||
719723 DateTime . toEpochMillis ( parsedNextRunAt . value ) > DateTime . toEpochMillis ( startedAt ) )
720724 ) {
721- return active ;
725+ return { task : active , threadId : null } ;
722726 }
723727 // A queued delivery must not run a task that was paused, deleted and
724728 // recreated under the same id, or switched to another trigger while
@@ -753,45 +757,50 @@ export const layer = Layer.effect(
753757 const result =
754758 active . threadId === null
755759 ? yield * Effect . exit (
756- threadLaunch . launch ( {
757- commandId,
758- projectId : active . projectId ,
759- title : active . title ,
760- modelSelection : active . modelSelection ,
761- runtimeMode : active . runtimeMode ,
762- interactionMode : active . interactionMode ,
763- workspaceStrategy : active . workspaceStrategy ,
764- initialMessage : {
765- messageId,
766- scheduledTaskId : active . id ,
767- text : prompt ,
768- attachments : [ ] ,
769- } ,
770- createdBy : active . createdBy ,
771- creationSource : active . creationSource ,
772- } ) ,
760+ threadLaunch
761+ . launch ( {
762+ commandId,
763+ projectId : active . projectId ,
764+ title : active . title ,
765+ modelSelection : active . modelSelection ,
766+ runtimeMode : active . runtimeMode ,
767+ interactionMode : active . interactionMode ,
768+ workspaceStrategy : active . workspaceStrategy ,
769+ initialMessage : {
770+ messageId,
771+ scheduledTaskId : active . id ,
772+ text : prompt ,
773+ attachments : [ ] ,
774+ } ,
775+ createdBy : active . createdBy ,
776+ creationSource : active . creationSource ,
777+ } )
778+ . pipe ( Effect . map ( ( launched ) => launched . threadId ) ) ,
773779 )
774780 : yield * Effect . exit (
775781 // The stored selection only seeds fresh threads. A bound run
776782 // follows the thread's current provider, so it passes none.
777- threadManagement . sendToThread ( {
778- projectId : active . projectId ,
779- commandId,
780- threadId : ThreadId . make ( active . threadId ) ,
781- messageId,
782- scheduledTaskId : active . id ,
783- text : prompt ,
784- attachments : [ ] ,
785- mode : "queue" ,
786- createdBy : active . createdBy ,
787- creationSource : active . creationSource ,
788- } ) ,
783+ threadManagement
784+ . sendToThread ( {
785+ projectId : active . projectId ,
786+ commandId,
787+ threadId : ThreadId . make ( active . threadId ) ,
788+ messageId,
789+ scheduledTaskId : active . id ,
790+ text : prompt ,
791+ attachments : [ ] ,
792+ mode : "queue" ,
793+ createdBy : active . createdBy ,
794+ creationSource : active . creationSource ,
795+ } )
796+ . pipe ( Effect . as ( ThreadId . make ( active . threadId ) ) ) ,
789797 ) ;
790798
791799 const completedAt = yield * localNow ;
792800 const runSucceeded = result . _tag === "Success" ;
793801 const lastRunStatus = runSucceeded ? ( "succeeded" as const ) : ( "failed" as const ) ;
794802 const lastRunError = runSucceeded ? null : errorMessage ( result . cause ) ;
803+ const threadId = runSucceeded ? result . value : null ;
795804 const current = yield * findTask ( task . id ) ;
796805 const scheduleSource = current ?? task ;
797806 const completed : ScheduledTask = {
@@ -817,7 +826,7 @@ export const layer = Layer.effect(
817826 } ) ;
818827 yield * notifyChanged ;
819828 }
820- return completed ;
829+ return { task : completed , threadId } ;
821830 } ) . pipe (
822831 Effect . onError ( ( cause ) => releaseStuckRun ( task , errorMessage ( cause ) ) ) ,
823832 Effect . ensuring (
@@ -1153,12 +1162,11 @@ export const layer = Layer.effect(
11531162 taskId : input . id ,
11541163 } ) ;
11551164 }
1156- const next = yield * runTask ( task , "manual" ) . pipe (
1165+ return yield * runTask ( task , "manual" ) . pipe (
11571166 Effect . mapError ( ( cause ) =>
11581167 taskError ( "Could not run schedule task." , { taskId : input . id , cause } ) ,
11591168 ) ,
11601169 ) ;
1161- return { task : next } ;
11621170 } ) ;
11631171
11641172 const rotateWebhookToken : ScheduledTaskService [ "Service" ] [ "rotateWebhookToken" ] = Effect . fn (
@@ -1605,7 +1613,7 @@ export const layer = Layer.effect(
16051613 Metrics . increment ( Metrics . webhookRunsTotal , { outcome } ) ,
16061614 ] ) ;
16071615 yield * runTask ( task , "webhook" , { deliveryId, prompt : rendered . prompt } ) . pipe (
1608- Effect . flatMap ( ( completed ) =>
1616+ Effect . flatMap ( ( { task : completed } ) =>
16091617 completed . lastRunStatus === "failed"
16101618 ? runOutcome ( "failed" ) . pipe (
16111619 Effect . andThen ( markDeliveryFailed ( deliveryId , "The run failed to start." ) ) ,
0 commit comments