Merge pull request SeemSeam#112 from daniellee2015/clean/upstream-cancel-completion-v2

fix(adapters): emit completion on cancellation to avoid stuck processing

Author: SeemSeam

lib/askd/adapters/claude.py

@@ -552,18 +552,21 @@ def handle_task(self, task: QueuedTask) -> ProviderResult:
     def _finalize_result(self, result: ProviderResult, req: ProviderRequest, task: QueuedTask) -> None:
         _write_log(f"[INFO] done provider=claude req_id={result.req_id} exit={result.exit_code}")
 
-        # Skip completion hook for cancelled tasks
+        reply_for_hook = result.reply
+        notify_done_seen = result.done_seen
         if task.cancelled:
-            _write_log(f"[INFO] Task cancelled, skipping completion hook: req_id={task.req_id}")
-            return
+            _write_log(f"[WARN] Task cancelled, sending failure completion hook: req_id={task.req_id}")
+            notify_done_seen = False
+            if not (reply_for_hook or "").strip():
+                reply_for_hook = "Task cancelled or timed out before completion."
 
-        _write_log(f"[INFO] notify_completion caller={req.caller} done_seen={result.done_seen} email_req_id={req.email_req_id}")
+        _write_log(f"[INFO] notify_completion caller={req.caller} done_seen={notify_done_seen} email_req_id={req.email_req_id}")
         notify_completion(
             provider="claude",
             output_file=req.output_path,
-            reply=result.reply,
+            reply=reply_for_hook,
             req_id=result.req_id,
-            done_seen=result.done_seen,
+            done_seen=notify_done_seen,
             caller=req.caller,
             email_req_id=req.email_req_id,
             email_msg_id=req.email_msg_id,

lib/askd/adapters/codex.py

@@ -279,20 +279,20 @@ def handle_task(self, task: QueuedTask) -> ProviderResult:
             f"anchor={result.anchor_seen} done={result.done_seen}"
         )
 
-        # Skip completion hook for cancelled tasks
+        reply_for_hook = reply
+        notify_done_seen = done_seen
         if task.cancelled:
