karajan-code 4.28.1 → 4.29.0

package/src/roles/commiter-role.js

@@ -35,7 +35,9 @@ export class CommiterRole extends BaseRole {
   }
 
   async execute(input) {
-    const { task, commitMessage, push = false, createPr = false } = input || {};
+    // KJC-TSK-0838: the caller hands the sonar stage result (pipelineSonarBlock);
+    // without it the stamp carries no proof and the commit gate refuses code.
+    const { task, commitMessage, push = false, createPr = false, sonar = null } = input || {};
 
     const isRepo = await ensureGitRepo();
     if (!isRepo) {
@@ -65,6 +67,7 @@ export class CommiterRole extends BaseRole {
         projectDir: this.config?.projectDir || process.cwd(),
         reviewer: this.config?.reviewer || "pipeline-reviewer",
         summary: "kj pipeline (commiter role): review passed",
+        sonar,
       }),
     });
     const commitHash = await revParse("HEAD");

package/src/sonar/scanner.js

@@ -37,8 +37,23 @@ export async function pickSonarScanner(scannerConfig = {}, deps = {}) {
   return { type: "docker" };
 }
 
+/**
+ * KJC-TSK-0838: the files the scanner ITSELF reports having indexed
+ * (`'<path>' indexed with language '<lang>'`, emitted with sonar.verbose).
+ * Paths are relative to the scanned base dir. This is the proof of coverage:
+ * what the engine saw, not what the config claims it should see.
+ * @param {string} scanOutput @returns {Set<string>}
+ */
+export function indexedFilesFrom(scanOutput) {
+  const files = new Set();
+  for (const m of String(scanOutput || "").matchAll(/'([^']+)' indexed with language '/g)) files.add(m[1]);
+  return files;
+}
+
 export function buildScannerOpts(projectKey, scanner = {}) {
   const opts = [`-Dsonar.projectKey=${projectKey}`];
+  // KJC-TSK-0838: verbose is what makes the scanner name every indexed file.
+  if (scanner.verbose) opts.push("-Dsonar.verbose=true");
   if (scanner.sources) opts.push(`-Dsonar.sources=${scanner.sources}`);
   if (scanner.exclusions) opts.push(`-Dsonar.exclusions=${scanner.exclusions}`);
   if (scanner.test_inclusions) opts.push(`-Dsonar.test.inclusions=${scanner.test_inclusions}`);
@@ -225,18 +240,27 @@ export async function ensureSonarProjectProperties(cwd = process.cwd()) {
   }
 }
 
-export async function runSonarScan(config, projectKey = null) {
+export async function runSonarScan(config, projectKey = null, { verbose = false, cwd = null } = {}) {
+  const scanCwd = cwd || process.cwd();
+  // KJC-TSK-0838 step 3 (monorepo): a nested package scans from its own
+  // directory under the key its properties declare — so the proof of
+  // coverage is about that package, not the root's `sonar.sources`.
+  const repoProps = await ensureSonarProjectProperties(scanCwd);
   let effectiveProjectKey;
-  try {
-    effectiveProjectKey = await resolveSonarProjectKey(config, { projectKey });
-  } catch (error) {
-    return {
-      ok: false,
-      projectKey: null,
-      stdout: "",
-      stderr: error?.message || String(error),
-      exitCode: 1
-    };
+  if (cwd && !projectKey && repoProps.declaredKey) {
+    effectiveProjectKey = repoProps.declaredKey;
+  } else {
+    try {
+      effectiveProjectKey = await resolveSonarProjectKey(config, { projectKey });
+    } catch (error) {
+      return {
+        ok: false,
+        projectKey: null,
+        stdout: "",
+        stderr: error?.message || String(error),
+        exitCode: 1
+      };
+    }
   }
   const sonarConfig = config?.sonarqube || {};
   const rawHost = sonarConfig.host || "http://localhost:9000";
@@ -260,7 +284,6 @@ export async function runSonarScan(config, projectKey = null) {
   }
   // KJC-BUG-0156: kj's -Dsonar.projectKey stays (scan and query must use the
   // SAME key), but the repo's properties own the LAYOUT from here on.
-  const repoProps = await ensureSonarProjectProperties();
   const token = await resolveSonarTokenWithFallback(config, apiHost);
   if (!token) {
     return {
@@ -284,7 +307,8 @@ export async function runSonarScan(config, projectKey = null) {
   const scannerConfig = respectRepoProperties(
     normalizeScannerConfig({
       ...sonarConfig.scanner,
-      ...coverage.scannerPatch
+      ...coverage.scannerPatch,
+      ...(verbose ? { verbose: true } : {})
     }),
     repoProps
   );
@@ -310,7 +334,7 @@ export async function runSonarScan(config, projectKey = null) {
       "run",
       "--rm",
       "-v",
-      `${process.cwd()}:/usr/src`,
+      `${scanCwd}:/usr/src`,
       ...(isLocalHost ? ["--add-host", "host.docker.internal:host-gateway"] : []),
       ...(isLocalHost || isExternalSonar ? [] : ["--network", sonarNetwork]),
       "-e", "SONAR_HOST_URL",
@@ -320,10 +344,11 @@ export async function runSonarScan(config, projectKey = null) {
     ];
   }
 
-  const result = await runCommand(cmd, args, { timeout: scannerTimeout, env });
+  const result = await runCommand(cmd, args, { timeout: scannerTimeout, env, cwd: scanCwd });
   return {
     ok: result.exitCode === 0,
     projectKey: effectiveProjectKey,
+    cwd: scanCwd,
     scanner: pick.type,
     note,
     stdout: result.stdout,

package/src/utils/paths.js

@@ -4,6 +4,7 @@
 export {
   resolveHome,
   getKarajanHome,
+  withKarajanHome,
   __resetKjHomeWarningForTests,
   getSessionRoot,
   getSonarComposePath,