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

* codex/work-folders-staging-hardening-refresh:
  fix(test): await issue lock before retry race assertions (#13273)
  fix: resume saved user messages after execution recovery (#13270)

# Conflicts:
#	server/src/services/native-runtime/native-runner-restart-recovery.integration.test.ts

server/src/services/native-runtime/native-session-executor.ts

@@ -1,3 +1,4 @@
+import { PROCESS_START_REQUESTED } from "../native-local-process-stop.js";
 import { remoteLeaseCleanupScope } from "../remote-execution-termination.js";
 import { resolveConnectorAssignments, isConnectorSkill } from "../connector-runtime.js";
 import {
@@ -7722,6 +7723,17 @@ async function executePaperclipNativeSessionWithinScope(
       input.db,
       input.execution.binding,
     );
+    // Invalidate prior stop evidence before a backend can spawn. A crash between
+    // spawn and the PID callback must not make an old receipt authorize a turn.
+    await appendHeartbeatRunEvent(input.db, {
+      companyId: input.execution.binding.companyId,
+      runId: input.execution.binding.runId,
+      agentId: input.execution.binding.agentId,
+      eventType: PROCESS_START_REQUESTED,
+      stream: "system",
+      level: "info",
+      message: "Native execution requested; prior local stop evidence no longer applies.",
+    });
     const runnerdBackend =
       input.useRunnerd && input.backend === undefined
         ? await createRunnerdBackend({