-            _write_log(f"[INFO] Task cancelled, skipping completion hook: req_id={task.req_id}")
-            return result
-
-        # Log caller info before notify_completion
-        _write_log(f"[INFO] notify_completion caller={req.caller} done_seen={done_seen}")
-
+            _write_log(f"[WARN] Task cancelled, sending failure completion hook: req_id={task.req_id}")
+            notify_done_seen = False
+            if not reply_for_hook.strip():
+                reply_for_hook = "Task cancelled or timed out before completion."
+        _write_log(f"[INFO] notify_completion caller={req.caller} done_seen={notify_done_seen}")
         notify_completion(
             provider="codex",
             output_file=req.output_path,
-            reply=reply,
+            reply=reply_for_hook,
             req_id=task.req_id,
-            done_seen=done_seen,
+            done_seen=notify_done_seen,
             caller=req.caller,
             email_req_id=req.email_req_id,
             email_msg_id=req.email_msg_id,

lib/askd/adapters/droid.py

@@ -195,22 +195,23 @@ def handle_task(self, task: QueuedTask) -> ProviderResult:
         combined = "\n".join(chunks)
         final_reply = extract_reply_for_req(combined, task.req_id)
 
-        # Skip completion hook for cancelled tasks
-        if not task.cancelled:
-            notify_completion(
-                provider="droid",
-                output_file=req.output_path,
-                reply=final_reply,
-                req_id=task.req_id,
-                done_seen=done_seen,
-                caller=req.caller,
-                email_req_id=req.email_req_id,
-                email_msg_id=req.email_msg_id,
-                email_from=req.email_from,
-                work_dir=req.work_dir,
-            )
-        else:
-            _write_log(f"[INFO] Task cancelled, skipping completion hook: req_id={task.req_id}")
+        reply_for_hook = final_reply
+        if task.cancelled:
+            _write_log(f"[WARN] Task cancelled, sending failure completion hook: req_id={task.req_id}")
+            if not reply_for_hook.strip():
+                reply_for_hook = "Task cancelled or timed out before completion."
+        notify_completion(
+            provider="droid",
+            output_file=req.output_path,
+            reply=reply_for_hook,
+            req_id=task.req_id,
+            done_seen=done_seen and (not task.cancelled),
+            caller=req.caller,
+            email_req_id=req.email_req_id,
+            email_msg_id=req.email_msg_id,
+            email_from=req.email_from,
+            work_dir=req.work_dir,
+        )
 
         result = ProviderResult(
             exit_code=0 if done_seen else 2,

lib/askd/adapters/gemini.py

@@ -274,22 +274,23 @@ def handle_task(self, task: QueuedTask) -> ProviderResult:
             else:
                 _write_log(f"[WARN] Degraded completion rejected: empty reply for req_id={task.req_id}")
 
-        # Skip completion hook for cancelled tasks
-        if not task.cancelled:
-            notify_completion(
-                provider="gemini",
-                output_file=req.output_path,
-                reply=final_reply,
-                req_id=task.req_id,
-                done_seen=done_seen,
-                caller=req.caller,
-                email_req_id=req.email_req_id,
-                email_msg_id=req.email_msg_id,
-                email_from=req.email_from,
-                work_dir=req.work_dir,
-            )
-        else:
-            _write_log(f"[INFO] Task cancelled, skipping completion hook: req_id={task.req_id}")
+        reply_for_hook = final_reply
+        if task.cancelled:
+            _write_log(f"[WARN] Task cancelled, sending failure completion hook: req_id={task.req_id}")
+            if not reply_for_hook.strip():
+                reply_for_hook = "Task cancelled or timed out before completion."
+        notify_completion(
+            provider="gemini",
+            output_file=req.output_path,
+            reply=reply_for_hook,
+            req_id=task.req_id,
+            done_seen=done_seen and (not task.cancelled),
+            caller=req.caller,
+            email_req_id=req.email_req_id,
+            email_msg_id=req.email_msg_id,
+            email_from=req.email_from,
+            work_dir=req.work_dir,
+        )
 
         result = ProviderResult(
             exit_code=0 if done_seen else 2,

lib/askd/adapters/opencode.py

@@ -222,22 +222,23 @@ def _handle_task_locked(self, task: QueuedTask, session: Any, session_key: str,
             else:
                 _write_log(f"[WARN] Degraded completion rejected: empty reply for req_id={task.req_id}")
 
-        # Skip completion hook for cancelled tasks
-        if not task.cancelled:
-            notify_completion(
-                provider="opencode",
-                output_file=req.output_path,
-                reply=final_reply,
-                req_id=task.req_id,
-                done_seen=done_seen,
-                caller=req.caller,
-                email_req_id=req.email_req_id,
-                email_msg_id=req.email_msg_id,
-                email_from=req.email_from,
-                work_dir=req.work_dir,
-            )
-        else:
-            _write_log(f"[INFO] Task cancelled, skipping completion hook: req_id={task.req_id}")
+        reply_for_hook = final_reply
+        if task.cancelled:
+            _write_log(f"[WARN] Task cancelled, sending failure completion hook: req_id={task.req_id}")
+            if not reply_for_hook.strip():
+                reply_for_hook = "Task cancelled or timed out before completion."
+        notify_completion(
+            provider="opencode",
+            output_file=req.output_path,
+            reply=reply_for_hook,
+            req_id=task.req_id,
+            done_seen=done_seen and (not task.cancelled),
+            caller=req.caller,
+            email_req_id=req.email_req_id,
+            email_msg_id=req.email_msg_id,
+            email_from=req.email_from,
+            work_dir=req.work_dir,
+        )
 
         result = ProviderResult(
             exit_code=0 if done_seen else 2,