@danmoisan/drm-copilot-mcp 1.1.19 → 1.1.20

package/resources/codex-and-agents-customizations/.codex/agents/atomic-executor.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - acceptance-criteria-tracking
+- execution-environment
 
 ---
 name: atomic-executor
@@ -35,11 +36,13 @@ tools:
   - "mcp__drm-copilot__run_poshqc_analyze"
   - "mcp__drm-copilot__run_poshqc_test"
   - "mcp__drm-copilot__run_poshqc_analyze_autofix"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
   - acceptance-criteria-tracking
+  - execution-environment
 memory: project
 hooks:
   SubagentStop:
@@ -106,19 +109,20 @@ Concurrent child runs in one session share one session scratchpad, so every scra
 
 ## Preflight Validation
 
-When receiving a plan with directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY`, perform validation only and return exactly one of `PREFLIGHT: ALL CLEAR` or `PREFLIGHT: REVISIONS REQUIRED`.
+When the delegation prompt carries the directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY`, perform validation only and return exactly one of `PREFLIGHT: ALL CLEAR` or `PREFLIGHT: REVISIONS REQUIRED`. The preflight directive belongs in the delegation prompt, never in a plan file.
 
 - `PREFLIGHT: ALL CLEAR`
 - `PREFLIGHT: REVISIONS REQUIRED`
-- If revisions are required, include a precise plan delta that can be applied to the same plan file.
-- When returning `PREFLIGHT: REVISIONS REQUIRED`, automatically hand off back to `atomic-planner` and request that it apply the delta to the same plan file.
-- Continue the validate -> delta -> planner-revise -> validate loop until preflight can return `PREFLIGHT: ALL CLEAR`.
-- If the handoff loop cannot proceed or the required validator is unavailable, stop and report blocked state.
+- Review the entire plan in one pass and classify every defect as trivial or substantive, per `### Single-Pass Preflight` in `atomic-plan-contract`.
+- Fix trivial defects in place, in task text only; never add, remove, or reorder tasks. Report each fix as `PREFLIGHT-FIX: <task id or heading> | <defect class> | <change made>` and name the fix record as `preflight-fix-record: <path>`.
+- If revisions are required, include a precise plan delta that can be applied to the same plan file, with one `PREFLIGHT-DEFECT: <task id or heading> | <defect class> | <required change>` line per substantive defect.
+- Return the result to the caller. A plan returns to the planner at most once; the orchestrator routes the defect list for one revision and runs one confirming preflight.
+- If the required validator is unavailable, stop and report blocked state.
 - Before any `PREFLIGHT: ALL CLEAR` result is treated as approved, the target plan must pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 
 ## Blocking Protocol
 
-Blocking is permitted only during preflight validation (before `[P0-T1]`). When preflight-blocked:
+Blocking is permitted only during preflight validation (before `[P0-T1]`), including the preflight that opens a combined preflight-and-execute run of a proportionate remediation cycle. When preflight-blocked:
 
 1. State: `BLOCKED at preflight (before [P0-T1])`.
 2. Provide a short, concrete explanation of why.

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner-c1.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner-c2.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner-c3-elevated.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner-c3.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner-c4.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planner.toml

@@ -11,6 +11,7 @@ Use the following repo-local skills as the canonical workflow source:
 - atomic-plan-contract
 - policy-compliance-order
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ---
 name: atomic-planner
@@ -23,10 +24,12 @@ tools:
   - "Edit(artifacts/**)"
   - "Write(docs/**)"
   - "Write(artifacts/**)"
+  - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
   - policy-compliance-order
   - atomic-plan-contract
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:
@@ -84,8 +87,8 @@ Before reporting completion, explicitly spawn the `atomic-executor` subagent for
   - `PREFLIGHT: ALL CLEAR`
   - `PREFLIGHT: REVISIONS REQUIRED`
 - Treat executor preflight findings as binding plan defects.
-- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file using the executor's precise plan delta and re-run preflight.
-- Reuse the same target plan file for every preflight revision iteration in the same planning cycle.
+- If preflight returns `PREFLIGHT: REVISIONS REQUIRED`, revise the same target plan file once using the executor's precise plan delta and its full `PREFLIGHT-DEFECT:` list, and run one confirming preflight. Preflight is single-pass: trivial defects are fixed in place by the executor, and a plan returns to the planner at most once; a second substantive result halts with `blocked_reason: "validator_failed"`.
+- Reuse the same target plan file for the single permitted preflight revision in the same planning cycle.
 - If the required `atomic-executor` handoff cannot be started or completed, stop and report blocked state; do not self-approve the plan.
 - Before reporting completion, the target plan MUST pass the `validate_orchestration_artifacts` MCP tool with `artifact_type: "plan"` and `artifact_path: <plan-path>`.
 

package/resources/codex-and-agents-customizations/.codex/agents/atomic-planning.toml

@@ -13,7 +13,7 @@ Core behavior:
 - Produce or revise only deterministic plan files.
 - Delegate validation-only preflight to `atomic-executor`.
 - Require the exact directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY` in the delegated preflight handoff.
-- Reuse the same target plan file for every preflight revision iteration.
+- Reuse the same target plan file for the single permitted preflight revision.
 - Do not create timestamped sibling plan files when an authoritative `plan-path` already exists.
 - Stop and report blocked state if the required `atomic-executor` handoff cannot be started, resumed, or completed.
 

package/resources/codex-and-agents-customizations/.codex/agents/csharp-atomic-planning.toml

@@ -14,7 +14,7 @@ Core behavior:
 - Delegate validation-only preflight to `atomic-executor`.
 - Require the exact directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY` in the delegated preflight handoff.
 - Require explicit C# baseline and final-QA tasks, including formatting, analyzer, type-safety, test, and coverage steps where policy requires coverage.
