drizzle-cube 0.4.20 → 0.4.21

package/dist/adapters/{handler-CbDMdSY5.js → handler-9Rdn7zM2.js}

@@ -1,40 +1,40 @@
-import { h as H, Q as B, j, D as U } from "./mcp-transport-m1X1GtwG.js";
-import { handleDiscover as Z, handleLoad as G } from "./utils.js";
-function K(l) {
-  if (l.length === 0)
+import { h as j, Q as U, j as Z, D as G } from "./mcp-transport-m1X1GtwG.js";
+import { handleDiscover as K, handleLoad as W } from "./utils.js";
+function X(d) {
+  if (d.length === 0)
     return "No cubes are currently available.";
-  const t = ["## Available Cubes", ""];
-  for (const a of l) {
-    if (t.push(`### ${a.name}`), a.description && t.push(a.description), a.measures && a.measures.length > 0) {
-      t.push(""), t.push("**Measures:**");
-      for (const i of a.measures) {
-        const d = i.description ? ` - ${i.description}` : "";
-        t.push(`- \`${a.name}.${i.name}\` (${i.type})${d}`);
+  const s = ["## Available Cubes", ""];
+  for (const a of d) {
+    if (s.push(`### ${a.name}`), a.description && s.push(a.description), a.measures && a.measures.length > 0) {
+      s.push(""), s.push("**Measures:**");
+      for (const o of a.measures) {
+        const y = o.description ? ` - ${o.description}` : "";
+        s.push(`- \`${a.name}.${o.name}\` (${o.type})${y}`);
       }
     }
     if (a.dimensions && a.dimensions.length > 0) {
-      t.push(""), t.push("**Dimensions:**");
-      for (const i of a.dimensions) {
-        const d = i.description ? ` - ${i.description}` : "";
-        t.push(`- \`${a.name}.${i.name}\` (${i.type})${d}`);
+      s.push(""), s.push("**Dimensions:**");
+      for (const o of a.dimensions) {
+        const y = o.description ? ` - ${o.description}` : "";
+        s.push(`- \`${a.name}.${o.name}\` (${o.type})${y}`);
       }
     }
     if (a.relationships && a.relationships.length > 0) {
-      t.push(""), t.push("**Joins:**");
-      for (const i of a.relationships)
-        t.push(`- → \`${i.targetCube}\` (${i.relationship})`);
+      s.push(""), s.push("**Joins:**");
+      for (const o of a.relationships)
+        s.push(`- → \`${o.targetCube}\` (${o.relationship})`);
     }
-    a.meta?.eventStream && (t.push(""), t.push("**Event Stream:** Yes (supports funnel, flow, retention queries)"), a.meta.eventStream.bindingKey && t.push(`- Binding key: \`${a.name}.${a.meta.eventStream.bindingKey}\``), a.meta.eventStream.timeDimension && t.push(`- Time dimension: \`${a.name}.${a.meta.eventStream.timeDimension}\``)), t.push("");
+    a.meta?.eventStream && (s.push(""), s.push("**Event Stream:** Yes (supports funnel, flow, retention queries)"), a.meta.eventStream.bindingKey && s.push(`- Binding key: \`${a.name}.${a.meta.eventStream.bindingKey}\``), a.meta.eventStream.timeDimension && s.push(`- Time dimension: \`${a.name}.${a.meta.eventStream.timeDimension}\``)), s.push("");
   }
-  return t.join(`
+  return s.join(`
 `);
 }
-function I(l) {
-  return l.messages.map((t) => t.content.text).join(`
+function I(d) {
+  return d.messages.map((s) => s.content.text).join(`
 
 `);
 }
-function W(l) {
+function J(d) {
   return [
     "# Drizzle Cube Analytics Agent",
     "",
@@ -43,20 +43,24 @@ function W(l) {
     "",
     "## Your Workflow",
     "",
-    "1. **Discover** available cubes using `discover_cubes` to understand the data",
-    "2. **Explain your approach** by calling `add_markdown` to describe what you plan to analyze and why",
-    "3. **Query** data using `execute_query` with properly structured queries",
-    "4. **Explain results** by calling `add_markdown` to describe what the data shows, key insights, and methodology",
-    "5. **Visualize** results by calling `add_portlet` to add charts/tables to the notebook",
+    "For EACH insight, follow this cycle — do NOT batch all queries first:",
+    "",
+    "1. **Discover** available cubes using `discover_cubes` (once at the start)",
+    "2. **For each analysis point**, repeat this cycle:",
+    "   a. `execute_query` — get the data",
+    "   b. `add_markdown` — explain the results and insight",
+    "   c. `add_portlet` — visualize the results",
+    "",
+    "Call all three (query → markdown → portlet) in a single turn before moving on to the next analysis.",
+    "Do NOT run multiple queries first and add charts later — the user sees results in real-time.",
     "",
     "## 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",
+    "- Field names MUST be `CubeName.fieldName` with a DOT separator (e.g. `PullRequests.count`, `Teams.name`). NEVER use underscores, NEVER use just the cube name as a field — `PullRequests.PullRequests` and `Teams_count` are WRONG.",
+    "- Order keys MUST be one of the measures or dimensions already listed in that query. You CANNOT order by a field that is not in measures or dimensions — add it to measures first, or remove it from order.",
+    "- After EVERY `execute_query`, IMMEDIATELY call `add_markdown` and `add_portlet` in the SAME turn — never defer visualizations to a later turn",
     "- Choose appropriate chart types: bar for categories, line for trends, table for detailed data",
-    "- When showing data, always add both a portlet (visualization) and markdown (explanation)",
     "- If a query fails, explain the error and try an alternative approach",
     "",
     "## Output Format Rules",
@@ -160,19 +164,19 @@ function W(l) {
     "",
     "---",
     "",
-    I(H),
+    I(j),
     "",
     "---",
     "",
-    I(B),
+    I(U),
     "",
     "---",
     "",
-    I(j),
+    I(Z),
     "",
     "---",
     "",
-    I(U),
+    I(G),
     "",
     "---",
     "",
@@ -226,11 +230,11 @@ function W(l) {
     "",
     "---",
     "",
-    K(l)
+    X(d)
   ].join(`
 `);
 }
-const X = {
+const Q = {
   label: "Bar Chart",
   description: "Compare values across categories",
   useCase: "Best for comparing discrete categories, showing rankings, or displaying changes over time",
@@ -296,7 +300,7 @@ const X = {
       description: "Number formatting for right Y-axis"
     }
   ]
-}, J = {
+}, ee = {
   label: "Line Chart",
   description: "Show trends and changes over time",
   useCase: "Best for continuous data, trends, time series, and showing relationships between multiple series",
@@ -379,7 +383,7 @@ const X = {
       description: "Number formatting for right Y-axis"
     }
   ]
-}, Q = {
+}, te = {
   label: "Area Chart",
   description: "Emphasize magnitude of change over time",
   useCase: "Best for showing cumulative totals, volume changes, or stacked comparisons over time",
@@ -451,7 +455,7 @@ const X = {
       description: "Number formatting for right Y-axis"
     }
   ]
-}, ee = {
+}, se = {
   label: "Pie Chart",
   description: "Show proportions of a whole",
   useCase: "Best for showing percentage distribution or composition of a total (limit to 5-7 slices)",
@@ -485,7 +489,7 @@ const X = {
       description: "Number formatting for values"
     }
   ]
-}, te = {
+}, ae = {
   label: "Scatter Plot",
   description: "Reveal correlations between variables",
   useCase: "Best for identifying patterns, correlations, outliers, and relationships between two measures",
@@ -533,7 +537,7 @@ const X = {
       description: "Number formatting for Y-axis"
     }
   ]
-}, ae = {
+}, ie = {
   label: "Bubble Chart",
   description: "Compare three dimensions of data",
   useCase: "Best for showing relationships between three variables (X, Y, and size), market analysis",
@@ -599,7 +603,7 @@ const X = {
       description: "Number formatting for Y-axis and values"
     }
   ]
-}, se = {
+}, oe = {
   label: "Radar Chart",
   description: "Compare multiple metrics across categories",
   useCase: "Best for multivariate comparisons, performance metrics, strengths/weaknesses analysis",
@@ -638,7 +642,7 @@ const X = {
       description: "Number formatting for values"
     }
   ]
-}, ie = {
+}, re = {
   label: "Radial Bar Chart",
   description: "Circular progress and KPI visualization",
   useCase: "Best for showing progress toward goals, KPIs, or comparing percentages in a compact form",
@@ -670,7 +674,7 @@ const X = {
       description: "Number formatting for values"
     }
   ]
-}, oe = {
+}, ne = {
   label: "TreeMap",
   description: "Visualize hierarchical data with nested rectangles",
   useCase: "Best for showing part-to-whole relationships in hierarchical data, disk usage, budget allocation",
@@ -712,7 +716,7 @@ const X = {
     }
   ],
   clickableElements: { cell: !0 }
-}, re = {
+}, le = {
   label: "Data Table",
   description: "Display detailed tabular data",
   useCase: "Best for precise values, detailed analysis, sortable/filterable data exploration",
@@ -735,7 +739,7 @@ const X = {
       description: "Number formatting for numeric values"
     }
   ]
-}, ne = {
+}, de = {
   label: "Activity Grid",
   description: "GitHub-style activity grid showing temporal patterns across different time scales",
   useCase: "Best for visualizing activity patterns over time. Supports hour (3hr blocks × days), day (days × weeks), week (weeks × months), month (months × quarters), and quarter (quarters × years) granularities",
@@ -769,9 +773,9 @@ const X = {
       description: "Automatically size blocks to fill portlet width and height while maintaining aspect ratio"
     }
   ],
-  validate: (l) => {
-    const { dateField: t, valueField: a } = l;
-    return !t || Array.isArray(t) && t.length === 0 ? {
+  validate: (d) => {
+    const { dateField: s, valueField: a } = d;
+    return !s || Array.isArray(s) && s.length === 0 ? {
       isValid: !1,
       message: "Time dimension is required for activity grid"
     } : !a || Array.isArray(a) && a.length === 0 ? {
@@ -780,7 +784,7 @@ const X = {
     } : { isValid: !0 };
   },
   clickableElements: { cell: !0 }
-}, le = {
+}, pe = {
   label: "KPI Number",
   description: "Display key performance indicators as large numbers",
   useCase: "Perfect for showing important metrics like revenue, user count, or other key business metrics in a prominent, easy-to-read format",
@@ -850,7 +854,7 @@ const X = {
     }
   ],
   displayOptions: ["hideHeader"]
-}, de = {
+}, ue = {
   label: "KPI Delta",
   description: "Display change between latest and previous values with trend indicators",
   useCase: "Perfect for showing performance changes over time, such as revenue growth, user acquisition changes, or other metrics where the trend and delta are more important than the absolute value",
@@ -938,11 +942,11 @@ const X = {
     }
   ],
   displayOptions: ["hideHeader"],
-  validate: (l) => !l.yAxis || Array.isArray(l.yAxis) && l.yAxis.length === 0 ? {
+  validate: (d) => !d.yAxis || Array.isArray(d.yAxis) && d.yAxis.length === 0 ? {
     isValid: !1,
     message: "A measure is required for KPI Delta charts"
   } : { isValid: !0 }
-}, pe = {
+}, ce = {
   label: "KPI Text",
   description: "Display key performance indicators as customizable text",
   useCase: "Perfect for showing metrics with custom formatting, combining multiple values, or displaying contextual KPI information using templates",
@@ -984,7 +988,7 @@ const X = {
     }
   ],
   displayOptions: ["hideHeader"]
-}, ue = {
+}, me = {
   label: "Markdown",
   description: "Display custom markdown content with formatting",
   useCase: "Perfect for adding documentation, notes, section headers, instructions, or formatted text to dashboards",
@@ -1076,7 +1080,7 @@ Use --- for horizontal rules.`,
       description: "Add an accent-colored border on one side of the content"
     }
   ]
-}, ce = {
+}, ye = {
   label: "Funnel Chart",
   description: "Show conversion through sequential steps",
   useCase: "Best for visualizing user journey funnels, sales pipelines, or multi-step processes",
@@ -1163,7 +1167,7 @@ Use --- for horizontal rules.`,
       description: "Display 90th percentile time to convert"
     }
   ]
-}, me = {
+}, he = {
   label: "Sankey Chart",
   description: "Show flow between states or steps",
   useCase: "Best for visualizing user journey flows, path analysis, or state transitions",
@@ -1219,7 +1223,7 @@ Use --- for horizontal rules.`,
       description: "Hide the statistics footer below the chart"
     }
   ]
-}, ye = {
+}, fe = {
   label: "Sunburst Chart",
   description: "Show hierarchical flow as radial rings",
   useCase: "Best for visualizing forward paths from a starting event in a compact radial layout",
@@ -1264,7 +1268,7 @@ Use --- for horizontal rules.`,
       description: "Hide the statistics footer below the chart"
     }
   ]
