RomanNum3ral
/
paperclip
mirror of https://github.com/paperclipai/paperclip.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'codex/work-folders-staging-hardening-refresh' into codex/work-folders-remote-recovery-refresh 

* codex/work-folders-staging-hardening-refresh:
  fix: preserve validated conversation reset during admission recheck

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Dotta 2026-09-12 14:13:59 -05:00
parent 92689a325b c6ca2c4037
commit 4ce7150424
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/services/heartbeat.ts
View File

@ -26299,9 +26299,11 @@ export function heartbeatService(
return { kind: "deferred" as const };
};
const explicitContinuationRunId = randomUUID();
const executionBlockerOptions = {
conversationResetCommentId: opts.requestedByActorType === "user" ? wakeCommentId : null,
};
const executionBlocker = await getExecutionBlocker(
tx as unknown as Db, issue.companyId, issue.id,
{ conversationResetCommentId: opts.requestedByActorType === "user" ? wakeCommentId : null },
tx as unknown as Db, issue.companyId, issue.id, executionBlockerOptions,
);
// Prove eligibility without retiring the hold. Later gates can still
// decline this wake; hold retirement and successor creation stay atomic.
@ -27081,7 +27083,7 @@ export function heartbeatService(
// Recovery can change while earlier admission gates await I/O. Use
// the current blocker, not the snapshot from the start of admission.
const remainingExecutionBlocker = await getExecutionBlocker(
tx as unknown as Db, issue.companyId, issue.id,
tx as unknown as Db, issue.companyId, issue.id, executionBlockerOptions,
);
// A decision can reject a saved message after cleanup has removed
// every recovery blocker; null can also mean no applicable hold to retire.