Merge pull request #21 from ericpassmore/codex/remove-revalidate

Remove revalidate stage from ACAC lifecycle

Author: ericpassmore

codex/AGENTS.md

@@ -3,7 +3,7 @@
 ## Autonomous Coding Agent Contract
 
 This contract defines cross-stage invariants for the lifecycle:
-`establish-goals` -> `prepare-takeoff` -> `prepare-phased-impl` -> `implement` -> `revalidate` -> `land-the-plan`
+`establish-goals` -> `prepare-takeoff` -> `prepare-phased-impl` -> `implement` -> `land-the-plan`
 
 Stage mechanics, commands, and file-surface details are owned by stage artifacts under `codex/skills/*/SKILL.md`.
 
@@ -16,8 +16,7 @@ Stages must run in lifecycle order and emit only these verdicts:
 - `establish-goals`: `GOALS LOCKED` or `BLOCKED`
 - `prepare-takeoff`: `READY FOR PLANNING` or `BLOCKED`
 - `prepare-phased-impl`: `READY FOR IMPLEMENTATION` or `BLOCKED`
-- `implement`: `READY FOR REVERIFICATION` or `BLOCKED`
-- `revalidate`: `READY TO REPLAN`, `READY TO LAND`, or `BLOCKED`
+- `implement`: `READY TO LAND` or `BLOCKED`
 - `land-the-plan`: `LANDED` or `BLOCKED`
 
 If any stage emits `BLOCKED`, progression stops immediately.
@@ -71,7 +70,7 @@ Traceability is mandatory:
 
 - planned phase work maps to locked goals
 - implemented changes maps to approved phase work
-- reverification evidence maps to implemented changes
+- verification evidence maps to implemented changes
 
 ### 3.1 Principles Traceability Matrix
 
@@ -82,7 +81,7 @@ Traceability is mandatory:
 - `Keep Changes Minimal` -> Section 3 (`Execution Invariants`)
 - `Fail Fast and Explicitly` -> Section 3 (`Execution Invariants`)
 - `Verify, Then Declare Done` -> Section 4 (`Verification and Completion Contract`)
-- `Revalidate on Drift` -> Section 5 and Section 6 (`Drift and Revalidation`)
+- `Detect Drift and Stop` -> Section 5 (`Drift Hard Gate`)
 
 ---
 
@@ -93,7 +92,7 @@ Completion requires passing verification or explicit blocker documentation.
 - tests or equivalent validation must exist
 - tests are mandatory when behavior is changed
 - unverifiable goals are invalid
-- `lint`, `build`, and `test` are mandatory reverification command classes
+- `lint`, `build`, and `test` are mandatory verification command classes
 - command instances must come from pinned task/repo command records:
   - `spec.md`
   - `./codex/project-structure.md`
@@ -103,9 +102,9 @@ A stage MAY be declared complete only when locked success criteria and verificat
 
 ---
 
-## 5. Drift and Revalidation Hard Gate
+## 5. Drift Hard Gate
 
-Post-lock stages MUST continuously detect drift and enter `revalidate` on drift.
+Post-lock stages MUST continuously detect drift and stop immediately on drift.
 
 ### 5.1 Drift signals
 
@@ -148,52 +147,14 @@ New evidence is at least one of:
 - reduced failure surface
 - concrete reproducible observation not previously recorded
 