-}, he = {
+}, be = {
   label: "Heatmap",
   description: "Visualize intensity across two dimensions",
   useCase: "Best for showing patterns in matrix data like correlations, schedules, or category comparisons",
@@ -1335,8 +1339,8 @@ Use --- for horizontal rules.`,
       description: "Number formatting for cell values and legend"
     }
   ],
-  validate: (l) => l.xAxis?.length ? l.yAxis?.length ? l.valueField?.length ? { isValid: !0 } : { isValid: !1, message: "Value measure required" } : { isValid: !1, message: "Y-axis dimension required" } : { isValid: !1, message: "X-axis dimension required" }
-}, fe = {
+  validate: (d) => d.xAxis?.length ? d.yAxis?.length ? d.valueField?.length ? { isValid: !0 } : { isValid: !1, message: "Value measure required" } : { isValid: !1, message: "Y-axis dimension required" } : { isValid: !1, message: "X-axis dimension required" }
+}, ge = {
   label: "Retention Matrix",
   // RetentionHeatmap auto-configures from the retention data structure
   // No drop zones needed as the chart maps directly to cohort × period matrix
@@ -1360,7 +1364,7 @@ Use --- for horizontal rules.`,
   ],
   description: "Cohort retention matrix visualization",
   useCase: "Visualize user retention over time by cohort"
-}, be = {
+}, xe = {
   label: "Retention Chart",
   // RetentionCombinedChart auto-configures from the retention data structure
   // No drop zones needed as the chart maps directly to retention result data
@@ -1403,7 +1407,7 @@ Use --- for horizontal rules.`,
   ],
   description: "Combined retention visualization with line chart and heatmap modes",
   useCase: "Visualize user retention over time with optional breakdown segmentation"
-}, ge = {
+}, we = {
   label: "Box Plot",
   description: "Show statistical distribution (median, IQR, whiskers) across categories",
   useCase: "Best for P&L spread per symbol, trade size distribution, latency distribution across platforms",
@@ -1436,7 +1440,7 @@ Use --- for horizontal rules.`,
       description: "Number formatting for the value axis"
     }
   ]
