@topogram/cli 0.3.76 → 0.3.78

package/src/import/extractors/db/flutter-entities.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -82,7 +82,7 @@ export const flutterEntitiesExtractor = {
   id: "db.flutter-entities",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/domain\/entities\/.+_entity\.dart$/i.test(filePath)
     );
@@ -93,7 +93,7 @@ export const flutterEntitiesExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/domain\/entities\/.+_entity\.dart$/i.test(filePath)
     );

package/src/import/extractors/db/jpa.js

@@ -1,4 +1,4 @@
-import { canonicalCandidateTerm, dedupeCandidateRecords, findImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase } from "../../core/shared.js";
+import { canonicalCandidateTerm, dedupeCandidateRecords, findPrimaryImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase } from "../../core/shared.js";
 
 function extractAnnotatedFields(text) {
   const fields = [];
@@ -44,7 +44,7 @@ export const jpaExtractor = {
   id: "db.jpa",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const count = entityFiles.filter((filePath) => /@Entity\b/.test(context.helpers.readTextIfExists(filePath) || "")).length;
     return {
       score: count > 0 ? 87 : 0,
@@ -52,7 +52,7 @@ export const jpaExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/liquibase.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -109,14 +109,14 @@ export const liquibaseExtractor = {
   id: "db.liquibase",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.(xml|ya?ml)$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.(xml|ya?ml)$/i.test(filePath));
     return {
       score: files.length > 0 ? 88 : 0,
       reasons: files.length > 0 ? ["Found Liquibase changelog files"] : []
     };
   },
   extract(context) {
-    const changelogFiles = findImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.xml$/i.test(filePath));
+    const changelogFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.xml$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/maintained-seams.js

@@ -2,7 +2,7 @@
 
 import path from "node:path";
 
-import { findImportFiles, makeCandidateRecord, relativeTo } from "../../core/shared.js";
+import { findPrimaryImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo } from "../../core/shared.js";
 
 /** @param {string} value @returns {string} */
 function toPosix(value) {
@@ -86,6 +86,13 @@ function maintainedDbSeamCandidate(context, options) {
     ...(options.migrationsPath ? { migrationsPath: options.migrationsPath } : {})
   };
   const idHint = `seam_${options.tool}_db_migrations`;
+  const manualNextSteps = [
+    "Review evidence, match_reasons, and missing_decisions before accepting this seam.",
+    `Confirm database runtime '${runtimeId}' and projection '${projectionId}' are the right topology targets for the maintained app.`,
+    "If accepted, copy proposed_runtime_migration into the matching database runtime's migration block in topogram.project.json.",
+    "Keep ownership 'maintained' and apply 'never'; import must not apply migrations or patch maintained app files.",
+    "After editing topogram.project.json, run topogram check . --json and the maintained app's migration verification."
+  ];
 
   return makeCandidateRecord({
     kind: "maintained_db_migration_seam",
@@ -112,6 +119,13 @@ function maintainedDbSeamCandidate(context, options) {
     match_reasons: options.matchReasons,
     missing_decisions: options.missingDecisions,
     proposed_runtime_migration: proposedRuntimeMigration,
+    manual_next_steps: manualNextSteps,
+    project_config_target: {
+      file: "topogram.project.json",
+      path: `topology.runtimes[id=${runtimeId}].migration`,
+      runtime_id: runtimeId,
+      projection_id: projectionId
+    },
     maintained_modules: [options.schemaPath, options.migrationsPath].filter(Boolean),
     emitted_dependencies: [snapshotPath, projectionId],
     allowed_change_classes: ["proposal_only"],
@@ -125,7 +139,10 @@ export function inferPrismaMaintainedDbSeams(context, prismaFiles) {
     return [];
   }
   const schemaPath = appRelativePath(context, prismaFiles[0]);
-  const migrationFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) => toPosix(filePath).includes("/prisma/migrations/")));
+  const migrationFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+    toPosix(filePath).includes("/prisma/migrations/") &&
+    isPrimaryImportSource(context.paths, filePath)
+  ));
   const migrationsPath = firstMarkedDirectory(context, migrationFiles, [["prisma", "migrations"]]);
   return [
     maintainedDbSeamCandidate(context, {
@@ -150,8 +167,14 @@ export function inferDrizzleMaintainedDbSeams(context, schemaFiles) {
   if (!schemaFiles.length) {
     return [];
   }
-  const configFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) => /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath))));
-  const drizzleFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) => appRelativePath(context, filePath).startsWith("drizzle/")));
+  const configFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+    /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath)) &&
+    isPrimaryImportSource(context.paths, filePath)
+  ));
+  const drizzleFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+    appRelativePath(context, filePath).startsWith("drizzle/") &&
+    isPrimaryImportSource(context.paths, filePath)
+  ));
   const configuredOutPath = drizzleOutPathFromConfig(context, configFiles);
   const migrationsPath = configuredOutPath ||
     firstMarkedDirectory(context, drizzleFiles, [["drizzle"]]);

