Merge master into issue-552-blocked-diagnose to resolve conflicts

2026-07-09 09:06:59 -04:00
parent 92fc913cad 8e7a69800a
commit c35f713291
45 changed files with 4439 additions and 84 deletions
@@ -11,6 +11,9 @@ Router: skills/llm-project-workflow/SKILL.md (task mode: work-issue)

 Rules (llm-project-workflow):
 - **BLOCKED + DIAGNOSE default (required):** If any required step (load workflow, acquire lease, prove worktree under branches/, capability, profile, tool, instruction, preflight, etc.) cannot be performed, STOP. State BLOCKED. Use [`blocked-diagnose-report.md`](../templates/blocked-diagnose-report.md) template exactly. Only safe non-mutating recovery. Report. Do not continue or fallback.
+- Find the latest CTH comment on the issue/PR thread before starting work.
+  Post a new CTH: Author Handoff (or CTH: Blocker) at session end.
+  Template: skills/llm-project-workflow/templates/canonical-thread-handoff.md
 - No repo changes without a tracking issue. If none exists, create one first;
  if it can't be created, stop.
 - Work only in an isolated branch worktree under branches/. The main checkout