@@ -501,14 +501,16 @@ export namespace Session {
501501 wakeupInProgress . delete ( sessionID )
502502 }
503503
504- export function cancelBackgroundTask ( id : string ) : boolean {
504+ function cancelBackgroundTask ( id : string ) : boolean {
505505 const task = pendingBackgroundTasks . get ( id )
506506 if ( ! task ) return false
507507
508+ const existing = backgroundTaskResults . get ( id )
509+ if ( existing && existing . status !== "running" ) return false
510+
508511 const metadata = pendingTaskMetadata . get ( id )
509512 const startTime = metadata ?. start_time ?? Date . now ( )
510513
511- // Release slot BEFORE deleting metadata to prevent permanent slot leak
512514 if ( metadata ?. release_slot ) {
513515 try {
514516 metadata . release_slot ( )
@@ -530,12 +532,13 @@ export namespace Session {
530532 cancelled : true ,
531533 }
532534
533- const existing = backgroundTaskResults . get ( id )
534535 if ( existing ) {
535- existing . status = "failed"
536- existing . error = "Task was cancelled"
537- existing . cancelled = true
538- existing . time . completed = Date . now ( )
536+ if ( existing . status === "running" ) {
537+ existing . status = "failed"
538+ existing . error = "Task was cancelled"
539+ existing . cancelled = true
540+ existing . time . completed = Date . now ( )
541+ }
539542 } else {
540543 backgroundTaskResults . set ( id , result )
541544 if ( backgroundTaskResults . size > MAX_STORED_TASK_RESULTS ) {
@@ -553,8 +556,11 @@ export namespace Session {
553556 return true
554557 }
555558
556- export function tryCancel ( taskId : string ) : {
557- status : "cancelled" | "not_found" | "already_completed"
559+ export function tryCancel (
560+ taskId : string ,
561+ callerSessionID : string ,
562+ ) : {
563+ status : "cancelled" | "not_found" | "already_completed" | "unauthorized"
558564 message ?: string
559565 } {
560566 const result = backgroundTaskResults . get ( taskId )
@@ -565,6 +571,13 @@ export namespace Session {
565571 }
566572 }
567573
574+ if ( result . metadata ?. session_id !== callerSessionID ) {
575+ return {
576+ status : "unauthorized" ,
577+ message : `Task ${ taskId } belongs to a different session and cannot be cancelled` ,
578+ }
579+ }
580+
568581 if ( result . status !== "running" ) {
569582 return {
570583 status : "already_completed" ,
0 commit comments