-- Reuse the same target plan file for every preflight revision iteration.
+- Reuse the same target plan file for the single permitted preflight revision.
 - Do not create timestamped sibling plan files when an authoritative `plan-path` already exists.
 - Stop and report blocked state if the required `atomic-executor` handoff cannot be started, resumed, or completed.
 

package/resources/codex-and-agents-customizations/.codex/agents/epic-orchestrator.toml

@@ -81,6 +81,8 @@ integration-to-main PR is merged with its merge SHA recorded, the status project
 acceptance criteria are checked, and `validate_orchestration_artifacts` passes
 `epic-orchestrator-state` with `require_complete: true`, `require_codex_topology: true`, and
 `require_codex_model_routing: true`.
+The final merge SHA is recorded only after the merge is confirmed by polling and ancestry check:
+under a merge queue on `main`, `gh pr merge` can return before the merge happens (issue #952).
 '''
 
 [skills]

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator-c1.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator-c2.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator-c3-elevated.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator-c3.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator-c4.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/orchestrator.toml

@@ -18,6 +18,7 @@ Use the following repo-local skills as the canonical workflow source:
 - pr-context-artifacts
 - pr-base-branch-merge-base
 - evidence-and-timestamp-conventions
+- execution-environment
 
 ## Startup Protocol
 
@@ -60,8 +61,10 @@ entry path with `EPIC_INVOCATION_ORIGIN_BLOCKED`.
 
 When the parent prompt carries the literal `Preparation mode: true` marker, select only
 `route_id: preparation`. Perform promotion through the MCP surface, research, `spec.md`,
-`user-story.md`, atomic planning, and atomic-executor preflight. Iterate the same plan until
-`PREFLIGHT: ALL CLEAR`, commit the prepared feature folder and plan, then stop with
+`user-story.md`, atomic planning, and atomic-executor preflight. Run single-pass preflight on the
+same plan (trivial defects fixed in place, at most one return to the planner, a second substantive
+result halts with `blocked_reason: "validator_failed"`), commit the prepared feature folder and
+plan after `PREFLIGHT: ALL CLEAR`, then stop with
 `completed_steps` containing `S3_promotion` and `S4_atomic_planning`,
 `next_step: "S5_atomic_execution"`, execution-through-CI statuses exactly `not-applicable`, and
 `blocked_reason: "none"`. Do not implement, create a PR, run feature review, monitor CI, or claim

package/resources/codex-and-agents-customizations/.codex/agents/powershell-atomic-planning.toml

@@ -14,7 +14,7 @@ Core behavior:
 - Delegate validation-only preflight to `atomic-executor`.
 - Require the exact directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY` in the delegated preflight handoff.
 - Require explicit PowerShell baseline and final-QA tasks, including format, analyzer, test, and coverage steps where policy requires coverage.
-- Reuse the same target plan file for every preflight revision iteration.
+- Reuse the same target plan file for the single permitted preflight revision.
 - Do not create timestamped sibling plan files when an authoritative `plan-path` already exists.
 - Stop and report blocked state if the required `atomic-executor` handoff cannot be started, resumed, or completed.
 

package/resources/codex-and-agents-customizations/.codex/agents/python-atomic-planning.toml

@@ -14,7 +14,7 @@ Core behavior:
 - Delegate validation-only preflight to `atomic-executor`.
 - Require the exact directive `DIRECTIVE: PREFLIGHT VALIDATION ONLY` in the delegated preflight handoff.
 - Require explicit Python baseline and final-QA tasks, including Ruff, Pyright, pytest, and coverage where policy requires coverage.
-- Reuse the same target plan file for every preflight revision iteration.
+- Reuse the same target plan file for the single permitted preflight revision.
 - Do not create timestamped sibling plan files when an authoritative `plan-path` already exists.
 - Stop and report blocked state if the required `atomic-executor` handoff cannot be started, resumed, or completed.
 

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher-c1.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher-c2.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher-c3-elevated.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher-c3.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher-c4.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/agents/task-researcher.toml

@@ -13,6 +13,10 @@ Do not weaken validation-only preflight loops, QA gates, remediation triggers, r
 Applied rewrites:
 - Rewrite Claude skill paths to shared skill paths.
 
+Use the following repo-local skills as the canonical workflow source:
+- evidence-and-timestamp-conventions
+- execution-environment
+
 Canonical migration source:
 - .github/agents/task-researcher.agent.md
 
@@ -33,7 +37,9 @@ tools:
   - Glob
   - WebFetch
   - "Write(/artifacts/research/**)"
+skills:
   - evidence-and-timestamp-conventions
+  - execution-environment
 memory: project
 hooks:
   Stop:

package/resources/codex-and-agents-customizations/.codex/config.toml

@@ -2,7 +2,7 @@ default_permissions = ":danger-full-access"
 
 [mcp_servers.drm-copilot]
 command = "npx"
-args = ["-y", "@danmoisan/drm-copilot-mcp@1.1.19"]
+args = ["-y", "@danmoisan/drm-copilot-mcp@1.1.20"]
 required = true
 enabled_tools = [
     "collect_commit_context",