yamchart 0.10.1 → 0.10.3

package/dist/dev-supervisor-JXLVGEHP.js

@@ -0,0 +1,43 @@
+import { createRequire as __yamchartCreateRequire } from 'module'; if (!globalThis.require) globalThis.require = __yamchartCreateRequire(import.meta.url);
+import "./chunk-7D4SUZUM.js";
+
+// src/commands/dev-supervisor.ts
+import { spawn } from "child_process";
+var RESTART_EXIT_CODE = 75;
+function shouldRestart(code, signal) {
+  return signal === null && code === RESTART_EXIT_CODE;
+}
+function superviseDevServer(argv) {
+  let child = null;
+  let shuttingDown = false;
+  const start = () => {
+    child = spawn(process.execPath, [process.argv[1], ...argv], {
+      stdio: "inherit",
+      env: { ...process.env, YAMCHART_DEV_CHILD: "1" }
+    });
+    child.on("exit", (code, signal) => {
+      if (shuttingDown) {
+        process.exit(0);
+      }
+      if (shouldRestart(code, signal)) {
+        start();
+      } else {
+        process.exit(code ?? 0);
+      }
+    });
+  };
+  for (const sig of ["SIGINT", "SIGTERM"]) {
+    process.once(sig, () => {
+      shuttingDown = true;
+      if (child) child.kill(sig);
+      else process.exit(0);
+    });
+  }
+  start();
+}
+export {
+  RESTART_EXIT_CODE,
+  shouldRestart,
+  superviseDevServer
+};
+//# sourceMappingURL=dev-supervisor-JXLVGEHP.js.map

