@dcluttr/dclare-mcp 0.1.5 → 0.1.7

package/dist/index.js

@@ -133,9 +133,12 @@ server.registerTool("get_dataset_context", {
 server.registerTool("run_semantic_query", {
     title: "Run semantic query",
     description: "Runs a semantic query against the data platform with guardrails. " +
-        "IMPORTANT: Brand-specific datasets contain both the user's brand AND competitor data. " +
+        "IMPORTANT RULES: " +
+        "1. TIME DIMENSIONS: For any query involving a date range or daily/weekly/monthly trend, you MUST use the timeDimensions parameter with the dataset's time column (usually 'created_at'). Use dateRange for filtering (e.g. 'this month', 'last 7 days', ['2026-02-01','2026-02-28']) and granularity ('day','week','month') for time-series breakdowns. " +
+        "2. BRAND FILTER: Brand-specific datasets contain both the user's brand AND competitor data. " +
         "When the user asks about their own brand's performance, include the 'curr_brand' segment to filter to their brand only. " +
-        "When the user asks for competitor analysis or market-wide comparison, do NOT include 'curr_brand' so all brands are returned.",
+        "When the user asks for competitor analysis or market-wide comparison, do NOT include 'curr_brand' so all brands are returned. " +
+        "3. MEMBER NAMES: Use plain column names (e.g. 'created_at', 'offtake_mrp') without the dataset prefix.",
     inputSchema: {
         tenantToken: z.string().optional(),
         query: z.object({
@@ -168,7 +171,8 @@ server.registerTool("ask_data_question", {
         "IMPORTANT: Always call search_datasets first to resolve the exact dataset name and pass it as datasetHint. Do NOT guess dataset names. " +
         "Brand-specific datasets contain both the user's brand AND competitor data. " +
         "When the question is about the user's own brand, the plan should include the 'curr_brand' segment. " +
-        "When the question involves competitor analysis or market-wide data, do NOT include 'curr_brand'.",
+        "When the question involves competitor analysis or market-wide data, do NOT include 'curr_brand'. " +
+        "For any question involving dates, trends, or time periods, the plan MUST include timeDimensions with the correct dateRange and granularity.",
     inputSchema: {
         tenantToken: z.string().optional(),
         question: z.string().min(5),

package/dist/services/query-guardrails.js

@@ -17,12 +17,19 @@ function buildJoinedCubeMap(dataset, allDatasets) {
     }
     return map;
 }
-function validateMember(member, allowedLocal, joinedCubes, label) {
+function validateMember(member, allowedLocal, joinedCubes, label, currentCubeName) {
     if (isJoinedMember(member)) {
         const dotIndex = member.indexOf(".");
         const cubeName = member.slice(0, dotIndex);
         const columnName = member.slice(dotIndex + 1);
         const stripped = normalizeMemberName(columnName);
+        // If the prefix matches the current cube, treat as a local member
+        if (currentCubeName && cubeName === currentCubeName) {
+            if (allowedLocal.has(stripped)) {
+                return stripped;
+            }
+            throw new AppError("INVALID_QUERY", `${label} '${member}' is not allowed for this dataset.`, 400);
+        }
         const joinedColumns = joinedCubes.get(cubeName);
         if (joinedColumns && joinedColumns.has(stripped)) {
             return `${cubeName}.${stripped}`;
@@ -41,7 +48,7 @@ export class QueryGuardrails {
         const allowedMetrics = new Set(dataset.metrics.map((metric) => metric.name));
         const allowedSegments = new Set((dataset.segments ?? []).map((segment) => segment.name));
         const joinedCubes = buildJoinedCubeMap(dataset, allDatasets ?? []);
-        const validatedDimensions = (input.dimensions ?? []).map((d) => validateMember(d, allowedColumns, joinedCubes, "Dimension"));
+        const validatedDimensions = (input.dimensions ?? []).map((d) => validateMember(d, allowedColumns, joinedCubes, "Dimension", dataset.cubeName));
         for (const metric of input.metrics ?? []) {
             const normalized = normalizeMemberName(metric);
             if (!allowedMetrics.has(normalized)) {
@@ -50,15 +57,23 @@ export class QueryGuardrails {
         }
         for (const segment of input.segments ?? []) {
             const normalized = normalizeMemberName(segment);
+            // Strip prefix if it matches current cube name
+            if (isJoinedMember(segment)) {
+                const dotIndex = segment.indexOf(".");
+                const cubeName = segment.slice(0, dotIndex);
+                if (cubeName !== dataset.cubeName) {
+                    throw new AppError("INVALID_QUERY", `Segment '${segment}' is not allowed for this dataset.`, 400);
+                }
+            }
             if (!allowedSegments.has(normalized)) {
                 throw new AppError("INVALID_QUERY", `Segment '${segment}' is not allowed for this dataset.`, 400);
             }
         }
         const validatedTimeDimensions = (input.timeDimensions ?? []).map((item) => {
-            const resolved = validateMember(item.member, allowedColumns, joinedCubes, "Time dimension");
+            const resolved = validateMember(item.member, allowedColumns, joinedCubes, "Time dimension", dataset.cubeName);
             return { ...item, member: resolved };
         });
-        const validFilters = this.validateFilters(input.filters ?? [], allowedColumns, joinedCubes);
+        const validFilters = this.validateFilters(input.filters ?? [], allowedColumns, joinedCubes, dataset.cubeName);
         const allFilters = [...validFilters];
         const order = this.validateOrder(input.order ?? [], allowedColumns, allowedMetrics, joinedCubes, dataset.cubeName);
         const normalizedSegments = (input.segments ?? []).map((segment) => normalizeMemberName(segment));
@@ -81,9 +96,9 @@ export class QueryGuardrails {
             limit
         };
     }
-    validateFilters(filters, allowedColumns, joinedCubes) {
+    validateFilters(filters, allowedColumns, joinedCubes, currentCubeName) {
         return filters.map((filter) => {
-            const resolved = validateMember(filter.member, allowedColumns, joinedCubes, "Filter member");
+            const resolved = validateMember(filter.member, allowedColumns, joinedCubes, "Filter member", currentCubeName);
             if (!Array.isArray(filter.values) || filter.values.length === 0) {
                 throw new AppError("INVALID_QUERY", `Filter '${filter.member}' must include at least one value.`, 400);
             }
@@ -98,7 +113,7 @@ export class QueryGuardrails {
         for (const item of order) {
             let member;
             try {
-                member = validateMember(item.member, allowedColumns, joinedCubes, "Order member");
+                member = validateMember(item.member, allowedColumns, joinedCubes, "Order member", cubeName);
             }
             catch {
                 const normalized = normalizeMemberName(item.member);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcluttr/dclare-mcp",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "description": "MCP server for secure talk-to-data on Cube + ClickHouse",
   "bin": {