From 4597967f894767363192de5562ce5e2da020585d Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Tue, 29 Sep 2026 23:15:13 -0500
Subject: [PATCH] Handle durable cancellation before workspace failure recovery

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 server/src/services/heartbeat.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.ts
index d5de690a9f4..fd341bae281 100644
--- a/server/src/services/heartbeat.ts
+++ b/server/src/services/heartbeat.ts
@@ -24770,6 +24770,11 @@ export function heartbeatService(
             await completeWorkspace();
           }
         } catch (adapterErr) {
+          if (adapterErr instanceof NativeCancellationPendingRecoveryError) {
+            // Durable cancellation is settled by the outer recovery handler;
+            // it does not imply a failed workspace or a persisted run result.
+            throw adapterErr;
+          }
           if (adapterErr instanceof NativeWorkspaceFinalizationBusyError
             || adapterErr instanceof NativeWorkspaceFinalizationOwnershipLostError) {
             nativeWorkspaceFinalizeScheduled = true;