@@ -786,20 +786,7 @@ export const layer = Layer.effect(
786786 // Read before reserving: nothing between the reservation and its release may fail.
787787 const startedAt = yield * localNow ;
788788 const startedAtIso = iso ( startedAt ) ;
789- const reserved = yield * Ref . modify ( activeRuns , ( active ) => {
790- if ( active . has ( task . id ) ) return [ false , active ] as const ;
791- const next = new Set ( active ) ;
792- next . add ( task . id ) ;
793- return [ true , next ] as const ;
794- } ) ;
795- if ( ! reserved ) {
796- if ( trigger !== "scheduled" ) {
797- return yield * taskError ( "Schedule task is already running." , { taskId : task . id } ) ;
798- }
799- return { task, threadId : null , dispatchFailed : false } ;
800- }
801-
802- return yield * Effect . gen ( function * ( ) {
789+ const run = Effect . gen ( function * ( ) {
803790 // Re-read stale poll snapshots so deleted, paused or postponed tasks cannot fire.
804791 const active = yield * findTask ( task . id ) ;
805792 if ( active === null ) {
@@ -1018,13 +1005,30 @@ export const layer = Layer.effect(
10181005 Effect . onError ( ( cause ) =>
10191006 releaseStuckRun ( task , startedAtIso , errorMessage ( cause ) , webhook ?. deliveryId ) ,
10201007 ) ,
1021- Effect . ensuring (
1022- Ref . update ( activeRuns , ( active ) => {
1023- const next = new Set ( active ) ;
1024- next . delete ( task . id ) ;
1025- return next ;
1026- } ) ,
1027- ) ,
1008+ ) ;
1009+
1010+ // Reserve and release as one bracket so an interrupt cannot leave the task marked busy.
1011+ return yield * Effect . acquireUseRelease (
1012+ Ref . modify ( activeRuns , ( active ) => {
1013+ if ( active . has ( task . id ) ) return [ false , active ] as const ;
1014+ const next = new Set ( active ) ;
1015+ next . add ( task . id ) ;
1016+ return [ true , next ] as const ;
1017+ } ) ,
1018+ ( reserved ) =>
1019+ reserved
1020+ ? run
1021+ : trigger !== "scheduled"
1022+ ? Effect . fail ( taskError ( "Schedule task is already running." , { taskId : task . id } ) )
1023+ : Effect . succeed ( { task, threadId : null , dispatchFailed : false } ) ,
1024+ ( reserved ) =>
1025+ reserved
1026+ ? Ref . update ( activeRuns , ( active ) => {
1027+ const next = new Set ( active ) ;
1028+ next . delete ( task . id ) ;
1029+ return next ;
1030+ } )
1031+ : Effect . void ,
10281032 ) ;
10291033 } ) ;
10301034
@@ -2243,83 +2247,87 @@ export const layer = Layer.effect(
22432247 }
22442248 yield * Effect . forEach (
22452249 tasks ,
2246- ( { task_id : taskId } ) =>
2247- Effect . gen ( function * ( ) {
2248- const reserved = yield * Ref . modify ( pendingInFlight , ( active ) =>
2249- active . has ( taskId )
2250- ? ( [ false , active ] as const )
2251- : ( [ true , new Set ( active ) . add ( taskId ) ] as const ) ,
2252- ) ;
2253- if ( ! reserved ) return ;
2254- const permit = yield * webhookPermit ( taskId ) ;
2255- // One worker per task waits on its permit, then drains persisted rows in order.
2256- // Other tasks remain independent and ticks never reload an active task's payloads.
2257- const dispatch = Effect . gen ( function * ( ) {
2258- while ( true ) {
2259- const [ entry ] = yield * sql < {
2260- delivery_id : string ;
2261- task_json : string ;
2262- request_json : string ;
2263- state : string ;
2264- } > `
2250+ ( { task_id : taskId } ) => {
2251+ // One worker per task waits on its permit, then drains persisted rows in order.
2252+ // Other tasks remain independent and ticks never reload an active task's payloads.
2253+ const dispatch = Effect . gen ( function * ( ) {
2254+ while ( true ) {
2255+ const [ entry ] = yield * sql < {
2256+ delivery_id : string ;
2257+ task_json : string ;
2258+ request_json : string ;
2259+ state : string ;
2260+ } > `
22652261 SELECT delivery_id, task_json, request_json, state FROM scheduled_task_webhook_pending
22662262 WHERE task_id = ${ taskId } AND state IN ('dispatching', 'running', 'completed', 'failed') ORDER BY due_at, rowid LIMIT 1
22672263 ` . pipe ( NodeSqliteClient . readOnly ) ;
2268- if ( entry === undefined ) return ;
2269- const remove = sql `DELETE FROM scheduled_task_webhook_pending WHERE delivery_id = ${ entry . delivery_id } ` ;
2270- if ( entry . state === "completed" || entry . state === "failed" ) {
2271- if ( entry . state === "failed" ) {
2272- yield * markDeliveryFailed ( entry . delivery_id , "The run failed to start." ) ;
2273- yield * releaseFailedDelivery ( entry . delivery_id ) ;
2274- }
2275- yield * remove ;
2276- continue ;
2277- }
2278- const prepared = yield * Effect . gen ( function * ( ) {
2279- const task = yield * decodePendingTask ( entry . task_json ) ;
2280- const request = yield * decodePendingRequest ( entry . request_json ) ;
2281- const frameId = Buffer . from ( yield * crypto . randomBytes ( 6 ) ) . toString ( "hex" ) ;
2282- return { task, rendered : renderWebhookPrompt ( task . prompt , request , frameId ) } ;
2283- } ) . pipe ( Effect . exit ) ;
2284- if ( Exit . isFailure ( prepared ) ) {
2285- if ( Cause . hasInterruptsOnly ( prepared . cause ) )
2286- return yield * Effect . failCause ( prepared . cause ) ;
2287- yield * markDeliveryFailed (
2288- entry . delivery_id ,
2289- "The pending webhook payload could not be prepared." ,
2290- ) ;
2291- yield * releaseFailedDelivery ( entry . delivery_id ) ;
2292- yield * remove ;
2293- continue ;
2294- }
2295- const { task, rendered } = prepared . value ;
2296- if ( rendered . prompt . trim ( ) . length > PROVIDER_SEND_TURN_MAX_INPUT_CHARS ) {
2297- yield * markDeliveryFailed ( entry . delivery_id , PROMPT_TOO_LONG ) ;
2264+ if ( entry === undefined ) return ;
2265+ const remove = sql `DELETE FROM scheduled_task_webhook_pending WHERE delivery_id = ${ entry . delivery_id } ` ;
2266+ if ( entry . state === "completed" || entry . state === "failed" ) {
2267+ if ( entry . state === "failed" ) {
2268+ yield * markDeliveryFailed ( entry . delivery_id , "The run failed to start." ) ;
22982269 yield * releaseFailedDelivery ( entry . delivery_id ) ;
2299- } else {
2300- 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 } ` ;
2301- if ( ! ( yield * runWebhookDelivery ( task , entry . delivery_id , rendered . prompt ) ) )
2302- return ;
23032270 }
23042271 yield * remove ;
2272+ continue ;
23052273 }
2306- } ) ;
2307- yield * dispatch . pipe (
2308- permit . withPermits ( 1 ) ,
2309- Effect . catch ( ( cause ) =>
2310- Effect . logWarning ( "Pending webhook dispatch failed" , { cause } ) ,
2311- ) ,
2312- Effect . ensuring (
2313- Ref . update ( pendingInFlight , ( active ) => {
2314- const next = new Set ( active ) ;
2315- next . delete ( taskId ) ;
2316- return next ;
2317- } ) ,
2318- ) ,
2319- Effect . withSpan ( "ScheduledTaskService.dispatchPendingWebhook" , { root : true } ) ,
2320- Effect . forkIn ( serviceScope ) ,
2321- ) ;
2322- } ) ,
2274+ const prepared = yield * Effect . gen ( function * ( ) {
2275+ const task = yield * decodePendingTask ( entry . task_json ) ;
2276+ const request = yield * decodePendingRequest ( entry . request_json ) ;
2277+ const frameId = Buffer . from ( yield * crypto . randomBytes ( 6 ) ) . toString ( "hex" ) ;
2278+ return { task, rendered : renderWebhookPrompt ( task . prompt , request , frameId ) } ;
2279+ } ) . pipe ( Effect . exit ) ;
2280+ if ( Exit . isFailure ( prepared ) ) {
2281+ if ( Cause . hasInterruptsOnly ( prepared . cause ) )
2282+ return yield * Effect . failCause ( prepared . cause ) ;
2283+ yield * markDeliveryFailed (
2284+ entry . delivery_id ,
2285+ "The pending webhook payload could not be prepared." ,
2286+ ) ;
2287+ yield * releaseFailedDelivery ( entry . delivery_id ) ;
2288+ yield * remove ;
2289+ continue ;
2290+ }
2291+ const { task, rendered } = prepared . value ;
2292+ if ( rendered . prompt . trim ( ) . length > PROVIDER_SEND_TURN_MAX_INPUT_CHARS ) {
2293+ yield * markDeliveryFailed ( entry . delivery_id , PROMPT_TOO_LONG ) ;
2294+ yield * releaseFailedDelivery ( entry . delivery_id ) ;
2295+ } else {
2296+ 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 } ` ;
2297+ if ( ! ( yield * runWebhookDelivery ( task , entry . delivery_id , rendered . prompt ) ) ) return ;
2298+ }
2299+ yield * remove ;
2300+ }
2301+ } ) ;
2302+ // The worker owns its reservation, so an interrupt anywhere still releases it.
2303+ return Effect . acquireUseRelease (
2304+ Ref . modify ( pendingInFlight , ( active ) =>
2305+ active . has ( taskId )
2306+ ? ( [ false , active ] as const )
2307+ : ( [ true , new Set ( active ) . add ( taskId ) ] as const ) ,
2308+ ) ,
2309+ ( reserved ) =>
2310+ reserved
2311+ ? webhookPermit ( taskId ) . pipe (
2312+ Effect . flatMap ( ( permit ) => dispatch . pipe ( permit . withPermits ( 1 ) ) ) ,
2313+ Effect . catch ( ( cause ) =>
2314+ Effect . logWarning ( "Pending webhook dispatch failed" , { cause } ) ,
2315+ ) ,
2316+ Effect . withSpan ( "ScheduledTaskService.dispatchPendingWebhook" , {
2317+ root : true ,
2318+ } ) ,
2319+ )
2320+ : Effect . void ,
2321+ ( reserved ) =>
2322+ reserved
2323+ ? Ref . update ( pendingInFlight , ( active ) => {
2324+ const next = new Set ( active ) ;
2325+ next . delete ( taskId ) ;
2326+ return next ;
2327+ } )
2328+ : Effect . void ,
2329+ ) . pipe ( Effect . forkIn ( serviceScope ) ) ;
2330+ } ,
23232331 { discard : true } ,
23242332 ) ;
23252333 } ) ;
0 commit comments