-}, xe = {
+}, ke = {
   label: "Waterfall Chart",
   description: "Show cumulative effect of sequential positive and negative values",
   useCase: "Best for P&L decomposition, cash flow analysis, budget variance, or any sequential contribution breakdown",
@@ -1491,7 +1495,7 @@ Use --- for horizontal rules.`,
       description: "Number formatting for the Y-axis"
     }
   ]
-}, we = {
+}, ve = {
   label: "Candlestick Chart",
   description: "Financial candlestick chart showing open/close body and high/low wicks",
   useCase: "Best for EOD quotes (bid/ask spread per date/symbol), markout distribution bands, or OHLC price data",
@@ -1556,7 +1560,7 @@ Use --- for horizontal rules.`,
       description: "Number formatting for the price axis"
     }
   ]
-}, ke = {
+}, Ce = {
   label: "Measure Profile",
   description: "Plot N measures as sequential X-axis points to visualise a profile or shape across intervals",
   useCase: "Best for markout interval analysis (e.g. avgMinus2m → avgAtEvent → avgPlus2h), metric profiles, or any pattern across ordered measures",
@@ -1621,7 +1625,7 @@ Use --- for horizontal rules.`,
       description: "Number formatting for the Y-axis"
     }
   ]
-}, ve = {
+}, Te = {
   label: "Gauge Chart",
   description: "Half-circle arc gauge for a single KPI value versus a maximum target",
   useCase: "Best for high-water marks vs equity, margin utilisation, or any single value progress toward a goal",
@@ -1680,133 +1684,133 @@ Use --- for horizontal rules.`,
       description: "Number formatting for the displayed value and axis labels"
     }
   ]
-}, P = {
-  bar: X,
-  line: J,
-  area: Q,
-  pie: ee,
-  scatter: te,
-  bubble: ae,
-  radar: se,
-  radialBar: ie,
-  treemap: oe,
-  table: re,
-  activityGrid: ne,
-  kpiNumber: le,
-  kpiDelta: de,
-  kpiText: pe,
-  markdown: ue,
-  funnel: ce,
-  sankey: me,
-  sunburst: ye,
-  heatmap: he,
-  retentionHeatmap: fe,
-  retentionCombined: be,
-  boxPlot: ge,
-  waterfall: xe,
-  candlestick: we,
-  measureProfile: ke,
-  gauge: ve
+}, R = {
+  bar: Q,
+  line: ee,
+  area: te,
+  pie: se,
+  scatter: ae,
+  bubble: ie,
+  radar: oe,
+  radialBar: re,
+  treemap: ne,
+  table: le,
+  activityGrid: de,
+  kpiNumber: pe,
+  kpiDelta: ue,
+  kpiText: ce,
+  markdown: me,
+  funnel: ye,
+  sankey: he,
+  sunburst: fe,
+  heatmap: be,
+  retentionHeatmap: ge,
+  retentionCombined: xe,
+  boxPlot: we,
+  waterfall: ke,
+  candlestick: ve,
+  measureProfile: Ce,
+  gauge: Te
 };
