refactor(reqstool): address full-pr-review findings on #166

- Extract the main/test annotations.yml merge logic from build.yml
  into scripts/combine-annotations.sh, so it's testable/runnable
  outside CI rather than only living as inline workflow YAML
- Fix import ordering in AbstractAnnotationsProcessor.java and
  AnnotationsProcessorTests.java (io.github.reqstool.* grouped with
  other imports, not appended out of order)

Other findings from the review were judged out of scope for this PR:
the openspecui.hooks.ts MCP client and .claude/settings.json
auto-enable pattern are byte-identical to what's already merged
across reqstool-client and the other three dogfooded repos this
rollout, and the self-apply Maven profile being CI-only (no isolated
Invoker IT) matches the Maven/Gradle plugins' existing pattern.

Signed-off-by: Jimisola Laursen <jimisola@jimisola.com>

Author: jimisola

.github/workflows/build.yml

@@ -42,13 +42,10 @@ jobs:
         # the Maven/Gradle plugins) -- merge them the same way those plugins'
         # combineOutput() would, so reqstool status has real, non-fabricated data.
         run: |
-          mkdir -p target/reqstool
-          {
-            echo "# yaml-language-server: \$schema=https://raw.githubusercontent.com/reqstool/reqstool-client/main/src/reqstool/resources/schemas/v1/annotations.schema.json"
-            yq eval-all '. as $item ireduce ({}; . * $item )' \
-              target/generated-sources/annotations/resources/annotations.yml \
-              target/generated-test-sources/test-annotations/resources/annotations.yml | grep -v "^#"
-          } > target/reqstool/annotations.yml
+          scripts/combine-annotations.sh \
+            target/generated-sources/annotations/resources/annotations.yml \
+            target/generated-test-sources/test-annotations/resources/annotations.yml \
+            target/reqstool/annotations.yml
       - name: Install reqstool
         uses: reqstool/.github/.github/actions/install-reqstool@9c6feaab046f4782f430dd2527fdb82c2a5cd926 # main 2026-06-22
         with:

scripts/combine-annotations.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Combines this library's own main/test annotation processor output into a
+# single annotations.yml, the way the Maven/Gradle plugins' combineOutput()
+# would -- but this library has no shared mojo to do it, since main and test
+# annotation processing run in separate javac invocations and write to
+# separate generated-sources directories.
+#
+# Usage: scripts/combine-annotations.sh <main-annotations.yml> <test-annotations.yml> <output.yml>
+set -euo pipefail
+
+main_file="$1"
+test_file="$2"
+output_file="$3"
+
+mkdir -p "$(dirname "$output_file")"
+
+{
+  echo '# yaml-language-server: $schema=https://raw.githubusercontent.com/reqstool/reqstool-client/main/src/reqstool/resources/schemas/v1/annotations.schema.json'
+  yq eval-all '. as $item ireduce ({}; . * $item )' "$main_file" "$test_file" | grep -v "^#"
+} > "$output_file"

src/main/java/io/github/reqstool/processor/AbstractAnnotationsProcessor.java

@@ -1,6 +1,7 @@
 // Copyright © LFV
 package io.github.reqstool.processor;
 
+import io.github.reqstool.annotations.Requirements;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -26,7 +27,6 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import io.github.reqstool.annotations.Requirements;
 
 public abstract class AbstractAnnotationsProcessor extends AbstractProcessor {
 

src/test/java/io/github/reqstool/processor/AnnotationsProcessorTests.java

@@ -3,6 +3,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import io.github.reqstool.annotations.SVCs;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -16,7 +17,6 @@
 import javax.tools.ToolProvider;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import io.github.reqstool.annotations.SVCs;
 
 /**
  * Test custom AnnotationsProcessorTests