-Exceeding `N`, `M`, or `K` is drift and requires `revalidate`.
-
----
-
-## 6. Revalidate Contract
-
-All revalidation decisions must be documented.
-
-- `revalidate` wipes prior working memory/history for active execution context
-- `establish-goals` and `prepare-takeoff` remain locked context-only inputs
-- each revalidate run appends an entry to:
-  - `./tasks/<TASK_NAME_IN_KEBAB_CASE>/audit-log.md`
-- each revalidate audit entry must include, at minimum:
-  - findings summary (status/count/severity/verdict/confidence)
-  - complexity score snapshot (score/level/recommended goals and phases)
-  - fragile artifacts snapshot sourced from `./codex/project-structure.md`
-  - diff surface/churn snapshot
-  - lifecycle counters snapshot (`Stage 3 runs`, `Stage 3 current cycle`, `Drift revalidation count`)
-- trigger classes:
-  - drift-triggered revalidation
-  - direct reverification revalidation (direct from `implement` verdict `READY FOR REVERIFICATION`)
-
-Allowed exits by trigger:
-
-- drift-triggered: `READY TO REPLAN` or `BLOCKED`
-- direct reverification: `READY TO LAND` or `BLOCKED`
-
-Outcome routing:
-
-- `READY TO REPLAN`: resume at `prepare-phased-impl` (Stage 3 restart)
-- `READY TO LAND`: hand off directly to `land-the-plan` (no Stage 3 restart)
-
-`READY TO LAND` is valid only when:
-
-- `prepare-phased-impl` has been executed at least once total for the task
-- current `revalidate` entry is direct from Stage 4 verdict `READY FOR REVERIFICATION`
-- no open actionable code-review findings
-- code-review verdict is `patch is correct`
-- unresolved actionable findings are covered by explicit risk acceptance at:
-  - `./tasks/<TASK_NAME_IN_KEBAB_CASE>/risk-acceptance.md`
+Exceeding `N`, `M`, or `K` is drift and requires immediate stage stop with `BLOCKED`.
 
 Stage 3 state source of truth:
 
 - `./tasks/<TASK_NAME_IN_KEBAB_CASE>/lifecycle-state.md`:
   - `- Stage 3 runs: <N>`
-  - `- Drift revalidation count: <N>`
+  - `- Stage 3 current cycle: <N>`
+  - `- Stage 3 last validated cycle: <N>`
 
 Stage 3 restart archival requirement:
 
@@ -207,13 +168,13 @@ Stage 3 restart archival requirement:
 
 ---
 
-## 7. Land Cleanly
+## 6. Land Cleanly
 
 Do not finalize until:
 
 - Definition of Done is met
 - verification is complete or explicitly blocked
 - task artifacts are current
-- latest reverification includes `lint`, `build`, and `test` outcomes
+- latest verification includes `lint`, `build`, and `test` outcomes
 
 Finalization requires approved commit workflow and reviewer-ready handoff details.

codex/codex-config.yaml

@@ -1,5 +1,5 @@
 code_review:
-  base_branch: main
+  base_branch: qa
 
 notes:
   - "Update this manifest only when the repository's canonical commands change."
@@ -14,10 +14,12 @@ notes:
 
 
 
+
+
 # PREPARE-TAKEOFF BOOTSTRAP START
 bootstrap:
-  codex_root: "/Users/eric/.codex/worktrees/d4c7/prompts/codex"
-  codex_scripts_dir: "/Users/eric/.codex/worktrees/d4c7/prompts/codex/scripts"
+  codex_root: "/Users/eric/side-projects/prompts/codex"
+  codex_scripts_dir: "/Users/eric/side-projects/prompts/codex/scripts"
   canonical_scripts_path: "./.codex/scripts"
   repository_local_fallback_scripts_path: "./codex/scripts"
   home_fallback_scripts_path: "$HOME/.codex/scripts"

codex/principles.md

@@ -26,7 +26,7 @@ Do not hide uncertainty or errors.
 Completion requires passing verification or explicitly documented blockers.
 Tests are mandatory when behavior is changed.
 
-### 6. Revalidate on Drift
+### 6. Detect Drift and Stop
 
-If goals, scope, tests, touched surfaces, verification plans, or locked completion criteria drift, enter `revalidate` before continuing.
+If goals, scope, tests, touched surfaces, verification plans, or locked completion criteria drift, stop the active stage and emit `BLOCKED`.
 Treat drift detection as a hard gate, including loop-prevention limits (`N=45m`, `M=5 cycles`, `K=2 no-evidence cycles`).

