@archpilotlabs/archpilot 0.2.5 → 0.2.7

package/dist/archpilot-cli.js

@@ -12907,7 +12907,7 @@ ${lanes.join("\n")}
               return process.memoryUsage().heapUsed;
             },
             getFileSize(path74) {
-              const stat = statSync(path74);
+              const stat = statSync2(path74);
               if (stat == null ? void 0 : stat.isFile()) {
                 return stat.size;
               }
@@ -12951,7 +12951,7 @@ ${lanes.join("\n")}
             }
           };
           return nodeSystem;
-          function statSync(path74) {
+          function statSync2(path74) {
             try {
               return _fs.statSync(path74, statSyncOptions);
             } catch {
@@ -13010,7 +13010,7 @@ ${lanes.join("\n")}
               activeSession.post("Profiler.stop", (err, { profile }) => {
                 var _a;
                 if (!err) {
-                  if ((_a = statSync(profilePath)) == null ? void 0 : _a.isDirectory()) {
+                  if ((_a = statSync2(profilePath)) == null ? void 0 : _a.isDirectory()) {
                     profilePath = _path.join(profilePath, `${(/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-")}+P${process.pid}.cpuprofile`);
                   }
                   try {
@@ -13130,7 +13130,7 @@ ${lanes.join("\n")}
                 let stat;
                 if (typeof dirent === "string" || dirent.isSymbolicLink()) {
                   const name = combinePaths(path74, entry);
-                  stat = statSync(name);
+                  stat = statSync2(name);
                   if (!stat) {
                     continue;
                   }
@@ -13154,7 +13154,7 @@ ${lanes.join("\n")}
             return matchFiles(path74, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
           }
           function fileSystemEntryExists(path74, entryKind) {
-            const stat = statSync(path74);
+            const stat = statSync2(path74);
             if (!stat) {
               return false;
             }
@@ -13196,7 +13196,7 @@ ${lanes.join("\n")}
           }
           function getModifiedTime3(path74) {
             var _a;
-            return (_a = statSync(path74)) == null ? void 0 : _a.mtime;
+            return (_a = statSync2(path74)) == null ? void 0 : _a.mtime;
           }
           function setModifiedTime(path74, time) {
             try {
@@ -225435,6 +225435,7 @@ init_sourceScopeClassification();
 var maxFileSizeBytes = 256 * 1024;
 var supplementalRiskScanExtensions = [".json", ".yaml", ".yml", ".sql"];
 var backendCodeExtensions = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".java", ".cs", ".py", ".php", ".go"];
+var methodBodyScanExtensions = new Set(backendCodeExtensions);
 var supplementalIgnoredDirectoryNames = [".vscode-test", ".tmp"];
 var batchingEvidencePattern = /\b(?:DataLoader|Promise\.all|findMany\s*\([\s\S]{0,300}\bin\b|where\s*:\s*\{[\s\S]{0,300}\bin\s*:|include\s*:|join\s*\(|leftJoin|innerJoin|JOIN\b)\b/iu;
 var queryReadPattern = /\b((?:this\.)?(?:prisma\.(\w+)|([A-Za-z_$][\w$]*Repository|repository))\.(find\w*|count|aggregate|groupBy)\s*\()/giu;
@@ -225443,6 +225444,7 @@ var boundEvidencePattern = /\b(?:take|limit|page|cursor|skip|offset|PageRequest|
 var repeatedQueryPattern = /\b((?:this\.)?(?:prisma\.(\w+)|(\w*Repository|repository))\.(find\w*|count|aggregate|groupBy)\s*\(\s*(?:\{[\s\S]{0,300}?\}|\w+)\s*\))/giu;
 var tenantPredicatePattern = /\b(?:tenantId|tenant_id|organizationId|organization_id|orgId|org_id|accountId|account_id|workspaceId|workspace_id|companyId|company_id|customerId|customer_id)\b/u;
 var codePaginationEvidencePattern = /\b(?:take|skip|limit|offset|page|perPage|pageSize|cursor|Pageable|PageRequest|paginate|simplePaginate|Limit|Offset|Take|Skip|TOP\s+\d+)\b/iu;
+var sqlQueryInvocationHintPattern = /\b(?:query|execute|executeQuery|createNativeQuery|createQuery|FromSqlRaw|FromSqlInterpolated|Query|QueryContext|QueryRow|QueryRowContext|Exec|ExecContext|Raw|text|DB::select|DB::statement|DB::raw|DB::table)\s*\(|\$queryRaw\s*\(|\$executeRaw\s*\(|@Query\s*\(/u;
 function getLineStarts(file) {
   if (file.lineStarts) {
     return file.lineStarts;
@@ -225666,10 +225668,15 @@ function hasPaginationEvidence(statement) {
   );
 }
 function hasEqualityPredicate(statement, columnPattern) {
+  const whereMatch = /\bwhere\b/iu.exec(statement);
+  if (!whereMatch) {
+    return false;
+  }
+  const predicateWindow = statement.slice(whereMatch.index, whereMatch.index + 1200);
   return new RegExp(
-    `\\bwhere\\b[\\s\\S]*\\b(?:${columnPattern})\\b\\s*=\\s*(?:[\\w$:@?]+|'[^']+'|"[^"]+"|\\d+)`,
+    `\\b(?:${columnPattern})\\b\\s*=\\s*(?:[\\w$:@?]+|'[^']+'|"[^"]+"|\\d+)`,
     "iu"
-  ).test(statement);
+  ).test(predicateWindow);
 }
 function isCatalogIdentifierPointLookup(statement) {
   const metadataSourcePattern = /\bfrom\s+(?:information_schema\.(?:schemata|tables|columns|key_column_usage|table_constraints)|pg_catalog\.(?:pg_class|pg_namespace|pg_attribute|pg_constraint|pg_type|pg_enum|pg_tables|pg_indexes)|pg_(?:class|namespace|attribute|constraint|type|enum|tables|indexes))\b/iu;
@@ -226270,6 +226277,9 @@ function detectRepeatedQueryPattern(method) {
 }
 function extractSqlQueryLiterals(content) {
   const queries = [];
+  if (!sqlQueryInvocationHintPattern.test(content)) {
+    return queries;
+  }
   const searchableContent = maskSourceComments(content);
   const patterns = [
     /(?:\b(?:[\w$]+\.)?(?:query|execute|executeQuery|createNativeQuery|createQuery|FromSqlRaw|FromSqlInterpolated|Query|QueryContext|QueryRow|QueryRowContext|Exec|ExecContext|Raw|text)|\$queryRaw|\$executeRaw)\s*\([^'"`)]{0,180}?(['"`])([\s\S]{0,900}?)\1/giu,
@@ -226291,7 +226301,7 @@ function extractSqlQueryLiterals(content) {
   return queries;
 }
 function maskSourceComments(content) {
-  let masked = "";
+  const masked = [];
   let index = 0;
   let state = "code";
   let escaped = false;
@@ -226300,27 +226310,27 @@ function maskSourceComments(content) {
     const next = content[index + 1] ?? "";
     if (state === "line-comment") {
       if (current === "\r" || current === "\n") {
-        masked += current;
+        masked.push(current);
         state = "code";
       } else {
-        masked += " ";
+        masked.push(" ");
       }
       index += 1;
       continue;
     }
     if (state === "block-comment") {
       if (current === "*" && next === "/") {
-        masked += "  ";
+        masked.push("  ");
         index += 2;
         state = "code";
         continue;
       }
-      masked += current === "\r" || current === "\n" ? current : " ";
+      masked.push(current === "\r" || current === "\n" ? current : " ");
       index += 1;
       continue;
     }
     if (state === "single" || state === "double" || state === "template") {
-      masked += current;
+      masked.push(current);
       if (escaped) {
         escaped = false;
       } else if (current === "\\") {
@@ -226332,13 +226342,13 @@ function maskSourceComments(content) {
       continue;
     }
     if (current === "/" && next === "/") {
-      masked += "  ";
+      masked.push("  ");
       index += 2;
       state = "line-comment";
       continue;
     }
     if (current === "/" && next === "*") {
-      masked += "  ";
+      masked.push("  ");
       index += 2;
       state = "block-comment";
       continue;
@@ -226350,10 +226360,10 @@ function maskSourceComments(content) {
     } else if (current === "`") {
       state = "template";
     }
-    masked += current;
+    masked.push(current);
     index += 1;
   }
-  return masked;
+  return masked.join("");
 }
 function detectCodeSqlQueryShapeFindings(file, config) {
   const findings = [];
@@ -226383,7 +226393,7 @@ function detectCodeSqlQueryShapeFindings(file, config) {
           target: firstTable ?? "sql-query"
         }));
       }
-      if (statement.queryType === "select" && !isOperationalOrBatchQueryContext(file) && !hasPaginationEvidence(statement.statement) && !isObviousPointLookup(statement.statement) && !/\bcount\s*\(/i.test(statement.statement)) {
+      if (statement.queryType === "select" && !isOperationalOrBatchQueryContext(file) && !hasPaginationEvidence(statement.statement) && !hasSpringDataRepositoryMethodBoundEvidence(file.content, query.offset) && !isObviousPointLookup(statement.statement) && !/\bcount\s*\(/i.test(statement.statement)) {
         findings.push(createCodeFinding({
           id: "AP-DQR-003",
           message: `Potential unbounded query risk: SELECT query${firstTable ? ` on table '${firstTable}'` : ""} has no LIMIT/OFFSET/FETCH pagination evidence.`,
@@ -226397,6 +226407,18 @@ function detectCodeSqlQueryShapeFindings(file, config) {
   }
   return findings;
 }
+function hasSpringDataRepositoryMethodBoundEvidence(content, queryOffset) {
+  const annotationOffset = content.lastIndexOf("@Query", queryOffset);
+  if (annotationOffset < 0 || queryOffset - annotationOffset > 2400) {
+    return false;
+  }
+  const semicolonOffset = content.indexOf(";", queryOffset);
+  if (semicolonOffset < queryOffset || semicolonOffset - annotationOffset > 3200) {
+    return false;
+  }
+  const declarationWindow = content.slice(queryOffset, semicolonOffset + 1);
+  return /\b(?:Page|Slice|Window)\s*</u.test(declarationWindow) && /\b(?:Pageable|Limit)\s+\w+\b/u.test(declarationWindow);
+}
 function collectOrmReadEvidence(method) {
   const patterns = [
     [/\b(?:this\.)?prisma\.\w+\.findMany\s*\(/giu, "prisma.findMany"],
@@ -226514,7 +226536,11 @@ function detectCodeQueryRiskFindings(files, config, astCache) {
     if (isProductionBackend) {
       findings.push(...detectCodeSqlQueryShapeFindings(file, config));
     }
-    for (const method of extractMethodBodies(file, astCache)) {
+    if (!methodBodyScanExtensions.has(file.extension)) {
+      continue;
+    }
+    const methods = extractMethodBodies(file, astCache);
+    for (const method of methods) {
       if (!isProductionBackend) {
         continue;
       }
@@ -228136,6 +228162,8 @@ var transactionBoundaryDecoratorPattern = /@(?:Transactional|Transaction)\b|\[(?
 var explicitTransactionBoundaryPattern = /\b(?:\$transaction|DB::transaction)\s*\(|\b(?:knex|sequelize|typeorm|dataSource|connection|manager|transactionManager)\.transaction\s*\(|\b(?:this\.)?connection\.withTransaction\s*\(|\b(?:startTransaction|beginTransaction|BeginTransaction|BeginTransactionAsync|BeginTx)\s*\(|\bnew\s+TransactionScope\b|\bsession\.begin\s*\(|\bdb\.Transaction\s*\(/iu;
 var separateTransactionPropagationPattern = /\b(?:requiresNew|REQUIRES_NEW|Propagation\.REQUIRES_NEW)\b/u;
 var businessRulePattern = /\b(?:approve|reject|authorize|eligible|eligibility|policy|discount|limit|quota|balance|risk|compliance|settle|state|status|transition)\b/iu;
+var repositoryBusinessRulePattern = /\b(?:approve|reject|authorize|eligible|eligibility|policy|discount|quota|balance|risk|compliance|settle|transition)\b/iu;
+var decisionStructurePattern = /\bif\s*\(|\bswitch\s*\(|\bthrow\s+new\b/u;
 var transactionCallbackStartPattern = /\b(?:this\.)?(?:[\w.$:]+\.)?(?:\$transaction|transaction|Transaction)\s*\(\s*(?:async\s*)?(?:function\s*)?\(?\s*\w*\s*\)?\s*(?:=>)?\s*\{/gu;
 var explicitDomainModelEvidencePattern = /@(?:Entity|Embeddable|MappedSuperclass|Column|PrimaryGeneratedColumn|ObjectType|Field)\b|\[(?:Table|Key|Required|Column|StringLength|MaxLength)\b[^\]]*\]|\b(?:BaseModel|SQLModel|declarative_base|Mapped\[|Column\s*\(|@dataclass\b|extends\s+Model\b|\$fillable\b|\$casts\b|gorm\.Model|`[^`]*(?:gorm|db):)/u;
 var domainFrameworkLeakPattern = /\b(?:ControllerBase|IActionResult|HttpContext|Microsoft\.AspNetCore|APIRouter|FastAPI|Request|Response|Depends|Illuminate\\Http|Illuminate\\Routing|Route::|http\.ResponseWriter|http\.Request|gin\.Context|express|Router|org\.springframework\.web|jakarta\.servlet|HttpServletRequest|@Controller|@RestController|@Get|@Post|DbContext|EntityManager|Session|Repository)\b/u;
@@ -229281,6 +229309,16 @@ function hasEntitySpecificServiceBusinessRules(entityNames, methods) {
     return [...entityAliases].some((entityName) => new RegExp(`\\b${entityName}\\b`, "u").test(method.file.content));
   });
 }
+function hasScatteredDomainLogicEvidence(method) {
+  const code = maskNonCodeEvidence2(method.body);
+  if (!decisionStructurePattern.test(code)) {
+    return false;
+  }
+  if (hasRole(method.classification, "repository")) {
+    return repositoryBusinessRulePattern.test(code);
+  }
+  return businessRulePattern.test(code);
+}
 function detectDomainFindings(files, classifications, methods, contract, astCache) {
   const findings = [];
   for (const file of files) {
@@ -229350,7 +229388,7 @@ function detectDomainFindings(files, classifications, methods, contract, astCach
         }));
       }
     }
-    if (isProductionBackendGovernanceScope(method.classification.scope) && (hasRole(method.classification, "controller") || hasRole(method.classification, "repository")) && businessRulePattern.test(method.body) && /\bif\s*\(|\bswitch\s*\(|\bthrow\s+new\b/u.test(method.body)) {
+    if (isProductionBackendGovernanceScope(method.classification.scope) && (hasRole(method.classification, "controller") || hasRole(method.classification, "repository")) && hasScatteredDomainLogicEvidence(method)) {
       findings.push(createFinding3({
         id: RuleIds2.DOM_LOGIC_SCATTERED,
         message: `Business rule evidence appears in a ${hasRole(method.classification, "controller") ? "controller" : "repository"} method '${method.name}'.`,
@@ -229666,6 +229704,11 @@ function httpMethodFromDecorator(decorators, extension) {
   }
   return value;
 }
+function routeDecoratorOffsetInGroup(decorators, extension) {
+  const pattern = extension === ".java" ? /@(?:GetMapping|PostMapping|PutMapping|PatchMapping|DeleteMapping|RequestMapping)\b/u : /@(?:Get|Post|Put|Patch|Delete)\b/u;
+  const match = pattern.exec(decorators);
+  return match?.index ?? 0;
+}
 function methodPathFromDecorators(decorators, extension) {
   const pattern = extension === ".java" ? /@(?:GetMapping|PostMapping|PutMapping|PatchMapping|DeleteMapping|RequestMapping)\s*(?:\(([^)]*)\))?/u : /@(?:Get|Post|Put|Patch|Delete)\s*(?:\(([^)]*)\))?/u;
   const match = pattern.exec(decorators);
@@ -229685,11 +229728,12 @@ function extractDecoratorEndpoints(file, contract) {
     const returnType = file.extension === ".java" ? match[3] ?? "" : match[3] ?? "";
     const openBrace = (match.index ?? 0) + match[0].lastIndexOf("{");
     const end = findMatchingBrace4(file.content, openBrace);
+    const routeDecoratorOffset = routeDecoratorOffsetInGroup(decorators, file.extension);
     endpoints.push({
       httpMethod,
       path: joinEndpointPath(basePath, methodPathFromDecorators(decorators, file.extension)),
       name,
-      line: lineNumberForOffset4(file.content, match.index ?? 0),
+      line: lineNumberForOffset4(file.content, (match.index ?? 0) + routeDecoratorOffset),
       decorators,
       signature: `${returnType} ${match[0]}`,
       body: file.content.slice(openBrace, end + 1),
@@ -229970,8 +230014,15 @@ function isStaticCollectionBackedEndpoint(endpoint) {
   }
   return isStaticCollectionExpression(stripStaticLiteralNoise(expression));
 }
+function isUnconditionallyTerminalThrowEndpoint(endpoint) {
+  const body = endpoint.body.trim().replace(/^\{\s*/u, "").replace(/\s*\}$/u, "").trim();
+  if (!/^throw\s+new\s+[A-Z]\w*(?:Exception|Error)\s*\([^;{}]*\)\s*;?$/u.test(body)) {
+    return false;
+  }
+  return !/\b(?:if|for|while|switch|try|catch|return|await|yield)\b/u.test(body);
+}
 function detectPaginationFindings(endpoints, contractEndpoints) {
-  return endpoints.filter((endpoint) => isCollectionGet(endpoint) && !hasPaginationEvidence2(endpoint, contractEndpoints) && !isStaticCollectionBackedEndpoint(endpoint)).map((endpoint) => createFinding4({
+  return endpoints.filter((endpoint) => isCollectionGet(endpoint) && !hasPaginationEvidence2(endpoint, contractEndpoints) && !isStaticCollectionBackedEndpoint(endpoint) && !isUnconditionallyTerminalThrowEndpoint(endpoint)).map((endpoint) => createFinding4({
     id: RuleIds3.MISSING_PAGINATION,
     message: `Collection endpoint ${endpoint.httpMethod.toUpperCase()} ${endpoint.path} lacks visible pagination evidence.`,
     endpoint
@@ -230731,12 +230782,14 @@ function extractTypeScriptSignals(file, astCache) {
     ts6.forEachChild(node, visit);
   };
   visit(sourceFile);
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: /* @__PURE__ */ new Map() };
 }
 function extractJavaSignals(file) {
   const publishes = [];
   const handlers2 = [];
-  for (const match of file.content.matchAll(/@EventListener\s*(?:\(\s*([A-Za-z]\w*Event)\.class\s*\))?/gu)) {
+  for (const match of file.content.matchAll(
+    /@EventListener\s*(?:\(\s*(?:(?:classes|value)\s*=\s*)?(?:\{\s*)?([A-Za-z_]\w*)\.class\s*(?:\})?\s*\))?/gu
+  )) {
     const eventName = match[1] ?? "ApplicationEvent";
     handlers2.push({
       eventName,
@@ -230748,6 +230801,21 @@ function extractJavaSignals(file) {
       publishes: []
     });
   }
+  for (const match of file.content.matchAll(/\b(?:class|interface)\s+\w+[^{;]*\bApplicationListener\s*<\s*([A-Za-z_]\w*)\s*>/gu)) {
+    const eventName = match[1];
+    if (!eventName) {
+      continue;
+    }
+    handlers2.push({
+      eventName,
+      normalizedName: normalizeEventName(eventName),
+      file,
+      line: lineNumberForOffset5(file, match.index ?? 0),
+      module: file.module,
+      style: classifyEventStyle(eventName),
+      publishes: []
+    });
+  }
   for (const match of file.content.matchAll(/(?:await\s+)?(?:\w+\.)?(?:publishEvent|publish|emit)\s*\(\s*(?:(new)\s+([A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*)\s*\(|(["'])([A-Za-z][\w.]*Event?|[a-z][\w.]+)\3|([A-Z][A-Za-z0-9_]*Event)\b)/gu)) {
     const constructedType = match[2]?.split(".").at(-1);
     const eventName = constructedType ?? match[4] ?? match[5];
@@ -230765,7 +230833,23 @@ function extractJavaSignals(file) {
       assignedOrReturned: false
     });
   }
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: extractJavaEventTypeParents(file) };
+}
+function extractJavaEventTypeParents(file) {
+  const parentsByType = /* @__PURE__ */ new Map();
+  for (const match of file.content.matchAll(/\b(?:class|record)\s+([A-Za-z_]\w*)(?:\s*<[^>{}]+>)?\s+extends\s+([A-Za-z_]\w*)/gu)) {
+    const child = match[1];
+    const parent = match[2];
+    if (!child || !parent || !child.endsWith("Event")) {
+      continue;
+    }
+    const normalizedChild = normalizeEventName(child);
+    const normalizedParent = normalizeEventName(parent);
+    const parents = parentsByType.get(normalizedChild) ?? /* @__PURE__ */ new Set();
+    parents.add(normalizedParent);
+    parentsByType.set(normalizedChild, parents);
+  }
+  return parentsByType;
 }
 function extractPublishSignalsFromText(file, body, baseOffset, pattern) {
   const publishes = [];
@@ -230811,7 +230895,7 @@ function extractCsharpSignals(file) {
       publishes: extractPublishSignalsFromText(file, classBody, classOpenBrace >= 0 ? classOpenBrace : classStart, csharpPublishPattern)
     });
   }
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: /* @__PURE__ */ new Map() };
 }
 function extractPythonSignals(file) {
   const publishes = extractPublishSignalsFromText(file, file.content, 0, pythonPublishPattern);
@@ -230834,7 +230918,7 @@ function extractPythonSignals(file) {
       publishes: extractPublishSignalsFromText(file, block, blockStart, pythonPublishPattern)
     });
   }
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: /* @__PURE__ */ new Map() };
 }
 function extractPhpSignals(file) {
   const publishes = extractPublishSignalsFromText(file, file.content, 0, phpEventPublishPattern);
@@ -230859,7 +230943,7 @@ function extractPhpSignals(file) {
       publishes: extractPublishSignalsFromText(file, classBody, classOpenBrace >= 0 ? classOpenBrace : classStart, phpEventPublishPattern)
     });
   }
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: /* @__PURE__ */ new Map() };
 }
 function extractGoSignals(file) {
   const publishes = extractPublishSignalsFromText(file, file.content, 0, goPublishPattern);
@@ -230879,7 +230963,7 @@ function extractGoSignals(file) {
       publishes: []
     });
   }
-  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set() };
+  return { publishes, handlers: handlers2, publicEventNames: /* @__PURE__ */ new Set(), eventTypeParents: /* @__PURE__ */ new Map() };
 }
 function isTypeScriptLikeExtension(extension) {
   return [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"].includes(extension);
@@ -230979,6 +231063,7 @@ function collectPublicTypeScriptEventNames(files, contract, astCache) {
 function collectSignals(files, contract, astCache) {
   const publishes = [];
   const handlers2 = [];
+  const eventTypeParents = /* @__PURE__ */ new Map();
   const publicEventNames = collectPublicTypeScriptEventNames(files, contract, astCache);
   for (const file of files) {
     let signals;
@@ -231004,14 +231089,41 @@ function collectSignals(files, contract, astCache) {
     }
     publishes.push(...signals.publishes);
     handlers2.push(...signals.handlers);
+    for (const [eventName, parents] of signals.eventTypeParents) {
+      const existing = eventTypeParents.get(eventName) ?? /* @__PURE__ */ new Set();
+      for (const parent of parents) {
+        existing.add(parent);
+      }
+      eventTypeParents.set(eventName, existing);
+    }
   }
-  return { publishes, handlers: handlers2, publicEventNames };
+  return { publishes, handlers: handlers2, publicEventNames, eventTypeParents };
+}
+function isHandledEventName(normalizedName, handledNames, eventTypeParents) {
+  const queue = [normalizedName];
+  const visited = /* @__PURE__ */ new Set();
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (!current || visited.has(current)) {
+      continue;
+    }
+    if (handledNames.has(current)) {
+      return true;
+    }
+    visited.add(current);
+    for (const parent of eventTypeParents.get(current) ?? []) {
+      if (!visited.has(parent)) {
+        queue.push(parent);
+      }
+    }
+  }
+  return false;
 }
 function buildEventFindings(signals) {
   const findings = [];
   const handledNames = new Set(signals.handlers.map((handler) => handler.normalizedName));
   for (const publish of signals.publishes) {
-    if (!handledNames.has(publish.normalizedName)) {
+    if (!isHandledEventName(publish.normalizedName, handledNames, signals.eventTypeParents)) {
       if (signals.publicEventNames.has(publish.normalizedName)) {
         continue;
       }
@@ -236969,6 +237081,41 @@ function formatRuleLine(ruleId) {
 function formatFindingLine(finding) {
   return `${formatRuleLine(finding.id)} | ${finding.message}`;
 }
+function formatRegressionFindingLine(finding) {
+  const parts = [`${finding.id} ${finding.severity}`];
+  const scope = finding.module && finding.target ? `${finding.module} -> ${finding.target}` : finding.sourceComponentName && finding.targetComponentName ? `${finding.sourceComponentName} -> ${finding.targetComponentName}` : finding.module ?? finding.target ?? finding.table ?? finding.api ?? finding.filePath;
+  if (scope) {
+    parts.push(scope);
+  }
+  if (finding.sourceFile) {
+    parts.push(
+      finding.sourceLine !== void 0 ? `${finding.sourceFile}:${finding.sourceLine}` : finding.sourceFile
+    );
+  }
+  parts.push(finding.message);
+  return parts.join(" | ");
+}
+function renderRegressionFindingLines(findings, limit) {
+  if (findings.length === 0) {
+    return "- (none)";
+  }
+  const sorted = [...findings].sort((left, right) => {
+    const idCompare = left.id.localeCompare(right.id);
+    if (idCompare !== 0) {
+      return idCompare;
+    }
+    const sourceCompare = (left.sourceFile ?? "").localeCompare(right.sourceFile ?? "");
+    if (sourceCompare !== 0) {
+      return sourceCompare;
+    }
+    return left.message.localeCompare(right.message);
+  });
+  const rendered = sorted.slice(0, limit).map((finding) => `- ${formatRegressionFindingLine(finding)}`);
+  if (sorted.length > limit) {
+    rendered.push(`- ... ${sorted.length - limit} more`);
+  }
+  return rendered.join("\n");
+}
 function parseFindingKind2(value) {
   return value === "violation" || value === "setup-gap" || value === "guidance" ? value : void 0;
 }
@@ -236993,7 +237140,7 @@ function renderArchitecturePrCommentMarkdown(input2) {
     findingKindByRule.set(finding.id, byRule);
     findingKindByRuleAndMessage.set(`${finding.id}::${finding.message}`, kind);
   }
-  const resolveKind2 = (entry) => {
+  const resolveKind3 = (entry) => {
     const explicit = readFindingKind(entry);
     if (explicit) {
       return explicit;
@@ -237011,28 +237158,28 @@ function renderArchitecturePrCommentMarkdown(input2) {
     return "violation";
   };
   const newQualityViolationLines = sortUniqueLines(
-    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind2(entry) === "violation").map((entry) => formatRuleLine(entry.ruleId))
+    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind3(entry) === "violation").map((entry) => formatRuleLine(entry.ruleId))
   );
   const newSetupGapLines = sortUniqueLines(
-    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind2(entry) === "setup-gap").map((entry) => formatRuleLine(entry.ruleId))
+    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind3(entry) === "setup-gap").map((entry) => formatRuleLine(entry.ruleId))
   );
   const newGuidanceLines = sortUniqueLines(
-    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind2(entry) === "guidance").map((entry) => formatRuleLine(entry.ruleId))
+    (input2.driftComparison?.newViolations ?? []).filter((entry) => resolveKind3(entry) === "guidance").map((entry) => formatRuleLine(entry.ruleId))
   );
   const resolvedViolationLines = sortUniqueLines(
-    (input2.driftComparison?.resolvedViolations ?? []).filter((entry) => resolveKind2(entry) === "violation").map((entry) => formatRuleLine(entry.ruleId))
+    (input2.driftComparison?.resolvedViolations ?? []).filter((entry) => resolveKind3(entry) === "violation").map((entry) => formatRuleLine(entry.ruleId))
   );
   const resolvedSetupGapLines = sortUniqueLines(
-    (input2.driftComparison?.resolvedViolations ?? []).filter((entry) => resolveKind2(entry) === "setup-gap").map((entry) => formatRuleLine(entry.ruleId))
+    (input2.driftComparison?.resolvedViolations ?? []).filter((entry) => resolveKind3(entry) === "setup-gap").map((entry) => formatRuleLine(entry.ruleId))
   );
   const activeQualityViolationLines = sortUniqueLines(
-    input2.summary.findings.filter((entry) => resolveKind2({ ruleId: entry.id, message: entry.message }) === "violation").map((entry) => formatFindingLine(entry))
+    input2.summary.findings.filter((entry) => resolveKind3({ ruleId: entry.id, message: entry.message }) === "violation").map((entry) => formatFindingLine(entry))
   );
   const activeSetupGapLines = sortUniqueLines(
-    input2.summary.findings.filter((entry) => resolveKind2({ ruleId: entry.id, message: entry.message }) === "setup-gap").map((entry) => formatFindingLine(entry))
+    input2.summary.findings.filter((entry) => resolveKind3({ ruleId: entry.id, message: entry.message }) === "setup-gap").map((entry) => formatFindingLine(entry))
   );
   const activeGuidanceLines = sortUniqueLines(
-    input2.summary.findings.filter((entry) => resolveKind2({ ruleId: entry.id, message: entry.message }) === "guidance").map((entry) => formatFindingLine(entry))
+    input2.summary.findings.filter((entry) => resolveKind3({ ruleId: entry.id, message: entry.message }) === "guidance").map((entry) => formatFindingLine(entry))
   );
   const activeQualityViolationCount = activeQualityViolationLines.length;
   const activeSetupGapCount = activeSetupGapLines.length;
@@ -237168,6 +237315,37 @@ function renderArchitecturePrCommentMarkdown(input2) {
     lines.push(`Setup gaps: ${activeSetupGapCount}`);
   }
   lines.push(trendLine);
+  const baselineComparison = input2.summary.baselineComparison;
+  if (baselineComparison) {
+    lines.push("");
+    lines.push("Architecture Regression Summary");
+    const comparisonAvailable = baselineComparison.baselineAvailable !== false && baselineComparison.status !== "NO_BASELINE";
+    if (!comparisonAvailable) {
+      lines.push("Architecture regression comparison is unavailable.");
+      if (baselineComparison.summary.toLowerCase().includes("no baseline")) {
+        lines.push("No governance baseline exists.");
+        lines.push("Create or refresh the governance baseline with `archpilot baseline refresh`.");
+      }
+      lines.push(`Summary: ${baselineComparison.summary}`);
+    } else {
+      lines.push(`Introduced: ${baselineComparison.newlyIntroducedFindings.length}`);
+      lines.push(`Resolved: ${baselineComparison.resolvedFindings.length}`);
+      lines.push(`Existing: ${baselineComparison.unchangedFindings.length}`);
+      if (baselineComparison.newlyIntroducedFindings.length === 0) {
+        lines.push("");
+        lines.push("No new architecture regressions detected.");
+      } else {
+        lines.push("");
+        lines.push("New architecture regressions");
+        lines.push(renderRegressionFindingLines(baselineComparison.newlyIntroducedFindings, 10));
+      }
+      if (baselineComparison.resolvedFindings.length > 0) {
+        lines.push("");
+        lines.push("Resolved architecture findings");
+        lines.push(renderRegressionFindingLines(baselineComparison.resolvedFindings, 8));
+      }
+    }
+  }
   if (input2.driftComparison?.hasPreviousSnapshot) {
     lines.push(
       `Previous score: ${input2.driftComparison.previousScore ?? "n/a"}${input2.driftComparison.scoreDelta !== void 0 ? ` (${input2.driftComparison.scoreDelta >= 0 ? "+" : ""}${input2.driftComparison.scoreDelta})` : ""}`
@@ -238332,6 +238510,190 @@ async function checkArchitectureBaseline(workspaceRoot) {
 // ../core/src/architectureGovernanceBaseline.ts
 var path42 = __toESM(require("node:path"));
 var import_node_fs36 = require("node:fs");
+
+// ../core/src/findingRegressionComparison.ts
+function normalizeToken2(value) {
+  return value.replace(/\\/g, "/").trim().toLowerCase();
+}
+function normalizeOptionalToken(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const normalized = normalizeToken2(value);
+  return normalized.length > 0 ? normalized : void 0;
+}
+function resolveKind(input2) {
+  if (input2.kind === "violation" || input2.kind === "setup-gap" || input2.kind === "guidance") {
+    return input2.kind;
+  }
+  if (input2.classification === "violation" || input2.classification === "setup-gap" || input2.classification === "guidance") {
+    return input2.classification;
+  }
+  if (input2.type === "violation" || input2.type === "setup-gap" || input2.type === "guidance") {
+    return input2.type;
+  }
+  return "violation";
+}
+function appendPart(parts, label, value) {
+  const normalized = normalizeOptionalToken(value);
+  if (normalized) {
+    parts.push(`${label}=${normalized}`);
+  }
+}
+function normalizeDeductionIdentity(deductionKey) {
+  const normalized = normalizeOptionalToken(deductionKey);
+  if (!normalized) {
+    return void 0;
+  }
+  if (normalized.includes("|")) {
+    const parts2 = normalized.split("|");
+    if (parts2[0] === "quality" || parts2[0] === "setup" || parts2[0] === "guidance") {
+      parts2.shift();
+    }
+    if (parts2[0]?.startsWith("ap-")) {
+      parts2.shift();
+    }
+    if (parts2.length >= 4 && /^\d+$/u.test(parts2[3] ?? "")) {
+      return parts2.filter((_, index) => index !== 3).join("|");
+    }
+    return parts2.join("|");
+  }
+  const parts = normalized.split(":");
+  if (parts[0] === "quality" || parts[0] === "setup" || parts[0] === "guidance") {
+    parts.shift();
+  }
+  if (parts[0]?.startsWith("ap-")) {
+    parts.shift();
+  }
+  return parts.join(":");
+}
+function buildSemanticRegressionIdentity(input2) {
+  const parts = [`rule=${normalizeToken2(input2.id)}`, `kind=${resolveKind(input2)}`];
+  appendPart(parts, "findingtype", input2.findingType);
+  appendPart(parts, "module", input2.module);
+  appendPart(parts, "target", input2.target);
+  appendPart(parts, "table", input2.table);
+  appendPart(parts, "api", input2.api);
+  appendPart(parts, "filepath", input2.filePath);
+  appendPart(parts, "sourcefile", input2.sourceFile);
+  appendPart(parts, "dependencytype", input2.dependencyType);
+  appendPart(parts, "sourcecomponentid", input2.sourceComponentId);
+  appendPart(parts, "targetcomponentid", input2.targetComponentId);
+  appendPart(parts, "importspecifier", input2.importSpecifier);
+  appendPart(parts, "resolvedtargetpath", input2.resolvedTargetPath);
+  if (input2.isExternal !== void 0) {
+    parts.push(`external=${input2.isExternal ? "true" : "false"}`);
+  }
+  const deductionIdentity = normalizeDeductionIdentity(input2.deductionKey);
+  if (deductionIdentity) {
+    parts.push(`deduction=${deductionIdentity}`);
+  }
+  if (parts.length <= 2) {
+    return void 0;
+  }
+  return parts.join("|");
+}
+function normalizeLegacyKey(key) {
+  const normalized = normalizeOptionalToken(key);
+  if (!normalized) {
+    return void 0;
+  }
+  return `legacy=${normalized}`;
+}
+function buildFindingRegressionIdentity(input2) {
+  const persisted = normalizeOptionalToken(input2.regressionIdentity);
+  if (persisted) {
+    return { identity: persisted, source: "persisted" };
+  }
+  const semantic = buildSemanticRegressionIdentity(input2);
+  if (semantic) {
+    return { identity: semantic, source: "semantic" };
+  }
+  const legacy = normalizeLegacyKey(input2.key);
+  if (legacy) {
+    return { identity: legacy, source: "legacy-key" };
+  }
+  return {
+    identity: [
+      `rule=${normalizeToken2(input2.id)}`,
+      `kind=${resolveKind(input2)}`,
+      `message=${normalizeToken2(input2.message ?? "")}`
+    ].join("|"),
+    source: "legacy-key"
+  };
+}
+function toComparableFindingRegression(input2) {
+  const identity = buildFindingRegressionIdentity(input2);
+  return {
+    identity: identity.identity,
+    id: input2.id,
+    kind: resolveKind(input2),
+    ...input2.severity ? { severity: input2.severity } : {},
+    ...input2.message ? { message: input2.message } : {},
+    ...input2.sourceFile ? { sourceFile: input2.sourceFile.replace(/\\/g, "/") } : {},
+    ...input2.sourceLine !== void 0 ? { sourceLine: input2.sourceLine } : {},
+    ...input2.sourceColumn !== void 0 ? { sourceColumn: input2.sourceColumn } : {},
+    ...input2.module ? { module: input2.module } : {},
+    ...input2.target ? { target: input2.target } : {},
+    ...input2.findingType ? { findingType: input2.findingType } : {},
+    regressionIdentitySource: identity.source
+  };
+}
+function compareComparableFindings(left, right) {
+  const identityCompare = left.identity.localeCompare(right.identity);
+  if (identityCompare !== 0) {
+    return identityCompare;
+  }
+  const idCompare = left.id.localeCompare(right.id);
+  if (idCompare !== 0) {
+    return idCompare;
+  }
+  const sourceCompare = (left.sourceFile ?? "").localeCompare(right.sourceFile ?? "");
+  if (sourceCompare !== 0) {
+    return sourceCompare;
+  }
+  const leftLine = left.sourceLine ?? Number.MAX_SAFE_INTEGER;
+  const rightLine = right.sourceLine ?? Number.MAX_SAFE_INTEGER;
+  if (leftLine !== rightLine) {
+    return leftLine - rightLine;
+  }
+  const leftColumn = left.sourceColumn ?? Number.MAX_SAFE_INTEGER;
+  const rightColumn = right.sourceColumn ?? Number.MAX_SAFE_INTEGER;
+  if (leftColumn !== rightColumn) {
+    return leftColumn - rightColumn;
+  }
+  const severityCompare = (left.severity ?? "").localeCompare(right.severity ?? "");
+  if (severityCompare !== 0) {
+    return severityCompare;
+  }
+  return (left.message ?? "").localeCompare(right.message ?? "");
+}
+function dedupeByIdentity(findings, toComparable) {
+  const map = /* @__PURE__ */ new Map();
+  for (const finding of findings) {
+    const comparable = toComparable(finding);
+    const existing = map.get(comparable.identity);
+    if (!existing || compareComparableFindings(comparable, existing.comparable) < 0) {
+      map.set(comparable.identity, { finding, comparable });
+    }
+  }
+  return [...map.values()].sort(
+    (left, right) => compareComparableFindings(left.comparable, right.comparable)
+  );
+}
+function compareFindingRegressions(reference, current, options) {
+  const referenceEntries = dedupeByIdentity(reference, options.toReferenceComparable);
+  const currentEntries = dedupeByIdentity(current, options.toCurrentComparable);
+  const referenceIdentities = new Set(referenceEntries.map((entry) => entry.comparable.identity));
+  const currentIdentities = new Set(currentEntries.map((entry) => entry.comparable.identity));
+  return {
+    introduced: currentEntries.filter((entry) => !referenceIdentities.has(entry.comparable.identity)).map((entry) => entry.finding),
+    existing: currentEntries.filter((entry) => referenceIdentities.has(entry.comparable.identity)).map((entry) => entry.finding),
+    resolved: referenceEntries.filter((entry) => !currentIdentities.has(entry.comparable.identity)).map((entry) => entry.finding)
+  };
+}
+
+// ../core/src/architectureGovernanceBaseline.ts
 function sortUnique9(values) {
   return [...new Set(values)].sort((left, right) => left.localeCompare(right));
 }
@@ -238348,13 +238710,51 @@ function baselineFindingKey(entry) {
   ].join("|");
 }
 function toBaselineFinding(entry) {
+  const regressionIdentity = entry.regressionIdentity ?? buildFindingRegressionIdentity({
+    id: entry.id,
+    kind: entry.kind,
+    severity: entry.severity,
+    message: entry.message,
+    sourceFile: entry.sourceFile,
+    findingType: entry.findingType,
+    module: entry.module,
+    target: entry.target,
+    filePath: entry.filePath,
+    table: entry.table,
+    api: entry.api,
+    dependencyType: entry.dependencyType,
+    sourceComponentId: entry.sourceComponentId,
+    sourceComponentName: entry.sourceComponentName,
+    targetComponentId: entry.targetComponentId,
+    targetComponentName: entry.targetComponentName,
+    importSpecifier: entry.importSpecifier,
+    resolvedTargetPath: entry.resolvedTargetPath,
+    isExternal: entry.isExternal
+  }).identity;
   return {
     key: baselineFindingKey(entry),
+    regressionIdentity,
     id: entry.id,
     severity: entry.severity,
     kind: entry.kind,
     message: entry.message,
-    ...entry.sourceFile ? { sourceFile: normalizePath18(entry.sourceFile) } : {}
+    ...entry.sourceFile ? { sourceFile: normalizePath18(entry.sourceFile) } : {},
+    ...typeof entry.sourceLine === "number" && Number.isFinite(entry.sourceLine) ? { sourceLine: Math.max(1, Math.floor(entry.sourceLine)) } : {},
+    ...typeof entry.sourceColumn === "number" && Number.isFinite(entry.sourceColumn) ? { sourceColumn: Math.max(1, Math.floor(entry.sourceColumn)) } : {},
+    ...entry.findingType ? { findingType: entry.findingType } : {},
+    ...entry.module ? { module: entry.module } : {},
+    ...entry.target ? { target: entry.target } : {},
+    ...entry.filePath ? { filePath: normalizePath18(entry.filePath) } : {},
+    ...entry.table ? { table: entry.table } : {},
+    ...entry.api ? { api: entry.api } : {},
+    ...entry.dependencyType ? { dependencyType: entry.dependencyType } : {},
+    ...entry.sourceComponentId ? { sourceComponentId: entry.sourceComponentId } : {},
+    ...entry.sourceComponentName ? { sourceComponentName: entry.sourceComponentName } : {},
+    ...entry.targetComponentId !== void 0 ? { targetComponentId: entry.targetComponentId } : {},
+    ...entry.targetComponentName !== void 0 ? { targetComponentName: entry.targetComponentName } : {},
+    ...entry.importSpecifier ? { importSpecifier: entry.importSpecifier } : {},
+    ...entry.resolvedTargetPath !== void 0 ? { resolvedTargetPath: entry.resolvedTargetPath } : {},
+    ...entry.isExternal !== void 0 ? { isExternal: entry.isExternal } : {}
   };
 }
 function compareFindings(left, right) {
@@ -238390,7 +238790,28 @@ function parseSummaryArtifact(value) {
     severity: entry.severity,
     kind: entry.kind,
     message: entry.message,
-    ...typeof entry.sourceFile === "string" ? { sourceFile: entry.sourceFile } : {}
+    ...typeof entry.regressionIdentity === "string" ? { regressionIdentity: entry.regressionIdentity } : {},
+    ...typeof entry.sourceFile === "string" ? { sourceFile: entry.sourceFile } : {},
+    ...typeof entry.sourceLine === "number" && Number.isFinite(entry.sourceLine) ? { sourceLine: entry.sourceLine } : {},
+    ...typeof entry.sourceColumn === "number" && Number.isFinite(entry.sourceColumn) ? { sourceColumn: entry.sourceColumn } : {},
+    ...typeof entry.findingType === "string" ? {
+      findingType: entry.findingType
+    } : {},
+    ...typeof entry.module === "string" ? { module: entry.module } : {},
+    ...typeof entry.target === "string" ? { target: entry.target } : {},
+    ...typeof entry.filePath === "string" ? { filePath: entry.filePath } : {},
+    ...typeof entry.table === "string" ? { table: entry.table } : {},
+    ...typeof entry.api === "string" ? { api: entry.api } : {},
+    ...typeof entry.dependencyType === "string" ? {
+      dependencyType: entry.dependencyType
+    } : {},
+    ...typeof entry.sourceComponentId === "string" ? { sourceComponentId: entry.sourceComponentId } : {},
+    ...typeof entry.sourceComponentName === "string" ? { sourceComponentName: entry.sourceComponentName } : {},
+    ...typeof entry.targetComponentId === "string" || entry.targetComponentId === null ? { targetComponentId: entry.targetComponentId } : {},
+    ...typeof entry.targetComponentName === "string" || entry.targetComponentName === null ? { targetComponentName: entry.targetComponentName } : {},
+    ...typeof entry.importSpecifier === "string" ? { importSpecifier: entry.importSpecifier } : {},
+    ...typeof entry.resolvedTargetPath === "string" || entry.resolvedTargetPath === null ? { resolvedTargetPath: entry.resolvedTargetPath } : {},
+    ...typeof entry.isExternal === "boolean" ? { isExternal: entry.isExternal } : {}
   }));
   const suppressionRaw = typed.suppressionSummary && typeof typed.suppressionSummary === "object" ? typed.suppressionSummary : void 0;
   const suppressionSummary = suppressionRaw && typeof suppressionRaw.configuredSuppressions === "number" && typeof suppressionRaw.activeSuppressions === "number" && typeof suppressionRaw.expiredSuppressions === "number" && typeof suppressionRaw.unusedSuppressions === "number" && typeof suppressionRaw.findingsSuppressed === "number" ? {
@@ -238459,6 +238880,57 @@ function buildBaselineFromSummaryArtifact(artifact, nowUtcIso2) {
     ...artifact.impactAnalysis ? { impactAnalysis: artifact.impactAnalysis } : {}
   };
 }
+function buildGovernanceBaselineFromReviewSummary(summary, nowUtcIso2) {
+  return {
+    reportVersion: 1,
+    projectName: summary.projectName,
+    capturedAtUtc: nowUtcIso2 ?? (/* @__PURE__ */ new Date()).toISOString(),
+    sourceSummaryGeneratedAtUtc: summary.generatedAtUtc,
+    healthScore: summary.healthScore,
+    readinessScore: summary.readinessScore,
+    categoryScores: summary.categoryScores,
+    readinessCategoryScores: summary.readinessCategoryScores,
+    counts: {
+      errors: summary.counts.errors,
+      warnings: summary.counts.warnings,
+      info: summary.counts.info,
+      passed: summary.counts.passed
+    },
+    findingCount: summary.findings.length,
+    remainingViolationsCount: summary.findings.filter((finding) => finding.kind === "violation").length,
+    findings: summary.findings.map(
+      (entry) => toBaselineFinding({
+        id: entry.id,
+        severity: entry.severity,
+        kind: entry.kind,
+        message: entry.message,
+        ...entry.sourceFile ? { sourceFile: entry.sourceFile } : {},
+        ...entry.sourceLine !== void 0 ? { sourceLine: entry.sourceLine } : {},
+        ...entry.sourceColumn !== void 0 ? { sourceColumn: entry.sourceColumn } : {},
+        ...entry.findingType ? { findingType: entry.findingType } : {},
+        ...entry.module ? { module: entry.module } : {},
+        ...entry.target ? { target: entry.target } : {},
+        ...entry.filePath ? { filePath: entry.filePath } : {},
+        ...entry.table ? { table: entry.table } : {},
+        ...entry.api ? { api: entry.api } : {},
+        ...entry.dependencyType ? { dependencyType: entry.dependencyType } : {},
+        ...entry.sourceComponentId ? { sourceComponentId: entry.sourceComponentId } : {},
+        ...entry.sourceComponentName ? { sourceComponentName: entry.sourceComponentName } : {},
+        ...entry.targetComponentId !== void 0 ? { targetComponentId: entry.targetComponentId } : {},
+        ...entry.targetComponentName !== void 0 ? { targetComponentName: entry.targetComponentName } : {},
+        ...entry.importSpecifier ? { importSpecifier: entry.importSpecifier } : {},
+        ...entry.resolvedTargetPath !== void 0 ? { resolvedTargetPath: entry.resolvedTargetPath } : {},
+        ...entry.isExternal !== void 0 ? { isExternal: entry.isExternal } : {}
+      })
+    ).sort(compareFindings),
+    changeRisk: {
+      riskLevel: summary.changeRisk.riskLevel,
+      score: summary.changeRisk.score,
+      summary: summary.changeRisk.summary
+    },
+    ...summary.impactAnalysis ? { impactAnalysis: summary.impactAnalysis } : {}
+  };
+}
 function getGovernanceBaselinePath(workspaceRoot) {
   return path42.join(workspaceRoot, ".archpilot", "baseline", "baseline.json");
 }
@@ -238542,13 +239014,43 @@ async function readGovernanceBaseline(workspaceRoot) {
   }
 }
 function compareFindingsByKey(current, baseline) {
-  const currentMap = new Map(current.map((entry) => [entry.key, entry]));
-  const baselineMap = new Map(baseline.map((entry) => [entry.key, entry]));
-  const newlyIntroducedFindings = [...currentMap.entries()].filter(([key]) => !baselineMap.has(key)).map(([, entry]) => entry).sort(compareFindings);
-  const resolvedFindings = [...baselineMap.entries()].filter(([key]) => !currentMap.has(key)).map(([, entry]) => entry).sort(compareFindings);
-  const unchangedFindings = [...currentMap.entries()].filter(([key]) => baselineMap.has(key)).map(([, entry]) => entry).sort(compareFindings);
+  const comparison = compareFindingRegressions(baseline, current, {
+    toReferenceComparable: toComparableBaselineFinding,
+    toCurrentComparable: toComparableBaselineFinding
+  });
+  const newlyIntroducedFindings = comparison.introduced.sort(compareFindings);
+  const resolvedFindings = comparison.resolved.sort(compareFindings);
+  const unchangedFindings = comparison.existing.sort(compareFindings);
   return { newlyIntroducedFindings, resolvedFindings, unchangedFindings };
 }
+function toRegressionInput(entry) {
+  return {
+    id: entry.id,
+    kind: entry.kind,
+    severity: entry.severity,
+    message: entry.message,
+    regressionIdentity: entry.regressionIdentity,
+    key: entry.key,
+    sourceFile: entry.sourceFile,
+    findingType: entry.findingType,
+    module: entry.module,
+    target: entry.target,
+    filePath: entry.filePath,
+    table: entry.table,
+    api: entry.api,
+    dependencyType: entry.dependencyType,
+    sourceComponentId: entry.sourceComponentId,
+    sourceComponentName: entry.sourceComponentName,
+    targetComponentId: entry.targetComponentId,
+    targetComponentName: entry.targetComponentName,
+    importSpecifier: entry.importSpecifier,
+    resolvedTargetPath: entry.resolvedTargetPath,
+    isExternal: entry.isExternal
+  };
+}
+function toComparableBaselineFinding(entry) {
+  return toComparableFindingRegression(toRegressionInput(entry));
+}
 function compareWithGovernanceBaseline(currentSummary, baselineLoad) {
   const currentFindings = currentSummary.findings.map(
     (entry) => toBaselineFinding({
@@ -238556,7 +239058,23 @@ function compareWithGovernanceBaseline(currentSummary, baselineLoad) {
       severity: entry.severity,
       kind: entry.kind,
       message: entry.message,
-      ...entry.sourceFile ? { sourceFile: entry.sourceFile } : {}
+      ...entry.sourceFile ? { sourceFile: entry.sourceFile } : {},
+      ...entry.sourceLine !== void 0 ? { sourceLine: entry.sourceLine } : {},
+      ...entry.sourceColumn !== void 0 ? { sourceColumn: entry.sourceColumn } : {},
+      ...entry.findingType ? { findingType: entry.findingType } : {},
+      ...entry.module ? { module: entry.module } : {},
+      ...entry.target ? { target: entry.target } : {},
+      ...entry.filePath ? { filePath: entry.filePath } : {},
+      ...entry.table ? { table: entry.table } : {},
+      ...entry.api ? { api: entry.api } : {},
+      ...entry.dependencyType ? { dependencyType: entry.dependencyType } : {},
+      ...entry.sourceComponentId ? { sourceComponentId: entry.sourceComponentId } : {},
+      ...entry.sourceComponentName ? { sourceComponentName: entry.sourceComponentName } : {},
+      ...entry.targetComponentId !== void 0 ? { targetComponentId: entry.targetComponentId } : {},
+      ...entry.targetComponentName !== void 0 ? { targetComponentName: entry.targetComponentName } : {},
+      ...entry.importSpecifier ? { importSpecifier: entry.importSpecifier } : {},
+      ...entry.resolvedTargetPath !== void 0 ? { resolvedTargetPath: entry.resolvedTargetPath } : {},
+      ...entry.isExternal !== void 0 ? { isExternal: entry.isExternal } : {}
     })
   ).sort(compareFindings);
   const currentRemainingViolations = currentSummary.findings.filter(
@@ -238717,6 +239235,43 @@ function renderList(values) {
   }
   return values.map((value) => `- ${value}`).join("\n");
 }
+function formatRegressionFinding(finding) {
+  const pieces = [`[${finding.id}]`, `(${finding.severity})`];
+  const scope = finding.module && finding.target ? `${finding.module} -> ${finding.target}` : finding.sourceComponentName && finding.targetComponentName ? `${finding.sourceComponentName} -> ${finding.targetComponentName}` : finding.module ?? finding.target ?? finding.table ?? finding.api ?? finding.filePath;
+  if (scope) {
+    pieces.push(scope);
+  }
+  if (finding.sourceFile) {
+    pieces.push(
+      finding.sourceLine !== void 0 ? `${finding.sourceFile}:${finding.sourceLine}` : finding.sourceFile
+    );
+  }
+  if (finding.message) {
+    pieces.push(finding.message);
+  }
+  return pieces.join(" | ");
+}
+function renderRegressionFindingList(findings, limit) {
+  if (findings.length === 0) {
+    return "- (none)";
+  }
+  const sorted = [...findings].sort((left, right) => {
+    const idCompare = left.id.localeCompare(right.id);
+    if (idCompare !== 0) {
+      return idCompare;
+    }
+    const sourceCompare = (left.sourceFile ?? "").localeCompare(right.sourceFile ?? "");
+    if (sourceCompare !== 0) {
+      return sourceCompare;
+    }
+    return (left.message ?? "").localeCompare(right.message ?? "");
+  });
+  const rendered = sorted.slice(0, limit).map((finding) => `- ${formatRegressionFinding(finding)}`);
+  if (sorted.length > limit) {
+    rendered.push(`- ... ${sorted.length - limit} more`);
+  }
+  return rendered.join("\n");
+}
 function renderStatusLine(input2) {
   const validationHasIssues = input2.validation.kind === "ok" && (input2.validation.data.counts.errors > 0 || input2.validation.data.counts.warnings > 0 || input2.validation.data.counts.info > 0);
   const driftHasChanges = input2.drift.kind === "ok" && (input2.drift.data.summaryCounts.totalChanges ?? input2.drift.data.summaryCounts.modulesAdded + input2.drift.data.summaryCounts.modulesRemoved + input2.drift.data.summaryCounts.dependenciesAdded + input2.drift.data.summaryCounts.dependenciesRemoved + input2.drift.data.summaryCounts.cyclesAdded + input2.drift.data.summaryCounts.cyclesRemoved) > 0;
@@ -238866,14 +239421,43 @@ function renderArchitecturePrReviewMarkdown(input2) {
   }
   if (input2.validation.kind === "ok" && input2.validation.data.baselineComparison) {
     const baseline = input2.validation.data.baselineComparison;
-    lines.push("## Baseline Comparison");
-    lines.push(`- Baseline status: ${baseline.status}`);
-    lines.push(`- Health score delta: ${baseline.deltas.healthScoreDelta}`);
-    lines.push(`- Readiness score delta: ${baseline.deltas.readinessScoreDelta}`);
-    lines.push(`- New findings: ${baseline.newlyIntroducedFindings.length}`);
-    lines.push(`- Resolved findings: ${baseline.resolvedFindings.length}`);
-    lines.push(`- Summary: ${baseline.summary}`);
-    lines.push("");
+    const comparisonAvailable = baseline.baselineAvailable !== false && baseline.status !== "NO_BASELINE";
+    lines.push("## Architecture Regression Summary");
+    if (!comparisonAvailable) {
+      lines.push("- Architecture regression comparison is unavailable.");
+      if (baseline.summary.toLowerCase().includes("no baseline")) {
+        lines.push("- No governance baseline exists.");
+        lines.push("- Create or refresh the governance baseline with `archpilot baseline refresh`.");
+      }
+      lines.push(`- Summary: ${baseline.summary}`);
+      lines.push("");
+    } else {
+      const introducedCount = baseline.newlyIntroducedFindings.length;
+      const resolvedCount = baseline.resolvedFindings.length;
+      const existingCount = baseline.unchangedFindings?.length ?? 0;
+      lines.push("| | Count |");
+      lines.push("| --- | ---: |");
+      lines.push(`| Introduced | ${introducedCount} |`);
+      lines.push(`| Resolved | ${resolvedCount} |`);
+      lines.push(`| Existing | ${existingCount} |`);
+      lines.push("");
+      lines.push(
+        `Existing means current findings already represented by the accepted governance baseline.`
+      );
+      lines.push("");
+      if (introducedCount === 0) {
+        lines.push("No new architecture regressions detected.");
+      } else {
+        lines.push("### New architecture regressions");
+        lines.push(renderRegressionFindingList(baseline.newlyIntroducedFindings, 10));
+      }
+      if (resolvedCount > 0) {
+        lines.push("");
+        lines.push("### Resolved architecture findings");
+        lines.push(renderRegressionFindingList(baseline.resolvedFindings, 8));
+      }
+      lines.push("");
+    }
   }
   if (input2.validation.kind === "ok" && input2.validation.data.risk) {
     const governanceRisk = input2.validation.data.risk;
@@ -238964,23 +239548,32 @@ function renderArchitecturePrReviewMarkdown(input2) {
     }
   }
   if (input2.validation.kind === "ok") {
-    const topFindings = [...input2.validation.data.findings].sort((left, right) => {
-      const severityCompare = severityRank(left.severity) - severityRank(right.severity);
-      if (severityCompare !== 0) {
-        return severityCompare;
-      }
-      const idCompare = left.id.localeCompare(right.id);
-      if (idCompare !== 0) {
-        return idCompare;
-      }
-      return left.message.localeCompare(right.message);
-    }).slice(0, 8);
     lines.push("## Validation Findings");
-    lines.push(
-      topFindings.length === 0 ? "- (none)" : topFindings.map(
-        (finding) => `- [${finding.id}] (${finding.severity}) ${finding.title} | ${finding.message}`
-      ).join("\n")
-    );
+    const baseline = input2.validation.data.baselineComparison;
+    const comparisonAvailable = baseline && baseline.baselineAvailable !== false && baseline.status !== "NO_BASELINE";
+    if (comparisonAvailable) {
+      lines.push(`- Current canonical findings: ${input2.validation.data.findings.length}`);
+      lines.push(
+        "- Regression details above prioritize introduced and resolved findings; complete current findings remain in the validation artifacts."
+      );
+    } else {
+      const topFindings = [...input2.validation.data.findings].sort((left, right) => {
+        const severityCompare = severityRank(left.severity) - severityRank(right.severity);
+        if (severityCompare !== 0) {
+          return severityCompare;
+        }
+        const idCompare = left.id.localeCompare(right.id);
+        if (idCompare !== 0) {
+          return idCompare;
+        }
+        return left.message.localeCompare(right.message);
+      }).slice(0, 8);
+      lines.push(
+        topFindings.length === 0 ? "- (none)" : topFindings.map(
+          (finding) => `- [${finding.id}] (${finding.severity}) ${finding.title} | ${finding.message}`
+        ).join("\n")
+      );
+    }
     lines.push("");
   }
   if (input2.drift.kind === "ok") {
@@ -239107,7 +239700,7 @@ function toAnnotatableFinding(workspaceRoot, finding) {
   if (finding.severity !== "error" && finding.severity !== "warning") {
     return void 0;
   }
-  if (typeof finding.title !== "string" || typeof finding.message !== "string") {
+  if (typeof finding.message !== "string") {
     return void 0;
   }
   if (typeof finding.sourceFile !== "string") {
@@ -239124,7 +239717,7 @@ function toAnnotatableFinding(workspaceRoot, finding) {
   const column = typeof finding.sourceColumn === "number" && Number.isFinite(finding.sourceColumn) ? Math.max(1, Math.floor(finding.sourceColumn)) : void 0;
   return {
     id: finding.id,
-    title: finding.title,
+    title: typeof finding.title === "string" ? finding.title : finding.id,
     message: finding.message,
     severity: finding.severity,
     file,
@@ -239244,9 +239837,47 @@ async function loadFromSummaryReport(workspaceRoot, maxAgeMinutes) {
     findings: findings.filter((entry) => !!entry && typeof entry === "object")
   };
 }
+async function loadFromBaselineComparisonReport(workspaceRoot, maxAgeMinutes) {
+  const comparisonPath = path43.join(
+    workspaceRoot,
+    ".archpilot",
+    "reports",
+    "baseline-comparison.json"
+  );
+  let raw;
+  try {
+    raw = await import_node_fs37.promises.readFile(comparisonPath, { encoding: "utf8" });
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      console.log("ArchPilot inline annotations: unable to read baseline-comparison.json.");
+    }
+    return void 0;
+  }
+  if (!await isFreshArtifact(comparisonPath, maxAgeMinutes)) {
+    console.log(
+      `ArchPilot inline annotations: baseline-comparison.json is stale (older than ${maxAgeMinutes} minutes).`
+    );
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    console.log("ArchPilot inline annotations: baseline-comparison.json is invalid JSON.");
+    return void 0;
+  }
+  if (parsed.baselineAvailable !== true) {
+    return void 0;
+  }
+  const findings = Array.isArray(parsed.newlyIntroducedFindings) ? parsed.newlyIntroducedFindings : [];
+  return {
+    sourceLabel: ".archpilot/reports/baseline-comparison.json",
+    findings: findings.filter((entry) => !!entry && typeof entry === "object")
+  };
+}
 async function emitGithubInlineArchitectureAnnotations(workspaceRoot) {
   const maxAgeMinutes = readMaxArtifactAgeMinutes();
-  const loaded = await loadFromValidationStatus(workspaceRoot, maxAgeMinutes) ?? await loadFromSummaryReport(workspaceRoot, maxAgeMinutes);
+  const loaded = await loadFromBaselineComparisonReport(workspaceRoot, maxAgeMinutes) ?? await loadFromValidationStatus(workspaceRoot, maxAgeMinutes) ?? await loadFromSummaryReport(workspaceRoot, maxAgeMinutes);
   if (!loaded) {
     const now = formatUtcDate(/* @__PURE__ */ new Date());
     console.log(
@@ -243013,8 +243644,6 @@ var ignoredRootPathPrefixes = [
   "static",
   "assets",
   "vendor",
-  "plugins",
-  "plugin",
   "themes",
   "theme",
   "generated",
@@ -243037,8 +243666,12 @@ function pushEvidence(evidence, message) {
 function safeReadDirectoryEntries(directoryPath) {
   try {
     return fs52.readdirSync(directoryPath, { withFileTypes: true });
-  } catch {
-    return [];
+  } catch (error) {
+    const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return [];
+    }
+    throw error;
   }
 }
 function safeReadJsonFile(jsonPath) {
@@ -245612,8 +246245,6 @@ function isIgnoredComponentCandidatePath(componentPath) {
     "static",
     "assets",
     "vendor",
-    "plugins",
-    "plugin",
     "themes",
     "theme",
     "generated",
@@ -245634,6 +246265,36 @@ function pathExists19(pathValue) {
     return false;
   }
 }
+function isSafeMissingPathError(error) {
+  const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
+  return code === "ENOENT" || code === "ENOTDIR";
+}
+function isDirectoryPath(pathValue) {
+  try {
+    return fs58.statSync(pathValue).isDirectory();
+  } catch (error) {
+    if (isSafeMissingPathError(error)) {
+      return false;
+    }
+    throw error;
+  }
+}
+function readDirectoryEntriesForTraversal(directoryPath, options) {
+  if (!isDirectoryPath(directoryPath)) {
+    return [];
+  }
+  try {
+    return fs58.readdirSync(directoryPath, {
+      withFileTypes: true,
+      ...options?.recursive ? { recursive: true } : {}
+    });
+  } catch (error) {
+    if (isSafeMissingPathError(error)) {
+      return [];
+    }
+    throw error;
+  }
+}
 function hasManifest2(workspaceRoot, componentPath) {
   const absoluteRoot = componentPath === "." ? workspaceRoot : path64.join(workspaceRoot, ...componentPath.split("/"));
   return [
@@ -245641,7 +246302,8 @@ function hasManifest2(workspaceRoot, componentPath) {
     "pom.xml",
     "requirements.txt",
     "go.mod",
-    "composer.json"
+    "composer.json",
+    "project.json"
   ].some((fileName) => pathExists19(path64.join(absoluteRoot, fileName)));
 }
 function safeReadJson(filePath) {
@@ -245664,6 +246326,10 @@ function recordKeys(value) {
 function hasObject(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
+function readStringProperty(value, key) {
+  const field = value?.[key];
+  return typeof field === "string" && field.trim().length > 0 ? field.trim() : void 0;
+}
 function hasPackagePublishSurface(packageJson) {
   return hasObject(packageJson?.exports) || typeof packageJson?.main === "string" || typeof packageJson?.module === "string" || typeof packageJson?.types === "string" || hasObject(packageJson?.publishConfig) || Array.isArray(packageJson?.files);
 }
@@ -245686,6 +246352,132 @@ function readProjectJson(workspaceRoot, componentPath) {
   const absoluteRoot = absoluteComponentRoot(workspaceRoot, componentPath);
   return safeReadJson(path64.join(absoluteRoot, "project.json"));
 }
+function readNxWorkspaceLayout(workspaceRoot) {
+  const nxJson = safeReadJson(path64.join(workspaceRoot, "nx.json"));
+  const workspaceLayout = nxJson?.workspaceLayout;
+  if (!hasObject(workspaceLayout)) {
+    return {};
+  }
+  const layout = workspaceLayout;
+  return {
+    ...typeof layout.appsDir === "string" && layout.appsDir.trim().length > 0 ? { appsDir: normalizePath25(layout.appsDir.trim()) } : {},
+    ...typeof layout.libsDir === "string" && layout.libsDir.trim().length > 0 ? { libsDir: normalizePath25(layout.libsDir.trim()) } : {}
+  };
+}
+function readTargetMap(projectJson) {
+  const targets = projectJson?.targets ?? projectJson?.architect;
+  return hasObject(targets) ? targets : {};
+}
+function targetExecutorText(target) {
+  if (!hasObject(target)) {
+    return "";
+  }
+  const typed = target;
+  const executor = typeof typed.executor === "string" ? typed.executor : "";
+  const builder = typeof typed.builder === "string" ? typed.builder : "";
+  const options = hasObject(typed.options) ? typed.options : {};
+  const main = typeof options.main === "string" ? options.main : "";
+  const index = typeof options.index === "string" ? options.index : "";
+  const outputPath = typeof options.outputPath === "string" ? options.outputPath : "";
+  return `${executor} ${builder} ${main} ${index} ${outputPath}`.toLowerCase();
+}
+function hasNxRuntimeProjectEvidence(projectJson) {
+  const projectType = readStringProperty(projectJson, "projectType");
+  if (projectType === "library") {
+    return false;
+  }
+  const targets = readTargetMap(projectJson);
+  const targetNames = Object.keys(targets);
+  const targetText = targetNames.map((targetName) => `${targetName} ${targetExecutorText(targets[targetName])}`).join(" ");
+  const hasRuntimeTarget = /\b(?:serve|start|preview|worker|package:container|deploy:static)\b/u.test(targetText);
+  const hasBuildEntrypoint = /\bbuild\b/u.test(targetNames.join(" ")) && /(?:\bmain\b|src\/main|src\/index|public\/index|webpack|vite|next|node|container|browser|dev-server)/u.test(targetText);
+  return projectType === "application" || hasRuntimeTarget || hasBuildEntrypoint;
+}
+function hasNxSupportOnlyProjectEvidence(projectJson) {
+  const projectType = readStringProperty(projectJson, "projectType");
+  const targets = readTargetMap(projectJson);
+  const targetNames = Object.keys(targets);
+  if (targetNames.length === 0) {
+    return false;
+  }
+  const targetText = targetNames.map((targetName) => `${targetName} ${targetExecutorText(targets[targetName])}`).join(" ");
+  const hasOnlySupportTargets = targetNames.every(
+    (targetName) => /^(?:e2e|test|unit-test|integration-test|lint|typecheck|format|smoke|bench|benchmark)$/u.test(targetName)
+  );
+  const hasTestExecutor = /(?:cypress|playwright|jest|vitest|mocha|karma|protractor)/u.test(targetText);
+  return projectType !== "library" && (hasOnlySupportTargets || hasTestExecutor);
+}
+function classifyNxRuntimeKind(projectJson) {
+  if (!hasNxRuntimeProjectEvidence(projectJson)) {
+    return void 0;
+  }
+  const targets = readTargetMap(projectJson);
+  const targetText = Object.entries(targets).map(([targetName, target]) => `${targetName} ${targetExecutorText(target)}`).join(" ");
+  if (/(?:webpack:dev-server|webpack-dev-server|src\/index\.(?:tsx|jsx|ts|js)|public\/index\.html|browser|react|vite|next|angular|deploy:static)/u.test(targetText)) {
+    return "frontend";
+  }
+  if (/(?:@nx\/js:node|@nrwl\/node|src\/main\.(?:ts|js)|target:\s*node|node\b|container|worker|queue)/u.test(targetText)) {
+    return /\bworker\b/u.test(targetText) ? "worker" : "backend";
+  }
+  return void 0;
+}
+function collectNxProjectCandidates(workspaceRoot) {
+  if (!pathExists19(path64.join(workspaceRoot, "nx.json"))) {
+    return [];
+  }
+  const candidates = /* @__PURE__ */ new Map();
+  const workspaceLayout = readNxWorkspaceLayout(workspaceRoot);
+  const preferredRoots = new Set(
+    ["apps", "packages", "services", "libs", workspaceLayout.appsDir, workspaceLayout.libsDir].filter((entry) => typeof entry === "string" && entry.length > 0).map(normalizePath25)
+  );
+  const maxDepth = 5;
+  const queue = [
+    { absolutePath: workspaceRoot, relativePath: "", depth: 0 }
+  ];
+  const addCandidate = (candidatePath, evidence) => {
+    const normalized = normalizePath25(candidatePath);
+    const existing = candidates.get(normalized) ?? { path: normalized, evidence: [] };
+    addEvidence6(existing.evidence, evidence);
+    candidates.set(normalized, existing);
+  };
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (!current) {
+      continue;
+    }
+    for (const entry of readDirectoryEntriesForTraversal(current.absolutePath)) {
+      if (!entry.isDirectory()) {
+        continue;
+      }
+      if ([".git", ".archpilot", "node_modules", "dist", "build", "out", "coverage"].includes(entry.name)) {
+        continue;
+      }
+      const relativePath = normalizePath25(current.relativePath ? `${current.relativePath}/${entry.name}` : entry.name);
+      if (current.depth >= maxDepth) {
+        continue;
+      }
+      const projectJsonPath = path64.join(current.absolutePath, entry.name, "project.json");
+      if (pathExists19(projectJsonPath)) {
+        const projectJson = safeReadJson(projectJsonPath);
+        const projectRoot = normalizePath25(readStringProperty(projectJson, "root") ?? relativePath);
+        if (hasNxRuntimeProjectEvidence(projectJson)) {
+          addCandidate(projectRoot, "Detected Nx runtime project metadata");
+        } else if (readStringProperty(projectJson, "sourceRoot")) {
+          addCandidate(projectRoot, "Detected Nx source-bearing project metadata");
+        }
+      }
+      const firstSegment = relativePath.split("/")[0] ?? "";
+      if (current.depth === 0 || preferredRoots.has(firstSegment) || preferredRoots.has(relativePath.split("/").slice(0, 2).join("/"))) {
+        queue.push({
+          absolutePath: path64.join(current.absolutePath, entry.name),
+          relativePath,
+          depth: current.depth + 1
+        });
+      }
+    }
+  }
+  return [...candidates.values()].sort((left, right) => left.path.localeCompare(right.path));
+}
 function readTextFileSafe(filePath) {
   try {
     return fs58.readFileSync(filePath, { encoding: "utf8" });
@@ -245732,6 +246524,8 @@ function readMavenMetadata(workspaceRoot, componentPath) {
     testScopedDependencyCount: dependencyBlocks.filter((block) => /<scope>\s*test\s*<\/scope>/iu.test(block)).length,
     totalDependencyCount: dependencyBlocks.length,
     hasMavenPluginConfiguration: packaging === "maven-plugin" || /maven-plugin-plugin|<goalPrefix>|<mojo/iu.test(normalizedPom),
+    hasAssemblyPackagingConfiguration: /maven-assembly-plugin|<goal>\s*single\s*<\/goal>|<descriptor>[^<]*(?:assembly|dist|distribution)[^<]*<\/descriptor>/iu.test(normalizedPom),
+    hasDeploySkipConfiguration: /<maven\.deploy\.skip>\s*true\s*<\/maven\.deploy\.skip>|<artifactId>\s*maven-deploy-plugin\s*<\/artifactId>[\s\S]*?<skip>\s*true\s*<\/skip>/iu.test(normalizedPom),
     hasTestLifecycleConfiguration: /maven-surefire-plugin|maven-failsafe-plugin|integration-test|failsafe|surefire/iu.test(normalizedPom),
     hasArquillianEvidence: /arquillian/iu.test(normalizedPom),
     hasMainJava: pathExists19(path64.join(absoluteRoot, "src", "main", "java")),
@@ -245864,6 +246658,12 @@ function buildRootCandidates(input2) {
     addCandidate(root, `Detected project root ${root}`);
   }
   if (input2.workspaceRoot) {
+    for (const candidate of collectNxProjectCandidates(input2.workspaceRoot)) {
+      addCandidate(candidate.path, "Detected Nx project metadata");
+      for (const evidence of candidate.evidence) {
+        addCandidate(candidate.path, evidence);
+      }
+    }
     const mavenRoots = [".", ...input2.topology.detectedRoots ?? []];
     for (const candidate of collectMavenReactorCandidates(input2.workspaceRoot, mavenRoots)) {
       addCandidate(
@@ -245947,10 +246747,7 @@ function isUnderJvmResourceRoot4(componentPath) {
   return /(^|\/)src\/main\/resources(?:\/|$)/u.test(normalizePath25(componentPath).toLowerCase());
 }
 function hasFileUnderRoot(root, pattern) {
-  if (!pathExists19(root)) {
-    return false;
-  }
-  const entries = fs58.readdirSync(root, { recursive: true, withFileTypes: true });
+  const entries = readDirectoryEntriesForTraversal(root, { recursive: true });
   return entries.some((entry) => entry.isFile() && pattern.test(entry.name));
 }
 var javaMainMethodPattern = /\bpublic\s+static\s+void\s+main\s*\(\s*String\s*(?:(?:\[\s*\]\s*)|\.\.\.\s*)[A-Za-z_$][\w$]*\s*(?:\[\s*\])?\s*\)/u;
@@ -246068,10 +246865,7 @@ function readMavenProductionSourceFiles(workspaceRoot, componentPath) {
   ];
   const files = [];
   for (const sourceRoot of mainRoots) {
-    if (!pathExists19(sourceRoot)) {
-      continue;
-    }
-    const entries = fs58.readdirSync(sourceRoot, { recursive: true, withFileTypes: true });
+    const entries = readDirectoryEntriesForTraversal(sourceRoot, { recursive: true });
     for (const entry of entries) {
       if (!entry.isFile() || !/\.(?:java|kt|scala)$/iu.test(entry.name)) {
         continue;
@@ -246243,10 +247037,7 @@ function hasRuntimeSourceFiles(workspaceRoot, componentPath) {
     path64.join(absoluteRoot, "server")
   ];
   for (const sourceRoot of sourceRoots) {
-    if (!pathExists19(sourceRoot)) {
-      continue;
-    }
-    const entries = fs58.readdirSync(sourceRoot, { recursive: true, withFileTypes: true });
+    const entries = readDirectoryEntriesForTraversal(sourceRoot, { recursive: true });
     if (entries.some((entry) => entry.isFile() && /\.(?:ts|tsx|js|jsx|java|cs|py|php|go)$/iu.test(entry.name))) {
       return true;
     }
@@ -246254,10 +247045,7 @@ function hasRuntimeSourceFiles(workspaceRoot, componentPath) {
   return false;
 }
 function hasFileMatchingUnderRoot(root, pattern) {
-  if (!pathExists19(root)) {
-    return false;
-  }
-  const entries = fs58.readdirSync(root, { recursive: true, withFileTypes: true });
+  const entries = readDirectoryEntriesForTraversal(root, { recursive: true });
   return entries.some((entry) => entry.isFile() && pattern.test(normalizePath25(path64.join(entry.parentPath, entry.name))));
 }
 function hasNestRuntimeApplicationEvidence(workspaceRoot, componentPath, packageJson = readPackageJson(workspaceRoot, componentPath)) {
@@ -246297,16 +247085,19 @@ function hasNestRuntimeApplicationEvidence(workspaceRoot, componentPath, package
   ].filter(Boolean).length;
   return hasBootstrapEntrypoint || hasRuntimePlatform && structuralEvidenceCount >= 2 || hasRunnableScript && hasRuntimeSourceShape && structuralEvidenceCount >= 3;
 }
-function resolveKind(workspaceRoot, candidate, localProjectKinds) {
+function resolveKind2(workspaceRoot, candidate, localProjectKinds) {
   const lowerPath = candidate.path.toLowerCase();
   const packageJson = readPackageJson(workspaceRoot, candidate.path);
+  const projectJson = readProjectJson(workspaceRoot, candidate.path);
+  const nxProjectType = readStringProperty(projectJson, "projectType");
   const maven = readMavenMetadata(workspaceRoot, candidate.path);
   const dependencies = new Set(packageDependencyNames(packageJson));
   const hasRunnableFrontendEvidence = hasRunnableFrontendComponentEvidence(workspaceRoot, candidate.path);
   const hasNestRuntimeEvidence = hasNestRuntimeApplicationEvidence(workspaceRoot, candidate.path, packageJson);
+  const nxRuntimeKind = classifyNxRuntimeKind(projectJson);
   const hasPublishSurface = hasPackagePublishSurface(packageJson);
   const hasMavenRunnableEvidence = Boolean(
-    maven && (hasMavenMainEntrypoint(workspaceRoot, candidate.path) || hasMavenConfiguredMainClassEntrypoint(workspaceRoot, candidate.path, maven.configuredMainClass) || maven.hasSpringBootPlugin && maven.hasSpringBootRepackageGoal && hasMavenMainEntrypoint(workspaceRoot, candidate.path) || maven.packaging === "war" && hasMavenMainEntrypoint(workspaceRoot, candidate.path))
+    maven && (hasMavenMainEntrypoint(workspaceRoot, candidate.path) || hasMavenConfiguredMainClassEntrypoint(workspaceRoot, candidate.path, maven.configuredMainClass) || maven.configuredMainClass && maven.hasSpringBootStarterDependency || maven.hasSpringBootPlugin && maven.hasSpringBootRepackageGoal && hasMavenMainEntrypoint(workspaceRoot, candidate.path) || maven.packaging === "war" && hasMavenMainEntrypoint(workspaceRoot, candidate.path))
   );
   const hasMavenLibraryEvidence = Boolean(
     maven && !hasMavenRunnableEvidence && (maven.packaging === "jar" || maven.packaging === "maven-plugin" || maven.packaging === "pom") && (hasMavenMainJvmSource(workspaceRoot, candidate.path) || maven.hasMainResources || maven.hasDependencyManagement || maven.hasSpringBootAutoconfigureDependency || maven.hasSpringBootAutoconfigureProcessor || hasMavenAutoConfigurationMetadata(workspaceRoot, candidate.path) || maven.hasDocumentationTooling || maven.hasTestJava || maven.hasTestResources)
@@ -246314,6 +247105,12 @@ function resolveKind(workspaceRoot, candidate, localProjectKinds) {
   if (lowerPath.endsWith("/db") || lowerPath.endsWith("/database") || lowerPath.endsWith("/data")) {
     return "data";
   }
+  if (nxRuntimeKind) {
+    return nxRuntimeKind;
+  }
+  if (nxProjectType === "library") {
+    return "library";
+  }
   if (hasMavenLibraryEvidence) {
     return "library";
   }
@@ -246413,7 +247210,10 @@ function classifyGovernanceRole(input2) {
   const scriptText = scripts.join(" ").toLowerCase();
   const projectMetadataText = `${projectTags.join(" ")} ${projectTargets.join(" ")}`.toLowerCase();
   const dependencyText = [...dependencies, ...devDependencies].join(" ").toLowerCase();
+  const hasRunnableFrontendEvidence = hasRunnableFrontendComponentEvidence(input2.workspaceRoot, input2.candidate.path);
   const hasNestRuntimeEvidence = hasNestRuntimeApplicationEvidence(input2.workspaceRoot, input2.candidate.path, packageJson);
+  const nxRuntimeKind = classifyNxRuntimeKind(projectJson);
+  const hasNxSupportOnlyEvidence = hasNxSupportOnlyProjectEvidence(projectJson);
   const hasStrongSupportPath = hasAnyToken(pathText, [
     /(^|\/)(testing|e2e-testing|test-plugins|cypress-tests|fixtures?|benchmarks?|smoke)(\/|$)/u,
     /(^|\/)(dev-server|scaffold|scaffolding|generators?|devkit|tooling|tools|templates?)(\/|$)/u
@@ -246428,9 +247228,11 @@ function classifyGovernanceRole(input2) {
   const hasMavenMainEntrypointEvidence = Boolean(maven && hasMavenMainEntrypoint(input2.workspaceRoot, input2.candidate.path));
   const hasMavenMainJvmSourceEvidence = Boolean(maven && hasMavenMainJvmSource(input2.workspaceRoot, input2.candidate.path));
   const hasMavenAutoConfigurationEvidence = Boolean(maven && (hasMavenAutoConfigurationMetadata(input2.workspaceRoot, input2.candidate.path) || maven.hasSpringBootAutoconfigureDependency || maven.hasSpringBootAutoconfigureProcessor));
-  const hasMavenExecutableConfiguration = Boolean(maven && (hasMavenConfiguredMainClassEntrypoint(input2.workspaceRoot, input2.candidate.path, maven.configuredMainClass) || maven.hasSpringBootPlugin && maven.hasSpringBootRepackageGoal && hasMavenMainEntrypointEvidence || maven.packaging === "war" && hasMavenMainEntrypointEvidence));
+  const hasMavenExecutableConfiguration = Boolean(maven && (hasMavenConfiguredMainClassEntrypoint(input2.workspaceRoot, input2.candidate.path, maven.configuredMainClass) || maven.configuredMainClass && maven.hasSpringBootStarterDependency || maven.hasSpringBootPlugin && maven.hasSpringBootRepackageGoal && hasMavenMainEntrypointEvidence || maven.packaging === "war" && hasMavenMainEntrypointEvidence));
   const hasMavenRunnableApplicationEvidence = Boolean(hasMavenMainEntrypointEvidence || hasMavenExecutableConfiguration);
-  const isMavenPomOnly = Boolean(maven?.packaging === "pom" && !hasMavenMainSource && !hasMavenTestSource);
+  const isMavenPomOnly = Boolean(
+    maven?.packaging === "pom" && !hasMavenRunnableApplicationEvidence && !hasMavenMainSource && !hasMavenTestSource
+  );
   const hasMavenTestContext = hasAnyToken(pathText, [
     /(^|\/)(test-framework|testsuite|integration-tests?|test-apps)(\/|$)/u
   ]) && (hasAnyToken(mavenMetadataText, [/\b(test|testsuite|test framework|arquillian|integration test)\b/u]) || Boolean(maven?.hasTestLifecycleConfiguration || maven?.hasArquillianEvidence || hasMavenTestSource));
@@ -246438,7 +247240,7 @@ function classifyGovernanceRole(input2) {
     maven?.packaging === "pom" && maven.hasDependencyManagement && !hasMavenMainSource && hasAnyToken(mavenMetadataText, [/\b(bom|bill of materials|dependency management|platform)\b/u])
   );
   const hasMavenDistributionPackagingEvidence = Boolean(
-    maven?.packaging === "pom" && !hasMavenMainSource && hasAnyToken(pathText, [/(^|\/)(distribution|dist|downloads|assembl(y|ies)|feature-packs?)(\/|$)/u])
+    maven && !hasMavenMainSource && (maven.hasAssemblyPackagingConfiguration || maven.hasDeploySkipConfiguration && maven.hasDocumentationTooling || hasAnyToken(mavenMetadataText, [/\b(distribution|assembly|release package|packaging bundle)\b/u]))
   );
   const hasMavenStarterPackagingEvidence = Boolean(
     maven && !hasMavenMainJvmSourceEvidence && hasAnyToken(`${pathText} ${mavenMetadataText}`, [/\bstarters?\b|\bspring-boot-starter\b|\bstarter[-\s]/u])
@@ -246465,6 +247267,18 @@ function classifyGovernanceRole(input2) {
     runtimeScore += 3;
     addEvidence6(evidence, "NestJS runtime application evidence");
   }
+  if (input2.kind === "frontend" && hasRunnableFrontendEvidence) {
+    runtimeScore += 3;
+    addEvidence6(evidence, "Runnable frontend application evidence");
+  }
+  if (nxRuntimeKind) {
+    runtimeScore += 3;
+    addEvidence6(evidence, `Nx runtime project evidence: ${nxRuntimeKind}`);
+  }
+  if (hasNxSupportOnlyEvidence) {
+    supportScore += 4;
+    addEvidence6(evidence, "Nx project metadata indicates test/tooling-only workspace");
+  }
   if (hasPublishSurface && !isPrivate) {
     runtimeScore += 1;
     addEvidence6(evidence, "Published package surface signal");
@@ -246475,7 +247289,7 @@ function classifyGovernanceRole(input2) {
   if (maven?.hasPom) {
     addEvidence6(evidence, `Maven packaging ${maven.packaging ?? "jar"}`);
   }
-  if (maven && (maven.packaging === "jar" || maven.packaging === "war") && hasMavenRunnableApplicationEvidence) {
+  if (maven && hasMavenRunnableApplicationEvidence) {
     runtimeScore += 3;
     addEvidence6(evidence, "Maven executable application evidence");
   }
@@ -246512,6 +247326,10 @@ function classifyGovernanceRole(input2) {
     supportScore += 1;
     addEvidence6(evidence, "Path contains support/tooling role tokens");
   }
+  if (maven && hasStrongSupportPath && !hasMavenRunnableApplicationEvidence) {
+    supportScore += 3;
+    addEvidence6(evidence, "Maven module path and metadata indicate support/tooling role");
+  }
   if (hasAnyToken(pathText, [/(^|\/)(?:src\/constants\/)?templates?(\/|$)/u])) {
     supportScore += 4;
     addEvidence6(evidence, "Nested scaffold/template source surface");
@@ -246544,6 +247362,10 @@ function classifyGovernanceRole(input2) {
     supportScore += 4;
     addEvidence6(evidence, "Maven documentation tooling without JVM runtime source");
   }
+  if (maven?.hasDeploySkipConfiguration && !hasMavenMainJvmSourceEvidence && !hasMavenRunnableApplicationEvidence) {
+    supportScore += 4;
+    addEvidence6(evidence, "Maven deploy-skipped artifact without runtime source");
+  }
   if (hasMavenBomEvidence) {
     supportScore += 5;
     addEvidence6(evidence, "Maven BOM/dependency-management module without runtime source");
@@ -246572,6 +247394,10 @@ function classifyGovernanceRole(input2) {
     supportScore += 4;
     addEvidence6(evidence, "Maven starter/resource artifact without JVM runtime source");
   }
+  if (hasMavenDistributionPackagingEvidence) {
+    supportScore += 4;
+    addEvidence6(evidence, "Maven distribution/release packaging without runtime source");
+  }
   if (isPlainResourcesSurface) {
     supportScore += 4;
     addEvidence6(evidence, "Resources-only surface without runtime source or manifest evidence");
@@ -246594,7 +247420,7 @@ function classifyGovernanceRole(input2) {
     supportScore += 3;
     addEvidence6(evidence, "Maven documentation/build/distribution packaging evidence without runtime source");
   }
-  if (supportScore >= 3 && supportScore > runtimeScore || hasStrongSupportPath && supportScore >= 2 && runtimeScore <= 5 || maven?.packaging === "maven-plugin" && input2.candidate.path !== "." && supportScore >= 5 || maven && supportScore >= 5 && !hasMavenMainSource || maven && supportScore >= 4 && hasMavenTestContext || maven && supportScore >= 4 && hasMavenDistributionPackagingEvidence && hasAnyToken(mavenMetadataText, [/\b(docs?|documentation|metadata tests?|licenses?|maven plugins?|builds?)\b/u])) {
+  if (supportScore >= 3 && supportScore > runtimeScore || hasStrongSupportPath && supportScore >= 2 && runtimeScore <= 5 || maven?.packaging === "maven-plugin" && input2.candidate.path !== "." && supportScore >= 5 || maven && supportScore >= 5 && !hasMavenMainJvmSourceEvidence && !hasMavenRunnableApplicationEvidence || maven && supportScore >= 4 && maven.hasDeploySkipConfiguration && !hasMavenMainJvmSourceEvidence && !hasMavenRunnableApplicationEvidence || maven && supportScore >= 4 && hasStrongSupportPath && !hasMavenMainJvmSourceEvidence && !hasMavenRunnableApplicationEvidence || maven && supportScore >= 4 && hasMavenTestContext || maven && supportScore >= 4 && hasMavenDistributionPackagingEvidence && hasAnyToken(mavenMetadataText, [/\b(docs?|documentation|metadata tests?|licenses?|maven plugins?|builds?)\b/u])) {
     return {
       governanceRole: "support",
       governanceEvidence: uniqueSorted4(evidence),
@@ -246672,7 +247498,7 @@ function detectComponents(input2) {
     }
     const localProjectKinds = input2.runContext?.detectProjectKinds(absoluteRoot) ?? detectProjectKinds(absoluteRoot);
     const stackDetection = input2.runContext?.detectStacks(absoluteRoot) ?? detectStacks(absoluteRoot);
-    const kind = resolveKind(input2.workspaceRoot, candidate, localProjectKinds);
+    const kind = resolveKind2(input2.workspaceRoot, candidate, localProjectKinds);
     const stack = resolveStack(kind, stackDetection);
     const evidence = [...candidate.evidence];
     if (candidate.architectureRoot?.classification && candidate.architectureRoot.classification !== "unknown") {
@@ -249938,7 +250764,30 @@ async function runStandardValidationWorkflowForWorkspace(input2) {
     "Loading governance baseline",
     () => readGovernanceBaseline(input2.workspaceRoot)
   );
-  const baselineComparison = compareWithGovernanceBaseline(reviewSummary, governanceBaseline);
+  applyCanonicalValidationSummary(reviewSummary, runResult.status.summary);
+  let effectiveGovernanceBaseline = governanceBaseline;
+  let initialGovernanceBaselinePath;
+  if (governanceBaseline.kind === "missing" && !input2.ciMode) {
+    const baseline = buildGovernanceBaselineFromReviewSummary(reviewSummary);
+    initialGovernanceBaselinePath = await phase(
+      "Creating initial governance baseline",
+      () => writeGovernanceBaseline(input2.workspaceRoot, baseline)
+    );
+    effectiveGovernanceBaseline = {
+      kind: "ok",
+      baseline,
+      baselinePath: initialGovernanceBaselinePath
+    };
+    emitOperationalMessage(
+      input2.onOperationalMessage,
+      "info",
+      "Governance baseline created from initial validation. Future validations will highlight new architecture regressions."
+    );
+  }
+  const baselineComparison = compareWithGovernanceBaseline(
+    reviewSummary,
+    effectiveGovernanceBaseline
+  );
   reviewSummary.enforcement = buildEnforcementResult(
     reviewSummary.risk,
     riskPolicyLoad.config,
@@ -249959,7 +250808,6 @@ async function runStandardValidationWorkflowForWorkspace(input2) {
     })
   );
   reviewSummary.baselineComparison = baselineComparison;
-  applyCanonicalValidationSummary(reviewSummary, runResult.status.summary);
   let baselineComparisonPath;
   try {
     baselineComparisonPath = await writeBaselineComparisonReport(
@@ -250024,6 +250872,7 @@ async function runStandardValidationWorkflowForWorkspace(input2) {
     impactAnalysisPath,
     baselineComparison,
     ...baselineComparisonPath ? { baselineComparisonPath } : {},
+    ...initialGovernanceBaselinePath ? { initialGovernanceBaselinePath } : {},
     ...prCommentPath ? { prCommentPath } : {}
   };
 }
@@ -250209,6 +251058,7 @@ function parseValidateFlags(args) {
     json: args.includes("--json"),
     changed: args.includes("--changed"),
     diff: args.includes("--diff"),
+    regressions: args.includes("--regressions"),
     base: base.length > 0 ? base : "main"
   };
 }
@@ -250255,8 +251105,8 @@ function readFlagValue(args, flag) {
   return value && value.length > 0 ? value : void 0;
 }
 async function readCliPackageVersion() {
-  if ("0.2.5".trim().length > 0) {
-    return "0.2.5".trim();
+  if ("0.2.7".trim().length > 0) {
+    return "0.2.7".trim();
   }
   const candidatePackageJsonPaths = [
     path73.join(__dirname, "..", "package.json"),
@@ -250313,7 +251163,7 @@ function printUsage() {
   console.error("Usage: archpilot init [--yes]");
   console.error("       archpilot init refresh --preview");
   console.error("       archpilot init refresh --apply");
-  console.error("Usage: archpilot validate [--ci] [--json] [--changed] [--diff] [--base <branch>]");
+  console.error("Usage: archpilot validate [--ci] [--json] [--regressions] [--changed] [--diff] [--base <branch>]");
   console.error("       archpilot impact <file-or-module> [--json] [--stdout] [--module] [--force]");
   console.error("       archpilot fix <RULE_ID>");
   console.error("       archpilot fix");
@@ -250400,11 +251250,12 @@ var cliHelpTopics = [
   {
     commandPath: ["validate"],
     lines: [
-      "Usage: archpilot validate [--ci] [--json] [--changed] [--diff] [--base <branch>]",
+      "Usage: archpilot validate [--ci] [--json] [--regressions] [--changed] [--diff] [--base <branch>]",
       "",
       "Options:",
       "  --ci                  CI mode",
       "  --json                JSON output",
+      "  --regressions         show findings introduced or resolved since the governance baseline",
       "  --changed             validate changed files only",
       "  --diff                compare with baseline",
       "  --base <branch>       compare against branch"
@@ -252481,12 +253332,136 @@ function applyCanonicalValidationSummary2(reviewSummary, validationSummary) {
   reviewSummary.guidanceFindings = validationSummary.guidanceFindings;
   reviewSummary.qualityFindings = validationSummary.qualityFindings;
 }
+function getRegressionComparisonUnavailableReason(comparison) {
+  if (comparison.baselineAvailable) {
+    return void 0;
+  }
+  return comparison.summary.startsWith("Baseline unavailable:") ? "INVALID_BASELINE" : "NO_BASELINE";
+}
+function formatRegressionFindingLine2(finding) {
+  const location = finding.module && finding.target ? `${finding.module} -> ${finding.target}` : finding.module ?? finding.target ?? finding.sourceFile ?? finding.filePath ?? finding.table ?? finding.api;
+  const header = `${finding.id}  ${finding.severity}`;
+  return [
+    location ? `${header}
+${location}` : header,
+    finding.message
+  ].join("\n");
+}
+function renderRegressionFindingSection(title, findings) {
+  const lines = [];
+  lines.push(title);
+  lines.push("-".repeat(title.length));
+  lines.push("");
+  if (findings.length === 0) {
+    lines.push("- (none)");
+    return lines;
+  }
+  for (const finding of findings) {
+    lines.push(formatRegressionFindingLine2(finding));
+    lines.push("");
+  }
+  while (lines.at(-1) === "") {
+    lines.pop();
+  }
+  return lines;
+}
+function renderValidationRegressionConsole(comparison) {
+  const unavailableReason = getRegressionComparisonUnavailableReason(comparison);
+  const lines = [];
+  lines.push("Regression Summary");
+  lines.push("------------------");
+  if (unavailableReason) {
+    lines.push("Regression comparison unavailable.");
+    lines.push("");
+    if (unavailableReason === "NO_BASELINE") {
+      lines.push("No governance baseline was found.");
+      lines.push("");
+      lines.push("Create a governance baseline first:");
+      lines.push("  archpilot baseline refresh");
+    } else {
+      lines.push(comparison.summary);
+    }
+    return `${lines.join("\n")}
+`;
+  }
+  lines.push(`Introduced: ${comparison.newlyIntroducedFindings.length}`);
+  lines.push(`Resolved:   ${comparison.resolvedFindings.length}`);
+  lines.push(`Existing:   ${comparison.unchangedFindings.length}`);
+  lines.push("");
+  if (comparison.newlyIntroducedFindings.length === 0) {
+    lines.push("No new architecture regressions detected.");
+  } else {
+    lines.push(
+      ...renderRegressionFindingSection(
+        "Introduced architecture findings",
+        comparison.newlyIntroducedFindings
+      )
+    );
+  }
+  if (comparison.resolvedFindings.length > 0) {
+    lines.push("");
+    lines.push(...renderRegressionFindingSection("Resolved", comparison.resolvedFindings));
+  }
+  return `${lines.join("\n").trimEnd()}
+`;
+}
+function buildRegressionComparisonJson(comparison) {
+  const unavailableReason = getRegressionComparisonUnavailableReason(comparison);
+  if (unavailableReason) {
+    return {
+      available: false,
+      reason: unavailableReason,
+      introducedCount: 0,
+      resolvedCount: 0,
+      existingCount: 0,
+      introduced: [],
+      resolved: []
+    };
+  }
+  return {
+    available: true,
+    introducedCount: comparison.newlyIntroducedFindings.length,
+    resolvedCount: comparison.resolvedFindings.length,
+    existingCount: comparison.unchangedFindings.length,
+    introduced: comparison.newlyIntroducedFindings,
+    resolved: comparison.resolvedFindings
+  };
+}
+function buildScopedRegressionComparisonUnavailable(summary, scopeMode) {
+  return {
+    reportVersion: 1,
+    baselineAvailable: false,
+    status: "NO_BASELINE",
+    summary: `Regression comparison unavailable for ${scopeMode} validation scope. Full governance baselines cannot be compared safely against scoped current findings.`,
+    current: {
+      projectName: summary.projectName,
+      generatedAtUtc: summary.generatedAtUtc,
+      healthScore: summary.healthScore,
+      readinessScore: summary.readinessScore
+    },
+    deltas: {
+      healthScoreDelta: 0,
+      readinessScoreDelta: 0,
+      errorDelta: 0,
+      warningDelta: 0,
+      findingDelta: 0,
+      remainingViolationsDelta: 0
+    },
+    newlyIntroducedFindings: [],
+    resolvedFindings: [],
+    unchangedFindings: []
+  };
+}
 async function runValidateCommand(args) {
   const flags = parseValidateFlags(args);
   if (flags.changed && flags.diff) {
     console.error("Choose one scope mode: --changed or --diff.");
     return 1;
   }
+  if (flags.regressions && (flags.changed || flags.diff)) {
+    console.error("--regressions cannot currently be combined with --changed/--diff.");
+    return 1;
+  }
   if (args.includes("--base") && !flags.diff) {
     console.error("--base can only be used with --diff.");
     return 1;
@@ -252643,8 +253618,7 @@ async function runValidateCommand(args) {
         }
       }
     });
-    const governanceBaseline = await readGovernanceBaseline(workspaceRoot);
-    baselineComparison = compareWithGovernanceBaseline(reviewSummary, governanceBaseline);
+    baselineComparison = buildScopedRegressionComparisonUnavailable(reviewSummary, scopeMode);
     reviewSummary.enforcement = buildEnforcementResult2(
       reviewSummary.risk,
       riskPolicyLoad.config,
@@ -252743,6 +253717,7 @@ async function runValidateCommand(args) {
           impactAnalysis: reviewSummary.impactAnalysis,
           impactAnalysisPath: toWorkspaceRelativePath(workspaceRoot, impactAnalysisPath),
           baselineComparison,
+          ...flags.regressions ? { regressionComparison: buildRegressionComparisonJson(baselineComparison) } : {},
           ...baselineComparisonPath ? {
             baselineComparisonPath: toWorkspaceRelativePath(
               workspaceRoot,
@@ -252787,24 +253762,36 @@ async function runValidateCommand(args) {
 `
       );
     }
-    process.stdout.write(
-      renderArchitectureReviewConsole(reviewSummary, {
-        ...reportArtifacts.reportWriteError ? { reportWriteError: reportArtifacts.reportWriteError } : {
-          reportPaths: {
-            markdownPath: reportArtifacts.reviewMarkdownPath,
-            jsonPath: reportArtifacts.reviewJsonPath,
-            compactMarkdownPath: reportArtifacts.reviewCompactMarkdownPath
-          }
-        },
-        remediation,
-        discoveredAdrs,
-        healthTrend: runResult.status.summary.healthTrend,
-        driftComparison: runResult.status.driftComparison,
-        adrSummary: runResult.status.adrSummary,
-        suppressionSummary: runResult.status.suppressionSummary,
-        baselineComparison
-      })
-    );
+    if (flags.regressions) {
+      process.stdout.write("ArchPilot Architecture Review\n\n");
+      process.stdout.write(`Architecture Health Score: ${reviewSummary.healthScore} / 100
+`);
+      process.stdout.write(`Setup Readiness Score: ${reviewSummary.readinessScore} / 100
+`);
+      process.stdout.write(`Current findings: ${reviewSummary.findings.length}
+
+`);
+      process.stdout.write(renderValidationRegressionConsole(baselineComparison));
+    } else {
+      process.stdout.write(
+        renderArchitectureReviewConsole(reviewSummary, {
+          ...reportArtifacts.reportWriteError ? { reportWriteError: reportArtifacts.reportWriteError } : {
+            reportPaths: {
+              markdownPath: reportArtifacts.reviewMarkdownPath,
+              jsonPath: reportArtifacts.reviewJsonPath,
+              compactMarkdownPath: reportArtifacts.reviewCompactMarkdownPath
+            }
+          },
+          remediation,
+          discoveredAdrs,
+          healthTrend: runResult.status.summary.healthTrend,
+          driftComparison: runResult.status.driftComparison,
+          adrSummary: runResult.status.adrSummary,
+          suppressionSummary: runResult.status.suppressionSummary,
+          baselineComparison
+        })
+      );
+    }
     process.stdout.write("\n");
     process.stdout.write(renderSetupNextStepsConsole(nextSteps));
     process.stdout.write(`${setupNextStepsReportPointerLine}