@peterxiaoyang/superspec 0.1.43 → 0.1.45

package/dist/phase_confirmation.js

@@ -1,6 +1,9 @@
 import { currentGitHead, dirtyCodeFiles } from "./git_state.js";
-import { reviewEvidenceDigest } from "./review.js";
+import { historicalProposeReadyRoles, reviewEvidenceDigest, reviewGateRoleResolution } from "./review.js";
+import { EXPLORE_DISCOVERY_REVIEW_GATE, PROPOSE_FINAL_REVIEW_GATE } from "./review_job_gates.js";
+import { changeRoot as openspecChangeRoot } from "./openspec.js";
 import { findLatestEvent, sha256Text } from "./store.js";
+import { hasFrozenWorkflowModeForProposeRound, workflowRiskForProject, workflowRiskForState, } from "./workflow_config.js";
 export const PHASE_CONFIRMATION_SCOPE_PREFIX = "phase_confirmation:";
 function latestTransition(events, predicate) {
     return findLatestEvent(events, "transition_commit", event => predicate(event.payload));
@@ -23,7 +26,7 @@ const SPECS = {
             },
         ],
         scopePrefix: `${PHASE_CONFIRMATION_SCOPE_PREFIX}explore_to_propose`,
-        epoch: events => latestTransition(events, payload => payload.from_state === "init" && payload.to_state === "explore"),
+        epoch: events => latestTransition(events, payload => payload.to_state === "explore" && payload.from_state !== "explore"),
     },
     propose_to_apply: {
         state: "propose_ready",
@@ -63,7 +66,21 @@ function boundaryForState(state) {
         default: return null;
     }
 }