codex/project-structure.md

@@ -60,7 +60,7 @@
 - `codex/project-structure.md` (required bootstrap input; missing or stale records block stage execution)
 - `codex/scripts/resolve-codex-root.sh` (root path selection used by stage scripts)
 - `codex/scripts/read-codex-paths.sh` (runtime path hydration for selected codex root/scripts dir)
-- `codex/scripts/revalidate-validate.sh` (terminal gate validator for Stage 5 verdict integrity)
+- `codex/scripts/implement-validate.sh` (terminal gate validator for Stage 4 -> Stage 5 readiness)
 - `goals/task-manifest.csv` (landing metadata and task identity continuity)
 
 ## Success Criteria

codex/rules/expand-task-spec.rules

@@ -243,7 +243,7 @@ prefix_rule(
 prefix_rule(
     pattern=["/Users/eric/.codex/scripts/implement-validate.sh"],
     decision="allow",
-    justification="Validate Stage 4 gates and emit READY FOR REVERIFICATION or BLOCKED.",
+    justification="Validate Stage 4 gates and emit READY TO LAND or BLOCKED.",
     match=[
         "/Users/eric/.codex/scripts/implement-validate.sh add-feature-x",
     ],
@@ -252,7 +252,7 @@ prefix_rule(
 prefix_rule(
     pattern=["./.codex/scripts/implement-validate.sh"],
     decision="allow",
-    justification="Validate Stage 4 gates and emit READY FOR REVERIFICATION or BLOCKED (canonical repo path).",
+    justification="Validate Stage 4 gates and emit READY TO LAND or BLOCKED (canonical repo path).",
     match=[
         "./.codex/scripts/implement-validate.sh add-feature-x",
     ],
@@ -261,7 +261,7 @@ prefix_rule(
 prefix_rule(
     pattern=["./codex/scripts/implement-validate.sh"],
     decision="allow",
-    justification="Validate Stage 4 gates and emit READY FOR REVERIFICATION or BLOCKED (repo-local fallback path).",
+    justification="Validate Stage 4 gates and emit READY TO LAND or BLOCKED (repo-local fallback path).",
     match=[
         "./codex/scripts/implement-validate.sh add-feature-x",
     ],
@@ -301,40 +301,6 @@ prefix_rule(
     ],
 )
 
-# -------------------------
-# Revalidate stage validator script
-# -------------------------
-
-prefix_rule(
-    pattern=["/Users/eric/.codex/scripts/revalidate-validate.sh"],
-    decision="allow",
-    justification="Validate Stage 5 Step 4/5 gates and emit READY TO REPLAN, READY TO LAND, or BLOCKED.",
-    match=[
-        "/Users/eric/.codex/scripts/revalidate-validate.sh add-feature-x",
-        "/Users/eric/.codex/scripts/revalidate-validate.sh add-feature-x main",
-    ],
-)
-
-prefix_rule(
-    pattern=["./.codex/scripts/revalidate-validate.sh"],
-    decision="allow",
-    justification="Validate Stage 5 Step 4/5 gates and emit READY TO REPLAN, READY TO LAND, or BLOCKED (canonical repo path).",
-    match=[
-        "./.codex/scripts/revalidate-validate.sh add-feature-x",
-        "./.codex/scripts/revalidate-validate.sh add-feature-x main",
-    ],
-)
-
-prefix_rule(
-    pattern=["./codex/scripts/revalidate-validate.sh"],
-    decision="allow",
-    justification="Validate Stage 5 Step 4/5 gates and emit READY TO REPLAN, READY TO LAND, or BLOCKED (repo-local fallback path).",
-    match=[
-        "./codex/scripts/revalidate-validate.sh add-feature-x",
-        "./codex/scripts/revalidate-validate.sh add-feature-x main",
-    ],
-)
-
 # -------------------------
 # Node / TypeScript (npm/bun)
 # -------------------------

codex/scripts/implement-validate.sh

@@ -76,8 +76,8 @@ if [[ ! -f "${FINAL_PHASE_FILE}" ]]; then
 fi
 
 if [[ -f "${PHASE_PLAN_FILE}" ]]; then
-  if ! grep -q '^- Verdict: READY FOR IMPLEMENTATION$' "${PHASE_PLAN_FILE}"; then
-    issues+=("Precondition failed: ${PHASE_PLAN_FILE} must contain '- Verdict: READY FOR IMPLEMENTATION' before Stage 4 closeout.")
+  if ! grep -Eq '^- Verdict: (READY FOR IMPLEMENTATION|READY TO LAND)$' "${PHASE_PLAN_FILE}"; then
+    issues+=("Precondition failed: ${PHASE_PLAN_FILE} must contain '- Verdict: READY FOR IMPLEMENTATION' or '- Verdict: READY TO LAND' before Stage 4/5 validation.")
   fi
 fi
 
@@ -138,8 +138,8 @@ if [[ -f "${FINAL_PHASE_FILE}" ]]; then
 fi
 
 if [[ "${#issues[@]}" -eq 0 ]]; then
-  set_verdict "READY FOR REVERIFICATION"
-  echo "READY FOR REVERIFICATION"
+  set_verdict "READY TO LAND"
+  echo "READY TO LAND"
   exit 0
 fi
 

codex/scripts/prepare-phased-impl-scaffold.sh

@@ -172,19 +172,16 @@ ensure_lifecycle_state_file() {
   local stage3_runs="0"
   local current_cycle="0"
   local last_validated_cycle="0"
-  local drift_revalidation_count="0"
 
   if [[ -f "${LIFECYCLE_STATE_FILE}" ]]; then
     stage3_runs="$(sed -nE 's/^- Stage 3 runs:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
     current_cycle="$(sed -nE 's/^- Stage 3 current cycle:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
     last_validated_cycle="$(sed -nE 's/^- Stage 3 last validated cycle:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
-    drift_revalidation_count="$(sed -nE 's/^- Drift revalidation count:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
   fi
 
   [[ "${stage3_runs}" =~ ^[0-9]+$ ]] || stage3_runs="0"
   [[ "${current_cycle}" =~ ^[0-9]+$ ]] || current_cycle="0"
   [[ "${last_validated_cycle}" =~ ^[0-9]+$ ]] || last_validated_cycle="0"
-  [[ "${drift_revalidation_count}" =~ ^[0-9]+$ ]] || drift_revalidation_count="0"
 
   current_cycle=$((current_cycle + 1))
 
@@ -193,7 +190,6 @@ ensure_lifecycle_state_file() {
 - Stage 3 runs: ${stage3_runs}
 - Stage 3 current cycle: ${current_cycle}
 - Stage 3 last validated cycle: ${last_validated_cycle}
-- Drift revalidation count: ${drift_revalidation_count}
 EOF
 }
 

codex/scripts/prepare-phased-impl-validate.sh

@@ -105,19 +105,16 @@ update_lifecycle_stage3_runs() {
   local stage3_runs="0"
   local current_cycle="0"
   local last_validated_cycle="0"
-  local drift_revalidation_count="0"
 
   if [[ -f "${LIFECYCLE_STATE_FILE}" ]]; then
     stage3_runs="$(sed -nE 's/^- Stage 3 runs:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
     current_cycle="$(sed -nE 's/^- Stage 3 current cycle:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
     last_validated_cycle="$(sed -nE 's/^- Stage 3 last validated cycle:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
-    drift_revalidation_count="$(sed -nE 's/^- Drift revalidation count:[[:space:]]*([0-9]+)[[:space:]]*$/\1/p' "${LIFECYCLE_STATE_FILE}" | head -n 1)"
   fi
 
   [[ "${stage3_runs}" =~ ^[0-9]+$ ]] || stage3_runs="0"
   [[ "${current_cycle}" =~ ^[0-9]+$ ]] || current_cycle="0"
   [[ "${last_validated_cycle}" =~ ^[0-9]+$ ]] || last_validated_cycle="0"
-  [[ "${drift_revalidation_count}" =~ ^[0-9]+$ ]] || drift_revalidation_count="0"
 
   if [[ "${current_cycle}" -eq 0 ]]; then
     current_cycle=1
@@ -133,7 +130,6 @@ update_lifecycle_stage3_runs() {
 - Stage 3 runs: ${stage3_runs}
 - Stage 3 current cycle: ${current_cycle}
 - Stage 3 last validated cycle: ${last_validated_cycle}
-- Drift revalidation count: ${drift_revalidation_count}
 EOF
 }
 
@@ -201,12 +197,12 @@ if [[ -f "${COMPLEXITY_LOCK_FILE}" ]]; then
   lock_signals_sha256="$(jq -r '.selected_signals_sha256 // empty' "${COMPLEXITY_LOCK_FILE}" 2>/dev/null || true)"
 
   if [[ -z "${lock_signals_path}" ]]; then
-    issues+=("Complexity lock metadata incomplete: missing 'selected_signals_path' in ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh, then enter revalidate.")
+    issues+=("Complexity lock metadata incomplete: missing 'selected_signals_path' in ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh, then rerun Stage 3 validation.")
     lock_metadata_complete="false"
   fi
 
   if [[ -z "${lock_signals_sha256}" ]]; then
-    issues+=("Complexity lock metadata incomplete: missing 'selected_signals_sha256' in ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh, then enter revalidate.")
+    issues+=("Complexity lock metadata incomplete: missing 'selected_signals_sha256' in ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh, then rerun Stage 3 validation.")
     lock_metadata_complete="false"
   fi
 
@@ -218,18 +214,18 @@ else
 fi
 
 if [[ ! -f "${COMPLEXITY_SIGNALS_FILE}" ]]; then
-  issues+=("Missing required complexity signals file: ${COMPLEXITY_SIGNALS_FILE}. Remediation: create it, rerun prepare-phased-impl-scaffold.sh, then enter revalidate.")
+  issues+=("Missing required complexity signals file: ${COMPLEXITY_SIGNALS_FILE}. Remediation: create it, rerun prepare-phased-impl-scaffold.sh, then rerun Stage 3 validation.")
 fi
 
 if [[ ! -f "${COMPLEXITY_LOCK_FILE}" ]]; then
-  issues+=("Missing required complexity lock file: ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh for this task, then enter revalidate.")
+  issues+=("Missing required complexity lock file: ${COMPLEXITY_LOCK_FILE}. Remediation: rerun prepare-phased-impl-scaffold.sh for this task, then rerun Stage 3 validation.")
 fi
 
 if [[ -f "${COMPLEXITY_LOCK_FILE}" && -f "${PHASE_PLAN_FILE}" ]]; then
   phase_plan_signals_path="$(signals_path_from_phase_plan)"
   if [[ -n "${phase_plan_signals_path}" ]]; then
     if [[ -n "${lock_signals_path}" && "${phase_plan_signals_path}" != "${lock_signals_path}" ]]; then
-      issues+=("Complexity drift detected: phase-plan signals path '${phase_plan_signals_path}' differs from locked path '${lock_signals_path}'. BLOCKED; run revalidate before continuing.")
+      issues+=("Complexity drift detected: phase-plan signals path '${phase_plan_signals_path}' differs from locked path '${lock_signals_path}'. BLOCKED; resolve drift before continuing.")
     fi
   fi
 fi
@@ -239,9 +235,9 @@ score_script="${SCRIPT_DIR}/complexity-score.sh"
 if [[ ! -x "${score_script}" ]]; then
   issues+=("Missing executable complexity scorer: ${score_script}")
 elif [[ -z "${complexity_signals_file}" ]]; then
-  issues+=("Complexity lock metadata incomplete: selected signals path could not be resolved from ${COMPLEXITY_LOCK_FILE}. BLOCKED; run revalidate after regenerating lock metadata.")
+  issues+=("Complexity lock metadata incomplete: selected signals path could not be resolved from ${COMPLEXITY_LOCK_FILE}. BLOCKED; resolve lock metadata before continuing.")
 elif [[ ! -f "${complexity_signals_file}" ]]; then
-  issues+=("Selected complexity signals file not found: ${complexity_signals_file}. BLOCKED; run revalidate after restoring the selected signals file.")
+  issues+=("Selected complexity signals file not found: ${complexity_signals_file}. BLOCKED; restore the selected signals file before continuing.")
 else
   if score_json="$("${score_script}" "${complexity_signals_file}" --format json 2>&1)"; then
     complexity_goals_min="$(printf '%s' "${score_json}" | jq -r '.ranges.goals.min // empty' 2>/dev/null || true)"
@@ -269,13 +265,13 @@ if [[ -f "${COMPLEXITY_LOCK_FILE}" && "${complexity_ranges_ready}" == "true" ]];
   lock_phases_max="$(jq -r '.ranges.phases.max // empty' "${COMPLEXITY_LOCK_FILE}" 2>/dev/null || true)"
 
   if [[ -n "${lock_signals_path}" && "${complexity_signals_file}" != "${lock_signals_path}" ]]; then
-    issues+=("Complexity drift detected: selected signals path changed from '${lock_signals_path}' to '${complexity_signals_file}'. BLOCKED; run revalidate before continuing.")
+    issues+=("Complexity drift detected: selected signals path changed from '${lock_signals_path}' to '${complexity_signals_file}'. BLOCKED; resolve drift before continuing.")
   fi
 
   if [[ -n "${lock_signals_sha256}" ]]; then
     if current_signals_sha256="$(sha256_file "${complexity_signals_file}")"; then
       if [[ "${current_signals_sha256}" != "${lock_signals_sha256}" ]]; then
-        issues+=("Complexity drift detected: selected signals content changed since Stage 3 lock. BLOCKED; run revalidate before continuing.")
+        issues+=("Complexity drift detected: selected signals content changed since Stage 3 lock. BLOCKED; resolve drift before continuing.")
       fi
     else
       issues+=("Unable to compute SHA-256 for ${complexity_signals_file} to enforce complexity drift policy.")
@@ -288,7 +284,7 @@ if [[ -f "${COMPLEXITY_LOCK_FILE}" && "${complexity_ranges_ready}" == "true" ]];
           "${lock_goals_max}" != "${complexity_goals_max}" || \
           "${lock_phases_min}" != "${complexity_phases_min}" || \
           "${lock_phases_max}" != "${complexity_phases_max}" ]]; then
-      issues+=("Complexity drift detected: scorer-derived ranges changed since Stage 3 lock (${lock_goals_min}-${lock_goals_max}/${lock_phases_min}-${lock_phases_max} -> ${complexity_goals_min}-${complexity_goals_max}/${complexity_phases_min}-${complexity_phases_max}). BLOCKED; run revalidate before continuing.")
+      issues+=("Complexity drift detected: scorer-derived ranges changed since Stage 3 lock (${lock_goals_min}-${lock_goals_max}/${lock_phases_min}-${lock_phases_max} -> ${complexity_goals_min}-${complexity_goals_max}/${complexity_phases_min}-${complexity_phases_max}). BLOCKED; resolve drift before continuing.")
     fi
   else
     issues+=("Complexity lock file has invalid range metadata: ${COMPLEXITY_LOCK_FILE}")