@windyroad/architect 0.4.0 → 0.4.1

package/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "wr-architect",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Architecture decision enforcement for Claude Code"
 }

package/hooks/architect-detect.sh

@@ -38,7 +38,7 @@ scripts, and decisions.
 Does NOT apply to: CSS/SCSS files, image assets, lockfiles, font files,
 docs/problems/ (problem tickets), docs/BRIEFING.md, RISK-POLICY.md,
 .risk-reports/, .changeset/, memory files, plan files, docs/jtbd/,
-docs/JOBS_TO_BE_DONE.md, docs/PRODUCT_DISCOVERY.md, docs/VOICE-AND-TONE.md,
+docs/PRODUCT_DISCOVERY.md, docs/VOICE-AND-TONE.md,
 docs/STYLE-GUIDE.md.
 HOOK_OUTPUT
 else

package/hooks/architect-enforce-edit.sh

@@ -65,8 +65,6 @@ case "$FILE_PATH" in
   */docs/problems/*.md|docs/problems/*.md)
     exit 0 ;;
   # Peer-plugin policy files — governed by their own plugin's enforce hook, not architect (P009)
-  */docs/JOBS_TO_BE_DONE.md|docs/JOBS_TO_BE_DONE.md)
-    exit 0 ;;
   */docs/PRODUCT_DISCOVERY.md|docs/PRODUCT_DISCOVERY.md)
     exit 0 ;;
   */docs/jtbd/*|docs/jtbd/*)

package/hooks/test/architect-enforce-scope.bats

@@ -41,8 +41,14 @@ assert_path_allowed() {
   [[ "$output" != *"BLOCKED"* ]]
 }
 
-@test "architect: exempts JTBD policy file (P009)" {
-  assert_path_allowed "$PWD/docs/JOBS_TO_BE_DONE.md"
+@test "architect: does NOT exempt legacy docs/JOBS_TO_BE_DONE.md (ADR-008 Option 3, P019)" {
+  # Legacy single-file path is no longer a recognised peer-plugin policy
+  # artefact — ADR-008 Option 3 removes it from runtime consideration.
+  # The architect gate treats it as ordinary content and applies its
+  # normal review rules.
+  run run_hook_with_file "$PWD/docs/JOBS_TO_BE_DONE.md"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"BLOCKED"* ]]
 }
 
 @test "architect: exempts JTBD directory file (P009)" {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/architect",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Architecture decision enforcement for AI coding agents",
   "bin": {
     "windyroad-architect": "./bin/install.mjs"

package/skills/create-adr/SKILL.md

@@ -69,7 +69,13 @@ local_max=$(ls docs/decisions/*.md 2>/dev/null | sed 's/.*\///' | grep -oE '^[0-
 # Origin-max number — reads remote-tracking ref; no fetch needed here
 # because `wr-architect:agent` upstream callers (e.g. work-problems) run
 # the Step 0 preflight that does the fetch.
-origin_max=$(git ls-tree origin/main docs/decisions/ 2>/dev/null | grep -oE '[0-9]{3}' | sort -n | tail -1)
+#
+# `--name-only` is required (P056): without it, each ls-tree line is
+# `<mode> <type> <sha>\t<path>` and the 40-char blob SHA can contain
+# three-digit runs that `grep -oE '[0-9]{3}'` false-matches. `sed` strips
+# the path prefix so the anchored `grep -oE '^[0-9]+'` only picks up
+# filename IDs.
+origin_max=$(git ls-tree --name-only origin/main docs/decisions/ 2>/dev/null | sed 's|^docs/decisions/||' | grep -oE '^[0-9]+' | sort -n | tail -1)
 
 # Take the max of the two and increment.
 next=$(printf '%03d' $(( $(echo -e "${local_max:-0}\n${origin_max:-0}" | sort -n | tail -1) + 1 )))
@@ -161,8 +167,9 @@ Apply any feedback by editing the file.
 
 If the user mentions this decision replaces an existing one:
 1. Add `supersedes: [NNN-old-decision-title]` to the new decision's frontmatter
-2. Rename the old decision file from `.accepted.md` (or `.proposed.md`) to `.superseded.md`
+2. Rename the old decision file from `.accepted.md` (or `.proposed.md`) to `.superseded.md` using `git mv`
 3. Update the old decision's frontmatter status to `superseded`
 4. Add a "Superseded by" section to the old decision referencing the new one
+5. **Re-stage the renamed file explicitly after the `Edit` tool runs**: `git add docs/decisions/<NNN>-<title>.superseded.md`. `git mv` stages only the rename — the subsequent frontmatter and "Superseded by" edits must be added again before commit, or they leak into the next commit (P057 staging trap).
 
 $ARGUMENTS

package/skills/create-adr/test/create-adr-next-id-origin-lookup.bats

@@ -0,0 +1,45 @@
+#!/usr/bin/env bats
+# Doc-lint guard: create-adr SKILL.md Step 3 origin-max lookup must use
+# `git ls-tree --name-only` to avoid false-matching blob SHA digits (P056).
+#
+# Structural assertion — Permitted Exception to the source-grep ban
+# (ADR-005 / P011). Same defect as manage-problem: default `git ls-tree`
+# output carries a 40-char blob SHA that can contain three-digit runs,
+# which `grep -oE '[0-9]{3}'` picks up as a false origin_max. `--name-only`
+# restores the invariant ADR-019 presumes.
+#
+# Cross-reference:
+#   P056: docs/problems/056-ticket-creator-next-id-lookup-blob-sha-false-match.*.md
+#   P043 (closed): next-ID collision guard in ticket-creator skills
+#   ADR-019: docs/decisions/019-afk-orchestrator-preflight.*.md
+#   @jtbd JTBD-002 (ship with confidence — audit trail)
+
+setup() {
+  TEST_DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" && pwd)"
+  REPO_ROOT="$(cd "${TEST_DIR}/../../../../.." && pwd)"
+  SKILL_FILE="${REPO_ROOT}/packages/architect/skills/create-adr/SKILL.md"
+}
+
+@test "create-adr SKILL.md exists (P056 precondition)" {
+  [ -f "$SKILL_FILE" ]
+}
+
+@test "create-adr SKILL.md origin-max lookup uses git ls-tree --name-only (P056)" {
+  # The fix: `git ls-tree --name-only` drops mode/type/SHA columns so the
+  # digit-extraction regex cannot match SHA hex runs.
+  run grep -nE "git ls-tree --name-only .* docs/decisions" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "create-adr SKILL.md does not keep the buggy bare git ls-tree pattern (P056)" {
+  # Regression guard: `git ls-tree <ref> docs/decisions/` without `--name-only`
+  # piped directly into a digit regex is the bug.
+  run grep -nE "git ls-tree [^-].* docs/decisions/ .*\| *grep -oE '\[0-9\]\{3\}'" "$SKILL_FILE"
+  [ "$status" -ne 0 ]
+}
+
+@test "create-adr SKILL.md cites P056 on the origin-max fix (P056)" {
+  # Traceability.
+  run grep -n "P056" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}

package/skills/create-adr/test/create-adr-rename-restage-reminder.bats

@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+# Doc-lint guard: create-adr SKILL.md must document the re-stage-after-Edit
+# requirement for ADR supersession renames (Step 6).
+#
+# Structural assertion — Permitted Exception to the source-grep ban
+# (ADR-005 / P011). The test asserts that the supersession step either
+# warns authors that `git mv` stages only the rename, or instructs them
+# to re-stage the file after editing frontmatter + "Superseded by" section.
+#
+# Cross-reference:
+#   P057: docs/problems/057-git-mv-plus-edit-staging-ordering-trap.*.md
+#   ADR-014: docs/decisions/014-governance-skills-commit-their-own-work.proposed.md
+#   @jtbd JTBD-002 (ship with confidence — audit trail)
+
+setup() {
+  TEST_DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" && pwd)"
+  REPO_ROOT="$(cd "${TEST_DIR}/../../../../.." && pwd)"
+  SKILL_FILE="${REPO_ROOT}/packages/architect/skills/create-adr/SKILL.md"
+}
+
+@test "create-adr SKILL.md exists (P057 precondition)" {
+  [ -f "$SKILL_FILE" ]
+}
+
+@test "create-adr SKILL.md instructs re-staging the renamed ADR file after Edit (P057)" {
+  # Authors must be told to run `git add <new>` (or equivalent) after editing
+  # the renamed file (supersession adds a `Superseded by` section and a status
+  # frontmatter update).
+  run grep -inE "re-stage|re‑stage|\`git add\`.*after|after.*\`git add\`|git add <new>|git add .*\.superseded\.md|stages only the rename" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "create-adr SKILL.md cites P057 on the re-stage requirement (P057)" {
+  # Traceability: the new guidance must cite P057 so reviewers can chase
+  # the fix back to the incident that motivated it.
+  run grep -n "P057" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}