fix: accept resume-mismatch for foreign run resumes

2026-08-11 20:02:38 +02:00
parent ec5ed413f7
commit 7aaffe6e68
1 changed files with 3 additions and 1 deletions
@@ -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: [