@@ -734,20 +734,7 @@ export const layer = Layer.effect(
734734 readonly dispatched : Ref . Ref < boolean > ;
735735 } ,
736736 ) {
737- const reserved = yield * Ref . modify ( activeRuns , ( active ) => {
738- if ( active . has ( task . id ) ) return [ false , active ] as const ;
739- const next = new Set ( active ) ;
740- next . add ( task . id ) ;
741- return [ true , next ] as const ;
742- } ) ;
743- if ( ! reserved ) {
744- if ( trigger !== "scheduled" ) {
745- return yield * taskError ( "Schedule task is already running." , { taskId : task . id } ) ;
746- }
747- return { task, threadId : null } ;
748- }
749-
750- return yield * Effect . gen ( function * ( ) {
737+ const run = Effect . gen ( function * ( ) {
751738 const startedAt = yield * localNow ;
752739 const startedAtIso = iso ( startedAt ) ;
753740
@@ -944,13 +931,30 @@ export const layer = Layer.effect(
944931 return { task : completed , threadId } ;
945932 } ) . pipe (
946933 Effect . onError ( ( cause ) => releaseStuckRun ( task , errorMessage ( cause ) , webhook ?. deliveryId ) ) ,
947- Effect . ensuring (
948- Ref . update ( activeRuns , ( active ) => {
949- const next = new Set ( active ) ;
950- next . delete ( task . id ) ;
951- return next ;
952- } ) ,
953- ) ,
934+ ) ;
935+
936+ // Reserve and release as one bracket so an interrupt cannot leave the task marked busy.
937+ return yield * Effect . acquireUseRelease (
938+ Ref . modify ( activeRuns , ( active ) => {
939+ if ( active . has ( task . id ) ) return [ false , active ] as const ;
940+ const next = new Set ( active ) ;
941+ next . add ( task . id ) ;
942+ return [ true , next ] as const ;
943+ } ) ,
944+ ( reserved ) =>
945+ reserved
946+ ? run
947+ : trigger !== "scheduled"
948+ ? Effect . fail ( taskError ( "Schedule task is already running." , { taskId : task . id } ) )
949+ : Effect . succeed ( { task, threadId : null } ) ,
950+ ( reserved ) =>
951+ reserved
952+ ? Ref . update ( activeRuns , ( active ) => {
953+ const next = new Set ( active ) ;
954+ next . delete ( task . id ) ;
955+ return next ;
956+ } )
957+ : Effect . void ,
954958 ) ;
955959 } ) ;
956960
@@ -2155,83 +2159,87 @@ export const layer = Layer.effect(
21552159 }
21562160 yield * Effect . forEach (
21572161 tasks ,
2158- ( { task_id : taskId } ) =>
2159- Effect . gen ( function * ( ) {
2160- const reserved = yield * Ref . modify ( pendingInFlight , ( active ) =>
2161- active . has ( taskId )
2162- ? ( [ false , active ] as const )
2163- : ( [ true , new Set ( active ) . add ( taskId ) ] as const ) ,
2164- ) ;
2165- if ( ! reserved ) return ;
2166- const permit = yield * webhookPermit ( taskId ) ;
2167- // One worker per task waits on its permit, then drains persisted rows in order.
2168- // Other tasks remain independent and ticks never reload an active task's payloads.
2169- const dispatch = Effect . gen ( function * ( ) {
2170- while ( true ) {
2171- const [ entry ] = yield * sql < {
2172- delivery_id : string ;
2173- task_json : string ;
2174- request_json : string ;
2175- state : string ;
2176- } > `
2162+ ( { task_id : taskId } ) => {
2163+ // One worker per task waits on its permit, then drains persisted rows in order.
2164+ // Other tasks remain independent and ticks never reload an active task's payloads.
2165+ const dispatch = Effect . gen ( function * ( ) {
2166+ while ( true ) {
2167+ const [ entry ] = yield * sql < {
2168+ delivery_id : string ;
2169+ task_json : string ;
2170+ request_json : string ;
2171+ state : string ;
2172+ } > `
21772173 SELECT delivery_id, task_json, request_json, state FROM scheduled_task_webhook_pending
21782174 WHERE task_id = ${ taskId } AND state IN ('dispatching', 'running', 'completed', 'failed') ORDER BY due_at, rowid LIMIT 1
21792175 ` . pipe ( NodeSqliteClient . readOnly ) ;
2180- if ( entry === undefined ) return ;
2181- const remove = sql `DELETE FROM scheduled_task_webhook_pending WHERE delivery_id = ${ entry . delivery_id } ` ;
2182- if ( entry . state === "completed" || entry . state === "failed" ) {
2183- if ( entry . state === "failed" ) {
2184- yield * markDeliveryFailed ( entry . delivery_id , "The run failed to start." ) ;
2185- yield * releaseFailedDelivery ( entry . delivery_id ) ;
2186- }
2187- yield * remove ;
2188- continue ;
2189- }
2190- const prepared = yield * Effect . gen ( function * ( ) {
2191- const task = yield * decodePendingTask ( entry . task_json ) ;
2192- const request = yield * decodePendingRequest ( entry . request_json ) ;
2193- const frameId = Buffer . from ( yield * crypto . randomBytes ( 6 ) ) . toString ( "hex" ) ;
2194- return { task, rendered : renderWebhookPrompt ( task . prompt , request , frameId ) } ;
2195- } ) . pipe ( Effect . exit ) ;
2196- if ( Exit . isFailure ( prepared ) ) {
2197- if ( Cause . hasInterruptsOnly ( prepared . cause ) )
2198- return yield * Effect . failCause ( prepared . cause ) ;
2199- yield * markDeliveryFailed (
2200- entry . delivery_id ,
2201- "The pending webhook payload could not be prepared." ,
2202- ) ;
2203- yield * releaseFailedDelivery ( entry . delivery_id ) ;
2204- yield * remove ;
2205- continue ;
2206- }
2207- const { task, rendered } = prepared . value ;
2208- if ( rendered . prompt . trim ( ) . length > PROVIDER_SEND_TURN_MAX_INPUT_CHARS ) {
2209- yield * markDeliveryFailed ( entry . delivery_id , PROMPT_TOO_LONG ) ;
2176+ if ( entry === undefined ) return ;
2177+ const remove = sql `DELETE FROM scheduled_task_webhook_pending WHERE delivery_id = ${ entry . delivery_id } ` ;
2178+ if ( entry . state === "completed" || entry . state === "failed" ) {
2179+ if ( entry . state === "failed" ) {
2180+ yield * markDeliveryFailed ( entry . delivery_id , "The run failed to start." ) ;
22102181 yield * releaseFailedDelivery ( entry . delivery_id ) ;
2211- } else {
2212- yield * sql `UPDATE scheduled_task_webhook_deliveries SET outcome = 'accepted', error = NULL, rendered_prompt = ${ rendered . prompt . slice ( 0 , WEBHOOK_DELIVERY_LOG_PROMPT_LIMIT ) } , missing_fields_json = ${ encodeMissingFieldsJson ( rendered . missing ) } WHERE delivery_id = ${ entry . delivery_id } ` ;
2213- if ( ! ( yield * runWebhookDelivery ( task , entry . delivery_id , rendered . prompt ) ) )
2214- return ;
22152182 }
22162183 yield * remove ;
2184+ continue ;
22172185 }
2218- } ) ;
2219- yield * dispatch . pipe (
2220- permit . withPermits ( 1 ) ,
2221- Effect . catch ( ( cause ) =>
2222- Effect . logWarning ( "Pending webhook dispatch failed" , { cause } ) ,
2223- ) ,
2224- Effect . ensuring (
2225- Ref . update ( pendingInFlight , ( active ) => {
2226- const next = new Set ( active ) ;
2227- next . delete ( taskId ) ;
2228- return next ;
2229- } ) ,
2230- ) ,
2231- Effect . withSpan ( "ScheduledTaskService.dispatchPendingWebhook" , { root : true } ) ,
2232- Effect . forkIn ( serviceScope ) ,
2233- ) ;
2234- } ) ,
2186+ const prepared = yield * Effect . gen ( function * ( ) {
2187+ const task = yield * decodePendingTask ( entry . task_json ) ;
2188+ const request = yield * decodePendingRequest ( entry . request_json ) ;
2189+ const frameId = Buffer . from ( yield * crypto . randomBytes ( 6 ) ) . toString ( "hex" ) ;
2190+ return { task, rendered : renderWebhookPrompt ( task . prompt , request , frameId ) } ;
2191+ } ) . pipe ( Effect . exit ) ;
2192+ if ( Exit . isFailure ( prepared ) ) {
2193+ if ( Cause . hasInterruptsOnly ( prepared . cause ) )
2194+ return yield * Effect . failCause ( prepared . cause ) ;
2195+ yield * markDeliveryFailed (
2196+ entry . delivery_id ,
2197+ "The pending webhook payload could not be prepared." ,
2198+ ) ;
2199+ yield * releaseFailedDelivery ( entry . delivery_id ) ;
2200+ yield * remove ;
2201+ continue ;
2202+ }
2203+ const { task, rendered } = prepared . value ;
2204+ if ( rendered . prompt . trim ( ) . length > PROVIDER_SEND_TURN_MAX_INPUT_CHARS ) {
2205+ yield * markDeliveryFailed ( entry . delivery_id , PROMPT_TOO_LONG ) ;
2206+ yield * releaseFailedDelivery ( entry . delivery_id ) ;
2207+ } else {
2208+ yield * sql `UPDATE scheduled_task_webhook_deliveries SET outcome = 'accepted', error = NULL, rendered_prompt = ${ rendered . prompt . slice ( 0 , WEBHOOK_DELIVERY_LOG_PROMPT_LIMIT ) } , missing_fields_json = ${ encodeMissingFieldsJson ( rendered . missing ) } WHERE delivery_id = ${ entry . delivery_id } ` ;
2209+ if ( ! ( yield * runWebhookDelivery ( task , entry . delivery_id , rendered . prompt ) ) ) return ;
2210+ }
2211+ yield * remove ;
2212+ }
2213+ } ) ;
2214+ // The worker owns its reservation, so an interrupt anywhere still releases it.
2215+ return Effect . acquireUseRelease (
2216+ Ref . modify ( pendingInFlight , ( active ) =>
2217+ active . has ( taskId )
2218+ ? ( [ false , active ] as const )
2219+ : ( [ true , new Set ( active ) . add ( taskId ) ] as const ) ,
2220+ ) ,
2221+ ( reserved ) =>
2222+ reserved
2223+ ? webhookPermit ( taskId ) . pipe (
2224+ Effect . flatMap ( ( permit ) => dispatch . pipe ( permit . withPermits ( 1 ) ) ) ,
2225+ Effect . catch ( ( cause ) =>
2226+ Effect . logWarning ( "Pending webhook dispatch failed" , { cause } ) ,
2227+ ) ,
2228+ Effect . withSpan ( "ScheduledTaskService.dispatchPendingWebhook" , {
2229+ root : true ,
2230+ } ) ,
2231+ )
2232+ : Effect . void ,
2233+ ( reserved ) =>
2234+ reserved
2235+ ? Ref . update ( pendingInFlight , ( active ) => {
2236+ const next = new Set ( active ) ;
2237+ next . delete ( taskId ) ;
2238+ return next ;
2239+ } )
2240+ : Effect . void ,
2241+ ) . pipe ( Effect . forkIn ( serviceScope ) ) ;
2242+ } ,
22352243 { discard : true } ,
22362244 ) ;
22372245 } ) ;
0 commit comments