@tickernelz/paperclip-pro-server 2026.1018.0 → 2026.1021.0

package/dist/services/recovery/service.js

@@ -30,6 +30,7 @@ import { logger } from "../../middleware/logger.js";
 import { isPidAlive, isProcessGroupAlive, } from "../local-service-supervisor.js";
 import { redactSensitiveText } from "../../redaction.js";
 import { isUniqueViolation } from "../../db-errors.js";
+import { wakeRequestHoldsExecutionPath, wakeStatusForTerminalRun } from "./wake-execution-path.js";
 import { logActivity, publishActivity, } from "../activity-log.js";
 import { appendHeartbeatRunEvent } from "../heartbeat-run-events.js";
 import { emitAgentTaskRun } from "../agent-task-run-telemetry.js";
@@ -2263,7 +2264,7 @@ export function recoveryService(db, deps) {
                 "queued",
                 "claimed",
                 "deferred_issue_execution",
-            ]), sql `coalesce(${agentWakeupRequests.payload} ->> 'issueId', ${agentWakeupRequests.payload} ->> 'taskId') = ${action.sourceIssueId}`, sql `coalesce(${agentWakeupRequests.payload} ->> 'recoveryActionId', '') <> ${action.id}`))
+            ]), wakeRequestHoldsExecutionPath(), sql `coalesce(${agentWakeupRequests.payload} ->> 'issueId', ${agentWakeupRequests.payload} ->> 'taskId') = ${action.sourceIssueId}`, sql `coalesce(${agentWakeupRequests.payload} ->> 'recoveryActionId', '') <> ${action.id}`))
                 .limit(1)
                 .then((rows) => rows[0] ?? null),
         ]);