package/dist/dev-supervisor-JXLVGEHP.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/commands/dev-supervisor.ts"],"sourcesContent":["import { spawn, type ChildProcess } from 'node:child_process';\n\n/** The child requests a restart by exiting with this code (see server services/restart.ts). */\nexport const RESTART_EXIT_CODE = 75;\n\nexport function shouldRestart(code: number | null, signal: NodeJS.Signals | null): boolean {\n  return signal === null && code === RESTART_EXIT_CODE;\n}\n\n/**\n * Run the dev server as a supervised child. Re-spawns it whenever it exits with\n * RESTART_EXIT_CODE (a UI-triggered \"apply changes\"); forwards SIGINT/SIGTERM; and\n * propagates any other exit code. Works locally and inside the Fly container\n * (CMD is `yamchart dev …`).\n */\nexport function superviseDevServer(argv: string[]): void {\n  let child: ChildProcess | null = null;\n  let shuttingDown = false;\n\n  const start = () => {\n    child = spawn(process.execPath, [process.argv[1]!, ...argv], {\n      stdio: 'inherit',\n      env: { ...process.env, YAMCHART_DEV_CHILD: '1' },\n    });\n    child.on('exit', (code, signal) => {\n      if (shuttingDown) {\n        // We were asked to shut down: exit only AFTER the child has closed\n        // (so it can drain connections), then propagate a clean code.\n        process.exit(0);\n      }\n      if (shouldRestart(code, signal)) {\n        start(); // re-spawn for an applied config change\n      } else {\n        process.exit(code ?? 0);\n      }\n    });\n  };\n\n  for (const sig of ['SIGINT', 'SIGTERM'] as const) {\n    process.once(sig, () => {\n      shuttingDown = true;\n      // Forward the signal; the child's 'exit' handler above triggers our exit.\n      if (child) child.kill(sig);\n      else process.exit(0);\n    });\n  }\n  start();\n}\n"],"mappings":";;;AAAA,SAAS,aAAgC;AAGlC,IAAM,oBAAoB;AAE1B,SAAS,cAAc,MAAqB,QAAwC;AACzF,SAAO,WAAW,QAAQ,SAAS;AACrC;AAQO,SAAS,mBAAmB,MAAsB;AACvD,MAAI,QAA6B;AACjC,MAAI,eAAe;AAEnB,QAAM,QAAQ,MAAM;AAClB,YAAQ,MAAM,QAAQ,UAAU,CAAC,QAAQ,KAAK,CAAC,GAAI,GAAG,IAAI,GAAG;AAAA,MAC3D,OAAO;AAAA,MACP,KAAK,EAAE,GAAG,QAAQ,KAAK,oBAAoB,IAAI;AAAA,IACjD,CAAC;AACD,UAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,UAAI,cAAc;AAGhB,gBAAQ,KAAK,CAAC;AAAA,MAChB;AACA,UAAI,cAAc,MAAM,MAAM,GAAG;AAC/B,cAAM;AAAA,MACR,OAAO;AACL,gBAAQ,KAAK,QAAQ,CAAC;AAAA,MACxB;AAAA,IACF,CAAC;AAAA,EACH;AAEA,aAAW,OAAO,CAAC,UAAU,SAAS,GAAY;AAChD,YAAQ,KAAK,KAAK,MAAM;AACtB,qBAAe;AAEf,UAAI,MAAO,OAAM,KAAK,GAAG;AAAA,UACpB,SAAQ,KAAK,CAAC;AAAA,IACrB,CAAC;AAAA,EACH;AACA,QAAM;AACR;","names":[]}

package/dist/{dist-PPAD6KOM.js → dist-F6TVLP6C.js}

@@ -2,18 +2,21 @@ import { createRequire as __yamchartCreateRequire } from 'module'; if (!globalTh
 import {
   AgentDefinitionSchema,
   AiConfigSchema,
+  BigQueryConfigSchema,
   BlindspotKindSchema,
   BlindspotSchema,
   BlindspotStatusSchema,
   ChartSchema,
   ColumnProfileSchema,
   ConnectionSchema,
+  ConnectionSecretsSchema,
   CuratedDimensionSchema,
   CuratedMetricSchema,
   CuratedSourceSchema,
   DashboardSchema,
   DimensionSchema,
   DimensionTypeSchema,
+  DuckDBConfigSchema,
   EventSchema,
   EventsFileSchema,
   HunchSampleSchema,
@@ -24,14 +27,23 @@ import {
   MeasureTypeSchema,
   ModelMetadataSchema,
   ModelSchema,
+  MySQLConfigSchema,
   NamedFilterSchema,
   NewBlindspotSchema,
   NewHunchSchema,
   NewKnowledgeDocSchema,
   ParameterSchema,
+  PoolConfigSchema,
+  PostgresConfigSchema,
   ProjectSchema,
   ProviderConfigSchema,
+  QueryConfigSchema,
+  RESERVED_SLUGS,
   RelationshipSchema,
+  RuntimeConfigSchema,
+  RuntimeConnectionSchema,
+  SLUG_REGEX,
+  SQLiteConfigSchema,
   ScheduleSchema,
   SemanticConfigSchema,
   SemanticDefinitionSchema,
@@ -40,29 +52,35 @@ import {
   SemanticFilterSchema,
   SemanticModelSchema,
   SemanticQuerySchema,
+  SnowflakeConfigSchema,
   SourceProfileSchema,
   SuggestedModelSchema,
   TableProfileSchema,
   VERSION,
   deepMerge,
-  resolveProjectConfig
-} from "./chunk-ZIY22VO7.js";
+  deriveSlug,
+  resolveProjectConfig,
+  validateSlug
+} from "./chunk-OYBI433Z.js";
 import "./chunk-7D4SUZUM.js";
 export {
   AgentDefinitionSchema,
   AiConfigSchema,
+  BigQueryConfigSchema,
   BlindspotKindSchema,
   BlindspotSchema,
   BlindspotStatusSchema,
   ChartSchema,
   ColumnProfileSchema,
   ConnectionSchema,
+  ConnectionSecretsSchema,
   CuratedDimensionSchema,
   CuratedMetricSchema,
   CuratedSourceSchema,
   DashboardSchema,
   DimensionSchema,
   DimensionTypeSchema,
+  DuckDBConfigSchema,
   EventSchema,
   EventsFileSchema,
   HunchSampleSchema,
@@ -73,14 +91,23 @@ export {
   MeasureTypeSchema,
   ModelMetadataSchema,
   ModelSchema,
+  MySQLConfigSchema,
   NamedFilterSchema,
   NewBlindspotSchema,
   NewHunchSchema,
   NewKnowledgeDocSchema,
   ParameterSchema,
+  PoolConfigSchema,
+  PostgresConfigSchema,
   ProjectSchema,
   ProviderConfigSchema,
+  QueryConfigSchema,
+  RESERVED_SLUGS,
   RelationshipSchema,
+  RuntimeConfigSchema,
+  RuntimeConnectionSchema,
+  SLUG_REGEX,
+  SQLiteConfigSchema,
   ScheduleSchema,
   SemanticConfigSchema,
   SemanticDefinitionSchema,
@@ -89,11 +116,14 @@ export {
   SemanticFilterSchema,
   SemanticModelSchema,
   SemanticQuerySchema,
+  SnowflakeConfigSchema,
   SourceProfileSchema,
   SuggestedModelSchema,
   TableProfileSchema,
   VERSION,
   deepMerge,
-  resolveProjectConfig
+  deriveSlug,
+  resolveProjectConfig,
+  validateSlug
 };
-//# sourceMappingURL=dist-PPAD6KOM.js.map
+//# sourceMappingURL=dist-F6TVLP6C.js.map

package/dist/{dist-XNCED7JW.js → dist-Q5ETETUU.js}

@@ -31,7 +31,7 @@ import {
   runModel,
   serializeDateValue,
   templateHasVariable
-} from "./chunk-QUIDZO5G.js";
+} from "./chunk-2XJZJ6IA.js";
 import {
   DATE_PRESETS,
   SemanticModelBuilder,
@@ -53,8 +53,8 @@ import {
   isRelativeDateRange,
   loadSemanticDefinitions,
   validateSemanticQuery
-} from "./chunk-UFDQ3C7Q.js";
-import "./chunk-ZIY22VO7.js";
+} from "./chunk-6ELSQNIH.js";
+import "./chunk-OYBI433Z.js";
 import "./chunk-7D4SUZUM.js";
 export {
   BigQueryConnector,
@@ -109,4 +109,4 @@ export {
   templateHasVariable,
   validateSemanticQuery
 };
-//# sourceMappingURL=dist-XNCED7JW.js.map
+//# sourceMappingURL=dist-Q5ETETUU.js.map

package/dist/{dist-5DQO6L2S.js → dist-YJOOH65Y.js}

@@ -6,6 +6,7 @@ import {
   OpenAICompatibleProvider,
   SYSTEM_PROMPT,
   TOOL_DEFINITIONS,
+  buildMartFiles,
   buildModelPath,
   buildProvider,
   buildSchemaYmlEntry,
@@ -17,12 +18,13 @@ import {
   listDbtModels,
   loadKnowledge,
   readDbtModel,
+  scaffoldModelSql,
   updateSchemaYml,
   writeDbtModel
-} from "./chunk-64CI3HSY.js";
-import "./chunk-QUIDZO5G.js";
-import "./chunk-UFDQ3C7Q.js";
-import "./chunk-ZIY22VO7.js";
+} from "./chunk-KDDO4UII.js";
+import "./chunk-2XJZJ6IA.js";
+import "./chunk-6ELSQNIH.js";
+import "./chunk-OYBI433Z.js";
 import "./chunk-7D4SUZUM.js";
 export {
   AdvisorAgent,
@@ -31,6 +33,7 @@ export {
   OpenAICompatibleProvider,
   SYSTEM_PROMPT,
   TOOL_DEFINITIONS,
+  buildMartFiles,
   buildModelPath,
   buildProvider,
   buildSchemaYmlEntry,
@@ -42,7 +45,8 @@ export {
   listDbtModels,
   loadKnowledge,
   readDbtModel,
+  scaffoldModelSql,
   updateSchemaYml,
   writeDbtModel
 };
-//# sourceMappingURL=dist-5DQO6L2S.js.map
+//# sourceMappingURL=dist-YJOOH65Y.js.map

package/dist/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { createRequire as __yamchartCreateRequire } from 'module'; if (!globalThis.require) globalThis.require = __yamchartCreateRequire(import.meta.url);
-import {
-  checkForUpdate
-} from "./chunk-TZKNU5TD.js";
 import {
   findProjectRoot,
   loadEnvFile,
   validateProject
-} from "./chunk-S2CH4HUZ.js";
+} from "./chunk-ODSPBOJW.js";
+import {
+  checkForUpdate
+} from "./chunk-TZKNU5TD.js";
 import {
   detail,
   error,
@@ -18,9 +18,9 @@ import {
   success,
   warning
 } from "./chunk-HJVVHYVN.js";
-import "./chunk-QUIDZO5G.js";
-import "./chunk-UFDQ3C7Q.js";
-import "./chunk-ZIY22VO7.js";
+import "./chunk-2XJZJ6IA.js";
+import "./chunk-6ELSQNIH.js";
+import "./chunk-OYBI433Z.js";
 import "./chunk-7D4SUZUM.js";
 
 // src/index.ts
@@ -98,6 +98,11 @@ program.command("validate").description("Validate configuration files").argument
   process.exit(result.success ? 0 : 1);
 });
 program.command("dev").description("Start development server with hot reload").argument("[path]", "Path to yamchart project", ".").option("-p, --port <number>", "Port to listen on", "3001").option("--api-only", "Only serve API, no web UI").option("--no-open", "Do not open browser automatically").action(async (path, options) => {
+  if (process.env.YAMCHART_DEV_CHILD !== "1") {
+    const { superviseDevServer } = await import("./dev-supervisor-JXLVGEHP.js");
+    superviseDevServer(process.argv.slice(2));
+    return;
+  }
   const startPath = resolve(path);
   const projectDir = await findProjectRoot(startPath);
   if (!projectDir) {
@@ -106,7 +111,7 @@ program.command("dev").description("Start development server with hot reload").a
     process.exit(2);
   }
   const globalOpts = program.opts();
-  const { runDevServer } = await import("./dev-H6SJZ5UA.js");
+  const { runDevServer } = await import("./dev-PHFYLJPJ.js");
   await runDevServer(projectDir, {
     port: parseInt(options.port, 10),
     apiOnly: options.apiOnly ?? false,
@@ -116,7 +121,7 @@ program.command("dev").description("Start development server with hot reload").a
   });
 });
 program.command("init").description("Create a new yamchart project").argument("[directory]", "Target directory", ".").option("--example", "Create full example project with sample database").option("--empty", "Create only yamchart.yaml (no connections, models, or charts)").option("--force", "Overwrite existing files").action(async (directory, options) => {
-  const { initProject } = await import("./init-SECXKD5G.js");
+  const { initProject } = await import("./init-TJJVKMEN.js");
   const targetDir = resolve(directory);
   const result = await initProject(targetDir, options);
   if (!result.success) {
@@ -180,7 +185,7 @@ program.command("sync-dbt").description("Sync dbt project metadata into AI-reada
   if (!options.targetDatabase) {
     try {
       const { readFile } = await import("fs/promises");
-      const { resolveConnection } = await import("./connection-utils-FEUWER5I.js");
+      const { resolveConnection } = await import("./connection-utils-S7EFPTLY.js");
       const { detectDatabaseMismatch } = await import("./rewrite-database-BOA4QPUR.js");
       const catalogJsonStr = await readFile(join(projectDir, ".yamchart", "catalog.json"), "utf-8");
       const catalogData = JSON.parse(catalogJsonStr);
@@ -234,7 +239,7 @@ program.command("test").description("Run model tests (@returns schema checks and
   }
   loadEnvFile(projectDir);
   try {
-    const { testProject, formatTestOutput } = await import("./test-SRHVOXZB.js");
+    const { testProject, formatTestOutput } = await import("./test-6MCPGXJP.js");
     const result = await testProject(projectDir, model, {
       connection: options.connection,
       json: options.json
@@ -283,7 +288,7 @@ program.command("tables").description("List tables and views in the connected da
   loadEnvFile(projectDir);
   try {
     if (options.compare) {
-      const { resolveTablesSource } = await import("./source-resolver-HZQLOODU.js");
+      const { resolveTablesSource } = await import("./source-resolver-GYXIRIVK.js");
       const { compareTables, formatCompareTables } = await import("./compare-RQFCEZIK.js");
       let localResult;
       try {
@@ -314,7 +319,7 @@ program.command("tables").description("List tables and views in the connected da
       }
       return;
     }
-    const { listTables } = await import("./tables-K5NAN2WK.js");
+    const { listTables } = await import("./tables-QMZMYYV5.js");
     const result = await listTables(projectDir, {
       ...options,
       source: options.source || "auto"
@@ -352,7 +357,7 @@ program.command("describe").description("Show columns and types for a table").ar
   loadEnvFile(projectDir);
   try {
     if (options.compare) {
-      const { resolveDescribeSource } = await import("./source-resolver-HZQLOODU.js");
+      const { resolveDescribeSource } = await import("./source-resolver-GYXIRIVK.js");
       const { compareColumns, formatCompareColumns } = await import("./compare-RQFCEZIK.js");
       let localResult;
       try {
@@ -374,7 +379,7 @@ program.command("describe").description("Show columns and types for a table").ar
       }
       return;
     }
-    const { describeTable } = await import("./describe-MEP72B56.js");
+    const { describeTable } = await import("./describe-TA2CTODC.js");
     const result = await describeTable(projectDir, table, {
       ...options,
       source: options.source || "auto"
@@ -413,8 +418,8 @@ program.command("query").description("Execute SQL against a connection").argumen
   }
   loadEnvFile(projectDir);
   try {
-    const { executeQuery } = await import("./query-2H3YOPI2.js");
-    const { formatTable, formatJSON } = await import("./connection-utils-FEUWER5I.js");
+    const { executeQuery } = await import("./query-AX4BOPMH.js");
+    const { formatTable, formatJSON } = await import("./connection-utils-S7EFPTLY.js");
     const limit = options.limit ? parseInt(options.limit, 10) : void 0;
     const result = await executeQuery(projectDir, sql, {
       connection: options.connection,
@@ -441,8 +446,8 @@ program.command("sample").description("Show sample rows from a table or dbt mode
   }
   loadEnvFile(projectDir);
   try {
-    const { sampleTable } = await import("./sample-ODUGGSFA.js");
-    const { formatTable, formatJSON } = await import("./connection-utils-FEUWER5I.js");
+    const { sampleTable } = await import("./sample-4NUBJGIL.js");
+    const { formatTable, formatJSON } = await import("./connection-utils-S7EFPTLY.js");
     const limit = options.limit ? parseInt(options.limit, 10) : void 0;
     const result = await sampleTable(projectDir, table, {
       connection: options.connection,
@@ -472,7 +477,7 @@ program.command("search").description("Search for tables and columns by keyword"
   }
   loadEnvFile(projectDir);
   try {
-    const { searchDatabase } = await import("./search-IPE4ISFB.js");
+    const { searchDatabase } = await import("./search-IBVVYN4I.js");
     const result = await searchDatabase(projectDir, keyword, {
       ...options,
       source: options.source || "auto"
@@ -526,7 +531,7 @@ catalogCmd.command("tables").description("List tables from cached catalog").opti
     process.exit(2);
   }
   try {
-    const { listTables } = await import("./tables-K5NAN2WK.js");
+    const { listTables } = await import("./tables-QMZMYYV5.js");
     const result = await listTables(projectDir, {
       source: "catalog",
       schema: options.schema
@@ -568,7 +573,7 @@ catalogCmd.command("describe").description("Show cached columns and types for a
     process.exit(2);
   }
   try {
-    const { describeTable } = await import("./describe-MEP72B56.js");
+    const { describeTable } = await import("./describe-TA2CTODC.js");
     const result = await describeTable(projectDir, table, { source: "catalog" });
     if (options.json) {
       console.log(JSON.stringify(result.columns, null, 2));
@@ -610,7 +615,7 @@ catalogCmd.command("search").description("Search cached metadata for tables and
     process.exit(2);
   }
   try {
-    const { searchDatabase } = await import("./search-IPE4ISFB.js");
+    const { searchDatabase } = await import("./search-IBVVYN4I.js");
     const result = await searchDatabase(projectDir, keyword, { source: "catalog" });
     if (options.json) {
       console.log(JSON.stringify(result.results, null, 2));
@@ -735,7 +740,7 @@ program.command("sync-warehouse").description("Sync warehouse table metadata int
   }
   loadEnvFile(projectDir);
   try {
-    const { runSyncWarehouse } = await import("./sync-warehouse-TUNULDUY.js");
+    const { runSyncWarehouse } = await import("./sync-warehouse-5NKENCOZ.js");
     await runSyncWarehouse(projectDir, options);
   } catch (err) {
     error(err instanceof Error ? err.message : String(err));
@@ -786,7 +791,7 @@ program.command("advisor").description("AI-powered dbt model advisor \u2014 sugg
     process.exit(2);
   }
   loadEnvFile(projectDir);
-  const { runAdvisor } = await import("./advisor-5TJDNAY7.js");
+  const { runAdvisor } = await import("./advisor-XTJQU7E4.js");
   await runAdvisor(projectDir, question, {
     top: options.top ? parseInt(options.top, 10) : 5,
     json: options.json,
@@ -794,7 +799,7 @@ program.command("advisor").description("AI-powered dbt model advisor \u2014 sugg
     connection: options.connection
   });
 });
-var semanticCmd = program.command("semantic").description("Explore the semantic layer \u2014 auto-generated measures and dimensions from your catalog").option("--json", "Output as JSON").action(async (options) => {
+var semanticCmd = program.command("semantic").description("Explore the semantic layer \u2014 curated semantic/*.yaml definitions or auto-generated from catalog").option("--json", "Output as JSON").action(async (options) => {
   const startPath = resolve(".");
   const projectDir = await findProjectRoot(startPath);
   if (!projectDir) {
@@ -804,21 +809,31 @@ var semanticCmd = program.command("semantic").description("Explore the semantic
   }
   loadEnvFile(projectDir);
   try {
-    const { readFile } = await import("fs/promises");
-    const catalogPath = join(projectDir, ".yamchart", "catalog.json");
-    const catalogJson = JSON.parse(await readFile(catalogPath, "utf-8"));
-    const { listSemanticEntities } = await import("./semantic-K3MYXXJI.js");
-    const result = listSemanticEntities(catalogJson);
+    const { loadSemanticDefinitions } = await import("./semantic-5WGVZ7HY.js");
+    const { listSemanticDefinitions, listSemanticEntities } = await import("./semantic-33YIUMUV.js");
+    const defs = loadSemanticDefinitions(projectDir);
+    let result;
+    let source;
+    if (defs.length > 0) {
+      result = listSemanticDefinitions(defs);
+      source = "curated";
+    } else {
+      const { readFile } = await import("fs/promises");
+      const catalogPath = join(projectDir, ".yamchart", "catalog.json");
+      const catalogJson = JSON.parse(await readFile(catalogPath, "utf-8"));
+      result = listSemanticEntities(catalogJson);
+      source = "catalog";
+    }
     if (options.json) {
       console.log(JSON.stringify(result.entities, null, 2));
       return;
     }
     if (result.entities.length === 0) {
       info("No semantic entities found.");
-      detail("Run `yamchart sync-dbt` or `yamchart sync-warehouse` to populate the catalog.");
+      detail("Add YAML files to semantic/ or run `yamchart sync-dbt` / `yamchart sync-warehouse` to populate the catalog.");
       return;
     }
-    header(`Semantic Layer \u2014 ${result.entities.length} entities`);
+    header(`Semantic Layer \u2014 ${result.entities.length} entities (${source === "curated" ? "semantic/*.yaml" : "catalog"})`);
     for (const entity of result.entities) {
       console.log(`  ${pc.bold(entity.name)}`);
       console.log(`  ${pc.dim(entity.source_table)}`);
@@ -835,7 +850,7 @@ var semanticCmd = program.command("semantic").description("Explore the semantic
     }
   } catch (err) {
     if (err instanceof Error && err.message.includes("ENOENT")) {
-      error("No catalog found. Run `yamchart sync-dbt` or `yamchart sync-warehouse` first.");
+      error("No catalog found. Add semantic/*.yaml files or run `yamchart sync-dbt` / `yamchart sync-warehouse` first.");
     } else {
       error(err instanceof Error ? err.message : String(err));
     }
@@ -851,10 +866,8 @@ semanticCmd.command("query").description("Run a structured query against the sem
   }
   loadEnvFile(projectDir);
   try {
-    const { readFile } = await import("fs/promises");
-    const catalogPath = join(projectDir, ".yamchart", "catalog.json");
-    const catalogJson = JSON.parse(await readFile(catalogPath, "utf-8"));
-    const { querySemanticEntity } = await import("./semantic-K3MYXXJI.js");
+    const { loadSemanticDefinitions } = await import("./semantic-5WGVZ7HY.js");
+    const { querySemanticDefinition, querySemanticEntity } = await import("./semantic-33YIUMUV.js");
     const filters = (options.filter || []).map((f) => {
       const eqIdx = f.indexOf("=");
       if (eqIdx === -1) throw new Error(`Invalid filter format: "${f}". Use dimension=value`);
@@ -864,19 +877,29 @@ semanticCmd.command("query").description("Run a structured query against the sem
         value: f.slice(eqIdx + 1)
       };
     });
-    const result = querySemanticEntity(catalogJson, {
+    const queryInput = {
       entity: options.entity,
       measures: options.measures.split(",").map((s) => s.trim()),
       dimensions: options.dimensions ? options.dimensions.split(",").map((s) => s.trim()) : [],
       filters,
       order_by: options.order ? { field: options.order, direction: options.desc ? "desc" : "asc" } : void 0,
       limit: options.limit ? parseInt(options.limit, 10) : 100
-    });
+    };
+    const defs = loadSemanticDefinitions(projectDir);
+    let result;
+    if (defs.length > 0) {
+      result = querySemanticDefinition(defs, queryInput);
+    } else {
+      const { readFile } = await import("fs/promises");
+      const catalogPath = join(projectDir, ".yamchart", "catalog.json");
+      const catalogJson = JSON.parse(await readFile(catalogPath, "utf-8"));
+      result = querySemanticEntity(catalogJson, queryInput);
+    }
     if (options.sql) {
       console.log(result.sql);
       return;
     }
-    const { resolveConnection, createConnector, formatTable, formatJSON } = await import("./connection-utils-FEUWER5I.js");
+    const { resolveConnection, createConnector, formatTable, formatJSON } = await import("./connection-utils-S7EFPTLY.js");
     const connection = await resolveConnection(projectDir, options.connection, program.opts().env);
     const connector = createConnector(connection, projectDir);
     const start = performance.now();
@@ -904,7 +927,7 @@ semanticCmd.command("query").description("Run a structured query against the sem
     }
   } catch (err) {
     if (err instanceof Error && err.message.includes("ENOENT")) {
-      error("No catalog found. Run `yamchart sync-dbt` or `yamchart sync-warehouse` first.");
+      error("No catalog found. Add semantic/*.yaml files or run `yamchart sync-dbt` / `yamchart sync-warehouse` first.");
     } else {
       error(err instanceof Error ? err.message : String(err));
     }