-function materialDigest(projectRoot, events, snapshot) {
+function ordinaryReviewRolesForBoundary(events, boundary, gate, risk) {
+    // 历史 plan 没有冻结 mode，当时的 gate 只能按实际创建过的角色回放。
+    if (boundary === "propose_to_apply" && !hasFrozenWorkflowModeForProposeRound(events)) {
+        return historicalProposeReadyRoles(events);
+    }
+    return gate.requiredRolesForRisk(risk);
+}
+/**
+ * 阶段确认不是 mode 的输入。它只读取当前 planning/apply round 的冻结快照；
+ * 仍处于 Explore/Propose 时才从项目配置获取候选 mode。
+ */
+export function workflowRiskForPhaseConfirmation(projectRoot, events, snapshot) {
+    return workflowRiskForState(events, snapshot.state, workflowRiskForProject(projectRoot));
+}
+function materialDigest(projectRoot, events, snapshot, boundary, risk) {
     const head = currentGitHead(projectRoot);
     const dirty = dirtyCodeFiles(projectRoot);
     const acceptedJobs = snapshot.accepted_jobs
@@ -77,10 +94,32 @@ function materialDigest(projectRoot, events, snapshot) {
         .sort((a, b) => a.job_id.localeCompare(b.job_id));
     const documents = Object.entries(snapshot.document_digests)
         .sort(([left], [right]) => left.localeCompare(right));
+    const ordinaryReviewGate = boundary === "explore_to_propose"
+        ? EXPLORE_DISCOVERY_REVIEW_GATE
+        : boundary === "propose_to_apply"
+            ? PROPOSE_FINAL_REVIEW_GATE
+            : null;
+    const currentChangeRoot = openspecChangeRoot(projectRoot, snapshot.change_id);
+    const overriddenReviewJobs = ordinaryReviewGate
+        ? ordinaryReviewRolesForBoundary(events, boundary, ordinaryReviewGate, risk)
+            .map(role => reviewGateRoleResolution(events, currentChangeRoot, ordinaryReviewGate, role))
+            .filter(resolution => resolution.kind === "overridden")
+            .map(resolution => ({
+            job_id: resolution.override.job_id,
+            role: resolution.override.role,
+            gate_id: resolution.override.gate_id,
+            packet_digest: resolution.override.packet_digest,
+            decision_event_id: resolution.override.decision_event_id,
+            decision_event_digest: resolution.override.decision_event_digest,
+        }))
+            .sort((left, right) => `${left.gate_id}\u0000${left.role}\u0000${left.job_id}`.localeCompare(`${right.gate_id}\u0000${right.role}\u0000${right.job_id}`))
+        : [];
     return sha256Text(JSON.stringify({
+        review_risk: risk,
         documents,
         tasks_structure_digest: snapshot.tasks_structure_digest,
         accepted_jobs: acceptedJobs,
+        ...(overriddenReviewJobs.length > 0 ? { overridden_review_jobs: overriddenReviewJobs } : {}),
         review_evidence_digest: reviewEvidenceDigest(events),
         code_state: {
             head: head.head,
@@ -93,14 +132,13 @@ function materialDigest(projectRoot, events, snapshot) {
 function phaseRecordArgv(change) {
     return ["superspec", "record", "user-decision", "--change", change, "--input", "-"];
 }
-function nextArgv(change, risk) {
+function nextArgv(change, _risk) {
     return [
         "superspec",
         "transition",
         "next",
         "--change",
         change,
-        ...(risk === "strict" ? [] : ["--risk", risk]),
     ];
 }
 function buildActions(change, boundary, scope, question, specs, risk) {
@@ -126,7 +164,7 @@ function buildActions(change, boundary, scope, question, specs, risk) {
         reason: spec.reason,
         ...(spec.reasonPrompt ? { reason_prompt: spec.reasonPrompt } : {}),
         record_argv: phaseRecordArgv(change),
-        record_input: { scope, question, answer: spec.label },
+        record_input: { scope, question, answer: spec.label, review_risk: risk },
         resume: spec.resume.kind === "next"
             ? { kind: "next", argv: nextArgv(change, risk) }
             : spec.resume.kind === "continue_current_phase"
@@ -147,7 +185,7 @@ export function phaseConfirmationForBoundary(projectRoot, events, snapshot, boun
         return null;
     const epoch = spec.epoch(events);
     const epochEventId = epoch?.event_id ?? `legacy-${spec.state}`;
-    const digest = materialDigest(projectRoot, events, snapshot);
+    const digest = materialDigest(projectRoot, events, snapshot, boundary, risk);
     const scope = `${spec.scopePrefix}:${epochEventId}:${digest}`;
     const actions = buildActions(snapshot.change_id, boundary, scope, spec.question, spec.actions, risk);
     return {
@@ -192,6 +230,11 @@ export function latestAcceptedPhaseDecision(events, confirmation) {
         scope: confirmation.scope,
         answer: payload.answer,
         decision: payload.phase_confirmation.decision,
+        review_risk: payload.phase_confirmation.review_risk === "minimal" ||
+            payload.phase_confirmation.review_risk === "normal" ||
+            payload.phase_confirmation.review_risk === "strict"
+            ? payload.phase_confirmation.review_risk
+            : "strict",
     };
 }
 export function isPhaseAdvanceAuthorized(events, confirmation) {
@@ -209,6 +252,7 @@ export function phaseConfirmationCommitPayload(confirmation, decision) {
             material_digest: confirmation.material_digest,
             scope: confirmation.scope,
             decision_event_id: decision.event.event_id,
+            review_risk: decision.review_risk,
         },
     };
 }

package/dist/phase_plan.d.ts

@@ -1,5 +1,5 @@
 import type { ReviewGateRule } from "./review_job_gates.ts";
-import type { AcceptedMaterialFollowupContinuation, AskUser, Event, Job, JobRole, State } from "./types.ts";
+import type { AcceptedMaterialFollowupContinuation, AskUser, Event, ExecutionPolicy, Job, JobRole, State } from "./types.ts";
 import type { Snapshot } from "./types.ts";
 import type { ReviewRisk } from "./review.ts";
 export type TransitionName = "explore" | "propose-ready" | "start-apply" | "task-start" | "task-complete" | "review-ready" | "reopen" | "accept";
@@ -64,6 +64,7 @@ export type TransitionDecisionPlan = {
     kind: "blocked";
     jobs: Job[];
     reason: string;
+    details?: Record<string, unknown>;
 } | {
     kind: "create_gate_jobs";
     gate: ReviewGateRule;
@@ -82,12 +83,18 @@ export interface ApplyPendingTaskStatus {
     needsCompletionEvent: string[];
     completedByEvent: string[];
 }
+export declare function executionPolicyForRisk(risk: ReviewRisk): ExecutionPolicy;
+export declare function executionPolicyForCurrentRound(events: Event[]): ExecutionPolicy;
 export declare function proposalDocsBaseline(changeRoot: string): Record<string, string>;
+export declare function discoveryDocsBaseline(changeRoot: string): Record<string, string>;
 export declare function latestAcceptedProposalBaseline(events: Event[]): Record<string, string> | null;
 export declare function latestReopenProposeBaseline(events: Event[]): Record<string, string> | null;
+export declare function latestReopenExploreBaseline(events: Event[]): Record<string, string> | null;
 export declare function proposalDocsChangedSinceBaseline(changeRoot: string, baseline: Record<string, string>): boolean;
-export declare function historicalProposeReadyRoles(events: Event[]): JobRole[];
+export declare function discoveryDocsChangedSinceBaseline(changeRoot: string, baseline: Record<string, string>): boolean;
 export declare function pendingTaskIds(changeRoot: string): string[];
+/** 当前 Apply round 的规则版本；缺失版本的历史 event 保持 v1 回放。 */
+export declare function executionRequirementVersionForCurrentRound(events: Event[]): 1 | 2;
 export declare function applyRequirementModeForCurrentRound(events: Event[]): boolean;
 export declare function pendingTaskStatusForApply(changeRoot: string, events: Event[]): ApplyPendingTaskStatus;
 export declare function formatPendingTaskMessage(ids: string[], action: string): string;

package/dist/phase_plan.js

@@ -4,15 +4,18 @@ import { EXPLORE_DISCOVERY_REVIEW_GATE, PROPOSE_FINAL_REVIEW_GATE } from "./revi
 import { collectProposeOpenQuestions, countDiscoveryOpenQuestions, parseTasksMd, pendingTasksInContent, validateDiscovery, validateExecutionRequirements, } from "./format.js";
 import { currentGitHead } from "./git_state.js";
 import { docRef, sha256File } from "./store.js";
-import { isReviewReadyVerifier, isFreshReviewVerifier, readReviewPolicyFromEvents, reviewEvidenceDigest, } from "./review.js";
+import { isReviewReadyVerifier, isFreshReviewVerifier, historicalProposeReadyRoles, readReviewPolicyFromEvents, reviewGateRoleResolution, reviewRejectionOverrideScope, reviewEvidenceDigest, } from "./review.js";
 import { CODE_REVIEW_DECISION_ANSWER_LABELS, CODE_REVIEW_REPAIR_SCOPE_PREFIX, codeReviewDecisionScope, codeReviewJobStaleReason, collectCodeReviewGateFacts, currentCodeReviewWorkingPaths, latestCodeReviewFailedStatus, requiresFinalVerifierForCurrentReview, scanCodeChangesForReview, } from "./code_review.js";
 import { isPhaseAdvanceAuthorized, latestAcceptedPhaseDecision, phaseConfirmationCommitPayload, phaseConfirmationForBoundary, phaseConfirmationMissingMessage, } from "./phase_confirmation.js";
 import { taskEvidenceReadiness } from "./task_evidence.js";
+import { workflowRiskForProposeRound, workflowRiskForState } from "./workflow_config.js";
 function requiredJobs(state, jobs, reason) {
     return { kind: "required_jobs", state, jobs, reason };
 }
 function phaseConfirmationStep(context, boundary, reason) {
-    const confirmation = phaseConfirmationForBoundary(context.projectRoot, context.events, context.snapshot, boundary, context.mode.risk);
+    // 进入 propose_ready / apply 后，mode 来自本轮快照而非当前配置。
+    const risk = workflowRiskForState(context.events, context.snapshot.state, context.mode.risk);
+    const confirmation = phaseConfirmationForBoundary(context.projectRoot, context.events, context.snapshot, boundary, risk);
     if (!confirmation || isPhaseAdvanceAuthorized(context.events, confirmation))
         return null;
     return {
@@ -22,16 +25,49 @@ function phaseConfirmationStep(context, boundary, reason) {
         reason,
     };
 }
-function reviewGatePlan(snapshot, gate, requiredRoles) {
+function reviewGatePlan(snapshot, events, changeRoot, gate, requiredRoles) {
     const missingRoles = [];
     for (const role of requiredRoles) {
         const openForRole = snapshot.open_jobs.find(job => gate.isJobForGate(job) && job.role === role);
         if (openForRole) {
             return { kind: "blocked", reason: `状态未推进；已有待完成工作项 ${role}（${openForRole.job_id}）`, jobs: [openForRole] };
         }
-        const acceptedForRole = snapshot.accepted_jobs.find(job => gate.isJobForGate(job) && job.role === role);
-        if (!acceptedForRole)
-            missingRoles.push({ role, reason: `需求 ${role} 无已接受的工作项` });
+        const resolution = reviewGateRoleResolution(events, changeRoot, gate, role);
+        if (resolution.kind === "accepted" || resolution.kind === "overridden")
+            continue;
+        if (resolution.kind === "rejected_pending") {
+            const terminal = resolution.terminal;
+            const overrideScope = reviewRejectionOverrideScope(terminal.job.job_id);
+            return {
+                kind: "blocked",
+                jobs: [],
+                reason: `状态未推进；${role} 审查工作项 ${terminal.job.job_id} 已拒绝。请修改绑定材料、在整份报告没有有效 blocker 时登记整体裁决，或在涉及业务决定时询问用户`,
+                details: {
+                    review_rejection: {
+                        job_id: terminal.job.job_id,
+                        role,
+                        gate_id: gate.gate_id,
+                        packet_digest: terminal.job.packet_digest,
+                        result_kind: terminal.result_kind,
+                        reason: terminal.reason ?? "报告结论为 fail，工作项未通过",
+                        override_scope: overrideScope,
+                        allowed_actions: ["modify_materials", "record_override", "ask_user"],
+                        record_input: {
+                            scope: overrideScope,
+                            answer: "do_not_block",
+                            reason: "<说明整份报告为何没有有效 blocker>",
+                            decision_source: "main_process",
+                        },
+                    },
+                },
+            };
+        }
+        const reason = resolution.kind === "stale"
+            ? `需求 ${role} 的最新审查工作项已过期：${resolution.stale_reason}`
+            : resolution.kind === "rejected_invalid"
+                ? `需求 ${role} 的最新审查报告无效，不能通过整体裁决绕过`
+                : `需求 ${role} 无已接受的工作项`;
+        missingRoles.push({ role, reason });
     }
     if (missingRoles.length > 0) {
         return {
@@ -52,14 +88,26 @@ function validateTasksPlan(changeRoot) {
         return "tasks.md 内容不像任务计划文档";
     return null;
 }
-function validateExecutionRequirementPlan(changeRoot) {
+export function executionPolicyForRisk(risk) {
+    return risk === "strict" ? "tdd" : "green_only";
+}
+export function executionPolicyForCurrentRound(events) {
+    const index = latestStartApplyIndex(events);
+    if (index < 0)
+        return "tdd";
+    const payload = events[index].payload;
+    return payload.execution_policy === "green_only" || payload.execution_policy === "tdd"
+        ? payload.execution_policy
+        : "tdd";
+}
+function validateExecutionRequirementPlan(changeRoot, executionPolicy, executionRequirementVersion = 2) {
     const tasksPath = join(changeRoot, "tasks.md");
     if (!existsSync(tasksPath))
         return { ok: true, mode: false };
     const tasksContent = readFileSync(tasksPath, "utf8");
     const testContractPath = join(changeRoot, ".superspec", "artifacts", "test-contract.md");
     const testContractContent = existsSync(testContractPath) ? readFileSync(testContractPath, "utf8") : null;
-    const validation = validateExecutionRequirements(tasksContent, testContractContent);
+    const validation = validateExecutionRequirements(tasksContent, testContractContent, executionPolicy, executionRequirementVersion);
     return validation.ok
         ? { ok: true, mode: validation.mode }
         : { ok: false, mode: validation.mode, message: validation.errors.join("；") };
@@ -68,7 +116,7 @@ function missingBaseArtifact(changeRoot, risk) {
     if (risk === "minimal")
         return null;
     const artifactsDir = join(changeRoot, ".superspec", "artifacts");
-    for (const doc of ["discovery.md", "business-invariants.md", "test-contract.md"]) {
+    for (const doc of ["discovery.md", "test-contract.md"]) {
         if (!existsSync(join(artifactsDir, doc)))
             return `基础职责缺失：${doc} 不存在（risk=${risk} 需要）`;
     }
@@ -83,6 +131,15 @@ export function proposalDocsBaseline(changeRoot) {
     }
     return baseline;
 }
+export function discoveryDocsBaseline(changeRoot) {
+    // 与 Explore gate 使用同一组审查目标。回退到 explore 后，至少要更新一项
+    // discovery 材料，才允许重新进入 propose，避免把一次纯状态回退误当作新探索轮次。
+    const baseline = {};
+    for (const doc of EXPLORE_DISCOVERY_REVIEW_GATE.reviewTargets) {
+        baseline[doc] = docRef(changeRoot, doc).sha;
+    }
+    return baseline;
+}
 function isDigestMap(value) {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return false;
@@ -119,23 +176,27 @@ export function latestReopenProposeBaseline(events) {
     }
     return null;
 }
+export function latestReopenExploreBaseline(events) {
+    for (let i = events.length - 1; i >= 0; i--) {
+        const ev = events[i];
+        if (ev.event_type !== "transition_commit")
+            continue;
+        const payload = ev.payload;
+        if (payload.transition !== "reopen" || payload.reopen_target !== "explore")
+            continue;
+        if (!payload.baseline_docs || typeof payload.baseline_docs !== "object" || Array.isArray(payload.baseline_docs))
+            return null;
+        return payload.baseline_docs;
+    }
+    return null;
+}
 export function proposalDocsChangedSinceBaseline(changeRoot, baseline) {
     const current = proposalDocsBaseline(changeRoot);
     return Object.entries(baseline).some(([path, digest]) => current[path] !== digest);
 }
-export function historicalProposeReadyRoles(events) {
-    const roles = new Set();
-    for (const ev of events) {
-        if (ev.event_type !== "transition_commit")
-            continue;
-        const newJobs = ev.payload.new_jobs ?? [];
-        for (const job of newJobs) {
-            if (PROPOSE_FINAL_REVIEW_GATE.isJobForGate(job) &&
-                (job.role === "critic" || job.role === "architect" || job.role === "test-engineer"))
-                roles.add(job.role);
-        }
-    }
-    return [...roles];
+export function discoveryDocsChangedSinceBaseline(changeRoot, baseline) {
+    const current = discoveryDocsBaseline(changeRoot);
+    return Object.entries(baseline).some(([path, digest]) => current[path] !== digest);
 }
 export function pendingTaskIds(changeRoot) {
     const tasksContent = readFileSync(join(changeRoot, "tasks.md"), "utf8");
@@ -152,6 +213,27 @@ function latestStartApplyIndex(events) {
     }
     return -1;
 }
+function executionRequirementVersionFromPayload(payload) {
+    return payload.execution_requirement_version === 2 ? 2 : 1;
+}
+/** 当前 Apply round 的规则版本；缺失版本的历史 event 保持 v1 回放。 */
+export function executionRequirementVersionForCurrentRound(events) {
+    const index = latestStartApplyIndex(events);
+    return index < 0 ? 1 : executionRequirementVersionFromPayload(events[index].payload);
+}
+/** Propose-ready 的规则版本决定随后 start-apply 是否采用新的全任务声明要求。 */
+function executionRequirementVersionForProposeRound(events) {
+    for (let i = events.length - 1; i >= 0; i--) {
+        const event = events[i];
+        if (event.event_type !== "transition_commit")
+            continue;
+        const payload = event.payload;
+        if (payload.transition === "propose-ready" && payload.to_state === "propose_ready") {
+            return executionRequirementVersionFromPayload(event.payload);
+        }
+    }
+    return 1;
+}
 export function applyRequirementModeForCurrentRound(events) {
     const index = latestStartApplyIndex(events);
     if (index < 0)
@@ -219,14 +301,13 @@ export function pendingTaskStatusForApply(changeRoot, events) {
 export function formatPendingTaskMessage(ids, action) {
     return `尚有未完成任务：${ids.join(", ")}；${action}`;
 }
-function nextArgv(change, risk) {
+function nextArgv(change, _risk) {
     return [
         "superspec",
         "transition",
         "next",
         "--change",
         change,
-        ...(risk === "strict" ? [] : ["--risk", risk]),
     ];
 }
 function acceptedMaterialFollowup(change, risk, planDocsChangedSinceAccept) {
@@ -262,6 +343,15 @@ export function planNextStep(context) {
             }
             return { kind: "run_transition", state: "init", transition: "explore", reason: "初始化完成，开始探索" };
         case "explore": {
+            const reopenBaseline = latestReopenExploreBaseline(events);
+            if (reopenBaseline && !discoveryDocsChangedSinceBaseline(changeRoot, reopenBaseline)) {
+                return {
+                    kind: "run_transition",
+                    state: "explore",
+                    transition: "explore",
+                    reason: "回到 explore 后至少一个 discovery 材料必须变化",
+                };
+            }
             const exploreReviewJobs = EXPLORE_DISCOVERY_REVIEW_GATE.openJobsForGate(snapshot);
             if (exploreReviewJobs.length > 0) {
                 return requiredJobs("explore", exploreReviewJobs, `有 ${exploreReviewJobs.length} 个待完成探索审查工作项`);
@@ -286,7 +376,7 @@ export function planNextStep(context) {
                 return { kind: "ask_user", state: "explore", ask, reason: `有 ${openQs} 个未确认问题` };
             }
             const requiredRoles = EXPLORE_DISCOVERY_REVIEW_GATE.requiredRolesForRisk(mode.risk);
-            if (!reviewGatePlan(snapshot, EXPLORE_DISCOVERY_REVIEW_GATE, requiredRoles)) {
+            if (!reviewGatePlan(snapshot, events, changeRoot, EXPLORE_DISCOVERY_REVIEW_GATE, requiredRoles)) {
                 const confirmation = phaseConfirmationStep(context, "explore_to_propose", "探索完成，等待用户确认进入计划阶段");
                 if (confirmation)
                     return confirmation;
@@ -333,6 +423,16 @@ export function planNextStep(context) {
                 if (confirmation)
                     return confirmation;
             }
+            // 尚未获得用户确认时，按本次 next 的候选风险预检失败不能退回默认 strict
+            // 的 start-apply 命令；否则 normal/minimal 的策略不匹配会被静默改写为 strict。
+            if (startApplyPlan.kind === "skip") {
+                const ask = {
+                    question: `${startApplyPlan.message}。请更新计划材料后重新执行 next。`,
+                    allowed_answers: ["计划已更新"],
+                    scope: "propose_apply_preflight",
+                };
+                return { kind: "ask_user", state: "propose_ready", ask, reason: startApplyPlan.message };
+            }
             return { kind: "run_transition", state: "propose_ready", transition: "start-apply", reason: "计划就绪，开始执行" };
         }
         case "apply":
@@ -609,14 +709,18 @@ function planExploreTransition(context) {
     if (snapshot.state !== "explore") {
         return { kind: "skip", message: `当前状态 ${snapshot.state}，explore 不适用` };
     }
+    const reopenBaseline = latestReopenExploreBaseline(events);
+    if (reopenBaseline && !discoveryDocsChangedSinceBaseline(changeRoot, reopenBaseline)) {
+        return { kind: "skip", message: "回到 explore 后至少一个 discovery 材料必须变化" };
+    }
     const discoveryCheck = validateDiscovery(changeRoot);
     if (!discoveryCheck.ok)
         return { kind: "skip", message: discoveryCheck.message };
     const requiredRoles = EXPLORE_DISCOVERY_REVIEW_GATE.requiredRolesForRisk(mode.risk);
-    const gatePlan = reviewGatePlan(snapshot, EXPLORE_DISCOVERY_REVIEW_GATE, requiredRoles);
+    const gatePlan = reviewGatePlan(snapshot, events, changeRoot, EXPLORE_DISCOVERY_REVIEW_GATE, requiredRoles);
     if (gatePlan)
         return gatePlan;
-    const confirmation = phaseConfirmationForBoundary(projectRoot, events, snapshot, "explore_to_propose");
+    const confirmation = phaseConfirmationForBoundary(projectRoot, events, snapshot, "explore_to_propose", mode.risk);
     const decision = confirmation ? latestAcceptedPhaseDecision(events, confirmation) : null;
     if (!confirmation || decision?.decision !== "advance") {
         return { kind: "skip", message: confirmation ? phaseConfirmationMissingMessage(confirmation) : "无法建立 Explore 阶段确认范围" };
@@ -637,7 +741,7 @@ function planProposeReadyTransition(context) {
     const tasksPlanError = validateTasksPlan(changeRoot);
     if (tasksPlanError)
         return { kind: "skip", message: tasksPlanError };
-    const executionRequirementPlan = validateExecutionRequirementPlan(changeRoot);
+    const executionRequirementPlan = validateExecutionRequirementPlan(changeRoot, executionPolicyForRisk(risk), 2);
     if (!executionRequirementPlan.ok)
         return { kind: "skip", message: executionRequirementPlan.message };
     const openQuestions = collectProposeOpenQuestions(changeRoot);
@@ -649,10 +753,24 @@ function planProposeReadyTransition(context) {
     if (missingArtifact)
         return { kind: "skip", message: missingArtifact };
     const requiredRoles = PROPOSE_FINAL_REVIEW_GATE.requiredRolesForRisk(risk);
-    const gatePlan = reviewGatePlan(snapshot, PROPOSE_FINAL_REVIEW_GATE, requiredRoles);
+    const gatePlan = reviewGatePlan(snapshot, context.events, changeRoot, PROPOSE_FINAL_REVIEW_GATE, requiredRoles);
     if (gatePlan)
         return gatePlan;
-    return { kind: "advance", fromState: "propose", toState: "propose_ready", reason: `risk=${risk}，所有需求已满足` };
+    return {
+        kind: "advance",
+        fromState: "propose",
+        toState: "propose_ready",
+        reason: `risk=${risk}，所有需求已满足`,
+        payload: {
+            workflow_mode: risk,
+            execution_requirement_version: 2,
+        },
+    };
+}
+function acceptedProposeToApplyConfirmation(context, risk) {
+    const confirmation = phaseConfirmationForBoundary(context.projectRoot, context.events, context.snapshot, "propose_to_apply", risk);
+    const decision = confirmation ? latestAcceptedPhaseDecision(context.events, confirmation) : null;
+    return confirmation && decision?.decision === "advance" ? { confirmation, decision } : null;
 }
 function planStartApplyTransition(context, enforceConfirmation = true) {
     const { changeRoot, events, projectRoot, snapshot } = context;
@@ -663,23 +781,31 @@ function planStartApplyTransition(context, enforceConfirmation = true) {
         // 按基线实际键名提示：升级前留下的旧基线可能不含 specs/，静态清单会误导
         return { kind: "skip", message: `回到 propose 后至少一个计划文档必须变化（基线绑定：${Object.keys(reopenBaseline).join("、")}）` };
     }
-    const reviewedRoles = historicalProposeReadyRoles(events);
-    if (reviewedRoles.length > 0) {
-        const gatePlan = reviewGatePlan(snapshot, PROPOSE_FINAL_REVIEW_GATE, reviewedRoles);
-        if (gatePlan) {
-            return {
-                ...gatePlan,
-                reason: `进入执行阶段前需要重新完成计划文档审查：${gatePlan.reason}`,
-            };
-        }
+    const risk = workflowRiskForProposeRound(events, context.mode.risk);
+    const executionRequirementVersion = executionRequirementVersionForProposeRound(events);
+    const requiredRoles = executionRequirementVersion === 2
+        ? PROPOSE_FINAL_REVIEW_GATE.requiredRolesForRisk(risk)
+        : historicalProposeReadyRoles(events);
+    const gatePlan = reviewGatePlan(snapshot, events, changeRoot, PROPOSE_FINAL_REVIEW_GATE, requiredRoles);
+    if (gatePlan) {
+        return {
+            ...gatePlan,
+            reason: `进入执行阶段前需要重新完成计划文档审查：${gatePlan.reason}`,
+        };
     }
-    const executionRequirementPlan = validateExecutionRequirementPlan(changeRoot);
+    const acceptedConfirmation = enforceConfirmation
+        ? acceptedProposeToApplyConfirmation(context, risk)
+        : null;
+    const executionPolicy = executionPolicyForRisk(risk);
+    const executionRequirementPlan = validateExecutionRequirementPlan(changeRoot, executionPolicy, executionRequirementVersion);
     if (!executionRequirementPlan.ok)
         return { kind: "skip", message: executionRequirementPlan.message };
-    const confirmation = phaseConfirmationForBoundary(projectRoot, events, snapshot, "propose_to_apply");
-    const decision = confirmation ? latestAcceptedPhaseDecision(events, confirmation) : null;
-    if (enforceConfirmation && (!confirmation || decision?.decision !== "advance")) {
-        return { kind: "skip", message: confirmation ? phaseConfirmationMissingMessage(confirmation) : "无法建立 Propose 阶段确认范围" };
+    if (enforceConfirmation && !acceptedConfirmation) {
+        const confirmation = phaseConfirmationForBoundary(projectRoot, events, snapshot, "propose_to_apply", risk);
+        return {
+            kind: "skip",
+            message: confirmation ? phaseConfirmationMissingMessage(confirmation) : "无法建立 Propose 阶段确认范围",
+        };
     }
     const gitHead = currentGitHead(projectRoot);
     return {
@@ -691,7 +817,14 @@ function planStartApplyTransition(context, enforceConfirmation = true) {
             apply_start_head: gitHead.head,
             apply_start_head_reason: gitHead.reason,
             apply_contract_mode: executionRequirementPlan.mode,
-            ...(confirmation && decision?.decision === "advance" ? phaseConfirmationCommitPayload(confirmation, decision) : {}),
+            ...(executionRequirementVersion === 2 ? { execution_requirement_version: 2 } : {}),
+            execution_policy: executionPolicy,
+            workflow_mode: risk,
+            review_policy: {
+                review_risk: risk,
+                requires_verifier: risk !== "minimal",
+            },
+            ...(acceptedConfirmation ? phaseConfirmationCommitPayload(acceptedConfirmation.confirmation, acceptedConfirmation.decision) : {}),
         },
     };
 }

package/dist/record.d.ts

@@ -7,7 +7,7 @@ export declare function recordJobSubmitContent(projectRoot: string, change: stri
 export declare function recordUserDecision(projectRoot: string, change: string, inputFile: string): RecordResult;
 /** record user-decision：从 JSON 内容登记用户决策 */
 export declare function recordUserDecisionContent(projectRoot: string, change: string, content: string): RecordResult;
-/** jobs list（HIGH-1 修复：从 transition_commit.new_jobs 提取，不再依赖已删除的 job_requested 事件） */
+/** jobs list（job 从 transition_commit.new_jobs 提取；reopen 可用 job_invalidated 关闭未完成工作项） */
 export declare function jobsList(projectRoot: string, change: string): {
     open: Job[];
     accepted: Job[];