@windyroad/architect 0.3.1-preview.95 → 0.3.2-preview.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/architect",
-  "version": "0.3.1-preview.95",
+  "version": "0.3.2-preview.99",
   "description": "Architecture decision enforcement for AI coding agents",
   "bin": {
     "windyroad-architect": "./bin/install.mjs"

package/skills/create-adr/SKILL.md

@@ -56,10 +56,27 @@ Before writing the ADR file, perform a decision-boundary analysis on the gathere
 
 ### 3. Determine sequence number and filename
 
-- Next number = highest existing decision number + 1 (or 001 if none exist)
+- Next number = **max of the local and origin highest decision numbers**, plus 1 (or 001 if none exist).
 - Filename: `NNN-decision-title-in-kebab-case.proposed.md`
 - Pad the number to 3 digits (001, 002, ... 010, 011, etc.)
 
+**Why compare against origin?** Per ADR-019 confirmation criterion 2, ticket-creator skills MUST re-check next-number assignment against `git ls-tree origin/<base>` before assigning. Without it, parallel sessions can mint the same ADR number for different decisions, causing a destructive surgical rebase on push (this was the failure mode that motivated ADR-019 itself).
+
+```bash
+# Local-max number
+local_max=$(ls docs/decisions/*.md 2>/dev/null | sed 's/.*\///' | grep -oE '^[0-9]+' | sort -n | tail -1)
+
+# 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)
+
+# 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 )))
+```
+
+If the local choice would have collided with an origin ADR created since the last fetch, the `git ls-tree origin/<base>` lookup catches it here and the renumber is automatic. Log the renumber in the user-facing report (e.g. "Bumped next ADR number from 020 → 021 to avoid collision with origin").
+
 ### 4. Write the ADR
 
 Write the file to `docs/decisions/` with this structure:

package/skills/create-adr/test/create-adr-id-collision-guard.bats

@@ -0,0 +1,35 @@
+#!/usr/bin/env bats
+# Doc-lint guard: create-adr SKILL.md step 3 (Determine sequence number)
+# must include the next-ID collision guard against origin per ADR-019
+# confirmation criterion 2.
+#
+# Structural assertion — Permitted Exception to the source-grep ban (ADR-005 / P011).
+# These tests assert that the skill specification document instructs the
+# ADR creator to compare next-number against origin/<base> before
+# assigning, so parallel sessions don't produce colliding ADR numbers.
+#
+# Cross-reference:
+#   P043 (next-ID collision guard in ticket-creator skills)
+#   ADR-019 (AFK orchestrator preflight, including next-ID guard)
+
+setup() {
+  SKILL_DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")/.." && pwd)"
+  SKILL_FILE="${SKILL_DIR}/SKILL.md"
+}
+
+@test "SKILL.md cites ADR-019 (next-ID collision guard)" {
+  run grep -n "ADR-019" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "SKILL.md step 3 references git ls-tree origin for next-number lookup" {
+  # ADR-019 mechanism: the ADR creator MUST re-check next-number against
+  # `git ls-tree origin/<base>` before assigning.
+  run grep -n "git ls-tree origin" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "SKILL.md mentions taking the max of local and origin numbers" {
+  run grep -niE "max of (the )?(two|local and origin)|max\(.*origin" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}