drizzle-cube 0.4.10 → 0.4.13

package/dist/server/index.d.ts

@@ -57,6 +57,7 @@ export declare type AgentSSEEvent = {
         id: string;
         name: string;
         result?: unknown;
+        isError?: boolean;
     };
 } | {
     type: 'add_portlet';

package/dist/server/index.js

@@ -2050,14 +2050,14 @@ function B(r, e) {
   const t = typeof r == "function" ? r(e) : r;
   return lt(t);
 }
-function ZT(r, e, t) {
+function zT(r, e, t) {
   return {
     ...r,
     cubes: e,
     currentCube: t
   };
 }
-function zT(r, e) {
+function eA(r, e) {
   return {
     name: r,
     ...e
@@ -2291,7 +2291,7 @@ function gt(r) {
     e ^= r.charCodeAt(t), e = e * 16777619 >>> 0;
   return e.toString(16).padStart(8, "0");
 }
-function eA(r, e) {
+function tA(r, e) {
   return `${e ?? "drizzle-cube:"}*${r}*`;
 }
 class Oe {
@@ -7545,7 +7545,7 @@ class Vn {
     return e;
   }
 }
-class tA {
+class sA {
   name = "pipeline";
   passes;
   constructor(e = []) {
@@ -29594,7 +29594,10 @@ function ws(r, e) {
         t.push(`Cube '${a}' not found (referenced in measure '${E}')`);
         continue;
       }
-      o.measures[A] || t.push(`Measure '${A}' not found on cube '${a}'`);
+      if (!o.measures[A]) {
+        const R = A === a ? `. Did you mean one of: ${Object.keys(o.measures).slice(0, 5).map((S) => `'${a}.${S}'`).join(", ")}?` : "";
+        t.push(`Measure '${A}' not found on cube '${a}'${R}`);
+      }
     }
   if (e.dimensions)
     for (const E of e.dimensions) {
@@ -29609,7 +29612,10 @@ function ws(r, e) {
         t.push(`Cube '${a}' not found (referenced in dimension '${E}')`);
         continue;
       }
-      o.dimensions[A] || t.push(`Dimension '${A}' not found on cube '${a}'`);
+      if (!o.dimensions[A]) {
+        const R = A === a ? `. Did you mean one of: ${Object.keys(o.dimensions).slice(0, 5).map((S) => `'${a}.${S}'`).join(", ")}?` : "";
+        t.push(`Dimension '${A}' not found on cube '${a}'${R}`);
+      }
     }
   if (e.timeDimensions)
     for (const E of e.timeDimensions) {
@@ -29656,7 +29662,10 @@ function $s(r, e, t, s) {
     t.push(`Cube '${n}' not found (referenced in filter '${r.member}')`);
     return;
   }
-  !E.dimensions[i] && !E.measures[i] && t.push(`Filter field '${i}' not found on cube '${n}' (must be a dimension or measure)`);
+  if (!E.dimensions[i] && !E.measures[i]) {
+    const a = i === n ? `. Did you mean one of: ${[...Object.keys(E.dimensions), ...Object.keys(E.measures)].slice(0, 5).map((A) => `'${n}.${A}'`).join(", ")}?` : "";
+    t.push(`Filter field '${i}' not found on cube '${n}' (must be a dimension or measure)${a}`);
+  }
 }
 function zo(r) {
   if (typeof r == "string") {
@@ -29665,7 +29674,7 @@ function zo(r) {
   }
   return r.cube;
 }
-class sA {
+class nA {
   cache = /* @__PURE__ */ new Map();
   defaultTtlMs;
   maxEntries;
@@ -29854,7 +29863,7 @@ Return ONLY valid JSON with no explanations:
 }
 
 CRITICAL: Be strict. When in doubt, reject. False positives are better than security breaches.`;
-function nA(r) {
+function iA(r) {
   return eT.replace("{USER_PROMPT}", r);
 }
 const tT = `You are a helpful AI assistant for analyzing business data using Cube.js/Drizzle-Cube semantic layer.
@@ -29994,7 +30003,7 @@ USER QUERY:
 {USER_PROMPT}
 
 Return the JSON response:`;
-function iA(r, e) {
+function rA(r, e) {
   return tT.replace("{CUBE_SCHEMA}", r).replace("{USER_PROMPT}", e);
 }
 const sT = `You are analyzing a data query request to determine its structure.
@@ -30026,7 +30035,7 @@ USER QUERY:
 {USER_PROMPT}
 
 Return ONLY valid JSON - no explanations or markdown:`;
-function rA(r, e) {
+function EA(r, e) {
   return sT.replace("{CUBE_SCHEMA}", r).replace("{USER_PROMPT}", e);
 }
 const nT = `Complete the data query using actual dimension values from the database.
@@ -30086,7 +30095,7 @@ CRITICAL FILTER FORMAT RULES:
 - The time filter (inDateRange) goes ONLY on step 0's filter, not on other steps.
 
 Return ONLY valid JSON - no explanations or markdown:`;
-function EA(r, e, t) {
+function aA(r, e, t) {
   const s = JSON.stringify(t, null, 2);
   return nT.replace("{CUBE_SCHEMA}", r).replace("{USER_PROMPT}", e).replace("{DIMENSION_VALUES}", s);
 }
@@ -30333,10 +30342,10 @@ RESPONSE FORMAT (JSON):
 }
 
 CRITICAL: Return ONLY valid JSON. No markdown, no explanations outside JSON.`;
-function aA(r, e, t, s, n, i, E) {
+function oA(r, e, t, s, n, i, E) {
   return iT.replace("{DATABASE_TYPE}", r).replaceAll("{DATABASE_TYPE}", r).replace("{CUBE_SCHEMA}", e).replace("{SEMANTIC_QUERY}", t).replace("{SQL_QUERY}", s).replace("{NORMALIZED_PLAN}", n).replace("{RAW_EXPLAIN}", i).replace("{EXISTING_INDEXES}", E || "No index information available");
 }
-function oA(r) {
+function TA(r) {
   const e = {};
   for (const t of r) {
     e[t.name] = {
@@ -30365,7 +30374,7 @@ function oA(r) {
   }
   return JSON.stringify({ cubes: e }, null, 2);
 }
-function TA(r) {
+function AA(r) {
   if (!r || r.length === 0)
     return "No indexes found on the queried tables.";
   const e = {};
@@ -30433,7 +30442,7 @@ const rT = {
         type: "text",
         text: [
           "Rules (keep JSON only):",
-          "- Use only measures/dimensions/timeDimensions from schema.",
+          "- Use only measures/dimensions/timeDimensions from schema. Fields are always `CubeName.fieldName` — never use just the cube name (e.g. `PullRequests.count` not `PullRequests`).",
           "- timeDimensions: include granularity when grouping; use inDateRange filter for relative windows; combine when both requested.",
           "- Funnel detection keywords: funnel, conversion, journey, drop off, step by step; use funnel format only if eventStream metadata exists.",
           "- Funnel rules: bindingKey/timeDimension from cube metadata; include time filter on step 0 (default last 6 months) using inDateRange; steps ordered; flat filters.",
@@ -30774,6 +30783,7 @@ function AT(r) {
     "## Important Guidelines",
     "",
     "- ALWAYS discover cubes first before attempting queries",
+    "- Field names MUST be `CubeName.fieldName` (e.g. `PullRequests.count`, `Teams.name`). NEVER use just the cube name as a field — `PullRequests.PullRequests` is WRONG.",
     "- Use `add_portlet` to create visualizations after getting query results",
     "- Use `add_markdown` to explain your findings, methodology, and insights",
     "- Choose appropriate chart types: bar for categories, line for trends, table for detailed data",
@@ -30785,15 +30795,20 @@ function AT(r) {
     "### CRITICAL: Always think before acting",
     "- EVERY single turn MUST begin with a text message (1-2 sentences) BEFORE any tool calls. This is your #1 rule — never violate it.",
     "- This applies to EVERY turn, including turns where you are adding visualizations or explanations to the notebook.",
-    `- Even when adding multiple portlets/markdowns in sequence, each turn must start with text like "Now I'll add the productivity chart." or "Next, let me visualize the department breakdown."`,
-    '- Example good turn: "Let me discover what data is available." → discover_cubes',
-    `- Example good turn: "I'll add a bar chart showing the top employees." → add_markdown → add_portlet`,
+    `- Even when adding multiple charts in sequence, each turn must start with a brief status like "Now I'll chart the productivity breakdown." or "Next, let me show the department comparison."`,
+    '- Example good turn: "Let me see what data is available." → discover_cubes',
+    `- Example good turn: "I'll add a chart showing the top employees." → add_markdown → add_portlet`,
     "- Example bad turn: (no text) → add_portlet ← NEVER do this",
     "",
     "### Text vs Notebook",
     "- ALL analysis, findings, methodology, and insights MUST go through `add_markdown` tool calls — never in your text responses",
     "- Your text responses must be 1-2 short sentences (under 50 words) summarizing what you are about to do next — status updates only",
     "- Never use markdown formatting (headers, bullets, bold, code blocks) in text responses — plain sentences only",
+    "- Write text responses as a friendly analyst would — use plain business language the user understands",
+    '- NEVER mention internal terms like "cube", "query syntax", "field names", "measures", "dimensions", "portlet", "prefix format", or tool names in text responses',
+    '- Instead of "Let me correct the query syntax and retry" → "Let me fix that and try again"',
+    `- Instead of "I'll query the PullRequests cube" → "I'll look at the pull request data"`,
+    `- Instead of "Adding a portlet with the results" → "Here's a chart of the results"`,
     "",
     "### Notebook content rules",
     "- Before each `add_portlet`, ALWAYS call `add_markdown` first to explain WHY you are adding this visualization and what it shows",
@@ -32597,7 +32612,7 @@ ${I.errors.join(`
     };
   }), s;
 }
-async function* AA(r) {
+async function* RA(r) {
   const { message: e, sessionId: t, semanticLayer: s, securityContext: n, agentConfig: i, apiKey: E } = r;
   let a;
   try {
@@ -32680,7 +32695,7 @@ async function* AA(r) {
             is_error: !0
           }), yield {
             type: "tool_use_result",
-            data: { id: w, name: U, result: `Unknown tool: ${U}` }
+            data: { id: w, name: U, result: `Unknown tool: ${U}`, isError: !0 }
           };
           continue;
         }
@@ -32693,7 +32708,7 @@ async function* AA(r) {
             ...x.isError ? { is_error: !0 } : {}
           }), yield {
             type: "tool_use_result",
-            data: { id: w, name: U, result: x.result }
+            data: { id: w, name: U, result: x.result, ...x.isError ? { isError: !0 } : {} }
           };
         } catch (x) {
           const k = x instanceof Error ? x.message : "Tool execution failed";
@@ -32704,7 +32719,7 @@ async function* AA(r) {
             is_error: !0
           }), yield {
             type: "tool_use_result",
-            data: { id: w, name: U, result: k }
+            data: { id: w, name: U, result: k, isError: !0 }
           };
         }
       }
@@ -32718,11 +32733,37 @@ async function* AA(r) {
     yield {
       type: "error",
       data: {
-        message: u instanceof Error ? u.message : "Agent execution failed"
+        message: YT(u)
       }
     };
   }
 }
+function YT(r) {
+  if (!r || !(r instanceof Error))
+    return "Something went wrong. Please try again.";
+  const e = r.message || "", t = {
+    overloaded_error: "The AI service is temporarily overloaded. Please try again in a moment.",
+    rate_limit_error: "Too many requests. Please wait a moment and try again.",
+    api_error: "The AI service encountered an error. Please try again.",
+    authentication_error: "Authentication failed. Please check your API key configuration.",
+    invalid_request_error: "There was a problem with the request. Please try again."
+  }, s = r;
+  if (s.status || s.type) {
+    const n = s.error?.type || s.type || "";
+    if (t[n])
+      return t[n];
+  }
+  if (e.startsWith("{") || e.startsWith("Error: {")) {
+    try {
+      const n = JSON.parse(e.replace(/^Error:\s*/, "")), i = n.error?.type || n.type || "";
+      if (t[i])
+        return t[i];
+    } catch {
+    }
+    return "The AI service encountered an error. Please try again.";
+  }
+  return e;
+}
 const cs = {
   funnel: {
     description: "Track conversion through sequential steps. Entities (identified by bindingKey) move through ordered steps.",
@@ -32774,7 +32815,7 @@ const cs = {
     }
   }
 };
-function YT(r, e) {
+function wT(r, e) {
   const t = [];
   for (let s = 0; s <= e.length; s++)
     t[s] = [s];
@@ -32798,7 +32839,7 @@ function X(r, e) {
     if (A === t) return 0.85;
     if (A.startsWith(t)) return 0.75;
   }
-  const i = YT(t, s), E = Math.max(t.length, s.length), a = 1 - i / E;
+  const i = wT(t, s), E = Math.max(t.length, s.length), a = 1 - i / E;
   return a > 0.5 ? a * 0.7 : 0;
 }
 function Me(r, e) {
@@ -32809,7 +32850,7 @@ function Me(r, e) {
   }
   return t;
 }
-function wT(r) {
+function $T(r) {
   const e = /* @__PURE__ */ new Set([
     "a",
     "an",
@@ -32903,7 +32944,7 @@ function wT(r) {
   ]);
   return r.toLowerCase().replace(/[^\w\s]/g, " ").split(/\s+/).filter((t) => t.length > 2 && !e.has(t));
 }
-function $T(r, e) {
+function vT(r, e) {
   let t = 0;
   const s = [], n = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
   for (const o of e) {
@@ -33025,12 +33066,12 @@ function vs(r, e = {}) {
         querySchemas: N ? cs : void 0
       };
     });
-  const a = wT(E);
+  const a = $T(E);
   if (a.length === 0)
     return [];
   const A = [];
   for (const o of r) {
-    const { score: R, matchedOn: S, suggestedMeasures: l, suggestedDimensions: N } = $T(o, a);
+    const { score: R, matchedOn: S, suggestedMeasures: l, suggestedDimensions: N } = vT(o, a);
     if (R >= i) {
       const I = Ot(o), O = Cs(o), c = ds(o, O), u = I.funnel || I.flow || I.retention;
       A.push({
@@ -33068,7 +33109,7 @@ function mt(r, e, t) {
   }
   return s;
 }
-function vT() {
+function VT() {
   const r = /* @__PURE__ */ new Date(), e = r.toISOString().split("T")[0], t = (a) => a.toISOString().split("T")[0], s = (a) => new Date(a.getFullYear(), a.getMonth(), 1), n = (a) => new Date(a.getFullYear(), 0, 1), i = (a) => {
     const A = Math.floor(a.getMonth() / 3);
     return new Date(a.getFullYear(), A * 3, 1);
@@ -33198,7 +33239,7 @@ const At = {
   flow: /\b(flows?|paths?|sequence|before|after|next|previous|user.?journey)\b/i,
   retention: /\b(retention|cohort|return|churn|comeback|retained|day.?\d+)\b/i
 };
-function VT(r) {
+function WT(r) {
   const e = r.toLowerCase();
   return At.funnel.test(e) ? "funnel" : At.flow.test(e) ? "flow" : At.retention.test(e) ? "retention" : "query";
 }
@@ -33224,8 +33265,8 @@ function ms(r, e) {
       ];
   }
 }
-function WT(r) {
-  const e = vT(), t = r.toLowerCase();
+function xT(r) {
+  const e = VT(), t = r.toLowerCase();
   for (const s of e) {
     const n = t.match(s.pattern);
     if (n) {
@@ -33253,7 +33294,7 @@ function WT(r) {
   }
   return null;
 }
-function xT(r) {
+function XT(r) {
   const e = r.toLowerCase(), t = [
     { pattern: /\b(total|sum|combined)\b/i, type: "sum" },
     { pattern: /\b(count|number of|how many)\b/i, type: "count" },
@@ -33266,7 +33307,7 @@ function xT(r) {
       return { type: n, confidence: 0.8 };
   return null;
 }
-function XT(r) {
+function KT(r) {
   const e = r.toLowerCase(), t = [], s = /\bby\s+(\w+(?:\s+\w+)?)/gi;
   let n;
   for (; (n = s.exec(e)) !== null; )
@@ -33279,8 +33320,8 @@ function XT(r) {
     t.push(n[1].trim());
   return t;
 }
-function RA(r, e, t) {
-  const s = [], n = [], i = {}, E = VT(e);
+function SA(r, e, t) {
+  const s = [], n = [], i = {}, E = WT(e);
   let a;
   if (t) {
     const c = r.find((u) => u.name === t);
@@ -33300,7 +33341,7 @@ function RA(r, e, t) {
   }
   const A = a[0];
   let o = 0.5;
-  const R = xT(e);
+  const R = XT(e);
   R && (s.push(`Detected ${R.type} aggregation intent`), o += 0.1);
   const S = [], l = e.toLowerCase();
   for (const c of A.measures) {
@@ -33327,7 +33368,7 @@ function RA(r, e, t) {
     }
   }
   S.length === 0 && A.measures.length > 0 && (S.push(A.measures[0].name), s.push(`Using default measure: ${A.measures[0].name}`), n.push("Could not determine specific measure from query, using default")), i.measures = S;
-  const N = XT(e), I = [];
+  const N = KT(e), I = [];
   for (const c of N) {
     const u = mt(a, c, "dimension");
     u && (I.push(u.field), s.push(`Matched dimension '${u.field}' from grouping keyword '${c}'`), o += 0.1);
@@ -33346,7 +33387,7 @@ function RA(r, e, t) {
         }
     }
   I.length > 0 && (i.dimensions = I);
-  const O = WT(e);
+  const O = xT(e);
   if (O) {
     const c = A.dimensions.find((u) => u.type === "time");
     if (c) {
@@ -33380,7 +33421,7 @@ function RA(r, e, t) {
     analysisMode: "query"
   };
 }
-function KT(r, e) {
+function kT(r, e) {
   const t = [];
   for (let s = 0; s <= e.length; s++)
     t[s] = [s];
@@ -33398,12 +33439,12 @@ function KT(r, e) {
 function Se(r, e) {
   let t = null;
   for (const s of e) {
-    const n = KT(r.toLowerCase(), s.toLowerCase());
+    const n = kT(r.toLowerCase(), s.toLowerCase());
     n <= 3 && (!t || n < t.distance) && (t = { field: s, distance: n });
   }
   return t;
 }
-function kT(r, e, t, s) {
+function JT(r, e, t, s) {
   const n = r.split(".");
   if (n.length !== 2) {
     t.push({
@@ -33576,7 +33617,7 @@ function Ue(r, e, t, s) {
     }
   }
 }
-function JT(r, e, t, s, n) {
+function QT(r, e, t, s, n) {
   const i = r.funnel;
   if (i)
     if (i.bindingKey ? typeof i.bindingKey == "string" && te(i.bindingKey, e, t, n) : t.push({
@@ -33605,7 +33646,7 @@ function JT(r, e, t, s, n) {
         }), a.filter && "member" in a.filter && Ue([a.filter], e, t, n);
       }
 }
-function QT(r, e, t, s, n) {
+function qT(r, e, t, s, n) {
   const i = r.flow;
   i && (i.bindingKey ? typeof i.bindingKey == "string" && te(i.bindingKey, e, t, n) : t.push({
     type: "syntax_error",
@@ -33622,7 +33663,7 @@ function QT(r, e, t, s, n) {
     suggestion: "Set stepsBefore and/or stepsAfter to see event sequences"
   }));
 }
-function qT(r, e, t, s, n) {
+function jT(r, e, t, s, n) {
   const i = r.retention;
   i && (i.bindingKey ? typeof i.bindingKey == "string" && te(i.bindingKey, e, t, n) : t.push({
     type: "syntax_error",
@@ -33640,10 +33681,10 @@ function qT(r, e, t, s, n) {
     suggestion: "Specify number of periods to analyze"
   }));
 }
-function SA(r, e) {
+function lA(r, e) {
   const t = [], s = [], n = /* @__PURE__ */ new Map();
   if (r.funnel)
-    return JT(r, e, t, s, n), {
+    return QT(r, e, t, s, n), {
       isValid: t.length === 0,
       errors: t,
       warnings: s,
@@ -33651,14 +33692,14 @@ function SA(r, e) {
       // Funnel corrections not implemented yet
     };
   if (r.flow)
-    return QT(r, e, t, s, n), {
+    return qT(r, e, t, s, n), {
       isValid: t.length === 0,
       errors: t,
       warnings: s,
       correctedQuery: void 0
     };
   if (r.retention)
-    return qT(r, e, t, s, n), {
+    return jT(r, e, t, s, n), {
       isValid: t.length === 0,
       errors: t,
       warnings: s,
@@ -33666,7 +33707,7 @@ function SA(r, e) {
     };
   if (r.measures)
     for (const E of r.measures)
-      kT(E, e, t, n);
+      JT(E, e, t, n);
   if (r.dimensions)
     for (const E of r.dimensions)
       te(E, e, t, n);
@@ -33711,7 +33752,7 @@ function SA(r, e) {
     correctedQuery: n.size > 0 ? i : void 0
   };
 }
-function lA(r) {
+function NA(r) {
   return new Ct({
     drizzle: r.drizzle,
     schema: r.schema
@@ -33732,9 +33773,9 @@ export {
   me as JoinPathResolver,
   vn as LogicalPlanBuilder,
   Mn as LogicalPlanner,
-  sA as MemoryCacheProvider,
+  nA as MemoryCacheProvider,
   _s as MySQLExecutor,
-  tA as OptimiserPipeline,
+  sA as OptimiserPipeline,
   nn as PostgresExecutor,
   Zn as QueryExecutor,
   $n as RetentionQueryBuilder,
@@ -33744,34 +33785,34 @@ export {
   nT as STEP2_SYSTEM_PROMPT,
   tT as SYSTEM_PROMPT_TEMPLATE,
   Ct as SemanticLayerCompiler,
-  SA as aiValidateQuery,
+  lA as aiValidateQuery,
   AT as buildAgentSystemPrompt,
-  aA as buildExplainAnalysisPrompt,
-  nA as buildStep0Prompt,
-  rA as buildStep1Prompt,
-  EA as buildStep2Prompt,
-  iA as buildSystemPrompt,
+  oA as buildExplainAnalysisPrompt,
+  iA as buildStep0Prompt,
+  EA as buildStep1Prompt,
+  aA as buildStep2Prompt,
+  rA as buildSystemPrompt,
   yt as createDatabaseExecutor,
-  lA as createDrizzleSemanticLayer,
+  NA as createDrizzleSemanticLayer,
   un as createDuckDBExecutor,
-  ZT as createMultiCubeContext,
+  zT as createMultiCubeContext,
   an as createMySQLExecutor,
   Mt as createPostgresExecutor,
   Ut as createSQLiteExecutor,
   HT as createToolExecutor,
-  zT as defineCube,
+  eA as defineCube,
   vs as discoverCubes,
   mt as findBestFieldMatch,
   gt as fnv1aHash,
-  oA as formatCubeSchemaForExplain,
-  TA as formatExistingIndexes,
+  TA as formatCubeSchemaForExplain,
+  AA as formatExistingIndexes,
   Cn as generateCacheKey,
-  eA as getCubeInvalidationPattern,
+  tA as getCubeInvalidationPattern,
   St as getJoinType,
   BT as getToolDefinitions,
-  AA as handleAgentChat,
+  RA as handleAgentChat,
   dn as normalizeQuery,
   J as resolveCubeReference,
   B as resolveSqlExpression,
-  RA as suggestQuery
+  SA as suggestQuery
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-cube",
-  "version": "0.4.10",
+  "version": "0.4.13",
   "description": "Drizzle ORM-first semantic layer with Cube.js compatibility. Type-safe analytics and dashboards with SQL injection protection.",
   "main": "./dist/server/index.js",
   "types": "./dist/server/index.d.ts",