refactorfirst
diff --git a/‎refactor-first-gradle-plugin/src/test/java/org/hjug/gradlereport/RefactorFirstPluginFunctionalTest.java‎
Lines changed: 42 additions & 0 deletions b/‎refactor-first-gradle-plugin/src/test/java/org/hjug/gradlereport/RefactorFirstPluginFunctionalTest.java‎
Lines changed: 42 additions & 0 deletions
diff --git a/‎report/src/main/java/org/hjug/refactorfirst/report/CsvReport.java‎
Lines changed: 16 additions & 4 deletions b/‎report/src/main/java/org/hjug/refactorfirst/report/CsvReport.java‎
Lines changed: 16 additions & 4 deletions
@@ -207,6 +207,48 @@ void csvReportFileNameUsesProjectVersionSetAfterPluginsBlock() {
                 "Expected exactly one non-empty RefFirst_P*_PV1.2.3_PD*.csv in " + reportsDir);
     }
 
+    /**
+     * Multi-project build: the Git repository root is the root project, but the plugin is
+     * applied (and the task invoked) on a subproject beneath it. The CSV report must be
+     * written to the subproject's build directory even though projectDir != Git root.
+     */
+    @Test
+    void csvReportWritesForSubprojectBeneathGitRoot() throws Exception {
+        Files.writeString(
+                projectDir.toPath().resolve("settings.gradle.kts"),
+                "rootProject.name = \"sample\"\ninclude(\"service\")\n");
+
+        Path serviceDir = projectDir.toPath().resolve("service");
+        Files.createDirectories(serviceDir);
+        Files.writeString(serviceDir.resolve("build.gradle.kts"), "plugins { id(\"org.hjug.refactorfirst\") }\n");
+
+        Path source = serviceDir.resolve(Path.of("src", "main", "java", "com", "example", "Service.java"));
+        Files.createDirectories(source.getParent());
+        Files.writeString(
+                source,
+                """
+                package com.example;
+
+                public class Service {
+                    public String serve() {
+                        return "served";
+                    }
+                }
+                """);
+        commitAll(projectDir, "Add service subproject");
+
+        BuildResult result = runGradle(projectDir, ":service:refactorFirstCsvReport");
+        assertNotNull(result.task(":service:refactorFirstCsvReport"));
+
+        File reportsDir = new File(serviceDir.toFile(), "build/reports/refactorfirst");
+        assertTrue(reportsDir.isDirectory(), "Expected reports directory at " + reportsDir);
+        File[] csvFiles = reportsDir.listFiles((dir, name) -> name.matches("RefFirst_P.*_PV.*_PD.*\\.csv"));
+        assertNotNull(csvFiles);
+        assertTrue(
+                csvFiles.length == 1 && csvFiles[0].length() > 0,
+                "Expected exactly one non-empty RefFirst CSV in " + reportsDir);
+    }
+
     /** T12: extension overrides are honored by the HTML report task. */
     @Test
     void extensionOverridesAreHonored() throws Exception {
 
@@ -71,16 +71,28 @@ public void execute(
         }
 
         String parentOfGitDir = gitDir.getParentFile().getPath();
+        Path gitRootPath = gitDir.getParentFile().toPath().toAbsolutePath().normalize();
+        Path projectBaseDirPath = Path.of(projectBaseDir).toAbsolutePath().normalize();
+
         log.info("Project Base Dir: {} ", projectBaseDir);
         log.info("Parent of Git Dir: {}", parentOfGitDir);
 
-        if (!projectBaseDir.equals(parentOfGitDir)) {
-            log.warn("Project Base Directory does not match Git Parent Directory");
-            contentBuilder.append("Project Base Directory does not match Git Parent Directory.  "
-                    + "Please refer to the report at the root of the site directory.");
+        if (!projectBaseDirPath.startsWith(gitRootPath)) {
+            log.warn("Project Base Directory {} is not within Git repository root {}", projectBaseDir, parentOfGitDir);
+            contentBuilder.append("Project Base Directory is not within Git repository root "
+                    + parentOfGitDir
+                    + ".  Please refer to the report at the root of the site directory.");
+            writeReportToDisk(outputDirectory, filename, contentBuilder.toString());
             return;
         }
 
+        if (!projectBaseDirPath.equals(gitRootPath)) {
+            log.info(
+                    "Project Base Directory {} is beneath the Git repository root; "
+                            + "analyzing sources within the project directory only.",
+                    projectBaseDir);
+        }
+
         // actual calcualte
         List<RankedDisharmony> rankedDisharmonies;
         // TODO: revisit