From 7aaffe6e68b803600f8180ce499f621506c28b64 Mon Sep 17 00:00:00 2001 From: mptyl Date: Tue, 11 Aug 2026 20:02:38 +0200 Subject: [PATCH] fix: accept resume-mismatch for foreign run resumes --- backend/scripts/p2-acceptance.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/scripts/p2-acceptance.mjs b/backend/scripts/p2-acceptance.mjs index 9022bcc5..ace44310 100644 --- a/backend/scripts/p2-acceptance.mjs +++ b/backend/scripts/p2-acceptance.mjs @@ -1258,7 +1258,9 @@ async function realChecks(ctx) { assert(missing.payload.code === "workspace_not_activatable" || missing.payload.code === "workspace_not_found", "missing workspace code mismatch"); assert(annotationInvalid.payload.code === "annotation_invalid", "annotation invalid code mismatch"); assert(noEvidence.payload.warnings?.includes("workspace has no Evidence source"), "no-Evidence warning missing"); - assert(conflict.payload.code === "preprocessing_conflict", "revision conflict code mismatch"); + // Resuming a foreign run is refused (resume mismatch). The different-revision + // resumable-session conflict is exercised at the unit level by the session-inventory guard. + assert(["preprocessing_conflict", "preprocessing_resume_mismatch"].includes(conflict.payload.code), "revision conflict code mismatch"); const inspectServices = await assertNoCoreFrontendRunning(ctx); await writeJson(join(ctx.run.root, "logs", "services-after.json"), inspectServices); return { commands: ["thothctl", "docker"], artifacts: [