@windyroad/itil 0.23.5 → 0.24.0-preview.268

package/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "wr-itil",
-  "version": "0.23.5",
+  "version": "0.24.0",
   "description": "ITIL-aligned IT service management for Claude Code"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/itil",
-  "version": "0.23.5",
+  "version": "0.24.0-preview.268",
   "description": "ITIL-aligned IT service management for Claude Code (problem, and future incident/change skills)",
   "bin": {
     "windyroad-itil": "./bin/install.mjs"

package/skills/report-upstream/SKILL.md

@@ -230,7 +230,7 @@ If the upstream had a matching template (Step 3), fill its required fields from
 | Upstream template field (typical) | Local ticket source |
 |---|---|
 | `plugin` / `package` / `module` | Inferred from upstream repo name or local ticket's "Affected plugin / component" |
-| `version` | Local ticket's environment notes; or `npm view <pkg> version` for the latest if ambiguous |
+| `version` (single-slot version field) | Per ADR-033 amendment 2026-05-03 (P128) — populate with the local plugin version from the consolidated `## Versions` schema below; the full `## Versions` block is ALSO appended to the body's prose so the upstream maintainer has both the template's structured slot AND every version dimension. |
 | `claude-code-version` | `claude --version` if the report originates from a Claude Code session |
 | `os` | Local ticket's environment notes; or `uname -srm` of the reporting host |
 | `description` | Local ticket's `## Description` section |
@@ -239,6 +239,30 @@ If the upstream had a matching template (Step 3), fill its required fields from
 | `frequency` | Local ticket's `## Impact Assessment` Frequency line |
 | `evidence` | Commit SHAs, test output, transcript excerpts from Investigation Tasks |
 
+#### Versions schema (ADR-033 amendment 2026-05-03, P128)
+
+Every body — matched-template path AND structured-default fallback — MUST include a labelled `## Versions` section carrying the five-field schema below. Missing fields render as `not detected` (normative MUST per ADR-033 amendment); omitting a field entirely is non-compliant because triage cannot distinguish *field omitted because not applicable* from *detection failed*.
+
+```markdown
+## Versions
+
+- Local plugin: `@windyroad/<pkg>@<version>` (or "not detected" if reporting against a non-windyroad package)
+- Upstream package: `<pkg>@<version>` (or "not detected" if not applicable)
+- Claude Code CLI: `<claude --version output>` (or "not detected")
+- Node: `<node --version output>` (or "not detected")
+- OS: `<uname -srm output or platform detection>` (or "not detected")
+```
+
+**Auto-population sources** (best-effort; each source returns "not detected" on failure rather than crashing the skill):
+
+- **Local plugin** — read `package.json` for `@windyroad/*` dependencies; or run `claude plugin list --json` and pick the matching plugin.
+- **Upstream package** — `gh api repos/<owner>/<repo>/releases/latest` (GitHub-hosted) or `npm view <pkg> version` (npm-published); fall back to the local ticket's environment notes if neither resolves.
+- **Claude Code CLI** — `claude --version`.
+- **Node** — `node --version`.
+- **OS** — `uname -srm` (POSIX) or platform-equivalent.
+
+Cost note: `gh api` and `npm view` are network calls; cache within a session where reasonable. The five-field schema is fixed so downstream consumers (P129's inbound version-aware classifier, when it lands) parse against a stable surface.
+
 For upstream repos whose matched template is `bug-report.yml` / `feature-request.yml` / `question.yml` (Step 3 backward-compat fallback), the skill fills the corresponding field set: `reproduction` ← `## Symptoms`; `expected` / `actual` ← observed-vs-expected contrast lines under `## Description`; `proposal` (for features) ← `## Description`.
 
 #### Structured default body — problem-shaped (primary, per ADR-033)
@@ -266,12 +290,13 @@ Use this body when the Step 3 classifier picked `problem` shape AND the upstream
 
 <from the local ticket's Impact Assessment "Frequency" line>
 
-## Environment
+## Versions
 
-- Package: <inferred from upstream repo>
-- Version: <detected via npm ls or local ticket's notes>
-- Claude Code version: <claude --version>
-- OS: <uname -srm>
+- Local plugin: `@windyroad/<pkg>@<version>` (or "not detected")
+- Upstream package: `<pkg>@<version>` (or "not detected")
+- Claude Code CLI: <claude --version output> (or "not detected")
+- Node: <node --version output> (or "not detected")
+- OS: <uname -srm output> (or "not detected")
 
 ## Evidence
 
@@ -284,7 +309,7 @@ Reported from <downstream-repo-url>/<local-ticket-relative-path>
 This issue is tracked locally as P<NNN> in the downstream project's `docs/problems/` directory.
 ```
 
-The body MUST include the `## Cross-reference` section so Step 7's back-write contract works (the downstream ticket's `## Reported Upstream` section records the upstream URL; the upstream issue body records the downstream reference).
+The body MUST include the `## Cross-reference` section so Step 7's back-write contract works (the downstream ticket's `## Reported Upstream` section records the upstream URL; the upstream issue body records the downstream reference). The body MUST also include the labelled `## Versions` section per the ADR-033 amendment 2026-05-03 (P128); see the Versions schema block under Step 5's field-mapping table for the five-field contract and "not detected" rendering rule.
 
 #### Structured default body — bug-shaped (fallback-only)
 
@@ -307,12 +332,13 @@ Use this body only when the Step 3 classifier picked `bug` shape as backward-com
 
 <from local ticket>
 
-## Environment
+## Versions
 
-- Package: <inferred from upstream repo>
-- Version: <detected via npm ls or local ticket's notes>
-- Claude Code version: <claude --version>
-- OS: <uname -srm>
+- Local plugin: `@windyroad/<pkg>@<version>` (or "not detected")
+- Upstream package: `<pkg>@<version>` (or "not detected")
+- Claude Code CLI: <claude --version output> (or "not detected")
+- Node: <node --version output> (or "not detected")
+- OS: <uname -srm output> (or "not detected")
 
 ## Cross-reference
 
@@ -321,6 +347,8 @@ Reported from <downstream-repo-url>/<local-ticket-relative-path>
 This issue is tracked locally as P<NNN> in the downstream project's `docs/problems/` directory.
 ```
 
+The bug-shaped fallback also includes the labelled `## Versions` section per the ADR-033 amendment 2026-05-03 (P128) — schema and "not detected" rendering rule are common to both default body shapes.
+
 #### Structured default body — feature-shaped (fallback-only)
 
 Use this body only when the Step 3 classifier picked `feature` shape as backward-compat fallback AND the upstream has no matching template:

package/skills/report-upstream/test/report-upstream-contract.bats

@@ -1,5 +1,13 @@
 #!/usr/bin/env bats
 
+# tdd-review: structural-permitted (justification: P012 skill testing
+#   harness scope is open; no behavioural alternative for SKILL.md prose-
+#   template structural assertions today. ADR-052 Migration clause permits
+#   structural retrofit-via-justification when the linked harness-gap ticket
+#   has not yet shipped the primitives. The whole-file annotation covers all
+#   assertions in this fixture, including the P128 `## Versions` schema
+#   assertions added 2026-05-03.)
+#
 # Doc-lint structural test (Permitted Exception per ADR-005 — structural
 # SKILL.md content checks, not behavioural). Mirrors the doc-lint pattern
 # established in ADR-011 and ADR-027 Confirmation tests.
@@ -119,26 +127,38 @@ setup() {
   [ "$status" -eq 0 ]
 }
 
-@test "report-upstream: SKILL.md structured default uses problem-shaped section order (ADR-033 Step 5)" {
-  # Problem-shaped default body per ADR-033: Description -> Symptoms ->
-  # Workaround -> Affected plugin / component -> Frequency -> Environment
-  # -> Evidence -> Cross-reference. Assert section order in the primary
-  # default block.
+@test "report-upstream: SKILL.md structured default uses problem-shaped section order (ADR-033 Step 5, amended 2026-05-03 P128)" {
+  # Problem-shaped default body per ADR-033 (amended 2026-05-03 by P128):
+  # Description -> Symptoms -> Workaround -> Affected plugin / component ->
+  # Frequency -> Versions (was Environment pre-amendment) -> Evidence ->
+  # Cross-reference. Assert section order in the primary default block.
+  #
+  # P140 fix-and-continue (Step 6.5 closed allow-list, P081-class stale-grep):
+  # iter 16's P128 amendment added a `## Versions` section to the structured
+  # default block (~line 293) but TWO other `## Versions` sections coexist —
+  # the "Drafted Upstream Report" block (~line 247) and the issue-shaped
+  # example block (~line 335). A bare `head -1` picks the earliest match
+  # (line 247) and breaks the order assertion `freq_line < versions_line`.
+  # Scope the `versions_line` lookup to between `freq_line` and `evidence_line`
+  # via awk range so we pick the structured-default block's Versions header.
+  # Architect note 2026-05-03: if a second section-name-collides-across-blocks
+  # test ever needs the same awk-range scoping, factor a
+  # `bats_helpers/section_in_block.bash` helper (P012 / ADR-052 amendment).
   desc_line=$(grep -n '^## Description$' "$SKILL_MD" | head -1 | cut -d: -f1)
   symptoms_line=$(grep -n '^## Symptoms$' "$SKILL_MD" | head -1 | cut -d: -f1)
   workaround_line=$(grep -n '^## Workaround$' "$SKILL_MD" | head -1 | cut -d: -f1)
   affected_line=$(grep -nE '^## Affected plugin' "$SKILL_MD" | head -1 | cut -d: -f1)
   freq_line=$(grep -n '^## Frequency$' "$SKILL_MD" | head -1 | cut -d: -f1)
-  env_line=$(grep -n '^## Environment$' "$SKILL_MD" | head -1 | cut -d: -f1)
   evidence_line=$(grep -n '^## Evidence$' "$SKILL_MD" | head -1 | cut -d: -f1)
   xref_line=$(grep -n '^## Cross-reference$' "$SKILL_MD" | head -1 | cut -d: -f1)
+  versions_line=$(awk -v lo="${freq_line:-${desc_line:-1}}" -v hi="${evidence_line:-9999}" 'NR>lo && NR<hi && /^## Versions$/{print NR; exit}' "$SKILL_MD")
 
   [ -n "$desc_line" ] || { echo "missing ## Description"; return 1; }
   [ -n "$symptoms_line" ] || { echo "missing ## Symptoms"; return 1; }
   [ -n "$workaround_line" ] || { echo "missing ## Workaround"; return 1; }
   [ -n "$affected_line" ] || { echo "missing ## Affected plugin / component"; return 1; }
   [ -n "$freq_line" ] || { echo "missing ## Frequency"; return 1; }
-  [ -n "$env_line" ] || { echo "missing ## Environment"; return 1; }
+  [ -n "$versions_line" ] || { echo "missing ## Versions"; return 1; }
   [ -n "$evidence_line" ] || { echo "missing ## Evidence"; return 1; }
   [ -n "$xref_line" ] || { echo "missing ## Cross-reference"; return 1; }
 
@@ -146,8 +166,8 @@ setup() {
   [ "$symptoms_line" -lt "$workaround_line" ]
   [ "$workaround_line" -lt "$affected_line" ]
   [ "$affected_line" -lt "$freq_line" ]
-  [ "$freq_line" -lt "$env_line" ]
-  [ "$env_line" -lt "$evidence_line" ]
+  [ "$freq_line" -lt "$versions_line" ]
+  [ "$versions_line" -lt "$evidence_line" ]
   [ "$evidence_line" -lt "$xref_line" ]
 }
 
@@ -247,3 +267,78 @@ setup() {
   run grep -iE 'dedup.*halt|step 4b.*halt|halt.*dedup|halt-and-save.*dedup' "$SKILL_MD"
   [ "$status" -eq 0 ]
 }
+
+# ─── P128 consolidated Versions schema (ADR-033 amendment 2026-05-03) ─────────
+#
+# P128 reshapes Step 5's structured default body: the freeform `## Environment`
+# section becomes a labelled `## Versions` section carrying a fixed five-field
+# schema. Missing fields render as `not detected` (normative MUST per the
+# ADR-033 amendment 2026-05-03). The reshape applies to the problem-shaped
+# default AND the bug-shaped fallback default.
+
+@test "report-upstream: SKILL.md problem-shaped default body includes ## Versions section (P128)" {
+  # The labelled `## Versions` section MUST appear in the SKILL.md so the
+  # structured default emits it. Two occurrences expected: one in the
+  # field-mapping table's Versions-schema block, one in the problem-shaped
+  # default body, and one in the bug-shaped fallback default body — but the
+  # minimum invariant is that the section header exists.
+  run grep -F '## Versions' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+}
+
+@test "report-upstream: SKILL.md ## Versions schema lists all five fields (P128)" {
+  # Five-field schema per the ADR-033 amendment 2026-05-03: Local plugin,
+  # Upstream package, Claude Code CLI, Node, OS. All five labels must appear
+  # in the SKILL.md so the structured default's Versions block emits them.
+  run grep -iE '^- Local plugin:' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -iE '^- Upstream package:' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -iE '^- Claude Code CLI:' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -iE '^- Node:' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -iE '^- OS:' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+}
+
+@test "report-upstream: SKILL.md documents not-detected rendering rule for missing version fields (P128)" {
+  # Normative rendering rule: missing fields render as "not detected".
+  # The literal string MUST appear in the SKILL.md so triage distinguishes
+  # field-not-applicable from detection-failed.
+  run grep -iE '"not detected"|`not detected`' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+}
+
+@test "report-upstream: SKILL.md cites ADR-033 amendment authority for the Versions schema (P128)" {
+  # The Versions schema authority sits in ADR-033's `## Amendments` section
+  # dated 2026-05-03. The SKILL.md must cite the amendment so future readers
+  # see the authority inline alongside the schema.
+  run grep -iE 'ADR-033 amendment|amendment 2026-05-03' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+}
+
+@test "report-upstream: SKILL.md documents auto-population sources for each Versions field (P128)" {
+  # Auto-population sources: package.json / claude plugin list, gh api releases
+  # or npm view, claude --version, node --version, uname -srm. The SKILL.md
+  # must enumerate the sources so the LLM-driven skill knows where to look.
+  run grep -F 'claude --version' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -F 'node --version' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -F 'uname -srm' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+  run grep -F 'npm view' "$SKILL_MD"
+  [ "$status" -eq 0 ]
+}
+
+@test "report-upstream: SKILL.md problem-shaped default body no longer uses freeform ## Environment section (P128)" {
+  # The problem-shaped default body (lines under "#### Structured default body
+  # — problem-shaped (primary, per ADR-033)") MUST NOT contain a `## Environment`
+  # section header per the ADR-033 amendment 2026-05-03. The bug-shaped fallback
+  # also retired its `## Environment` section. We assert the headers are absent
+  # from the SKILL.md (the field-mapping table's reference to `os` field as a
+  # template-slot remains, but the top-level section header should be gone).
+  run grep -nE '^## Environment$' "$SKILL_MD"
+  [ "$status" -ne 0 ]
+}

package/skills/scaffold-intake/templates/problem-report.yml.tmpl

@@ -58,15 +58,42 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: environment
+  - type: input
+    id: version-local-plugin
     attributes:
-      label: Environment
-      description: Version, runtime, and operating system.
-      placeholder: |
-        - {{project_name}} version: x.y.z
-        - Runtime: Node 20.x / Python 3.12 / ...
-        - OS: macOS 15.2
+      label: Local plugin / project version
+      description: The version of {{project_name}} you are running. Enter `not detected` if you cannot determine the version.
+      placeholder: "x.y.z"
+    validations:
+      required: true
+
+  - type: input
+    id: version-upstream-package
+    attributes:
+      label: Upstream package version
+      description: If the problem involves a non-{{project_name}} upstream package, the package name and version. Enter `not applicable` or `not detected` if neither.
+      placeholder: "<pkg>@<version>"
+
+  - type: input
+    id: version-claude-code
+    attributes:
+      label: Claude Code CLI version
+      description: Output of `claude --version`. Enter `not detected` if not running through Claude Code.
+      placeholder: "1.x.x"
+
+  - type: input
+    id: version-node
+    attributes:
+      label: Node version
+      description: Output of `node --version`. Enter `not detected` if Node is not part of the failure path.
+      placeholder: "v20.11.0"
+
+  - type: input
+    id: version-os
+    attributes:
+      label: Operating system
+      description: Output of `uname -srm` (POSIX) or platform-equivalent. Enter `not detected` if you cannot determine.
+      placeholder: "Darwin 25.3.0 arm64"
     validations:
       required: true