diff --git a/doc/architecture/native-status-arbitration.md b/doc/architecture/native-status-arbitration.md index 37ab7a925b0..85843264c4a 100644 --- a/doc/architecture/native-status-arbitration.md +++ b/doc/architecture/native-status-arbitration.md @@ -141,6 +141,8 @@ concrete blocker. This creates no generic human completion approval. Reassessment uses the same bounded incomplete-delivery continuation as initial finalization. A stable unmerged PR does not create a status-race retry deadline. +The proposed server status controls delivery validation, including when new +evidence completes a result that previously reported another disposition. The transactional commit also checks these outputs, including reassessment paths. Human and agent work-product updates lock their source and destination tasks in a stable order before changing status or identity. Provider reads occur diff --git a/server/src/__tests__/native-status-arbiter-corpus.test.ts b/server/src/__tests__/native-status-arbiter-corpus.test.ts index 92944206db9..507ba04b11c 100644 --- a/server/src/__tests__/native-status-arbiter-corpus.test.ts +++ b/server/src/__tests__/native-status-arbiter-corpus.test.ts @@ -2921,12 +2921,18 @@ describe("P6-31 Section 18.13 executable status-authority corpus", () => { }); it.each([ - { trigger: "retired review", correctiveUsed: false }, - { trigger: "new evidence", correctiveUsed: false }, - { trigger: "retired review", correctiveUsed: true }, - { trigger: "new evidence", correctiveUsed: true }, - ])("settles unmerged delivery from $trigger without retry polling (corrective used=$correctiveUsed)", async ({ trigger, correctiveUsed }) => { + { trigger: "retired review", correctiveUsed: false, disposition: "done" }, + { trigger: "new evidence", correctiveUsed: false, disposition: "done" }, + { trigger: "retired review", correctiveUsed: true, disposition: "done" }, + { trigger: "new evidence", correctiveUsed: true, disposition: "done" }, + ...["needs_review", "yielded", "blocked"].flatMap(disposition => [false, true].map(correctiveUsed => + ({ trigger: "new evidence", correctiveUsed, disposition }))), + ])("settles unmerged delivery from $trigger without retry polling (disposition=$disposition, corrective used=$correctiveUsed)", async ({ trigger, correctiveUsed, disposition }) => { const seeded = await seedAutomaticReview(); + const [saved] = await db.select().from(nativeRunResults).where(eq(nativeRunResults.id, seeded.resultId!)); + await db.update(nativeRunResults).set({ resultJson: { ...saved.resultJson, + result: { ...(saved.resultJson.result as object), reportedWorkDisposition: disposition } } }) + .where(eq(nativeRunResults.id, saved.id)); const [originalAssessment] = await db.select().from(workAssessments).where(eq(workAssessments.id, seeded.assessmentId)); await db.update(workAssessments).set({ createdAt: new Date(Date.now() - 2000), assessmentJson: { ...originalAssessment.assessmentJson, allCriteriaSatisfied: false } }).where(eq(workAssessments.id, seeded.assessmentId)); @@ -2957,6 +2963,8 @@ describe("P6-31 Section 18.13 executable status-authority corpus", () => { expect(effects.some(effect => effect.kind === "enqueue_continuation")).toBe(!correctiveUsed); expect(effects.some(effect => effect.kind === "record_finalization_error")).toBe(correctiveUsed); expect(effects.some(effect => (effect.summary ?? effect.nextAction ?? "").includes("not been verified as merged"))).toBe(true); + await db.update(statusDecisionEffects).set({ deliveryState: "delivered" }) + .where(eq(statusDecisionEffects.decisionId, latest.id)); const assessments = await db.select().from(workAssessments).where(eq(workAssessments.runId, seeded.runId)); expect(await work.load(scope)).toEqual([]); expect(await work.check(pending)).toBeNull(); diff --git a/server/src/services/native-runtime/native-status-reassessment.ts b/server/src/services/native-runtime/native-status-reassessment.ts index b711766893c..629169388d4 100644 --- a/server/src/services/native-runtime/native-status-reassessment.ts +++ b/server/src/services/native-runtime/native-status-reassessment.ts @@ -257,7 +257,7 @@ export async function reassessNativeStatusFromSource( : [currentIssue.title, currentIssue.description].filter(Boolean).join("\n"); try { await validateNativeDeliverableEvidence(db, { companyId: row.companyId, issueId: row.issueId, - runId: row.runId, objective, semanticToolReceipts: run.resultJson?.semanticToolReceipts }, + runId: row.runId, objective, semanticToolReceipts: run.resultJson?.semanticToolReceipts, authoritativeDone: true }, record(resultRow.resultJson).result); } catch (error) { if (!(error instanceof NativeDeliverableEvidenceError)) throw error;