@deftai/directive-content 0.90.0 → 0.92.0

package/templates/agent-prompt-preamble.md

@@ -543,9 +543,12 @@ Every worker MUST send a final status message before exiting its tool loop, rega
 
 ! **Thin DONE is not success (#2943):** A terminal message that lacks PR URL / merge evidence (no `PR #N`, no PR URL, no merge confirmation) is a **thin DONE** / failed-leaf signal for the parent monitor — re-dispatch or take over after ground truth. Prefer structured completion fields when the host supplies them (`prUrl`, `mergeStatus`, `emptyDiff`). Workers MUST NOT exit with mid-edit prose and call it `DONE` when the envelope required a PR or merge-ready outcome.
 
+! **Empty announce ≠ done / single review-monitor lease (#3044 / FC04 residual):** An empty settle, missing `STATUS:` line, or `status: unknown` from a review-monitor (`subagent_announce` with `(no output)` included) is **not** DONE/CLEAN/merge-ready. Parent MUST same-turn ground truth (`gh pr view` + checks + HEAD) and MUST NOT spawn a second monitor while the prior owner is running or only falsely settled. Prefer one sticky `<!-- deft:review-owner -->` lease and a non-empty `STATUS`/`HEAD`/`CHECKS`/`MERGE` handback. Full MUST language: `skills/deft-directive-review-cycle/SKILL.md` + OpenClaw host adapter residual.
+
 ! **Parent tool-first after leaf completion (#2943):** When a parent / monitor receives a leaf completion event (`subagent_announce`, parent-push, or host completion notify), its **first response** MUST be a **tool-first** ground-truth batch (`gh` / `git` / worktree or file status) **or** a host **yield** (`sessions_yield` on OpenClaw, or equivalent). ⊗ Multi-sentence progress-only first response with zero tools / yield — the OpenClaw text-repetition hang class (#2943).
 
 ⊗ Treat thin DONE (no PR URL / merge evidence) as success (#2943).
+⊗ Treat empty/unknown review-monitor settle as DONE without same-turn ground truth, or dual-spawn a second monitor while the first lease is live (#3044).
 
 Per-step acks during the run are noise. ONE start message, ONE final message; intermediate messages only on `BLOCKED` / `FAILED`. The final message lets the dispatcher distinguish a clean exit from a silent timeout when the lifecycle event arrives.
 

package/templates/agents-entry.md

@@ -5,6 +5,11 @@ Deft is installed in .deft/core/. Full guidelines: .deft/core/main.md
 
 ! If any .deft/core/.agents/skills/ path referenced in this file cannot be read (missing file, stale path from a previous framework version, or a deprecation redirect stub), read .deft/core/QUICK-START.md instead and follow it. QUICK-START refreshes this section idempotently for the current framework version.
 
+## Temporary test kill-switch (#3039)
+
+! Before further Directive process load, check root `.deft-directive-disable` (presence = flag). If present → stop DD load; recovery = delete file + NEW agent session. Deposit OK; not `.no-deft-directive` (#2926). Docs: `.deft/core/docs/deft-directive-disable.md`.
+⊗ Claim full operation while the flag exists or after delete without a NEW agent session.
+
 ## Session routing (#2176)
 
 ! **Read-only default** until mutation intent: load AGENTS.md / main.md / USER.md / `xbrief/PROJECT-DEFINITION.xbrief.json`; resolve USER.md via `deft session:start` (`USER.md resolved …`; win32 `%APPDATA%\deft\USER.md`; unix `~/.config/deft/USER.md`; ⊗ invent `~/.config/deft` on Windows #2544); confirm Deft alignment + addressing-name; ⊗ no mutable `deft session:start` / triage welcome / sync / branch-policy unless asked or implementation-ready (#2176) — `.deft/core/commands.md` § Session routing. Bootstrap: cold-start → README § Cold-start (#2273) ⊗ never `.deft/core/`; pre-cutover → setup Pre-Cutover (#2068); missing USER.md / PROJECT-DEFINITION → setup Phase 1/2 (#1813) ⊗ before answering; else main → USER → PROJECT-DEFINITION; ~ sync. Mutation → `deft session:start` then `deft verify:session-ritual -- --tier=gated` (#1149). ? `deft session:start -- --read-only` (#2176).
@@ -63,6 +68,11 @@ Legacy `vbrief/` read-accepted; `deft migrate:xbrief` for `xbrief/` (v0.6→v0.8
 ! **Default always-pins:** `deft-directive-build`, `deft-directive-pre-pr`, `deft-directive-review-cycle`, `deft-directive-swarm` — read each `SKILL.md` when that work type starts.
 ⊗ Pin entire language packs, deployment docs, or framework bulk into AGENTS.md — pins are for false-negative-sensitive process gates only (#2508).
 
+## Through-merge worker dispatch (#3032)
+
+! On **through merge** / **drive to merge** / land-ship / **drive-to: merge-ready** story intent: parent MUST dispatch a `drive-to: merge-ready` worker (worktree, preflight, pre-pr, review-cycle, merge/`scope:complete`) via the **swarm/solo-worker launch path** even if **cohort size is 1** — parent MUST NOT implement as the leaf. Depth: swarm Phase 0 + skill-pin-policy (#3032 / #1880 Gap C).
+⊗ Parent conversation implements or babysits product fix/CI loops for drive-to:merge-ready work when background subagent/worktree dispatch is available (#3032).
+
 ## Review-surface precedence (#2308)
 
 ! Route PR shepherding / review work through `deft-directive-review-cycle` — `.deft/core/.agents/skills/deft-directive-review-cycle/SKILL.md`; host `babysit` / `bugbot` / `security-review` advisory-only (#2308 / #2261).

package/templates/swarm-greptile-poller-prompt.md

@@ -426,10 +426,14 @@ Send to parent:
 
     Subject: PR #{pr_number} CLEAN -- ready for merge
     Body:
-      Greptile review on HEAD <sha> is clean.
+      STATUS: DONE
+      HEAD: <sha>
+      CHECKS: <list of CheckRun statuses>
+      MERGE: n/a
+      ISSUE: open
+      NOTES: Greptile CLEAN confidence <N>/5; ready for merge
       Confidence: <N>/5
       Findings: P0=0, P1=0
-      CI: <list of CheckRun statuses>
       Last reviewed commit: <sha>
       -- no more polling, exiting now
 
@@ -445,9 +449,13 @@ If the same review surfaces 3 consecutive review cycles (push -> review -> still
 
     Subject: PR #{pr_number} escalation -- 3 review cycles still surfacing P0/P1
     Body:
-      Three consecutive review cycles after push still surfaced P0/P1 findings.
+      STATUS: BLOCKED
+      HEAD: <sha>
+      CHECKS: see latest findings
+      MERGE: n/a
+      ISSUE: open
+      NOTES: 3 review cycles still surfacing P0/P1; <summary>
       Latest findings: <summary>
-      Latest HEAD: <sha>
       -- no more polling, exiting now
 
 ### (3) ERRORED
@@ -458,7 +466,12 @@ Retry ONCE: post `@greptileai review` as a PR comment via `gh pr comment {pr_num
 
     Subject: PR #{pr_number} Greptile errored -- escalation required
     Body:
-      Greptile errored on HEAD <sha>; retry via @greptileai also errored.
+      STATUS: FAILED
+      HEAD: <sha>
+      CHECKS: Greptile errored (retry also errored)
+      MERGE: n/a
+      ISSUE: open
+      NOTES: escalate per swarm Phase 6 Step 1 (wait / empty retrigger / override)
       Parent should escalate to user with the three-way choice per
       skills/deft-directive-swarm/SKILL.md Phase 6 Step 1:
         (a) wait longer (~15-20 min)
@@ -474,6 +487,12 @@ Send:
 
     Subject: PR #{pr_number} poll cap exceeded -- parent should escalate
     Body:
+      STATUS: BLOCKED
+      HEAD: <sha>
+      CHECKS: <statuses>
+      MERGE: n/a
+      ISSUE: open
+      NOTES: poll cap exceeded; holdout=<which-of-the-five-conditions-failed>
       {poll_cap_minutes}-minute poll cap exceeded.
       Latest state:
         last_reviewed_sha: <sha or "unparsed">
@@ -494,6 +513,12 @@ Increment the `stall_streak` counter introduced under `## CLEAN gate evaluation,
 
     Subject: PR #{pr_number} poll loop wedged -- terminal-condition detection failure
     Body:
+      STATUS: BLOCKED
+      HEAD: <sha>
+      CHECKS: holdout=<which-of-the-five-conditions-failed>
+      MERGE: n/a
+      ISSUE: open
+      NOTES: STALL — detector cannot reach CLEAN or P0/P1; diagnose instrumentation
       Detector cannot reach CLEAN or NEW P0/P1 FINDINGS but no blocking signals
       are visible. Likely terminal-condition detection gap on this PR's review surface.
       Latest state:
@@ -515,6 +540,12 @@ Send:
 
     Subject: PR #{pr_number} informal-clean missing canonical fields -- recovery required
     Body:
+      STATUS: BLOCKED
+      HEAD: <sha>
+      CHECKS: informal-clean missing canonical fields
+      MERGE: n/a
+      ISSUE: open
+      NOTES: #1543 informal-clean; recovery @greptileai or override
       Greptile informal-clean missing-canonical-fields state (#1543).
       Latest Greptile comment says the diff is clean / prior issues resolved,
       but lacks canonical `Last reviewed commit:` and `Confidence Score: X/5`.
@@ -542,6 +573,18 @@ Send:
 - ! Use Python scripts (single `run_shell_command` call) for the poll loop, NEVER shell `Start-Sleep` + repeated tool calls. The Python script handles `time.sleep({poll_interval_seconds})` between polls and exits when a terminal condition fires.
 - ! Always pass `do_not_summarize_output: true` semantics when fetching `gh pr view --comments` -- summarizers silently drop the Outside-Diff section.
 - ! Send a status message to `{parent_agent_id}` at start (acknowledging the task) and at every terminal exit (CLEAN / NEW P0/P1 FINDINGS escalation / ERRORED / TIMEOUT / STALL / INFORMAL-CLEAN). Route it through the host completion channel for your primitive (see Role posture -- OpenClaw `sessions_spawn` uses parent push / announce). Do NOT silently complete.
+- ! **Required non-empty monitor handback (#3044):** every terminal exit message MUST be non-empty and include these structured fields (map CLEAN → `STATUS: DONE`, NEW P0/P1 / INFORMAL-CLEAN / TIMEOUT / STALL → `STATUS: BLOCKED`, ERRORED → `STATUS: FAILED` unless a hard failure):
+
+```text
+STATUS: DONE|BLOCKED|FAILED
+HEAD: <sha>
+CHECKS: <summary>
+MERGE: <url|error|n/a>
+ISSUE: <closed|open|n/a>
+NOTES: <short>
+```
+
+⊗ Empty final assistant message / empty `subagent_announce` body. Parents treat empty or missing-`STATUS` settles as FC04 residual, not success (`skills/deft-directive-review-cycle/SKILL.md` Empty announce ≠ done).
 
 ## Implementation Notes