-function Ce(l, t, a) {
-  const i = P[l];
-  if (!i)
+function Ae(d, s, a) {
+  const o = R[d];
+  if (!o)
     return { isValid: !0, errors: [] };
-  if (i.skipQuery)
+  if (o.skipQuery)
     return { isValid: !0, errors: [] };
-  const d = [];
-  for (const u of i.dropZones) {
-    if (!u.mandatory) continue;
-    const e = t?.[u.key];
+  const y = [];
+  for (const h of o.dropZones) {
+    if (!h.mandatory) continue;
+    const e = s?.[h.key];
     if (!(Array.isArray(e) ? e.length > 0 : !!e)) {
-      const r = u.acceptTypes?.join("/") ?? "fields";
-      d.push(
-        `chartConfig.${u.key} is required for ${l} chart (${u.label}). Accepts: ${r}.`
+      const r = h.acceptTypes?.join("/") ?? "fields";
+      y.push(
+        `chartConfig.${h.key} is required for ${d} chart (${h.label}). Accepts: ${r}.`
       );
     }
   }
-  if (l === "bar") {
-    const u = t?.xAxis;
-    if (!(Array.isArray(u) ? u.length > 0 : !!u)) {
-      const o = a.dimensions ?? [], r = a.timeDimensions ?? [];
-      o.length > 0 || r.length > 0 ? d.push(
+  if (d === "bar") {
+    const h = s?.xAxis;
+    if (!(Array.isArray(h) ? h.length > 0 : !!h)) {
+      const n = a.dimensions ?? [], r = a.timeDimensions ?? [];
+      n.length > 0 || r.length > 0 ? y.push(
         "chartConfig.xAxis is required for bar charts. Put a dimension in xAxis so bars have category labels."
-      ) : d.push(
+      ) : y.push(
         'Bar charts need an xAxis dimension for category labels. Add a dimension to the query or use "table" chart type instead.'
       );
     }
   }
-  if (t?.xAxis && t?.series) {
-    const u = new Set(
-      Array.isArray(t.xAxis) ? t.xAxis : [t.xAxis]
-    ), o = (Array.isArray(t.series) ? t.series : [t.series]).filter((r) => u.has(r));
-    o.length > 0 && d.push(
-      `chartConfig.series must not contain the same field as xAxis (found: ${o.join(", ")}). The series field is only for splitting into grouped/stacked sub-series by a DIFFERENT dimension. Remove the duplicate from series.`
+  if (s?.xAxis && s?.series) {
+    const h = new Set(
+      Array.isArray(s.xAxis) ? s.xAxis : [s.xAxis]
+    ), n = (Array.isArray(s.series) ? s.series : [s.series]).filter((r) => h.has(r));
+    n.length > 0 && y.push(
+      `chartConfig.series must not contain the same field as xAxis (found: ${n.join(", ")}). The series field is only for splitting into grouped/stacked sub-series by a DIFFERENT dimension. Remove the duplicate from series.`
     );
   }
-  return { isValid: d.length === 0, errors: d };
+  return { isValid: y.length === 0, errors: y };
 }
-function Te(l, t, a) {
-  const i = P[l];
-  if (!i)
-    return t ?? {};
-  const d = { ...t }, u = a.measures ?? [], e = a.dimensions ?? [], r = (a.timeDimensions ?? []).map((s) => s.dimension);
-  for (const s of i.dropZones) {
-    const h = d[s.key];
-    if (Array.isArray(h) ? h.length > 0 : !!h) continue;
-    const c = s.acceptTypes ?? [];
-    if (s.key === "sizeField" || s.key === "colorField") {
-      if (c.includes("measure")) {
-        const g = /* @__PURE__ */ new Set();
-        for (const C of i.dropZones) {
-          if (C.key === s.key) continue;
-          const k = d[C.key];
-          Array.isArray(k) ? k.forEach((E) => g.add(E)) : typeof k == "string" && g.add(k);
+function De(d, s, a) {
+  const o = R[d];
+  if (!o)
+    return s ?? {};
+  const y = { ...s }, h = a.measures ?? [], e = a.dimensions ?? [], r = (a.timeDimensions ?? []).map((t) => t.dimension);
+  for (const t of o.dropZones) {
+    const m = y[t.key];
+    if (Array.isArray(m) ? m.length > 0 : !!m) continue;
+    const l = t.acceptTypes ?? [];
+    if (t.key === "sizeField" || t.key === "colorField") {
+      if (l.includes("measure")) {
+        const x = /* @__PURE__ */ new Set();
+        for (const A of o.dropZones) {
+          if (A.key === t.key) continue;
+          const C = y[A.key];
+          Array.isArray(C) ? C.forEach((T) => x.add(T)) : typeof C == "string" && x.add(C);
         }
-        const A = u.filter((C) => !g.has(C));
-        A.length > 0 && (d[s.key] = A[0]);
+        const D = h.filter((A) => !x.has(A));
+        D.length > 0 && (y[t.key] = D[0]);
       }
       continue;
     }
-    const n = [];
-    if (c.includes("dimension") && n.push(...e), c.includes("timeDimension") && n.push(...r), c.includes("measure") && n.push(...u), n.length === 0) continue;
-    let x = n;
-    if (s.key === "series") {
-      const g = new Set(
-        Array.isArray(d.xAxis) ? d.xAxis : d.xAxis ? [d.xAxis] : []
+    const i = [];
+    if (l.includes("dimension") && i.push(...e), l.includes("timeDimension") && i.push(...r), l.includes("measure") && i.push(...h), i.length === 0) continue;
+    let g = i;
+    if (t.key === "series") {
+      const x = new Set(
+        Array.isArray(y.xAxis) ? y.xAxis : y.xAxis ? [y.xAxis] : []
       );
-      if (x = n.filter((A) => !g.has(A)), x.length === 0) continue;
+      if (g = i.filter((D) => !x.has(D)), g.length === 0) continue;
     }
-    const b = s.maxItems ?? 1 / 0, m = x.slice(0, b);
-    m.length > 0 && (d[s.key] = m);
+    const b = t.maxItems ?? 1 / 0, u = g.slice(0, b);
+    u.length > 0 && (y[t.key] = u);
   }
-  return d;
+  return y;
 }
-function Ae(l) {
-  const t = [`
+function Se(d) {
+  const s = [`
 Chart config requirements by type:`];
-  for (const a of l) {
-    const i = P[a];
-    if (!i) continue;
-    const d = i.description ?? "", u = i.useCase ?? "", e = [d, u].filter(Boolean).join(". "), o = e ? ` — ${e}.` : "", r = i.dropZones.filter((h) => h.mandatory);
-    if (r.length === 0 && !i.skipQuery) {
-      t.push(`  ${a}${o} chartConfig auto-inferred from query.`);
+  for (const a of d) {
+    const o = R[a];
+    if (!o) continue;
+    const y = o.description ?? "", h = o.useCase ?? "", e = [y, h].filter(Boolean).join(". "), n = e ? ` — ${e}.` : "", r = o.dropZones.filter((m) => m.mandatory);
+    if (r.length === 0 && !o.skipQuery) {
+      s.push(`  ${a}${n} chartConfig auto-inferred from query.`);
       continue;
     }
-    if (i.skipQuery) {
-      t.push(`  ${a}${o} No query needed.`);
+    if (o.skipQuery) {
+      s.push(`  ${a}${n} No query needed.`);
       continue;
     }
-    const s = r.map((h) => {
-      const y = h.acceptTypes?.join("/") ?? "any", c = h.maxItems ? ` (max ${h.maxItems})` : "";
-      return `${h.key}=[${y}]${c}`;
+    const t = r.map((m) => {
+      const p = m.acceptTypes?.join("/") ?? "any", l = m.maxItems ? ` (max ${m.maxItems})` : "";
+      return `${m.key}=[${p}]${l}`;
     });
-    t.push(`  ${a}${o} Requires ${s.join(", ")}.`);
+    s.push(`  ${a}${n} Requires ${t.join(", ")}.`);
   }
-  return t.join(`
+  return s.join(`
 `);
 }
-const N = [
+const L = [
   "bar",
   "line",
   "area",
@@ -1826,13 +1830,13 @@ const N = [
   "boxPlot",
   "markdown"
 ];
-function De() {
+function Fe() {
   return [
     // Tool 1: discover_cubes
     {
       name: "discover_cubes",
       description: "Search for available data cubes by topic or intent. Call this FIRST to understand what data is available. Returns cube names, measures, dimensions, and relationships.",
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {
           topic: { type: "string", description: 'Keyword to search (e.g., "sales", "employees")' },
@@ -1846,7 +1850,7 @@ function De() {
     {
       name: "get_cube_metadata",
       description: "Get full metadata for all registered cubes including all measures, dimensions, types, and relationships. Use this for detailed schema information.",
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {}
       }
@@ -1855,7 +1859,7 @@ function De() {
     {
       name: "execute_query",
       description: "Execute a semantic query and return data results. Supports standard queries (measures/dimensions) and analysis modes (funnel/flow/retention). Only provide ONE mode per call.",
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {
           measures: {
@@ -1896,7 +1900,7 @@ function De() {
           },
           order: {
             type: "object",
-            description: 'Sort order (e.g., {"Employees.count": "desc"})'
+            description: 'Sort order. Keys MUST be a measure or dimension from this query in "CubeName.fieldName" format, values are "asc" or "desc". Example: {"Teams.count": "desc"}. WRONG: {"Teams_count": "desc"}'
           },
           limit: {
             type: "number",
@@ -1978,9 +1982,9 @@ function De() {
     {
       name: "add_portlet",
       description: `Add a chart visualization to the notebook.
-` + Ae(N) + `
+` + Se(L) + `
 The query is validated before adding. The portlet fetches its own data.`,
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {
           title: { type: "string", description: "Title for the visualization" },
@@ -1990,7 +1994,7 @@ The query is validated before adding. The portlet fetches its own data.`,
           },
           chartType: {
             type: "string",
-            enum: N,
+            enum: L,
             description: "Chart type to render"
           },
           chartConfig: {
@@ -2023,7 +2027,7 @@ The query is validated before adding. The portlet fetches its own data.`,
     {
       name: "add_markdown",
       description: "Add an explanation or analysis text block to the notebook. Use markdown formatting. Use this to explain findings, methodology, and insights alongside visualizations.",
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {
           title: { type: "string", description: "Optional title for the text block" },
@@ -2036,7 +2040,7 @@ The query is validated before adding. The portlet fetches its own data.`,
     {
       name: "save_as_dashboard",
       description: "Convert the current notebook analysis into a persistent dashboard. Constructs a professional DashboardConfig with proper grid layout, section headers (markdown portlets), and dashboard-level filters. Call this when the user asks to save/export the notebook as a dashboard.",
-      input_schema: {
+      parameters: {
         type: "object",
         properties: {
           title: { type: "string", description: "Dashboard title" },
@@ -2050,7 +2054,7 @@ The query is validated before adding. The portlet fetches its own data.`,
                 title: { type: "string", description: "Portlet title" },
                 chartType: {
                   type: "string",
-                  enum: N,
+                  enum: L,
                   description: 'Chart type. Use "markdown" for section headers.'
                 },
                 query: {
@@ -2121,81 +2125,135 @@ The query is validated before adding. The portlet fetches its own data.`,
     }
   ];
 }
-function Se(l) {
-  const { semanticLayer: t, securityContext: a } = l, i = /* @__PURE__ */ new Map();
-  i.set("discover_cubes", async (e) => {
-    const o = await Z(t, {
-      topic: e.topic,
-      intent: e.intent,
-      limit: e.limit,
-      minScore: e.minScore
-    });
-    return { result: JSON.stringify(o, null, 2) };
-  }), i.set("get_cube_metadata", async () => {
-    const e = t.getMetadata();
-    return { result: JSON.stringify(e, null, 2) };
+function Ee(d) {
+  const { semanticLayer: s, securityContext: a } = d, o = /* @__PURE__ */ new Map();
+  o.set("discover_cubes", async (e) => {
+    const r = {
+      cubes: (await K(s, {
+        topic: e.topic,
+        intent: e.intent,
+        limit: e.limit,
+        minScore: e.minScore
+      })).cubes.map((t) => ({
+        cube: t.cube,
+        title: t.title,
+        description: t.description,
+        relevanceScore: t.relevanceScore,
+        suggestedMeasures: t.suggestedMeasures,
+        suggestedDimensions: t.suggestedDimensions,
+        capabilities: t.capabilities,
+        // Only include analysisConfig if advanced modes are available, and only the essentials
+        ...t.capabilities.funnel || t.capabilities.flow || t.capabilities.retention ? {
+          analysisConfig: {
+            candidateBindingKeys: t.analysisConfig?.candidateBindingKeys?.map((m) => m.dimension) ?? [],
+            candidateTimeDimensions: t.analysisConfig?.candidateTimeDimensions?.map((m) => m.dimension) ?? [],
+            ...t.analysisConfig?.candidateEventDimensions?.length ? { candidateEventDimensions: t.analysisConfig.candidateEventDimensions.map((m) => m.dimension) } : {}
+          }
+        } : {}
+        // querySchemas and hints are omitted — already in the system prompt
+      }))
+    };
+    return { result: JSON.stringify(r) + `
+[IMPORTANT: Your next response MUST start with a brief text message BEFORE any tool calls.]` };
+  }), o.set("get_cube_metadata", async () => {
+    const e = s.getMetadata();
+    return { result: JSON.stringify(e) };
   });
-  const d = /* @__PURE__ */ new Map();
-  for (const e of t.getMetadata())
-    d.set(e.name, {
-      measures: (e.measures || []).map((o) => o.name),
-      dimensions: (e.dimensions || []).map((o) => o.name)
+  const y = /* @__PURE__ */ new Map();
+  for (const e of s.getMetadata())
+    y.set(e.name, {
+      measures: (e.measures || []).map((n) => n.name),
+      dimensions: (e.dimensions || []).map((n) => n.name)
     });
-  const u = (e, o) => {
-    const r = d.get(e), s = o === "measures" ? r?.measures : r?.dimensions;
-    return !s || s.length === 0 ? "" : ` Available ${o}: ${s.slice(0, 5).map((h) => `"${h}"`).join(", ")}`;
+  const h = (e, n) => {
+    const r = y.get(e), t = n === "measures" ? r?.measures : r?.dimensions;
+    return !t || t.length === 0 ? "" : ` Available ${n}: ${t.slice(0, 5).map((m) => `"${m}"`).join(", ")}`;
   };
-  return i.set("execute_query", async (e) => {
+  return o.set("execute_query", async (e) => {
     try {
-      const o = (y, c) => {
-        if (!Array.isArray(y)) return;
-        const n = [], x = [];
-        for (const b of y) {
+      const n = (p, l) => {
+        if (!Array.isArray(p)) return;
+        const i = [], g = [];
+        for (const b of p) {
           if (typeof b != "string") {
-            x.push(b);
+            g.push(b);
             continue;
           }
-          const m = b.split(".");
-          if (m.length === 1) {
-            n.push(`"${b}" is not valid — must be "CubeName.fieldName".${u(b, c)}`);
+          const u = b.split(".");
+          if (u.length === 1) {
+            i.push(`"${b}" is not valid — must be "CubeName.fieldName".${h(b, l)}`);
             continue;
           }
-          if (m.length === 3 && m[0] === m[1]) {
-            const g = `${m[0]}.${m[2]}`;
-            x.push(g);
+          if (u.length === 3 && u[0] === u[1]) {
+            const x = `${u[0]}.${u[2]}`;
+            g.push(x);
             continue;
           }
-          if (m.length === 2 && m[0] === m[1]) {
-            n.push(`"${b}" is WRONG — "${m[0]}" is the cube name, not a ${c.replace(/s$/, "")}.${u(m[0], c)}`);
+          if (u.length === 2 && u[0] === u[1]) {
+            i.push(`"${b}" is WRONG — "${u[0]}" is the cube name, not a ${l.replace(/s$/, "")}.${h(u[0], l)}`);
             continue;
           }
-          x.push(b);
+          g.push(b);
         }
-        if (n.length > 0)
-          throw new Error(`Invalid ${c}:
-${n.join(`
+        if (i.length > 0)
+          throw new Error(`Invalid ${l}:
+${i.join(`
 `)}`);
-        return x;
+        return g;
       };
-      e.measures = o(e.measures, "measures") ?? e.measures, e.dimensions = o(e.dimensions, "dimensions") ?? e.dimensions;
-      const r = (y) => {
-        const c = y.split(".");
-        return c.length === 3 && c[0] === c[1] ? `${c[0]}.${c[2]}` : y;
+      e.measures = n(e.measures, "measures") ?? e.measures, e.dimensions = n(e.dimensions, "dimensions") ?? e.dimensions;
+      const r = (p) => {
+        const l = p.split(".");
+        return l.length === 3 && l[0] === l[1] ? `${l[0]}.${l[2]}` : p;
       };
       if (Array.isArray(e.filters))
-        for (const y of e.filters)
-          typeof y.member == "string" && (y.member = r(y.member));
+        for (const p of e.filters)
+          typeof p.member == "string" && (p.member = r(p.member));
       if (Array.isArray(e.timeDimensions))
-        for (const y of e.timeDimensions)
-          typeof y.dimension == "string" && (y.dimension = r(y.dimension));
+        for (const p of e.timeDimensions)
+          typeof p.dimension == "string" && (p.dimension = r(p.dimension));
+      if (Array.isArray(e.order)) {
+        const p = {};
+        for (const l of e.order)
+          l && typeof l == "object" && Object.assign(p, l);
+        e.order = p;
+      }
       if (e.order && typeof e.order == "object" && !Array.isArray(e.order)) {
-        const y = {};
-        for (const [c, n] of Object.entries(e.order))
-          y[r(c)] = n;
-        e.order = y;
+        const p = /* @__PURE__ */ new Set([
+          ...Array.isArray(e.measures) ? e.measures : [],
+          ...Array.isArray(e.dimensions) ? e.dimensions : []
+        ]), l = {};
+        for (const [i, g] of Object.entries(e.order)) {
+          const b = r(i);
+          if (p.has(b)) {
+            l[b] = g;
+            continue;
+          }
+          if (!i.includes(".") && i.includes("_")) {
+            const u = i.replace(/_/g, "."), x = r(u);
+            if (p.has(x)) {
+              l[x] = g;
+              continue;
+            }
+            const D = [...p].find((A) => {
+              const C = A.split(".")[1];
+              return C && (i.endsWith(`_${C}`) || i.endsWith(`.${C}`));
+            });
+            if (D) {
+              l[D] = g;
+              continue;
+            }
+          }
+          p.size > 0 && !p.has(b) || (l[b] = g);
+        }
+        if (Object.keys(l).length === 0 && p.size > 0) {
+          const i = Array.isArray(e.measures) ? e.measures[0] : void 0;
+          i && (l[i] = "desc");
+        }
+        e.order = l;
       }
-      let s;
-      e.funnel ? s = { funnel: e.funnel } : e.flow ? s = { flow: e.flow } : e.retention ? s = { retention: e.retention } : s = {
+      let t;
+      e.funnel ? t = { funnel: e.funnel } : e.flow ? t = { flow: e.flow } : e.retention ? t = { retention: e.retention } : t = {
         measures: e.measures,
         dimensions: e.dimensions,
         filters: e.filters,
@@ -2203,15 +2261,16 @@ ${n.join(`
         order: e.order,
         limit: e.limit
       };
-      const h = await G(t, a, { query: s });
+      const m = await W(s, a, { query: t });
       return {
         result: JSON.stringify({
-          rowCount: h.data.length,
-          data: h.data,
-          annotation: h.annotation
-        }, null, 2)
+          rowCount: m.data.length,
+          data: m.data,
+          annotation: m.annotation
+        }) + `
+[IMPORTANT: Your next response MUST start with a brief text message BEFORE any tool calls. Now call add_markdown and add_portlet to visualize these results.]`
       };
-    } catch (o) {
+    } catch (n) {
       const r = {
         measures: e.measures,
         dimensions: e.dimensions,
@@ -2224,97 +2283,97 @@ ${n.join(`
         ...e.retention ? { retention: e.retention } : {}
       };
       return {
-        result: `Query execution failed: ${o instanceof Error ? o.message : "Unknown error"}
+        result: `Query execution failed: ${n instanceof Error ? n.message : "Unknown error"}
 
 Attempted query:
 ${JSON.stringify(r, null, 2)}`,
         isError: !0
       };
     }
-  }), i.set("add_portlet", async (e) => {
+  }), o.set("add_portlet", async (e) => {
     const r = {
       number: "kpiNumber",
       retention: "retentionHeatmap"
     }[e.chartType] ?? e.chartType;
-    let s;
+    let t;
     try {
-      s = JSON.parse(e.query);
+      t = JSON.parse(e.query);
     } catch {
       return {
         result: "Invalid query: could not parse JSON string. Ensure `query` is a valid JSON string.",
         isError: !0
       };
     }
-    const h = t.validateQuery(s);
-    if (!h.isValid)
+    const m = s.validateQuery(t);
+    if (!m.isValid)
       return {
         result: `Invalid query — fix these errors and retry:
-${h.errors.join(`
+${m.errors.join(`
 `)}
 
 Attempted query:
-${JSON.stringify(s, null, 2)}`,
+${JSON.stringify(t, null, 2)}`,
         isError: !0
       };
-    const y = !!(s.funnel || s.flow || s.retention);
-    let c;
-    if (y)
-      c = e.chartConfig ?? {};
+    const p = !!(t.funnel || t.flow || t.retention);
+    let l;
+    if (p)
+      l = e.chartConfig ?? {};
     else {
-      const b = Te(r, e.chartConfig, s), m = Ce(r, b, s);
-      if (!m.isValid)
+      const b = De(r, e.chartConfig, t), u = Ae(r, b, t);
+      if (!u.isValid)
         return {
           result: `Chart config invalid — fix these errors and retry:
-${m.errors.join(`
+${u.errors.join(`
 `)}`,
           isError: !0
         };
-      c = b;
+      l = b;
     }
-    const n = `portlet-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, x = {
-      id: n,
+    const i = `portlet-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, g = {
+      id: i,
       title: e.title,
       query: e.query,
       chartType: r,
-      chartConfig: c,
+      chartConfig: l,
       displayConfig: e.displayConfig
     };
     return {
-      result: `Portlet "${e.title}" added to notebook (id: ${n}, chart: ${r}). [Reminder: in your next response, start with a brief sentence about what you will do next BEFORE making any tool calls.]`,
-      sideEffect: { type: "add_portlet", data: x }
+      result: `Portlet "${e.title}" added to notebook (id: ${i}, chart: ${r}). [Reminder: in your next response, start with a brief sentence about what you will do next BEFORE making any tool calls.]`,
+      sideEffect: { type: "add_portlet", data: g }
     };
-  }), i.set("add_markdown", async (e) => {
-    const o = `markdown-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, r = {
-      id: o,
+  }), o.set("add_markdown", async (e) => {
+    const n = `markdown-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, r = e.content || e.text || e.markdown || "", t = {
+      id: n,
       title: e.title,
-      content: e.content
+      content: r
     };
     return {
-      result: `Markdown block added to notebook (id: ${o}). [Reminder: in your next response, start with a brief sentence about what you will do next BEFORE making any tool calls.]`,
-      sideEffect: { type: "add_markdown", data: r }
+      result: `Markdown block added to notebook (id: ${n}). [Reminder: in your next response, start with a brief sentence about what you will do next BEFORE making any tool calls.]`,
+      sideEffect: { type: "add_markdown", data: t }
     };
-  }), i.set("save_as_dashboard", async (e) => {
+  }), o.set("save_as_dashboard", async (e) => {
     try {
-      const o = e.portlets;
-      if (!o || o.length === 0)
+      const n = e.portlets;
+      if (!n || n.length === 0)
         return { result: "Dashboard must contain at least one portlet.", isError: !0 };
       const r = [];
-      for (const n of o) {
-        if (n.chartType === "markdown") continue;
-        const b = n.query;
+      for (const i of n) {
+        if (i.chartType === "markdown") continue;
+        const b = i.query;
         if (!b) {
-          r.push(`Portlet "${n.title}": missing query`);
+          r.push(`Portlet "${i.title}": missing query`);
           continue;
         }
-        let m;
+        let u;
         try {
-          m = JSON.parse(b);
+          u = JSON.parse(b);
         } catch {
-          r.push(`Portlet "${n.title}": invalid JSON query`);
+          r.push(`Portlet "${i.title}": invalid JSON query`);
           continue;
         }
-        const g = t.validateQuery(m);
-        g.isValid || r.push(`Portlet "${n.title}": ${g.errors.join(", ")}`);
+        const x = s.validateQuery(u);
+        x.isValid || r.push(`Portlet "${i.title}": ${x.errors.join(", ")}`);
       }
       if (r.length > 0)
         return {
@@ -2323,318 +2382,332 @@ ${r.join(`
 `)}`,
           isError: !0
         };
-      const s = {
-        portlets: o.map((n) => {
-          const x = n.chartType, b = x === "markdown", m = b ? "query" : n.analysisType || "query", g = m === "funnel" ? "funnel" : m === "flow" ? "flow" : m === "retention" ? "retention" : "query", A = n.query || "{}";
-          let C;
+      const t = {
+        portlets: n.map((i) => {
+          const g = i.chartType, b = g === "markdown", u = b ? "query" : i.analysisType || "query", x = u === "funnel" ? "funnel" : u === "flow" ? "flow" : u === "retention" ? "retention" : "query", D = i.query || "{}";
+          let A;
           try {
-            C = JSON.parse(A);
+            A = JSON.parse(D);
           } catch {
-            C = {};
+            A = {};
           }
-          const k = {
+          const C = {
             version: 1,
-            analysisType: g,
+            analysisType: x,
             activeView: "chart",
             charts: {
-              [g]: {
-                chartType: x,
-                chartConfig: n.chartConfig || {},
-                displayConfig: n.displayConfig || {}
+              [x]: {
+                chartType: g,
+                chartConfig: i.chartConfig || {},
+                displayConfig: i.displayConfig || {}
               }
             },
-            query: b ? {} : C
+            query: b ? {} : A
           };
           return {
-            id: n.id,
-            title: n.title,
-            analysisConfig: k,
-            dashboardFilterMapping: n.dashboardFilterMapping,
-            w: n.w,
-            h: n.h,
-            x: n.x,
-            y: n.y
+            id: i.id,
+            title: i.title,
+            analysisConfig: C,
+            dashboardFilterMapping: i.dashboardFilterMapping,
+            w: i.w,
+            h: i.h,
+            x: i.x,
+            y: i.y
           };
         }),
         filters: e.filters,
         colorPalette: e.colorPalette
-      }, h = e.title, y = s.portlets.length, c = s.filters?.length || 0;
+      }, m = e.title, p = t.portlets.length, l = t.filters?.length || 0;
       return {
-        result: `Dashboard "${h}" created with ${y} portlets and ${c} filters.`,
+        result: `Dashboard "${m}" created with ${p} portlets and ${l} filters.`,
         sideEffect: {
           type: "dashboard_saved",
           data: {
-            title: h,
+            title: m,
             description: e.description,
-            dashboardConfig: s
+            dashboardConfig: t
           }
         }
       };
-    } catch (o) {
+    } catch (n) {
       return {
-        result: `Failed to save dashboard: ${o instanceof Error ? o.message : "Unknown error"}`,
+        result: `Failed to save dashboard: ${n instanceof Error ? n.message : "Unknown error"}`,
         isError: !0
       };
     }
-  }), i;
+  }), o;
+}
+async function Ve(d, s, a) {
+  switch (d) {
+    case "anthropic": {
+      const { AnthropicProvider: o } = await import("./anthropic-CTu9E801.js");
+      return new o(s);
+    }
+    case "openai": {
+      const { OpenAIProvider: o } = await import("./openai-CUSRuKTk.js");
+      return new o(s, a);
+    }
+    case "google": {
+      const { GoogleProvider: o } = await import("./google-DficVAsJ.js");
+      return new o(s);
+    }
+    default:
+      throw new Error(
+        `Unknown LLM provider: "${d}". Supported providers: anthropic, openai, google`
+      );
+  }
 }
-async function* _e(l) {
-  const { message: t, history: a, semanticLayer: i, securityContext: d, agentConfig: u, apiKey: e } = l, o = l.sessionId || crypto.randomUUID(), r = u.observability, s = crypto.randomUUID(), h = Date.now();
-  let y;
+const Oe = {
+  anthropic: "claude-sonnet-4-6",
+  openai: "gpt-4.1-mini",
+  google: "gemini-3-flash-preview"
+};
+async function* Ie(d) {
+  const { message: s, history: a, semanticLayer: o, securityContext: y, agentConfig: h, apiKey: e } = d, n = d.sessionId || crypto.randomUUID(), r = h.observability, t = crypto.randomUUID(), m = Date.now(), p = d.providerOverride || h.provider || "anthropic", l = d.modelOverride || h.model || Oe[p] || "claude-sonnet-4-6", i = d.baseURLOverride || h.baseURL, g = h.maxTurns || 25, b = h.maxTokens || 4096;
+  let u;
   try {
-    const f = await import(
-      /* webpackIgnore: true */
-      "@anthropic-ai/sdk"
-    );
-    y = f.default || f.Anthropic || f;
-  } catch {
-    yield {
+    u = await Ve(p, e, { baseURL: i });
+  } catch (f) {
+    console.error(`[agent] Failed to create ${p} provider:`, f), yield {
       type: "error",
       data: {
-        message: "@anthropic-ai/sdk is required. Install it with: npm install @anthropic-ai/sdk"
+        message: f instanceof Error ? f.message : "Failed to initialize LLM provider"
       }
     };
     return;
   }
-  const c = new y({ apiKey: e }), n = De(), x = Se({ semanticLayer: i, securityContext: d }), b = i.getMetadata();
-  let m = W(b);
-  l.systemContext && (m += `
+  const x = Fe(), D = Ee({ semanticLayer: o, securityContext: y }), A = o.getMetadata();
+  let C = J(A);
+  d.systemContext && (C += `
 
 ## User Context
 
-${l.systemContext}`);
-  const g = u.model || "claude-sonnet-4-6", A = u.maxTurns || 25, C = u.maxTokens || 4096;
+${d.systemContext}`);
   try {
     r?.onChatStart?.({
-      traceId: s,
-      sessionId: o,
-      message: t,
-      model: g,
+      traceId: t,
+      sessionId: n,
+      message: s,
+      model: l,
       historyLength: a?.length ?? 0
     });
   } catch {
   }
-  const k = [];
+  const T = [];
   if (a && a.length > 0) {
     for (const f of a)
       if (f.role === "user")
-        k.push({ role: "user", content: f.content });
+        T.push({ role: "user", content: f.content });
       else if (f.role === "assistant") {
-        const F = [];
-        if (f.content && F.push({ type: "text", text: f.content }), f.toolCalls && f.toolCalls.length > 0) {
+        const O = [];
+        if (f.content && O.push({ type: "text", text: f.content }), f.toolCalls && f.toolCalls.length > 0) {
           for (const w of f.toolCalls)
-            F.push({
+            O.push({
               type: "tool_use",
               id: w.id,
               name: w.name,
               input: w.input || {}
             });
-          k.push({ role: "assistant", content: F }), k.push({
-            role: "user",
-            content: f.toolCalls.map((w) => ({
-              type: "tool_result",
-              tool_use_id: w.id,
-              content: typeof w.result == "string" ? w.result : JSON.stringify(w.result ?? ""),
-              ...w.status === "error" ? { is_error: !0 } : {}
-            }))
-          });
-        } else F.length > 0 && k.push({ role: "assistant", content: f.content });
+          T.push({ role: "assistant", content: O });
+          const v = f.toolCalls.map((w) => ({
+            toolUseId: w.id,
+            toolName: w.name,
+            content: typeof w.result == "string" ? w.result : JSON.stringify(w.result ?? ""),
+            isError: w.status === "error"
+          })), S = u.formatToolResults(v);
+          if (Array.isArray(S))
+            for (const w of S)
+              T.push(w);
+          else
+            T.push(S);
+        } else O.length > 0 && T.push({ role: "assistant", content: f.content });
       }
   }
-  k.push({ role: "user", content: t });
-  let E = 0;
+  T.push({ role: "user", content: s });
+  let P = 0;
   try {
-    for (let f = 0; f < A; f++) {
-      E = f + 1;
-      const F = await c.messages.create({
-        model: g,
-        max_tokens: C,
-        system: m,
-        tools: n,
-        messages: k,
-        stream: !0
-      }), w = [];
-      let q = -1, V = "", O = "", L, M;
-      const z = Date.now();
-      for await (const v of F)
-        switch (v.type) {
-          case "content_block_start": {
-            q++;
-            const p = v.content_block;
-            p.type === "tool_use" ? (w.push({ type: "tool_use", id: p.id, name: p.name, input: {} }), V = "", yield {
+    for (let f = 0; f < g; f++) {
+      P = f + 1;
+      const O = await u.createStream({
+        model: l,
+        maxTokens: b,
+        system: C,
+        tools: x,
+        messages: T
+      }), v = [];
+      let S = "", w = "", _, Y;
+      const B = Date.now();
+      let N = !1;
+      for await (const V of u.parseStreamEvents(O)) {
+        const c = V;
+        switch (c.type) {
+          case "text_delta": {
+            const k = v[v.length - 1];
+            k && k.type === "text" ? k.text = (k.text || "") + c.text : v.push({ type: "text", text: c.text }), yield { type: "text_delta", data: c.text };
+            break;
+          }
+          case "tool_use_start": {
+            if (N && S) {
+              const k = v[v.length - 1];
+              if (k?.type === "tool_use")
+                try {
+                  k.input = JSON.parse(S);
+                } catch {
+                }
+            }
+            v.push({ type: "tool_use", id: c.id, name: c.name, input: {}, ...c.metadata ? { metadata: c.metadata } : {} }), S = "", N = !0, yield {
               type: "tool_use_start",
-              data: { id: p.id, name: p.name, input: void 0 }
-            }) : p.type === "text" && w.push({ type: "text", text: "" });
+              data: { id: c.id, name: c.name, input: void 0 }
+            };
             break;
           }
-          case "content_block_delta": {
-            const p = v.delta;
-            if (p.type === "text_delta" && p.text) {
-              const D = w[q];
-              D && (D.text = (D.text || "") + p.text), yield { type: "text_delta", data: p.text };
-            } else p.type === "input_json_delta" && p.partial_json && (V += p.partial_json);
+          case "tool_input_delta": {
+            S += c.json;
             break;
           }
-          case "content_block_stop": {
-            const p = w[q];
-            if (p?.type === "tool_use" && V) {
-              try {
-                p.input = JSON.parse(V);
-              } catch {
-                p.input = {};
+          case "tool_use_end": {
+            if (c.id && c.input) {
+              const k = v.find((F) => F.type === "tool_use" && F.id === c.id);
+              k && (k.input = c.input);
+            } else if (N) {
+              const k = v[v.length - 1];
+              if (k?.type === "tool_use" && S) {
+                try {
+                  k.input = JSON.parse(S);
+                } catch {
+                  k.input = {};
+                }
+                S = "";
               }
-              V = "";
+              N = !1;
             }
             break;
           }
-          case "message_start": {
-            const p = v.message;
-            p?.usage?.input_tokens != null && (L = p.usage.input_tokens);
-            break;
-          }
-          case "message_delta": {
-            const p = v.delta, D = v.usage;
-            D?.output_tokens != null && (M = D.output_tokens), p.stop_reason && (O = p.stop_reason);
+          case "message_meta": {
+            c.inputTokens != null && (_ = c.inputTokens), c.outputTokens != null && (Y = c.outputTokens), c.stopReason && (w = c.stopReason);
             break;
           }
         }
+      }
       try {
         r?.onGenerationEnd?.({
-          traceId: s,
+          traceId: t,
           turn: f,
-          model: g,
-          stopReason: O,
-          inputTokens: L,
-          outputTokens: M,
-          durationMs: Date.now() - z
+          model: l,
+          stopReason: w,
+          inputTokens: _,
+          outputTokens: Y,
+          durationMs: Date.now() - B,
+          input: T,
+          output: v
         });
       } catch {
       }
-      if (k.push({ role: "assistant", content: w }), O !== "tool_use")
+      if (T.push({ role: "assistant", content: v }), !u.shouldContinue(w))
         break;
-      const _ = [];
-      for (const v of w) {
-        if (v.type !== "tool_use") continue;
-        const p = v.name, D = v.input || {}, S = v.id, R = x.get(p);
-        if (!R) {
-          _.push({
-            type: "tool_result",
-            tool_use_id: S,
-            content: `Unknown tool: ${p}`,
-            is_error: !0
+      const q = [];
+      for (const V of v) {
+        if (V.type !== "tool_use") continue;
+        const c = V.name, k = V.input || {}, F = V.id, $ = D.get(c);
+        if (!$) {
+          q.push({
+            toolUseId: F,
+            toolName: c,
+            content: `Unknown tool: ${c}`,
+            isError: !0
           }), yield {
             type: "tool_use_result",
-            data: { id: S, name: p, result: `Unknown tool: ${p}`, isError: !0 }
+            data: { id: F, name: c, result: `Unknown tool: ${c}`, isError: !0 }
           };
           continue;
         }
-        const Y = Date.now();
+        const z = Date.now();
         try {
-          const T = await R(D);
-          T.sideEffect && (yield T.sideEffect), _.push({
-            type: "tool_result",
-            tool_use_id: S,
-            content: T.result,
-            ...T.isError ? { is_error: !0 } : {}
+          const E = await $(k);
+          E.sideEffect && (yield E.sideEffect), q.push({
+            toolUseId: F,
+            toolName: c,
+            content: E.result,
+            ...E.isError ? { isError: !0 } : {}
           }), yield {
             type: "tool_use_result",
-            data: { id: S, name: p, result: T.result, ...T.isError ? { isError: !0 } : {} }
+            data: { id: F, name: c, result: E.result, ...E.isError ? { isError: !0 } : {} }
           };
           try {
             r?.onToolEnd?.({
-              traceId: s,
+              traceId: t,
               turn: f,
-              toolName: p,
-              toolUseId: S,
-              isError: !!T.isError,
-              durationMs: Date.now() - Y
+              toolName: c,
+              toolUseId: F,
+              isError: !!E.isError,
+              durationMs: Date.now() - z
             });
           } catch {
           }
-        } catch (T) {
-          const $ = T instanceof Error ? T.message : "Tool execution failed";
-          _.push({
-            type: "tool_result",
-            tool_use_id: S,
-            content: $,
-            is_error: !0
+        } catch (E) {
+          const H = E instanceof Error ? E.message : "Tool execution failed";
+          q.push({
+            toolUseId: F,
+            toolName: c,
+            content: H,
+            isError: !0
           }), yield {
             type: "tool_use_result",
-            data: { id: S, name: p, result: $, isError: !0 }
+            data: { id: F, name: c, result: H, isError: !0 }
           };
           try {
             r?.onToolEnd?.({
-              traceId: s,
+              traceId: t,
               turn: f,
-              toolName: p,
-              toolUseId: S,
+              toolName: c,
+              toolUseId: F,
               isError: !0,
-              durationMs: Date.now() - Y
+              durationMs: Date.now() - z
             });
           } catch {
           }
         }
       }
-      yield { type: "turn_complete", data: {} }, k.push({ role: "user", content: _ });
+      yield { type: "turn_complete", data: {} };
+      const M = u.formatToolResults(q);
+      if (Array.isArray(M))
+        for (const V of M)
+          T.push(V);
+      else
+        T.push(M);
     }
     try {
       r?.onChatEnd?.({
-        traceId: s,
-        sessionId: o,
-        totalTurns: E,
-        durationMs: Date.now() - h
+        traceId: t,
+        sessionId: n,
+        totalTurns: P,
+        durationMs: Date.now() - m
       });
     } catch {
     }
     yield {
       type: "done",
-      data: { sessionId: o || "", traceId: s }
+      data: { sessionId: n || "", traceId: t }
     };
   } catch (f) {
     try {
       r?.onChatEnd?.({
-        traceId: s,
-        sessionId: o,
+        traceId: t,
+        sessionId: n,
         totalTurns: 0,
-        durationMs: Date.now() - h,
+        durationMs: Date.now() - m,
         error: f instanceof Error ? f.message : "Unknown error"
       });
     } catch {
     }
-    yield {
+    console.error(`[agent] Chat error (provider=${p}, model=${l}):`, f), yield {
       type: "error",
       data: {
-        message: Fe(f)
+        message: u.formatError(f)
       }
     };
   }
 }
-function Fe(l) {
-  if (!l || !(l instanceof Error))
-    return "Something went wrong. Please try again.";
-  const t = l.message || "", a = {
-    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."
-  }, i = l;
-  if (i.status || i.type) {
-    const d = i.error?.type || i.type || "";
-    if (a[d])
-      return a[d];
-  }
-  if (t.startsWith("{") || t.startsWith("Error: {")) {
-    try {
-      const d = JSON.parse(t.replace(/^Error:\s*/, "")), u = d.error?.type || d.type || "";
-      if (a[u])
-        return a[u];
-    } catch {
-    }
-    return "The AI service encountered an error. Please try again.";
-  }
-  return t;
-}
 export {
-  _e as handleAgentChat
+  Ie as handleAgentChat
 };