@deftai/directive-runtime 0.129.3 → 0.129.4

package/vendor/directive-content/skills/deft-directive-pre-pr/SKILL.md

@@ -2,8 +2,8 @@
 name: deft-directive-pre-pr
 description: >-
   Iterative pre-PR quality improvement loop. Use before pushing a branch for
-  PR creation -- after completing implementation but before deft check. Cycles
-  through Read-Write-Lint-Diff until a full pass produces zero changes.
+  PR creation -- after completing implementation. Cycles through
+  Read-Write-Lint-Diff plus verify:ac until a full pass produces zero changes.
 ---
 <!-- AUTO-GENERATED by task packs:render -- DO NOT EDIT MANUALLY -->
 <!-- Purpose: rendered skill -->
@@ -65,7 +65,7 @@ task verify:plan-sequence -- --target-kind <entry-kind> --target <entry-id>
 GitHub `mergeable_state` is **textual only**. Post-open behavioral/policy gates stay invisible until the merge-chokepoint `task check` / `deft check` runs against the current base (#4888).
 
 - ! On **conflict-resolve** and **behind-rebase** (PR open; local HEAD matches live remote PR head), MUST treat the merge-chokepoint full gate as candidate validation against current base — not optional polish. Prefer `deft check`; else tree-correct `task check` / `task deft:check`. Then MUST call `evaluateNonCascadeCandidateGreen` with an attestation from `buildCandidateValidationAttestationFromProbe` (allowlisted probe exit 0; blessed producer) keyed to `(pr_head_sha, target_head_sha)`. Fail closed names the probe.
-- ! On **pre-push**, MUST run that same merge-chokepoint full gate locally against current base before pushing. Do **not** require `evaluateNonCascadeCandidateGreen` until after push when a PR exists and local HEAD matches the live remote PR head — then obtain the SHA-pair attestation. First push (no PR yet) and tip-ahead-of-remote pushes use the local gate only (#4888).
+- ! On **plain pre-push**, do **not** require the local merge-chokepoint full gate. Do **not** require `evaluateNonCascadeCandidateGreen` until after push when a PR exists and local HEAD matches the live remote PR head — then obtain the SHA-pair attestation. Conflict-resolve and behind-rebase keep the full-gate exception above (#4888 / #6040).
 - ! Frame `#4883` CLEAN / forge `mergeable_state=clean` as axis-1 necessity only — never three-axis sufficiency.
 - ⊗ Skip the merge-chokepoint `task check` after conflict-resolve or behind-rebase because GitHub shows mergeable/clean (#4888).
 - ⊗ Call `evaluateNonCascadeCandidateGreen` as a pre-push blocker when no PR exists or local HEAD does not yet match the remote PR head (#4888).
@@ -74,19 +74,19 @@ GitHub `mergeable_state` is **textual only**. Post-open behavioral/policy gates
 
 ## Gate throughput — iteration fast lane vs merge chokepoint (#1704)
 
-> **Invariant:** every change MUST pass the full gate at least once before merge. Pre-PR is the merge chokepoint — NOT every iteration commit.
+> **Invariant:** every change MUST pass the full gate at least once before merge. Ordinary pre-PR is the scoped Read-Write-Lint-Diff-Loop plus `verify:ac` — not the whole-repo merge chokepoint. CI `task check:merge` (and conflict-resolve / behind-rebase locally) hold the full gate (#6040).
 
-- ! **Iteration lane (Phases 2–3 loop):** use affected/static gates on changed paths — `vitest run --coverage <paths>`, relevant `verify:*` on touched files, `task coverage:hotspots` — instead of full `task check` on every pre-PR iteration. Phase 3 sits inside this loop, so it uses the iteration lane, not a full suite.
-- ! **Merge chokepoint (once after the loop, before push/PR):** prefer `deft check` once before push/PR. If the CLI is missing, use the tree-correct task form (`task deft:check` on include-only consumers; `task check` in framework source). These are one gate, not two sequential runs. Do not add a fourth probe (#2893 / #4379). A bare `task check` miss on an include-only consumer is not "gate unavailable". This is a #1704 revision of the prior Phase 3 Lint exit + final confirm (two runs, one inside every iteration). The escape-rate guard below still applies; do not invent a separate surface.
+- ! **Iteration lane (Phases 2–3 loop):** run only these scoped commands — the touched test files; `vitest related --run <changed source paths>` without `--coverage`; `biome check <changed-paths>`; `verify:orphan-active --changed-only`; and the existing `--base-ref` verify gates (`verify:evaluator-surface`, `verify:eval-health-relocation`, `verify:eval-triggers-relocation`). Whole-project `tsc -b` stays in CI (TypeScript lane), not in pre-PR. Phase 3 sits inside this loop.
+- ! **Full gate (CI / exception only):** ordinary pre-PR does **not** run or require post-loop `deft check` / `task check`. Prefer `deft check` (else tree-correct `task deft:check` / `task check`) only for conflict-resolve / behind-rebase candidate validation, and rely on CI `task check:merge` otherwise (#6040 / #4379). Do not add a fourth probe (#2893).
 - ! **Escape-rate safety (#1703 Tier-1):** before recommending fleet-wide fast-lane tightening, cite `#1703` Tier-1 telemetry (`helped/crud-metrics.jsonl`) and `task eval:health` — do NOT invent a separate escape-rate surface.
 - ~ **In-engine incrementality (#1713):** content-hash cache + runner-delegated affected selection are sibling work (#1713).
-- ⊗ Treat Phase 3c targeted coverage alone as PR-ready without full `task check` at the merge chokepoint.
-- ⊗ Run full `task check` inside every pre-PR Phase 3 iteration — Phase 3 is inside the loop; the chokepoint is once after exit.
+- ⊗ Prompt ordinary pre-PR for a post-loop full `task check` / `deft check` or a coverage run (#6040).
+- ⊗ Run full `task check` inside every pre-PR Phase 3 iteration — Phase 3 is the scoped loop only.
 
 ## When to Use
 
 - ! Before pushing a branch for PR creation
-- ! After completing implementation but before the final merge-chokepoint `deft check` (#1704 / #4379)
+- ! After completing implementation, before push/PR — run RWDL plus `verify:ac` (#6040)
 - ~ After addressing bot reviewer findings (run one pre-PR pass before pushing the fix batch)
 - ? During mid-implementation checkpoints on large changes
 
@@ -142,27 +142,23 @@ Each iteration proceeds through all phases in order. Do NOT skip phases or reord
 
 ### Phase 3 -- Lint
 
-! Run the iteration-lane gates and fix any failures (#1704). Full `task check` is the post-loop merge chokepoint, not this per-iteration phase.
+! Run the scoped iteration-lane gates and fix any failures (#6040). Ordinary pre-PR does not run a post-loop full `task check`.
 
-- ! Run affected/static gates on changed paths (`vitest run --coverage <paths>`, relevant `verify:*`, `task coverage:hotspots`) — not full `task check` inside the loop
-- ! Fix all failures before proceeding to Phase 3b
+- ! Run only Expected-6 scoped commands (touched tests; `vitest related --run <changed sources>` without `--coverage`; `biome check <changed-paths>`; `verify:orphan-active --changed-only`; `--base-ref` verify gates named above) — not full `task check` and not coverage inside the loop
+- ! When no linter exists for a changed path (or the toolchain is missing), note it visibly naming the path and continue — do not fail or stall on that absence alone; a linter that runs and reports errors still fails (#6040 Expected 7)
+- ! Fix real failures before proceeding to Phase 3b
 - ~ If a lint fix requires changing a file, that counts as a change for the Loop phase
 
 ~ **Windows + Grok Build (#1353):** Avoid `|`, `>`, or `2>&1` in `run_terminal_command` strings -- use Python `pathlib`/`subprocess` or plain task commands instead.
 
-### Phase 3c -- Coverage headroom (#2683 / #5421)
+### Phase 3c -- Coverage headroom (optional; not prompted in ordinary pre-PR) (#6040)
 
-! Before the full `task check` coverage gate, decide coverage applicability for the complete reviewed diff, then either measure headroom or record authorized not-applicable.
+Ordinary pre-PR does **not** run coverage or require `coverage_headroom`. The controller row stays in `PRE_PR_PHASES` as `required: false`. If an agent observes a red optional coverage row, the run still fails — so do not prompt or record that phase in ordinary pre-PR.
 
-- ! Run the shared applicability path (`deft coverage:hotspots` classifies before requiring Istanbul when the reviewed base/head/tree binding is available): **applicable** → measured path; **not-applicable** → inert skip channel; **coverageMode posture** (`initial`|`disabled`, exit 5) → mode skip channel (paths may still be coverable; authority is plan.policy.coverageMode); **refuse** → fail closed (or waived exit 4 when granted).
-- ! When applicable: run targeted coverage first: `vitest run --coverage <changed-paths>` (or language equivalent) — not only full `task check`. Then run `task coverage:hotspots` / `deft coverage:hotspots` for uncovered branches / headroom. Exercise both sides of new branches (ternary / early-return / catch / default switch / `||` / `??`). Treat barely ≥ floor as insufficient — aim for ≥ floor + 0.3–0.5pp headroom on the branch metric relative to **your project's** vitest/coverage floor (may differ from 85%). Complements `deft verify:forward-coverage` (#1310) and `--allow-coverage-debt=#N` (#2573).
-- ! When coverageMode is `initial` or `disabled` and no `coverage/coverage-final.json` is present: record `coverage_headroom` via **exit 5 + exact skip reason** `coverageMode posture skip (initial|disabled)` (`COVERAGE_HEADROOM_MODE_SKIP`). This is posture N/A — distinct from inert N/A and from forbidden report-missing-alone. The controller re-reads effective coverageMode at observe and commandSatisfied; hotspots exit 5 self-instructs the token and carries it on the mode artifact. When a coverage report exists, keep the measured path (report-present guard).
-- ! When not-applicable (every changed path proven inert): record `coverage_headroom` via **non-zero exit + exact skip reason** `reviewed diff has no coverable paths` (`ALLOWED_SKIP_REASONS.coverage_headroom`). The controller re-derives applicability from the run's PrePrInputBinding before honoring that skip. Hotspots exit 3 emits the machine-readable N/A artifact for this channel.
-- ! When coverageMode is `initial` or `disabled` and no `coverage/coverage-final.json` is present: record `lint_iteration` via **exit 5 + exact skip reason** `lint_iteration coverageMode posture skip (initial|disabled)` (`LINT_ITERATION_MODE_SKIP`). This discharges the Vitest-shaped observation only — keep applicable static / `verify:*` gates in Phase 3 and the merge_chokepoint phase. Do **not** invent `vitest --coverage`. The controller re-reads coverageMode at observe and commandSatisfied; refuse the mode skip when a coverage report exists (shared report-present guard with #5791). Never exit 0 and never bare any-nonzero for this channel.
-- ⊗ Satisfy `coverage_headroom` with an unbound exit-0 changed-file audit or any free-form exit-0 command that is not the authorized `deft coverage:hotspots` measured pass.
-- ⊗ Invent an Istanbul report, ask the operator to waive an irrelevant metric, or treat report-missing alone as not-applicable (mode posture skip requires coverageMode initial|disabled + exit 5 token — not a free-form missing-report claim).
-- ⊗ Soften `coverage_headroom` to optional, lower the coverage floor, or claim a general docs-only CI bypass.
-- ! Toolchain-only N/A for executable changes on non-Istanbul projects (Coverlet adapters) remains open — do not paper over executable .NET with inert-classifier N/A.
+- ! Leave coverage measurement to CI/release (#6041) or an explicit operator ask.
+- ! When coverageMode is `initial` or `disabled` and no `coverage/coverage-final.json` is present: the lint_iteration Vitest-shaped observation MAY still use **exit 5 + exact skip reason** `lint_iteration coverageMode posture skip (initial|disabled)` (`LINT_ITERATION_MODE_SKIP`) — keep applicable static / `verify:*` gates in Phase 3. Do **not** invent `vitest --coverage`.
+- ⊗ Soften fail-closed behavior for an *observed* red optional `coverage_headroom` row (optional ≠ ignore a recorded failure).
+- ⊗ Require `task coverage:hotspots` / `vitest --coverage` as part of ordinary pre-PR (#6040).
 
 ### Phase 3b -- Auto-Render Exports
 
@@ -208,16 +204,16 @@ git --no-pager diff master
 
 When session effort-budget is hard-capped (`DEFT_MAX_TURNS` / `DEFT_MAX_BUDGET` / session:start `effort_budget`):
 
-- ! Complete the merge-chokepoint path that proves stated AC (full `task check` once, stated AC evidence) before optional polish that only deepens beyond the bar.
-- ! If remaining budget cannot fund another full Read-Write-Lint-Diff pass **and** a fix for a new finding, stop after the stated-pass chokepoint and record `deepening_skipped=true` with reason (#1006).
-- ! Dual-stop pre-PR defaults (max 3 polish / 2 no-diff) still apply; under a hard cap, prefer fewer polish iterations once AC + check are green.
+- ! Complete the stated-AC path (scoped RWDL plus `verify:ac` evidence) before optional polish that only deepens beyond the bar (#6040).
+- ! If remaining budget cannot fund another full Read-Write-Lint-Diff pass **and** a fix for a new finding, stop after the stated-pass loop and record `deepening_skipped=true` with reason (#1006).
+- ! Dual-stop pre-PR defaults (max 3 polish / 2 no-diff) still apply; under a hard cap, prefer fewer polish iterations once AC is green.
 - ⊗ Start an unbounded self-imposed verification suite that exceeds stated AC while the hard budget is nearly exhausted (#3266).
 
 ## Product-first done-gate (#3284) / literal AC (#3267)
 
 - ! Before Phase 3 Lint exit / push, when the active scope xBRIEF has acceptance commands (`plan.acceptance` or #3267 metadata/narratives), run `task verify:ac -- <active-xbrief>` and fail closed on exit 1. (`verify:literal-ac` is the mechanism alias.)
 - ! Commands must be the exact strings from the task statement — same flags and cwd. Self-chosen verification is supplementary only.
-- ! Full `task check` already runs `verify:ac` first; still run it explicitly before push when AC is stated so failures are visible without the full hygiene suite.
+- ! `verify:ac -- <active-xbrief>` stays a required local pre-PR step. CI soft-missing `verify:ac` is not a substitute (#6040).
 - ⊗ Skip AC run on rapid/minimal ceremony dial — rapid = AC-only; AC never degrades when commands exist (#3284 / #3156).
 
 ## Product-oracle gate integrity (#3322 / #3156)
@@ -262,11 +258,9 @@ Shared retrieval tokens match article-review pre-filing (#1178): closed-PR walk
 ! Exit when a complete Read-Write-Lint-Diff cycle produces **zero changes** -- no file edits in Write, no lint fixes in Lint, and no scope issues in Diff.
 
 After exiting:
-- ! Run the merge chokepoint once: prefer `deft check`; if the CLI is missing, use the tree-correct task form (`task deft:check` on include-only consumers; `task check` in framework source). These are one gate, not two sequential runs. Do not add a fourth probe (#2893 / #4379). Phase 3 used the iteration lane, so this is the first full suite in the loop, not a second run.
-- ! If that post-loop full gate is red and the fix changes files, restart from Phase 1 (Read). Do not only re-run the gate — those edits must pass Read and Diff (#4324).
-- ! After that restart exits with zero changes, run the same tree-correct full gate once again (recovery after a red merge chokepoint).
-- ! Re-run the full gate only after a red merge chokepoint or a new commit.
-- ~ The branch is now ready for push and PR creation
+- ! Run `task verify:ac -- <active-xbrief>` (or `deft verify:ac`) when acceptance commands are stated; fail closed on exit 1 (#6040).
+- ! Do **not** prompt a post-loop full `task check` / `deft check` or a coverage run for ordinary pre-PR. Conflict-resolve / behind-rebase keep the local full-gate exception in Three-axis (#4888).
+- ~ The branch is now ready for push and PR creation; CI `task check:merge` holds the whole-repo gate.
 
 
 ## Significant decision log (#1396)
@@ -290,7 +284,7 @@ Docs: `docs/decision-log.md`.
 - ⊗ Ignore the iteration count -- more than 3 iterations usually indicates oscillating fixes or an unclear spec task
 - ⊗ Add a prohibition (`!` or `⊗`) without scanning the same file for conflicting softer-strength rules (`~`, `≉`) that reference the same term
 - ⊗ Add a weaker rule (`~` / `≉`) beside an existing `!` / `⊗` for the same command/pattern without reconciling in the same commit
-- ⊗ After a red post-loop `task check`, fix files and re-run only the gate without restarting Read-Write-Lint-Diff
+- ⊗ After a red conflict-resolve / behind-rebase full gate, fix files and re-run only the gate without restarting Read-Write-Lint-Diff
 - ⊗ Skip `task pr:check-closing-keywords` (#737) before pushing a PR. Intent mode (#3015) also refuses bare/conditional real `Closes #N` without `--allow-close`. The negation-context substring match is the Layer 0 (prevention) gate that prevents the recurring auto-close of umbrella / staying-OPEN issues observed in #697 (closed #642), #401 (closed #642), #700 (closed #233), and #735 (closed #734) -- each incident required manual reopen and downstream cleanup. The lint's three-state exit (0 clean / 1 hits found / 2 config error) MUST be treated as a hard refusal: rewrite the PR body / commit messages until clean, OR pass `--allow-known-false-positives` ONLY for legitimately-quoted occurrences (test fixtures, documentation that discusses the trigger token literally). See `skills/deft-directive-swarm/SKILL.md` Phase 6 Step 1 for the corresponding Layer 3 (recovery) `pr:check-protected-issues` rule (#701)
 - ⊗ Invent remote PR/SHA/CI/review claims in handoff evidence without same-turn probe binding — invented-done (#3120)
 - ⊗ Fill remote ship/gate fields from memory when only local work completed; legal partial omits PR fields (#3120)

package/vendor/directive-content/templates/agents-entry.md

@@ -88,7 +88,7 @@ Deft runtime is pinned as `@deftai/directive-runtime`. Full guidelines: node_mod
 ! **Dual stop (#2442):** multi-iteration work MUST have success + failure/budget stop (max iters / no-progress / budget); single-turn exempt; halt with operator-visible report; ⊗ thrash. Defaults: build, swarm, review-cycle skills. See main.md Dual Stop Rule. Ledger #3143.
 ## Rule Authority [AXIOM]
 ! Prefer `task deft:*` over AGENTS.md prose. See main.md.
-! Merge chokepoint (#4379 / #2893): prefer `deft check`; else `task deft:check` on include-only consumers. One gate, not two runs.
+! Merge chokepoint (#4379 / #2893 / #6040): when the full gate runs (conflict-resolve / behind-rebase locally, or CI merge-gate (`check:merge`)), prefer `deft check`; else `task deft:check` on include-only consumers. Ordinary pre-PR is RWDL + `verify:ac` and does not require that full gate. One gate, not two runs.
 ## Thin Fail-Closed Design (#3265)
 ! One fail-closed `task deft:*` check + one remediation. See main.md.
 ## Writing bar (#3368)