@@ -4448,47 +4449,60 @@ export function recoveryService(db, deps) {
             (await runUsedConversationAdapter(db, run));
         await deps.beforeOrphanedRunTerminalWrite?.(run.id);
         const now = new Date();
-        const updated = await db
-            .update(heartbeatRuns)
-            .set({
-            status: terminalStatus,
-            finishedAt: run.finishedAt ?? now,
-            error: run.error ?? (terminalStatus === "interrupted" ? message : null),
-            errorCode: run.errorCode ??
-                (terminalStatus === "interrupted" ? errorCode : null),
-            ...(conversationContinuation
-                ? {
-                    resultJson: sql `coalesce(${heartbeatRuns.resultJson}, '{}'::jsonb) || ${JSON.stringify({
-                        conversationContinuation: CONVERSATION_CONTINUATION_POLICY,
-                    })}::jsonb`,
-                }
-                : {}),
-            updatedAt: now,
-        })
-            .where(and(eq(heartbeatRuns.id, run.id), eq(heartbeatRuns.status, "running"), eq(heartbeatRuns.runtimeMode, run.runtimeMode), nativeRunnerOwnershipNotHeldCondition(), 
-        // Provider exit is expected while the native coordinator resumes a
-        // session or copies its completed workspace back. The coordinator
-        // owns those retries, including expired leases and future attempts.
-        // Check at the write so a newly recorded result cannot be orphaned
-        // using the earlier liveness snapshot. Terminal issue status remains
-        // the stronger authority.
-        !issueTerminalStatus && run.runtimeMode === "native"
-            ? notExists(db.select({ runId: nativeRunFinalizations.runId })
-                .from(nativeRunFinalizations).where(and(eq(nativeRunFinalizations.runId, heartbeatRuns.id), eq(nativeRunFinalizations.companyId, heartbeatRuns.companyId), or(and(isNotNull(nativeRunFinalizations.resultId), inArray(nativeRunFinalizations.phase, [
-                "observed", "workspace_finalizing", "ready_for_assessment",
-                "arbitrating", "retryable_failure",
-            ])), and(isNull(nativeRunFinalizations.resultId), or(eq(nativeRunFinalizations.phase, "retryable_failure"), and(eq(nativeRunFinalizations.phase, "observed"), gt(nativeRunFinalizations.attempt, 0))))))))
-            : undefined, 
-        // Recheck ownership in the write: a controller can renew or claim
-        // the run after the liveness read. An old snapshot cannot end a new
-        // controller's run, even if that controller's lease later expires.
-        run.runtimeMode === "legacy"
-            ? and(run.controllerBootId
-                ? eq(heartbeatRuns.controllerBootId, run.controllerBootId)
-                : isNull(heartbeatRuns.controllerBootId), or(isNull(heartbeatRuns.controllerBootId), sql `${heartbeatRuns.controllerLeaseExpiresAt} <= clock_timestamp()`))
-            : undefined))
-            .returning()
-            .then((rows) => rows[0] ?? null);
+        const updated = await db.transaction(async (tx) => {
+            const [terminalized] = await tx
+                .update(heartbeatRuns)
+                .set({
+                status: terminalStatus,
+                finishedAt: run.finishedAt ?? now,
+                error: run.error ?? (terminalStatus === "interrupted" ? message : null),
+                errorCode: run.errorCode ??
+                    (terminalStatus === "interrupted" ? errorCode : null),
+                ...(conversationContinuation
+                    ? {
+                        resultJson: sql `coalesce(${heartbeatRuns.resultJson}, '{}'::jsonb) || ${JSON.stringify({
+                            conversationContinuation: CONVERSATION_CONTINUATION_POLICY,
+                        })}::jsonb`,
+                    }
+                    : {}),
+                updatedAt: now,
+            })
+                .where(and(eq(heartbeatRuns.id, run.id), eq(heartbeatRuns.status, "running"), eq(heartbeatRuns.runtimeMode, run.runtimeMode), nativeRunnerOwnershipNotHeldCondition(), 
+            // Provider exit is expected while the native coordinator resumes a
+            // session or copies its completed workspace back. The coordinator
+            // owns those retries, including expired leases and future attempts.
+            // Check at the write so a newly recorded result cannot be orphaned
+            // using the earlier liveness snapshot. Terminal issue status remains
+            // the stronger authority.
+            !issueTerminalStatus && run.runtimeMode === "native"
+                ? notExists(db.select({ runId: nativeRunFinalizations.runId })
+                    .from(nativeRunFinalizations).where(and(eq(nativeRunFinalizations.runId, heartbeatRuns.id), eq(nativeRunFinalizations.companyId, heartbeatRuns.companyId), or(and(isNotNull(nativeRunFinalizations.resultId), inArray(nativeRunFinalizations.phase, [
+                    "observed", "workspace_finalizing", "ready_for_assessment",
+                    "arbitrating", "retryable_failure",
+                ])), and(isNull(nativeRunFinalizations.resultId), or(eq(nativeRunFinalizations.phase, "retryable_failure"), and(eq(nativeRunFinalizations.phase, "observed"), gt(nativeRunFinalizations.attempt, 0))))))))
+                : undefined, 
+            // Recheck ownership in the write: a controller can renew or claim
+            // the run after the liveness read. An old snapshot cannot end a new
+            // controller's run, even if that controller's lease later expires.
+            run.runtimeMode === "legacy"
+                ? and(run.controllerBootId
+                    ? eq(heartbeatRuns.controllerBootId, run.controllerBootId)
+                    : isNull(heartbeatRuns.controllerBootId), or(isNull(heartbeatRuns.controllerBootId), sql `${heartbeatRuns.controllerLeaseExpiresAt} <= clock_timestamp()`))
+                : undefined))
+                .returning();
+            if (terminalized && run.wakeupRequestId) {
+                await tx
+                    .update(agentWakeupRequests)
+                    .set({
+                    status: wakeStatusForTerminalRun(terminalStatus),
+                    finishedAt: terminalized.finishedAt ?? now,
+                    error: terminalized.error,
+                    updatedAt: now,
+                })
+                    .where(and(eq(agentWakeupRequests.id, run.wakeupRequestId), eq(agentWakeupRequests.companyId, run.companyId), eq(agentWakeupRequests.status, "claimed")));
+            }
+            return terminalized ?? null;
+        });
         if (!updated) {
             // Another path finalized the run between the read and this write. Keep
             // that terminal outcome authoritative.