@living-architecture/riviere-cli 0.9.21 → 0.9.22

package/dist/bin.js

@@ -24704,7 +24704,7 @@ function failure13(code, message) {
   };
 }
 
-// src/features/builder/entrypoint/add-component.ts
+// src/features/builder/entrypoint/add-component/entrypoint.ts
 import { Command } from "commander";
 
 // src/platform/infra/cli/presentation/error-codes.ts
@@ -24785,7 +24785,7 @@ function withParsedLineNumber(lineNumber) {
   return lineNumber === void 0 ? {} : { lineNumber: Number.parseInt(lineNumber, 10) };
 }
 
-// src/features/builder/entrypoint/add-component.ts
+// src/features/builder/entrypoint/add-component/entrypoint.ts
 function createAddComponentCommand(addComponent) {
   return new Command("add-component").description("Add a component to the graph").requiredOption(
     "--type <type>",
@@ -24819,7 +24819,7 @@ var CLI_ERROR_CODES = {
   DUPLICATE_COMPONENT: "DUPLICATE_COMPONENT" /* DuplicateComponent */
 };
 
-// src/features/builder/entrypoint/add-domain.ts
+// src/features/builder/entrypoint/add-domain/entrypoint.ts
 import { Command as Command2 } from "commander";
 
 // src/platform/infra/cli/input/component-types.ts
@@ -24887,7 +24887,7 @@ function isValidLinkType(value) {
   return VALID_LINK_TYPES.some((t) => t === value);
 }
 
-// src/features/builder/entrypoint/add-domain.ts
+// src/features/builder/entrypoint/add-domain/entrypoint.ts
 function createAddDomainCommand(addDomain) {
   return new Command2("add-domain").description("Add a domain to the graph").addHelpText(
     "after",
@@ -24938,7 +24938,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/add-source.ts
+// src/features/builder/entrypoint/add-source/entrypoint.ts
 import { Command as Command3 } from "commander";
 function createAddSourceCommand(addSource) {
   return new Command3("add-source").description("Add a source repository to the graph").addHelpText(
@@ -24971,7 +24971,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/check-consistency.ts
+// src/features/builder/entrypoint/check-consistency/entrypoint.ts
 import { Command as Command4 } from "commander";
 function createCheckConsistencyCommand(checkConsistency) {
   return new Command4("check-consistency").description("Check for structural issues in the graph").addHelpText(
@@ -25008,7 +25008,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/component-checklist.ts
+// src/features/builder/entrypoint/component-checklist/entrypoint.ts
 import { Command as Command5 } from "commander";
 function createComponentChecklistCommand(componentChecklist) {
   return new Command5("component-checklist").description("List components as a checklist for linking/enrichment").addHelpText(
@@ -25061,7 +25061,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/component-summary.ts
+// src/features/builder/entrypoint/component-summary/entrypoint.ts
 import { Command as Command6 } from "commander";
 function createComponentSummaryCommand(componentSummary) {
   return new Command6("component-summary").description("Show component counts by type and domain").addHelpText(
@@ -25089,7 +25089,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/define-custom-type.ts
+// src/features/builder/entrypoint/define-custom-type/entrypoint.ts
 import { Command as Command7 } from "commander";
 
 // src/platform/infra/cli/input/custom-type-parser.ts
@@ -25150,7 +25150,7 @@ function collectOption(value, previous) {
   return [...previous, value];
 }
 
-// src/features/builder/entrypoint/define-custom-type.ts
+// src/features/builder/entrypoint/define-custom-type/entrypoint.ts
 function createDefineCustomTypeCommand(defineCustomType) {
   return new Command7("define-custom-type").description("Define a custom component type").requiredOption("--name <name>", "Custom type name").option("--description <desc>", "Custom type description").option(
     "--required-property <spec>",
@@ -25200,7 +25200,7 @@ function createDefineCustomTypeCommand(defineCustomType) {
   });
 }
 
-// src/features/builder/entrypoint/enrich.ts
+// src/features/builder/entrypoint/enrich/entrypoint.ts
 import { Command as Command8 } from "commander";
 
 // src/platform/infra/cli/input/enrichment-parser.ts
@@ -25299,7 +25299,7 @@ function parseSignature(input) {
   };
 }
 
-// src/features/builder/entrypoint/enrich.ts
+// src/features/builder/entrypoint/enrich/entrypoint.ts
 function createEnrichCommand(enrichComponent) {
   return new Command8("enrich").description(
     "Enrich a DomainOp component with semantic information. Note: Enrichment is additive \u2014 running multiple times accumulates values."
@@ -25371,7 +25371,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/finalize.ts
+// src/features/builder/entrypoint/finalize/entrypoint.ts
 import { Command as Command9 } from "commander";
 import { writeFile } from "node:fs/promises";
 function createFinalizeCommand(finalizeGraph) {
@@ -25404,7 +25404,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/init.ts
+// src/features/builder/entrypoint/init/entrypoint.ts
 import { Command as Command10 } from "commander";
 
 // src/platform/infra/cli/input/domain-input-parser.ts
@@ -25426,7 +25426,7 @@ function parseDomainJson(value, previous) {
   return [...previous, parsed];
 }
 
-// src/features/builder/entrypoint/init.ts
+// src/features/builder/entrypoint/init/entrypoint.ts
 function createInitCommand(initGraph) {
   return new Command10("init").description("Initialize a new graph").addHelpText(
     "after",
@@ -25501,7 +25501,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link.ts
+// src/features/builder/entrypoint/link/entrypoint.ts
 import { Command as Command11 } from "commander";
 
 // src/platform/infra/cli/input/validation.ts
@@ -25551,7 +25551,7 @@ function validateHttpMethod(method) {
   };
 }
 
-// src/features/builder/entrypoint/link.ts
+// src/features/builder/entrypoint/link/entrypoint.ts
 function createLinkCommand(linkComponents) {
   return new Command11("link").description("Link two components").addHelpText(
     "after",
@@ -25609,7 +25609,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link-external.ts
+// src/features/builder/entrypoint/link-external/entrypoint.ts
 import { Command as Command12 } from "commander";
 
 // src/platform/infra/cli/input/link-external-transformer.ts
@@ -25621,7 +25621,7 @@ function buildExternalTarget(options) {
   };
 }
 
-// src/features/builder/entrypoint/link-external.ts
+// src/features/builder/entrypoint/link-external/entrypoint.ts
 function createLinkExternalCommand(linkExternal) {
   return new Command12("link-external").description("Link a component to an external system").addHelpText(
     "after",
@@ -25668,7 +25668,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link-http.ts
+// src/features/builder/entrypoint/link-http/entrypoint.ts
 import { Command as Command13 } from "commander";
 
 // src/platform/infra/cli/input/link-http-validator.ts
@@ -25682,7 +25682,7 @@ function validateOptions(options) {
   return void 0;
 }
 
-// src/features/builder/entrypoint/link-http.ts
+// src/features/builder/entrypoint/link-http/entrypoint.ts
 function createLinkHttpCommand(linkHttp) {
   return new Command13("link-http").description("Find an API by HTTP path and link to a target component").addHelpText(
     "after",
@@ -25736,7 +25736,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/validate.ts
+// src/features/builder/entrypoint/validate/entrypoint.ts
 import { Command as Command14 } from "commander";
 function createValidateCommand(validateGraph3) {
   return new Command14("validate").description("Validate the graph for errors and warnings").addHelpText(
@@ -29765,7 +29765,7 @@ function loadProjectFromInput(extractionProjectRepository, extractDraftComponent
   });
 }
 
-// src/features/extract/entrypoint/extract.ts
+// src/features/extract/entrypoint/extract/entrypoint.ts
 import { Command as Command15 } from "commander";
 
 // src/platform/infra/cli/presentation/exit-with-cli-error.ts
@@ -29824,7 +29824,7 @@ function validateFlagCombinations(options) {
   validateFormatOption(options);
 }
 
-// src/features/extract/commands/create-extract-draft-components-input.ts
+// src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
 function createExtractDraftComponentsInput(options) {
   return {
     allowIncomplete: options.allowIncomplete === true,
@@ -29847,7 +29847,7 @@ function readSourceMode(options) {
   return options.files === void 0 ? "all" : "files";
 }
 
-// src/features/extract/commands/create-enrich-draft-components-input.ts
+// src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
 function createEnrichDraftComponentsInput(options, enrichPath) {
   return {
     allowIncomplete: options.allowIncomplete === true,
@@ -29996,7 +29996,7 @@ function outputResult(data, options) {
   console.log(JSON.stringify(data));
 }
 
-// src/features/extract/infra/cli/output/present-extraction-result.ts
+// src/features/extract/entrypoint/extract/present-extraction-result.ts
 function presentExtractionResult(result, options) {
   if (result.kind === "draftOnly") {
     presentDraftResult(result.components, options);
@@ -30049,7 +30049,7 @@ function createOutputOptions(outputPath) {
   return outputPath === void 0 ? {} : { output: outputPath };
 }
 
-// src/features/extract/entrypoint/extract.ts
+// src/features/extract/entrypoint/extract/entrypoint.ts
 function createExtractCommand(extractDraftComponents, enrichDraftComponents) {
   return new Command15("extract").description("Extract architectural components from source code").requiredOption("--config <path>", "Path to extraction config file").option("--dry-run", "Show component counts per domain without full output").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--no-ts-config", "Skip tsconfig.json auto-discovery (disables full type resolution)").action(
     (options) => {
@@ -30092,14 +30092,48 @@ var RiviereQueryRepository = class {
   }
 };
 
+// src/features/query/queries/query-graph-load-failure.ts
+function toQueryGraphLoadFailure(error48) {
+  if (error48 instanceof GraphNotFoundError) {
+    return {
+      kind: "graphNotFound",
+      message: error48.message
+    };
+  }
+  if (error48 instanceof GraphCorruptedError) {
+    return {
+      kind: "graphCorrupted",
+      message: "Graph file contains invalid JSON"
+    };
+  }
+  return void 0;
+}
+function loadQueryGraph(repository, graphPathOption) {
+  try {
+    return {
+      kind: "loaded",
+      query: repository.load(graphPathOption)
+    };
+  } catch (error48) {
+    const failure14 = toQueryGraphLoadFailure(error48);
+    if (failure14 !== void 0) {
+      return failure14;
+    }
+    throw error48;
+  }
+}
+
 // src/features/query/queries/detect-orphans.ts
 var DetectOrphans = class {
   constructor(repository) {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { orphans: query.detectOrphans() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { orphans: loaded.query.detectOrphans() };
   }
 };
 
@@ -30109,8 +30143,11 @@ var ListComponents = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    const allComponents = query.components();
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    const allComponents = loaded.query.components();
     const filteredByDomain = input.domain === void 0 ? allComponents : allComponents.filter((component) => component.domain === input.domain);
     return {
       components: input.type === void 0 ? filteredByDomain : filteredByDomain.filter((component) => component.type === input.type)
@@ -30124,8 +30161,11 @@ var ListDomains = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { domains: query.domains() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { domains: loaded.query.domains() };
   }
 };
 
@@ -30135,8 +30175,11 @@ var ListEntryPoints = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { entryPoints: query.entryPoints() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { entryPoints: loaded.query.entryPoints() };
   }
 };
 
@@ -30146,8 +30189,11 @@ var SearchComponents = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { components: query.search(input.term) };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { components: loaded.query.search(input.term) };
   }
 };
 
@@ -30157,11 +30203,14 @@ var TraceFlow = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
     try {
       const componentId = parseComponentId(input.componentId);
       return {
-        flow: query.traceFlow(componentId),
+        flow: loaded.query.traceFlow(componentId),
         success: true
       };
     } catch (error48) {
@@ -30169,7 +30218,11 @@ var TraceFlow = class {
         throw error48;
       }
       const parsedId = ComponentId.parse(input.componentId);
-      const matches = findNearMatches(query.components(), { name: parsedId.name() }, { limit: 3 });
+      const matches = findNearMatches(
+        loaded.query.components(),
+        { name: parsedId.name() },
+        { limit: 3 }
+      );
       return {
         message: error48.message,
         success: false,
@@ -30179,22 +30232,13 @@ var TraceFlow = class {
   }
 };
 
-// src/features/query/entrypoint/components.ts
+// src/features/query/entrypoint/components/entrypoint.ts
 import { Command as Command16 } from "commander";
 
-// src/platform/infra/cli/presentation/query-graph-load-error-handler.ts
-function handleQueryGraphLoadError(error48) {
-  if (error48 instanceof GraphNotFoundError) {
-    console.log(JSON.stringify(formatError2("GRAPH_NOT_FOUND" /* GraphNotFound */, error48.message)));
-    return true;
-  }
-  if (error48 instanceof GraphCorruptedError) {
-    console.log(
-      JSON.stringify(formatError2("GRAPH_CORRUPTED" /* GraphCorrupted */, "Graph file contains invalid JSON"))
-    );
-    return true;
-  }
-  return false;
+// src/platform/infra/cli/presentation/query-graph-load-failure-output.ts
+function formatQueryGraphLoadFailure(failure14) {
+  const code = failure14.kind === "graphNotFound" ? "GRAPH_NOT_FOUND" /* GraphNotFound */ : "GRAPH_CORRUPTED" /* GraphCorrupted */;
+  return formatError2(code, failure14.message);
 }
 
 // src/platform/infra/cli/presentation/component-output.ts
@@ -30207,7 +30251,7 @@ function toComponentOutput(component) {
   };
 }
 
-// src/features/query/entrypoint/components.ts
+// src/features/query/entrypoint/components/entrypoint.ts
 function createComponentsCommand(listComponents) {
   return new Command16("components").description("List components with optional filtering").addHelpText(
     "after",
@@ -30228,25 +30272,23 @@ Examples:
       }
       return;
     }
-    try {
-      const result = listComponents.execute({
-        domain: options.domain,
-        graphPathOption: options.graph,
-        type: options.type === void 0 ? void 0 : normalizeToSchemaComponentType(options.type)
-      });
-      const components = result.components.map(toComponentOutput);
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listComponents.execute({
+      domain: options.domain,
+      graphPathOption: options.graph,
+      type: options.type === void 0 ? void 0 : normalizeToSchemaComponentType(options.type)
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    const components = result.components.map(toComponentOutput);
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess({ components })));
     }
   });
 }
 
-// src/features/query/entrypoint/domains.ts
+// src/features/query/entrypoint/domains/entrypoint.ts
 import { Command as Command17 } from "commander";
 function createDomainsCommand(listDomains) {
   return new Command17("domains").description("List domains with component counts").addHelpText(
@@ -30257,20 +30299,18 @@ Examples:
   $ riviere query domains --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = listDomains.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listDomains.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/entry-points.ts
+// src/features/query/entrypoint/entry-points/entrypoint.ts
 import { Command as Command18 } from "commander";
 function createEntryPointsCommand(listEntryPoints) {
   return new Command18("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
@@ -30281,20 +30321,18 @@ Examples:
   $ riviere query entry-points --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = listEntryPoints.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listEntryPoints.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/orphans.ts
+// src/features/query/entrypoint/orphans/entrypoint.ts
 import { Command as Command19 } from "commander";
 function createOrphansCommand(detectOrphans) {
   return new Command19("orphans").description("Find orphan components with no links").addHelpText(
@@ -30305,20 +30343,18 @@ Examples:
   $ riviere query orphans --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = detectOrphans.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = detectOrphans.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/search.ts
+// src/features/query/entrypoint/search/entrypoint.ts
 import { Command as Command20 } from "commander";
 function createSearchCommand(searchComponents2) {
   return new Command20("search").description("Search components by name").addHelpText(
@@ -30329,24 +30365,22 @@ Examples:
   $ riviere query search "place-order" --json
 `
   ).argument("<term>", "Search term").option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (term, options) => {
-    try {
-      const result = searchComponents2.execute({
-        graphPathOption: options.graph,
-        term
-      });
-      const components = result.components.map(toComponentOutput);
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = searchComponents2.execute({
+      graphPathOption: options.graph,
+      term
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    const components = result.components.map(toComponentOutput);
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess({ components })));
     }
   });
 }
 
-// src/features/query/entrypoint/trace.ts
+// src/features/query/entrypoint/trace/entrypoint.ts
 import { Command as Command21 } from "commander";
 function createTraceCommand(traceFlow) {
   return new Command21("trace").description("Trace flow from a component (bidirectional)").addHelpText(
@@ -30357,26 +30391,24 @@ Examples:
   $ riviere query trace "orders:checkout:usecase:placeorder" --json
 `
   ).argument("<componentId>", "Component ID to trace from").option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (componentIdArg, options) => {
-    try {
-      const result = traceFlow.execute({
-        componentId: componentIdArg,
-        graphPathOption: options.graph
-      });
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError2("COMPONENT_NOT_FOUND" /* ComponentNotFound */, result.message, result.suggestions)
-          )
-        );
-        return;
-      }
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result.flow)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = traceFlow.execute({
+      componentId: componentIdArg,
+      graphPathOption: options.graph
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (!result.success) {
+      console.log(
+        JSON.stringify(
+          formatError2("COMPONENT_NOT_FOUND" /* ComponentNotFound */, result.message, result.suggestions)
+        )
+      );
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result.flow)));
     }
   });
 }
@@ -30399,7 +30431,7 @@ function parsePackageJson(pkg) {
 }
 function loadPackageJson() {
   if (true) {
-    return { version: "0.9.20" };
+    return { version: "0.9.21" };
   }
   const require2 = createRequire2(import.meta.url);
   return parsePackageJson(require2("../../package.json"));

package/dist/index.js

@@ -24703,7 +24703,7 @@ function failure13(code, message) {
   };
 }
 
-// src/features/builder/entrypoint/add-component.ts
+// src/features/builder/entrypoint/add-component/entrypoint.ts
 import { Command } from "commander";
 
 // src/platform/infra/cli/presentation/error-codes.ts
@@ -24809,7 +24809,7 @@ function withParsedLineNumber(lineNumber) {
   return lineNumber === void 0 ? {} : { lineNumber: Number.parseInt(lineNumber, 10) };
 }
 
-// src/features/builder/entrypoint/add-component.ts
+// src/features/builder/entrypoint/add-component/entrypoint.ts
 function createAddComponentCommand(addComponent) {
   return new Command("add-component").description("Add a component to the graph").requiredOption(
     "--type <type>",
@@ -24843,7 +24843,7 @@ var CLI_ERROR_CODES = {
   DUPLICATE_COMPONENT: "DUPLICATE_COMPONENT" /* DuplicateComponent */
 };
 
-// src/features/builder/entrypoint/add-domain.ts
+// src/features/builder/entrypoint/add-domain/entrypoint.ts
 import { Command as Command2 } from "commander";
 
 // src/platform/infra/cli/input/component-types.ts
@@ -24911,7 +24911,7 @@ function isValidLinkType(value) {
   return VALID_LINK_TYPES.some((t) => t === value);
 }
 
-// src/features/builder/entrypoint/add-domain.ts
+// src/features/builder/entrypoint/add-domain/entrypoint.ts
 function createAddDomainCommand(addDomain) {
   return new Command2("add-domain").description("Add a domain to the graph").addHelpText(
     "after",
@@ -24962,7 +24962,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/add-source.ts
+// src/features/builder/entrypoint/add-source/entrypoint.ts
 import { Command as Command3 } from "commander";
 function createAddSourceCommand(addSource) {
   return new Command3("add-source").description("Add a source repository to the graph").addHelpText(
@@ -24995,7 +24995,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/check-consistency.ts
+// src/features/builder/entrypoint/check-consistency/entrypoint.ts
 import { Command as Command4 } from "commander";
 function createCheckConsistencyCommand(checkConsistency) {
   return new Command4("check-consistency").description("Check for structural issues in the graph").addHelpText(
@@ -25032,7 +25032,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/component-checklist.ts
+// src/features/builder/entrypoint/component-checklist/entrypoint.ts
 import { Command as Command5 } from "commander";
 function createComponentChecklistCommand(componentChecklist) {
   return new Command5("component-checklist").description("List components as a checklist for linking/enrichment").addHelpText(
@@ -25085,7 +25085,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/component-summary.ts
+// src/features/builder/entrypoint/component-summary/entrypoint.ts
 import { Command as Command6 } from "commander";
 function createComponentSummaryCommand(componentSummary) {
   return new Command6("component-summary").description("Show component counts by type and domain").addHelpText(
@@ -25113,7 +25113,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/define-custom-type.ts
+// src/features/builder/entrypoint/define-custom-type/entrypoint.ts
 import { Command as Command7 } from "commander";
 
 // src/platform/infra/cli/input/custom-type-parser.ts
@@ -25174,7 +25174,7 @@ function collectOption(value, previous) {
   return [...previous, value];
 }
 
-// src/features/builder/entrypoint/define-custom-type.ts
+// src/features/builder/entrypoint/define-custom-type/entrypoint.ts
 function createDefineCustomTypeCommand(defineCustomType) {
   return new Command7("define-custom-type").description("Define a custom component type").requiredOption("--name <name>", "Custom type name").option("--description <desc>", "Custom type description").option(
     "--required-property <spec>",
@@ -25224,7 +25224,7 @@ function createDefineCustomTypeCommand(defineCustomType) {
   });
 }
 
-// src/features/builder/entrypoint/enrich.ts
+// src/features/builder/entrypoint/enrich/entrypoint.ts
 import { Command as Command8 } from "commander";
 
 // src/platform/infra/cli/input/enrichment-parser.ts
@@ -25323,7 +25323,7 @@ function parseSignature(input) {
   };
 }
 
-// src/features/builder/entrypoint/enrich.ts
+// src/features/builder/entrypoint/enrich/entrypoint.ts
 function createEnrichCommand(enrichComponent) {
   return new Command8("enrich").description(
     "Enrich a DomainOp component with semantic information. Note: Enrichment is additive \u2014 running multiple times accumulates values."
@@ -25395,7 +25395,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/finalize.ts
+// src/features/builder/entrypoint/finalize/entrypoint.ts
 import { Command as Command9 } from "commander";
 import { writeFile } from "node:fs/promises";
 function createFinalizeCommand(finalizeGraph) {
@@ -25428,7 +25428,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/init.ts
+// src/features/builder/entrypoint/init/entrypoint.ts
 import { Command as Command10 } from "commander";
 
 // src/platform/infra/cli/input/domain-input-parser.ts
@@ -25450,7 +25450,7 @@ function parseDomainJson(value, previous) {
   return [...previous, parsed];
 }
 
-// src/features/builder/entrypoint/init.ts
+// src/features/builder/entrypoint/init/entrypoint.ts
 function createInitCommand(initGraph) {
   return new Command10("init").description("Initialize a new graph").addHelpText(
     "after",
@@ -25525,7 +25525,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link.ts
+// src/features/builder/entrypoint/link/entrypoint.ts
 import { Command as Command11 } from "commander";
 
 // src/platform/infra/cli/input/validation.ts
@@ -25575,7 +25575,7 @@ function validateHttpMethod(method) {
   };
 }
 
-// src/features/builder/entrypoint/link.ts
+// src/features/builder/entrypoint/link/entrypoint.ts
 function createLinkCommand(linkComponents) {
   return new Command11("link").description("Link two components").addHelpText(
     "after",
@@ -25633,7 +25633,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link-external.ts
+// src/features/builder/entrypoint/link-external/entrypoint.ts
 import { Command as Command12 } from "commander";
 
 // src/platform/infra/cli/input/link-external-transformer.ts
@@ -25645,7 +25645,7 @@ function buildExternalTarget(options) {
   };
 }
 
-// src/features/builder/entrypoint/link-external.ts
+// src/features/builder/entrypoint/link-external/entrypoint.ts
 function createLinkExternalCommand(linkExternal) {
   return new Command12("link-external").description("Link a component to an external system").addHelpText(
     "after",
@@ -25692,7 +25692,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/link-http.ts
+// src/features/builder/entrypoint/link-http/entrypoint.ts
 import { Command as Command13 } from "commander";
 
 // src/platform/infra/cli/input/link-http-validator.ts
@@ -25706,7 +25706,7 @@ function validateOptions(options) {
   return void 0;
 }
 
-// src/features/builder/entrypoint/link-http.ts
+// src/features/builder/entrypoint/link-http/entrypoint.ts
 function createLinkHttpCommand(linkHttp) {
   return new Command13("link-http").description("Find an API by HTTP path and link to a target component").addHelpText(
     "after",
@@ -25760,7 +25760,7 @@ Examples:
   });
 }
 
-// src/features/builder/entrypoint/validate.ts
+// src/features/builder/entrypoint/validate/entrypoint.ts
 import { Command as Command14 } from "commander";
 function createValidateCommand(validateGraph3) {
   return new Command14("validate").description("Validate the graph for errors and warnings").addHelpText(
@@ -29789,7 +29789,7 @@ function loadProjectFromInput(extractionProjectRepository, extractDraftComponent
   });
 }
 
-// src/features/extract/entrypoint/extract.ts
+// src/features/extract/entrypoint/extract/entrypoint.ts
 import { Command as Command15 } from "commander";
 
 // src/platform/infra/cli/presentation/exit-with-cli-error.ts
@@ -29848,7 +29848,7 @@ function validateFlagCombinations(options) {
   validateFormatOption(options);
 }
 
-// src/features/extract/commands/create-extract-draft-components-input.ts
+// src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
 function createExtractDraftComponentsInput(options) {
   return {
     allowIncomplete: options.allowIncomplete === true,
@@ -29871,7 +29871,7 @@ function readSourceMode(options) {
   return options.files === void 0 ? "all" : "files";
 }
 
-// src/features/extract/commands/create-enrich-draft-components-input.ts
+// src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
 function createEnrichDraftComponentsInput(options, enrichPath) {
   return {
     allowIncomplete: options.allowIncomplete === true,
@@ -30020,7 +30020,7 @@ function outputResult(data, options) {
   console.log(JSON.stringify(data));
 }
 
-// src/features/extract/infra/cli/output/present-extraction-result.ts
+// src/features/extract/entrypoint/extract/present-extraction-result.ts
 function presentExtractionResult(result, options) {
   if (result.kind === "draftOnly") {
     presentDraftResult(result.components, options);
@@ -30073,7 +30073,7 @@ function createOutputOptions(outputPath) {
   return outputPath === void 0 ? {} : { output: outputPath };
 }
 
-// src/features/extract/entrypoint/extract.ts
+// src/features/extract/entrypoint/extract/entrypoint.ts
 function createExtractCommand(extractDraftComponents, enrichDraftComponents) {
   return new Command15("extract").description("Extract architectural components from source code").requiredOption("--config <path>", "Path to extraction config file").option("--dry-run", "Show component counts per domain without full output").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--no-ts-config", "Skip tsconfig.json auto-discovery (disables full type resolution)").action(
     (options) => {
@@ -30116,14 +30116,48 @@ var RiviereQueryRepository = class {
   }
 };
 
+// src/features/query/queries/query-graph-load-failure.ts
+function toQueryGraphLoadFailure(error48) {
+  if (error48 instanceof GraphNotFoundError) {
+    return {
+      kind: "graphNotFound",
+      message: error48.message
+    };
+  }
+  if (error48 instanceof GraphCorruptedError) {
+    return {
+      kind: "graphCorrupted",
+      message: "Graph file contains invalid JSON"
+    };
+  }
+  return void 0;
+}
+function loadQueryGraph(repository, graphPathOption) {
+  try {
+    return {
+      kind: "loaded",
+      query: repository.load(graphPathOption)
+    };
+  } catch (error48) {
+    const failure14 = toQueryGraphLoadFailure(error48);
+    if (failure14 !== void 0) {
+      return failure14;
+    }
+    throw error48;
+  }
+}
+
 // src/features/query/queries/detect-orphans.ts
 var DetectOrphans = class {
   constructor(repository) {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { orphans: query.detectOrphans() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { orphans: loaded.query.detectOrphans() };
   }
 };
 
@@ -30133,8 +30167,11 @@ var ListComponents = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    const allComponents = query.components();
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    const allComponents = loaded.query.components();
     const filteredByDomain = input.domain === void 0 ? allComponents : allComponents.filter((component) => component.domain === input.domain);
     return {
       components: input.type === void 0 ? filteredByDomain : filteredByDomain.filter((component) => component.type === input.type)
@@ -30148,8 +30185,11 @@ var ListDomains = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { domains: query.domains() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { domains: loaded.query.domains() };
   }
 };
 
@@ -30159,8 +30199,11 @@ var ListEntryPoints = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { entryPoints: query.entryPoints() };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { entryPoints: loaded.query.entryPoints() };
   }
 };
 
@@ -30170,8 +30213,11 @@ var SearchComponents = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
-    return { components: query.search(input.term) };
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
+    return { components: loaded.query.search(input.term) };
   }
 };
 
@@ -30181,11 +30227,14 @@ var TraceFlow = class {
     this.repository = repository;
   }
   execute(input) {
-    const query = this.repository.load(input.graphPathOption);
+    const loaded = loadQueryGraph(this.repository, input.graphPathOption);
+    if (loaded.kind !== "loaded") {
+      return loaded;
+    }
     try {
       const componentId = parseComponentId(input.componentId);
       return {
-        flow: query.traceFlow(componentId),
+        flow: loaded.query.traceFlow(componentId),
         success: true
       };
     } catch (error48) {
@@ -30193,7 +30242,11 @@ var TraceFlow = class {
         throw error48;
       }
       const parsedId = ComponentId.parse(input.componentId);
-      const matches = findNearMatches(query.components(), { name: parsedId.name() }, { limit: 3 });
+      const matches = findNearMatches(
+        loaded.query.components(),
+        { name: parsedId.name() },
+        { limit: 3 }
+      );
       return {
         message: error48.message,
         success: false,
@@ -30203,22 +30256,13 @@ var TraceFlow = class {
   }
 };
 
-// src/features/query/entrypoint/components.ts
+// src/features/query/entrypoint/components/entrypoint.ts
 import { Command as Command16 } from "commander";
 
-// src/platform/infra/cli/presentation/query-graph-load-error-handler.ts
-function handleQueryGraphLoadError(error48) {
-  if (error48 instanceof GraphNotFoundError) {
-    console.log(JSON.stringify(formatError2("GRAPH_NOT_FOUND" /* GraphNotFound */, error48.message)));
-    return true;
-  }
-  if (error48 instanceof GraphCorruptedError) {
-    console.log(
-      JSON.stringify(formatError2("GRAPH_CORRUPTED" /* GraphCorrupted */, "Graph file contains invalid JSON"))
-    );
-    return true;
-  }
-  return false;
+// src/platform/infra/cli/presentation/query-graph-load-failure-output.ts
+function formatQueryGraphLoadFailure(failure14) {
+  const code = failure14.kind === "graphNotFound" ? "GRAPH_NOT_FOUND" /* GraphNotFound */ : "GRAPH_CORRUPTED" /* GraphCorrupted */;
+  return formatError2(code, failure14.message);
 }
 
 // src/platform/infra/cli/presentation/component-output.ts
@@ -30231,7 +30275,7 @@ function toComponentOutput(component) {
   };
 }
 
-// src/features/query/entrypoint/components.ts
+// src/features/query/entrypoint/components/entrypoint.ts
 function createComponentsCommand(listComponents) {
   return new Command16("components").description("List components with optional filtering").addHelpText(
     "after",
@@ -30252,25 +30296,23 @@ Examples:
       }
       return;
     }
-    try {
-      const result = listComponents.execute({
-        domain: options.domain,
-        graphPathOption: options.graph,
-        type: options.type === void 0 ? void 0 : normalizeToSchemaComponentType(options.type)
-      });
-      const components = result.components.map(toComponentOutput);
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listComponents.execute({
+      domain: options.domain,
+      graphPathOption: options.graph,
+      type: options.type === void 0 ? void 0 : normalizeToSchemaComponentType(options.type)
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    const components = result.components.map(toComponentOutput);
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess({ components })));
     }
   });
 }
 
-// src/features/query/entrypoint/domains.ts
+// src/features/query/entrypoint/domains/entrypoint.ts
 import { Command as Command17 } from "commander";
 function createDomainsCommand(listDomains) {
   return new Command17("domains").description("List domains with component counts").addHelpText(
@@ -30281,20 +30323,18 @@ Examples:
   $ riviere query domains --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = listDomains.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listDomains.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/entry-points.ts
+// src/features/query/entrypoint/entry-points/entrypoint.ts
 import { Command as Command18 } from "commander";
 function createEntryPointsCommand(listEntryPoints) {
   return new Command18("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
@@ -30305,20 +30345,18 @@ Examples:
   $ riviere query entry-points --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = listEntryPoints.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = listEntryPoints.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/orphans.ts
+// src/features/query/entrypoint/orphans/entrypoint.ts
 import { Command as Command19 } from "commander";
 function createOrphansCommand(detectOrphans) {
   return new Command19("orphans").description("Find orphan components with no links").addHelpText(
@@ -30329,20 +30367,18 @@ Examples:
   $ riviere query orphans --json
 `
   ).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
-    try {
-      const result = detectOrphans.execute({ graphPathOption: options.graph });
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = detectOrphans.execute({ graphPathOption: options.graph });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result)));
     }
   });
 }
 
-// src/features/query/entrypoint/search.ts
+// src/features/query/entrypoint/search/entrypoint.ts
 import { Command as Command20 } from "commander";
 function createSearchCommand(searchComponents2) {
   return new Command20("search").description("Search components by name").addHelpText(
@@ -30353,24 +30389,22 @@ Examples:
   $ riviere query search "place-order" --json
 `
   ).argument("<term>", "Search term").option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (term, options) => {
-    try {
-      const result = searchComponents2.execute({
-        graphPathOption: options.graph,
-        term
-      });
-      const components = result.components.map(toComponentOutput);
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = searchComponents2.execute({
+      graphPathOption: options.graph,
+      term
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    const components = result.components.map(toComponentOutput);
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess({ components })));
     }
   });
 }
 
-// src/features/query/entrypoint/trace.ts
+// src/features/query/entrypoint/trace/entrypoint.ts
 import { Command as Command21 } from "commander";
 function createTraceCommand(traceFlow) {
   return new Command21("trace").description("Trace flow from a component (bidirectional)").addHelpText(
@@ -30381,26 +30415,24 @@ Examples:
   $ riviere query trace "orders:checkout:usecase:placeorder" --json
 `
   ).argument("<componentId>", "Component ID to trace from").option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (componentIdArg, options) => {
-    try {
-      const result = traceFlow.execute({
-        componentId: componentIdArg,
-        graphPathOption: options.graph
-      });
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError2("COMPONENT_NOT_FOUND" /* ComponentNotFound */, result.message, result.suggestions)
-          )
-        );
-        return;
-      }
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result.flow)));
-      }
-    } catch (error48) {
-      if (!handleQueryGraphLoadError(error48)) {
-        throw error48;
-      }
+    const result = traceFlow.execute({
+      componentId: componentIdArg,
+      graphPathOption: options.graph
+    });
+    if ("kind" in result) {
+      console.log(JSON.stringify(formatQueryGraphLoadFailure(result)));
+      return;
+    }
+    if (!result.success) {
+      console.log(
+        JSON.stringify(
+          formatError2("COMPONENT_NOT_FOUND" /* ComponentNotFound */, result.message, result.suggestions)
+        )
+      );
+      return;
+    }
+    if (options.json) {
+      console.log(JSON.stringify(formatSuccess(result.flow)));
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +32,10 @@
     "glob": "^11.0.2",
     "ts-morph": "^24.0.0",
     "yaml": "^2.7.0",
-    "@living-architecture/riviere-builder": "0.8.4",
-    "@living-architecture/riviere-extract-ts": "0.4.19",
-    "@living-architecture/riviere-query": "0.6.15",
-    "@living-architecture/riviere-schema": "0.6.15",
-    "@living-architecture/riviere-extract-config": "0.5.15"
+    "@living-architecture/riviere-builder": "0.8.5",
+    "@living-architecture/riviere-extract-ts": "0.4.20",
+    "@living-architecture/riviere-extract-config": "0.5.16",
+    "@living-architecture/riviere-query": "0.6.16",
+    "@living-architecture/riviere-schema": "0.6.16"
   }
 }