package/src/import/extractors/db/mybatis-xml.js

@@ -1,4 +1,4 @@
-import { dedupeCandidateRecords, findImportFiles, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify, canonicalCandidateTerm } from "../../core/shared.js";
+import { dedupeCandidateRecords, findPrimaryImportFiles, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify, canonicalCandidateTerm } from "../../core/shared.js";
 import { parseSqlSchema } from "./sql.js";
 
 function classifyNoiseEntity(tableName, fields) {
@@ -36,15 +36,15 @@ export const myBatisXmlExtractor = {
   id: "db.mybatis-xml",
   track: "db",
   detect(context) {
-    const mapperFiles = findImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
+    const mapperFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
     return {
       score: mapperFiles.length > 0 ? 86 : 0,
       reasons: mapperFiles.length > 0 ? ["Found MyBatis mapper XML files"] : []
     };
   },
   extract(context) {
-    const mapperFiles = findImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
-    const allSqlFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
+    const mapperFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
+    const allSqlFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
     const schemaSqlFiles = allSqlFiles.filter((filePath) => !/\/src\/test\//i.test(filePath));
     const sqlFiles = selectPreferredImportFiles(context.paths, schemaSqlFiles, "sql");
     const findings = [];

package/src/import/extractors/db/prisma.js

@@ -1,5 +1,6 @@
 import {
-  findImportFiles,
+  findPrimaryImportFiles,
+  isPrimaryImportSource,
   makeCandidateRecord,
   normalizePrismaType,
   relativeTo,
@@ -113,7 +114,10 @@ export const prismaExtractor = {
   id: "db.prisma",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma"));
+    const files = findPrimaryImportFiles(context.paths, (filePath) =>
+      (filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma")) &&
+      isPrimaryImportSource(context.paths, filePath)
+    );
     return {
       score: files.length > 0 ? 100 : 0,
       reasons: files.length > 0 ? ["Found Prisma schema"] : []
@@ -122,7 +126,10 @@ export const prismaExtractor = {
   extract(context) {
     const prismaFiles = selectPreferredImportFiles(
       context.paths,
-      findImportFiles(context.paths, (filePath) => filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma")),
+      findPrimaryImportFiles(context.paths, (filePath) =>
+        (filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma")) &&
+        isPrimaryImportSource(context.paths, filePath)
+      ),
       "prisma"
     );
     const findings = [];

package/src/import/extractors/db/rails-schema.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -107,14 +107,14 @@ export const railsSchemaExtractor = {
   id: "db.rails-schema",
   track: "db",
   detect(context) {
-    const schemaFiles = findImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
+    const schemaFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
     return {
       score: schemaFiles.length > 0 ? 92 : 0,
       reasons: schemaFiles.length > 0 ? ["Found Rails schema.rb"] : []
     };
   },
   extract(context) {
-    const schemaFiles = findImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
+    const schemaFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/react-native-entities.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -60,7 +60,7 @@ export const reactNativeEntitiesExtractor = {
   id: "db.react-native-entities",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/domain\/entities\/.+Entity\.ts$/i.test(filePath)
     );
@@ -71,7 +71,7 @@ export const reactNativeEntitiesExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/domain\/entities\/.+Entity\.ts$/i.test(filePath)
     );

package/src/import/extractors/db/room.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -151,8 +151,8 @@ export const roomExtractor = {
   id: "db.room",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
-    const daoFiles = findImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
+    const daoFiles = findPrimaryImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
     const score = entityFiles.length > 0 && daoFiles.length > 0 ? 89 : 0;
     return {
       score,
@@ -160,8 +160,8 @@ export const roomExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
-    const daoFiles = findImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
+    const daoFiles = findPrimaryImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/snapshot.js

@@ -1,4 +1,4 @@
-import { findImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase, idHintify } from "../../core/shared.js";
+import { findPrimaryImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase, idHintify } from "../../core/shared.js";
 
 function parseDbSchemaSnapshot(snapshot) {
   return {
@@ -42,14 +42,14 @@ export const snapshotExtractor = {
   id: "db.snapshot",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
     return {
       score: files.length > 0 ? 40 : 0,
       reasons: files.length > 0 ? ["Found DB schema snapshot artifacts"] : []
     };
   },
   extract(context) {
-    const snapshotFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
+    const snapshotFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
     for (const filePath of snapshotFiles) {

package/src/import/extractors/db/sql.js

@@ -1,4 +1,4 @@
-import { canonicalCandidateTerm, findImportFiles, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify } from "../../core/shared.js";
+import { canonicalCandidateTerm, findPrimaryImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify } from "../../core/shared.js";
 import { inferSqlMaintainedDbSeams } from "./maintained-seams.js";
 
 function parseTableConstraint(line, tableName) {
@@ -105,14 +105,14 @@ export const sqlExtractor = {
   id: "db.sql",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
     return {
       score: files.length > 0 ? 80 : 0,
       reasons: files.length > 0 ? ["Found SQL schema or migration files"] : []
     };
   },
   extract(context) {
-    const allSqlFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
+    const allSqlFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
     const schemaSqlFiles = allSqlFiles.filter((filePath) => !/migration/i.test(filePath) && !/\/src\/test\//i.test(filePath));
     const migrationSqlFiles = allSqlFiles.filter((filePath) => /migration/i.test(filePath));
     const sqlFiles =

package/src/import/extractors/db/swiftdata.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -106,7 +106,7 @@ export const swiftDataExtractor = {
   id: "db.swiftdata",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
       .filter((filePath) => /@Model/.test(context.helpers.readTextIfExists(filePath) || ""));
     return {
       score: files.length > 0 ? 86 : 0,
@@ -114,7 +114,7 @@ export const swiftDataExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
       .filter((filePath) => /@Model/.test(context.helpers.readTextIfExists(filePath) || ""));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };

package/src/import/extractors/ui/android-compose.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -85,7 +85,7 @@ export const androidComposeUiExtractor = {
   id: "ui.android-compose",
   track: "ui",
   detect(context) {
-    const composeFiles = findImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
+    const composeFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
       .filter((filePath) => /@Composable/.test(context.helpers.readTextIfExists(filePath) || ""));
     const score = composeFiles.length > 0 ? 84 : 0;
     return {
@@ -94,8 +94,8 @@ export const androidComposeUiExtractor = {
     };
   },
   extract(context) {
-    const navFiles = findImportFiles(context.paths, (filePath) => /NavHost\.kt$/i.test(filePath) || /navigation\/.+\.kt$/i.test(filePath));
-    const composeFiles = findImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
+    const navFiles = findPrimaryImportFiles(context.paths, (filePath) => /NavHost\.kt$/i.test(filePath) || /navigation\/.+\.kt$/i.test(filePath));
+    const composeFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
       .filter((filePath) => /@Composable/.test(context.helpers.readTextIfExists(filePath) || ""));
     const findings = [];
     const candidates = { screens: [], routes: [], actions: [], stacks: [] };

package/src/import/extractors/ui/backend-only.js

@@ -1,9 +1,9 @@
 import path from "node:path";
 
-import { findImportFiles, relativeTo } from "../../core/shared.js";
+import { findPrimaryImportFiles, relativeTo } from "../../core/shared.js";
 
 function readPackageJson(context) {
-  const packageFile = findImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
+  const packageFile = findPrimaryImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
   if (!packageFile) return null;
   try {
     return {
@@ -24,7 +24,7 @@ function hasFrontendSignals(context) {
   if (deps.react || deps.next || deps["@remix-run/react"] || deps["@sveltejs/kit"] || deps.svelte || deps.vue || deps.nuxt) {
     return true;
   }
-  const uiFiles = findImportFiles(
+  const uiFiles = findPrimaryImportFiles(
     context.paths,
     (filePath) =>
       /(app\/.+\/page\.(tsx|ts|jsx|js|mdx)|src\/App\.tsx|src\/routes\/.+\.(svelte|tsx|jsx)|pages\/.+\.(tsx|ts|jsx|js))$/i.test(filePath)

package/src/import/extractors/ui/blazor.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -98,7 +98,7 @@ export const blazorUiExtractor = {
   id: "ui.blazor",
   track: "ui",
   detect(context) {
-    const razorFiles = findImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
+    const razorFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
       .filter((filePath) => !shouldIgnoreFile(filePath));
     const score = razorFiles.length > 0 ? 86 : 0;
     return {
@@ -107,7 +107,7 @@ export const blazorUiExtractor = {
     };
   },
   extract(context) {
-    const razorFiles = findImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
+    const razorFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
       .filter((filePath) => !shouldIgnoreFile(filePath));
     const findings = [];
     const candidates = { screens: [], routes: [], actions: [], stacks: [] };

package/src/import/extractors/ui/flutter-screens.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -110,7 +110,7 @@ export const flutterScreensUiExtractor = {
   id: "ui.flutter-screens",
   track: "ui",
   detect(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/presentation\/screens\/.+_screen\.dart$/i.test(filePath)
     );
@@ -121,7 +121,7 @@ export const flutterScreensUiExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/presentation\/screens\/.+_screen\.dart$/i.test(filePath)
     );

package/src/import/extractors/ui/maui-xaml.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -54,7 +54,7 @@ export const mauiXamlUiExtractor = {
   id: "ui.maui-xaml",
   track: "ui",
   detect(context) {
-    const xamlFiles = findImportFiles(context.paths, (filePath) => /\.xaml$/i.test(filePath));
+    const xamlFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.xaml$/i.test(filePath));
     const score = xamlFiles.some((filePath) => /ContentPage|Shell/.test(context.helpers.readTextIfExists(filePath) || "")) ? 82 : 0;
     return {
       score,
@@ -62,8 +62,8 @@ export const mauiXamlUiExtractor = {
     };
   },
   extract(context) {
-    const shellFiles = findImportFiles(context.paths, (filePath) => /AppShell\.xaml$/i.test(filePath));
-    const viewFiles = findImportFiles(context.paths, (filePath) => /\/Views\/.+\.xaml$/i.test(filePath));
+    const shellFiles = findPrimaryImportFiles(context.paths, (filePath) => /AppShell\.xaml$/i.test(filePath));
+    const viewFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/Views\/.+\.xaml$/i.test(filePath));
     const findings = [];
     const candidates = { screens: [], routes: [], actions: [], stacks: [] };
     const shellEntries = shellFiles.flatMap((filePath) => parseShellContent(context.helpers.readTextIfExists(filePath) || ""));

package/src/import/extractors/ui/next-app-router.js

@@ -1,4 +1,4 @@
-import { dedupeCandidateRecords, inferNextAppRoutes, makeCandidateRecord, nextScreenIdForRoute, nextScreenKindForRoute, uiCapabilityHintsForNextRoute, entityIdForNextRoute, conceptIdForNextRoute, relativeTo, titleCase, idHintify } from "../../core/shared.js";
+import { dedupeCandidateRecords, inferNextAppRoutes, inferNonResourceUiFlow, makeCandidateRecord, nextScreenIdForRoute, nextScreenKindForRoute, proposedUiContractAdditionsForFlow, uiCapabilityHintsForNextRoute, entityIdForNextRoute, conceptIdForNextRoute, relativeTo, titleCase, idHintify, uiFlowIdForRoute } from "../../core/shared.js";
 
 export const nextAppRouterUiExtractor = {
   id: "ui.next-app-router",
@@ -13,7 +13,7 @@ export const nextAppRouterUiExtractor = {
   extract(context) {
     const routes = inferNextAppRoutes(context.paths.workspaceRoot, context.helpers);
     const findings = [];
-    const candidates = { screens: [], routes: [], actions: [], stacks: [] };
+    const candidates = { screens: [], routes: [], actions: [], flows: [], stacks: [] };
     if (routes.length > 0) {
       findings.push({
         kind: "next_app_routes",
@@ -26,9 +26,10 @@ export const nextAppRouterUiExtractor = {
         const provenance = `${relativeTo(context.paths.repoRoot, route.file)}#${route.path}`;
         const screenId = nextScreenIdForRoute(route.path);
         const screenKind = nextScreenKindForRoute(route.path);
-        const capabilityHints = uiCapabilityHintsForNextRoute(route.path);
-        const entityId = entityIdForNextRoute(route.path);
-        const conceptId = conceptIdForNextRoute(route.path);
+        const flow = inferNonResourceUiFlow(route.path);
+        const capabilityHints = flow ? { load: null, submit: null, primary_action: null } : uiCapabilityHintsForNextRoute(route.path);
+        const entityId = flow ? null : entityIdForNextRoute(route.path);
+        const conceptId = flow?.concept_id || conceptIdForNextRoute(route.path);
         candidates.screens.push(makeCandidateRecord({
           kind: "screen",
           idHint: screenId,
@@ -56,6 +57,25 @@ export const nextAppRouterUiExtractor = {
           concept_id: conceptId,
           path: route.path
         }));
+        if (flow) {
+          candidates.flows.push(makeCandidateRecord({
+            kind: "ui_flow",
+            idHint: uiFlowIdForRoute(route.path, screenId),
+            label: `${titleCase(flow.flow_type)} Flow`,
+            confidence: flow.confidence,
+            sourceKind: "route_code",
+            sourceOfTruth: "candidate",
+            provenance,
+            track: "ui",
+            flow_type: flow.flow_type,
+            concept_id: flow.concept_id,
+            screen_ids: [screenId],
+            route_paths: [route.path],
+            evidence: [provenance],
+            missing_decisions: flow.missing_decisions,
+            proposed_ui_contract_additions: proposedUiContractAdditionsForFlow(route.path, screenId, screenKind)
+          }));
+        }
         if (capabilityHints.primary_action) {
           candidates.actions.push(makeCandidateRecord({
             kind: "ui_action",
@@ -77,6 +97,7 @@ export const nextAppRouterUiExtractor = {
     candidates.screens = dedupeCandidateRecords(candidates.screens, (record) => record.id_hint);
     candidates.routes = dedupeCandidateRecords(candidates.routes, (record) => record.id_hint);
     candidates.actions = dedupeCandidateRecords(candidates.actions, (record) => record.id_hint);
+    candidates.flows = dedupeCandidateRecords(candidates.flows, (record) => record.id_hint);
     candidates.stacks = [...new Set(candidates.stacks)].sort();
     return { findings, candidates };
   }