@quillsql/react 2.16.50 → 2.16.52

package/dist/index.js

@@ -20060,27 +20060,6 @@ function parseData(rows, queryType) {
       return rows;
   }
 }
-function isQuillFetchDebugEnabled() {
-  if (typeof globalThis !== "undefined") {
-    for (const debugFlag of QUILL_FETCH_DEBUG_FLAGS) {
-      if (globalThis?.[debugFlag] === true) {
-        return true;
-      }
-    }
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envCandidates = [
-      process?.env?.QUILL_DEBUG_USEFORM_HYDRATION,
-      process?.env?.QUILL_DEBUG_USEFORM_FILTERS,
-      process?.env?.QUILL_DEBUG_DATA_FETCHER
-    ];
-    return envCandidates.some((candidate) => {
-      const normalized = String(candidate ?? "").trim().toLowerCase();
-      return normalized === "1" || normalized === "true";
-    });
-  }
-  return false;
-}
 async function testSqlViewState(client, referencedTables, getToken) {
   let errorMessage = null;
   await Promise.all(
@@ -20566,7 +20545,7 @@ async function fetchRelevantInfoFromState(reportBuilderState, tables, columns, a
     return { error: error.message };
   }
 }
-var QUILL_FETCH_DEBUG_FLAGS, quillFetchDebugSeq, logQuillFetchDebug, quillFetch, parseFetchResponse;
+var quillFetch, parseFetchResponse;
 var init_dataFetcher = __esm({
   "src/utils/dataFetcher.tsx"() {
     "use strict";
@@ -20575,16 +20554,6 @@ var init_dataFetcher = __esm({
     init_tableProcessing();
     init_dates();
     init_changelogNotify();
-    QUILL_FETCH_DEBUG_FLAGS = [
-      "__QUILL_DEBUG_USEFORM_HYDRATION__",
-      "__QUILL_DEBUG_USEFORM_FILTERS__",
-      "__QUILL_DEBUG_DATA_FETCHER__"
-    ];
-    quillFetchDebugSeq = 0;
-    logQuillFetchDebug = (label, payload) => {
-      if (!isQuillFetchDebugEnabled()) return;
-      console.log(`[quillFetch-debug] ${label}`, payload);
-    };
     quillFetch = async ({
       client,
       task,
@@ -20595,24 +20564,7 @@ var init_dataFetcher = __esm({
       urlParameters,
       getToken
     }) => {
-      const debugSeq = ++quillFetchDebugSeq;
-      const debugStart = Date.now();
-      logQuillFetchDebug("request", {
-        seq: debugSeq,
-        task,
-        reportId: metadata?.reportId,
-        dashboardItemId: metadata?.dashboardItemId,
-        hasPivot: Boolean(metadata?.pivot),
-        hasReportBuilderState: Boolean(metadata?.reportBuilderState),
-        filtersLength: Array.isArray(metadata?.filters) ? metadata.filters.length : void 0
-      });
       const token = await getToken();
-      logQuillFetchDebug("token-acquired", {
-        seq: debugSeq,
-        task,
-        ms: Date.now() - debugStart,
-        hasToken: Boolean(token)
-      });
       const queryString = urlParameters ?? `task=${task}`;
       const endpoint = client.queryEndpoint ? `${client.queryEndpoint}?${queryString}` : `${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}?${queryString}`;
       try {
@@ -20644,17 +20596,6 @@ var init_dataFetcher = __esm({
         if (task !== "fetch-changelog-list" && Array.isArray(normalizedData?.changelogs)) {
           notifyChangelogs(normalizedData.changelogs);
         }
-        logQuillFetchDebug("response", {
-          seq: debugSeq,
-          task,
-          ms: Date.now() - debugStart,
-          status: result.status,
-          error: result.error,
-          dataError: normalizedData?.error,
-          queryResultRowCounts: Array.isArray(result.queries?.queryResults) ? result.queries.queryResults.map(
-            (qr) => Array.isArray(qr?.rows) ? qr.rows.length : null
-          ) : void 0
-        });
         return {
           data: normalizedData,
           queries: result.queries,
@@ -20663,19 +20604,8 @@ var init_dataFetcher = __esm({
         };
       } catch (e) {
         if (e instanceof Error && e.name === "AbortError") {
-          logQuillFetchDebug("aborted", {
-            seq: debugSeq,
-            task,
-            ms: Date.now() - debugStart
-          });
           throw e;
         }
-        logQuillFetchDebug("threw", {
-          seq: debugSeq,
-          task,
-          ms: Date.now() - debugStart,
-          message: e instanceof Error ? e.message : String(e)
-        });
         if (task !== "set-section-order") {
           console.error("Failed to fetch:", e);
         }
@@ -21106,7 +21036,7 @@ import {
   useEffect as useEffect19,
   useState as useState26,
   useMemo as useMemo19,
-  useRef as useRef16
+  useRef as useRef15
 } from "react";
 
 // src/Chart.tsx
@@ -21115,7 +21045,7 @@ import {
   useEffect as useEffect16,
   useContext as useContext17,
   useMemo as useMemo16,
-  useRef as useRef14
+  useRef as useRef13
 } from "react";
 
 // src/utils/csv.ts
@@ -29272,62 +29202,6 @@ function stableColorIndex(field) {
   }
   return hash;
 }
-function assignStableSeriesColors(fields, colors, knownFields = fields) {
-  const normalize2 = (values) => [
-    ...new Set(
-      values.filter((field) => typeof field === "string").map((field) => field.replace("comparison_", ""))
-    )
-  ];
-  const uniqueFields = normalize2(fields);
-  const universe = normalize2([...knownFields, ...fields]);
-  const result = /* @__PURE__ */ new Map();
-  if (universe.length === 0) {
-    return result;
-  }
-  if (!colors.length) {
-    for (const field of uniqueFields) {
-      result.set(field, "gray");
-    }
-    return result;
-  }
-  const palette = colors.length >= universe.length ? colors : generateArrayFromColor(colors, universe.length);
-  const ordered = [...universe].sort((a, b) => {
-    const diff = stableColorIndex(a) - stableColorIndex(b);
-    return diff !== 0 ? diff : a.localeCompare(b);
-  });
-  const usedIndices = /* @__PURE__ */ new Set();
-  const deferred = [];
-  const assigned = /* @__PURE__ */ new Map();
-  for (const field of ordered) {
-    const preferred = stableColorIndex(field) % palette.length;
-    if (!usedIndices.has(preferred)) {
-      usedIndices.add(preferred);
-      assigned.set(field, palette[preferred]);
-    } else {
-      deferred.push(field);
-    }
-  }
-  for (const field of deferred) {
-    const preferred = stableColorIndex(field) % palette.length;
-    let found = false;
-    for (let offset = 1; offset < palette.length; offset++) {
-      const idx = (preferred + offset) % palette.length;
-      if (!usedIndices.has(idx)) {
-        usedIndices.add(idx);
-        assigned.set(field, palette[idx]);
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      assigned.set(field, palette[preferred]);
-    }
-  }
-  for (const field of uniqueFields) {
-    result.set(field, assigned.get(field));
-  }
-  return result;
-}
 function selectColor(element, colors, index) {
   if (!element?.field) return "gray";
   const isComparison = element.field.includes("comparison_");
@@ -34287,7 +34161,7 @@ var CustomBar_default = CustomBar;
 // src/components/Chart/BarChart.tsx
 init_columnProcessing();
 init_textProcessing();
-import { useMemo as useMemo8, useRef as useRef6 } from "react";
+import { useMemo as useMemo8 } from "react";
 import { Fragment as Fragment3, jsx as jsx38, jsxs as jsxs28 } from "react/jsx-runtime";
 var CATEGORY_AXIS_WIDTH = 120;
 var VALUE_AXIS_WIDTH = 44;
@@ -34387,21 +34261,6 @@ function BarChart({
     () => stackedMode ? getStackedDomain(data, yAxisFields, comparison) : getDomain(data, yAxisFields, referenceLines),
     [stackedMode, data, yAxisFields, referenceLines, comparison]
   );
-  const knownSeriesFieldsRef = useRef6([]);
-  const knownColorsKeyRef = useRef6("");
-  const seriesColorByField = useMemo8(() => {
-    const visibleFields = yAxisFields.filter((field) => comparison || !field.field.startsWith("comparison_")).map((field) => field.field);
-    const colorsKey = colors.join("\0");
-    if (knownColorsKeyRef.current !== colorsKey) {
-      knownSeriesFieldsRef.current = [];
-      knownColorsKeyRef.current = colorsKey;
-    }
-    const knownFields = [
-      .../* @__PURE__ */ new Set([...knownSeriesFieldsRef.current, ...visibleFields])
-    ];
-    knownSeriesFieldsRef.current = knownFields;
-    return assignStableSeriesColors(visibleFields, colors, knownFields);
-  }, [yAxisFields, colors, comparison]);
   const allowDecimals = useMemo8(
     () => getAllowDecimals(data, yAxisFields, referenceLines),
     [data, yAxisFields, referenceLines]
@@ -34664,15 +34523,7 @@ function BarChart({
                       dataKey: elem.field,
                       stackId: stackedMode ? "same_id" : isStacked ? elem.field.replace("comparison_", "") : void 0,
                       type: "linear",
-                      fill: getCustomColor(elem.field) ?? selectColor(
-                        elem,
-                        [
-                          seriesColorByField.get(
-                            elem.field.replace("comparison_", "")
-                          ) ?? colors[0] ?? "gray"
-                        ],
-                        0
-                      ),
+                      fill: getCustomColor(elem.field) ?? selectColor(elem, colors, stableColorIndex(elem.field)),
                       isAnimationActive,
                       shape: customBarShape,
                       activeBar: customActiveBarShape ?? {
@@ -34866,7 +34717,7 @@ import { useMemo as useMemo12 } from "react";
 import {
   useContext as useContext9,
   useEffect as useEffect10,
-  useRef as useRef8,
+  useRef as useRef7,
   useState as useState12
 } from "react";
 import {
@@ -34889,7 +34740,7 @@ import {
 import {
   useContext as useContext8,
   useMemo as useMemo9,
-  useRef as useRef7,
+  useRef as useRef6,
   useState as useState11,
   useEffect as useEffect9
 } from "react";
@@ -34908,8 +34759,8 @@ function QuillSelectComponent({
 }) {
   const [theme] = useContext8(ThemeContext);
   const [showModal, setShowModal] = useState11(false);
-  const modalRef = useRef7(null);
-  const buttonRef = useRef7(null);
+  const modalRef = useRef6(null);
+  const buttonRef = useRef6(null);
   useOnClickOutside_default(
     modalRef,
     (event) => {
@@ -34934,7 +34785,7 @@ function QuillSelectComponent({
   }, [sortedItems]);
   const [popoverPosition, setPopoverPosition] = useState11(void 0);
   const [z, setZ] = useState11(10);
-  const scrollableParentRef = useRef7(document.body);
+  const scrollableParentRef = useRef6(document.body);
   const updatePosition = () => {
     if (buttonRef.current) {
       requestAnimationFrame(() => {
@@ -35259,8 +35110,8 @@ function QuillDateRangePicker({
   );
   const [localPreset, setLocalPreset] = useState12(preset);
   const [showModal, setShowModal] = useState12(false);
-  const buttonRef = useRef8(null);
-  const modalRef = useRef8(null);
+  const buttonRef = useRef7(null);
+  const modalRef = useRef7(null);
   useEffect10(() => {
     setLocalEndDate(dateRange.endDate);
     setLocalStartDate(dateRange.startDate);
@@ -35776,7 +35627,7 @@ import React7, {
   useContext as useContext10,
   useEffect as useEffect11,
   useMemo as useMemo10,
-  useRef as useRef9,
+  useRef as useRef8,
   useState as useState13
 } from "react";
 import { createPortal as createPortal3 } from "react-dom";
@@ -35796,15 +35647,15 @@ function QuillMultiSelectComponentWithCombo({
   const [theme] = useContext10(ThemeContext);
   const [selectedOptions, setSelectedOptions] = useState13([]);
   const [showModal, setShowModal] = useState13(false);
-  const modalRef = useRef9(null);
-  const buttonRef = useRef9(null);
-  const debounceTimeoutId = useRef9(null);
+  const modalRef = useRef8(null);
+  const buttonRef = useRef8(null);
+  const debounceTimeoutId = useRef8(null);
   const [searchQuery, setSearchQuery] = React7.useState("");
   const [exceedsLimit, setExceedsLimit] = useState13(false);
   const [popoverPosition, setPopoverPosition] = useState13(void 0);
   const [z, setZ] = useState13(10);
-  const scrollableParentRef = useRef9(document.body);
-  const selectAllRef = useRef9(null);
+  const scrollableParentRef = useRef8(document.body);
+  const selectAllRef = useRef8(null);
   let CheckboxState;
   ((CheckboxState2) => {
     CheckboxState2[CheckboxState2["SELECTED"] = 0] = "SELECTED";
@@ -36441,7 +36292,7 @@ var ListboxTextInput = ({
 import React8, {
   useContext as useContext11,
   useMemo as useMemo11,
-  useRef as useRef10,
+  useRef as useRef9,
   useState as useState14
 } from "react";
 import { jsx as jsx43, jsxs as jsxs33 } from "react/jsx-runtime";
@@ -36458,8 +36309,8 @@ function QuillSelectComponentWithCombo({
 }) {
   const [theme] = useContext11(ThemeContext);
   const [showModal, setShowModal] = useState14(false);
-  const modalRef = useRef10(null);
-  const buttonRef = useRef10(null);
+  const modalRef = useRef9(null);
+  const buttonRef = useRef9(null);
   const [searchQuery, setSearchQuery] = React8.useState("");
   const filteredItems = React8.useMemo(() => {
     if (searchQuery === "") {
@@ -37416,7 +37267,7 @@ var MetricDisplay = ({
 };
 
 // src/components/Dashboard/DataLoader.tsx
-import { useContext as useContext13, useEffect as useEffect12, useMemo as useMemo13, useRef as useRef11, useState as useState15 } from "react";
+import { useContext as useContext13, useEffect as useEffect12, useMemo as useMemo13, useRef as useRef10, useState as useState15 } from "react";
 init_paginationProcessing();
 init_tableProcessing();
 import equal2 from "fast-deep-equal";
@@ -37556,17 +37407,17 @@ function DataLoader({
     reportFilters,
     dashboardFilters
   ]);
-  const previousFilters = useRef11(filters);
-  const previousUserFilters = useRef11(userFilters);
-  const previousTenants = useRef11(tenants);
-  const previousCustomFields = useRef11(schemaData.customFields);
+  const previousFilters = useRef10(filters);
+  const previousUserFilters = useRef10(userFilters);
+  const previousTenants = useRef10(tenants);
+  const previousCustomFields = useRef10(schemaData.customFields);
   const [rowCountIsLoading, setRowCountIsLoading] = useState15(false);
-  const rowsRequestId = useRef11(0);
-  const rowsAbortController = useRef11(null);
-  const rowCountRequestId = useRef11(0);
-  const rowCountAbortController = useRef11(null);
-  const updateTableRowsRequestId = useRef11(0);
-  const updateTableRowsAbortController = useRef11(null);
+  const rowsRequestId = useRef10(0);
+  const rowsAbortController = useRef10(null);
+  const rowCountRequestId = useRef10(0);
+  const rowCountAbortController = useRef10(null);
+  const updateTableRowsRequestId = useRef10(0);
+  const updateTableRowsAbortController = useRef10(null);
   const fetchRowCount = async (processing) => {
     if (!client || !filters) {
       if (!rowCountAbortController.current) return;
@@ -37966,13 +37817,13 @@ var ChartDataLoader = ({
   const [error, setError] = useState15(void 0);
   const [client] = useContext13(ClientContext);
   const [schemaData] = useContext13(SchemaDataContext);
-  const previousFilters = useRef11(filters);
-  const previousUserFilters = useRef11(userFilters);
-  const previousDateBucket = useRef11(dateBucket);
-  const previousTenants = useRef11(tenants);
-  const previousCustomFields = useRef11(schemaData.customFields);
-  const fetchReportAbortController = useRef11(null);
-  const rowsRequestId = useRef11(0);
+  const previousFilters = useRef10(filters);
+  const previousUserFilters = useRef10(userFilters);
+  const previousDateBucket = useRef10(dateBucket);
+  const previousTenants = useRef10(tenants);
+  const previousCustomFields = useRef10(schemaData.customFields);
+  const fetchReportAbortController = useRef10(null);
+  const rowsRequestId = useRef10(0);
   const chartReport = useMemo13(() => {
     const report = dashboardName ? dashboard[item.id] : reports[item.id];
     if (!report) {
@@ -38247,7 +38098,7 @@ var useReportInternal = (reportId) => {
 import equal3 from "fast-deep-equal";
 
 // src/components/Chart/MapChart.tsx
-import { useEffect as useEffect13, useMemo as useMemo15, useRef as useRef12, useState as useState17 } from "react";
+import { useEffect as useEffect13, useMemo as useMemo15, useRef as useRef11, useState as useState17 } from "react";
 init_valueFormatter();
 import usStates10m from "us-atlas/states-10m.json";
 import worldCountries50m from "world-atlas/countries-50m.json";
@@ -38861,7 +38712,7 @@ function USMap({
   containerStyle
 }) {
   const simpleMaps = useSimpleMapsModule();
-  const containerRef = useRef12(null);
+  const containerRef = useRef11(null);
   const [hoveredState, setHoveredState] = useState17(
     void 0
   );
@@ -39057,7 +38908,7 @@ function WorldMap({
   containerStyle
 }) {
   const simpleMaps = useSimpleMapsModule();
-  const containerRef = useRef12(null);
+  const containerRef = useRef11(null);
   const [hoveredCountry, setHoveredCountry] = useState17(
     void 0
   );
@@ -39308,7 +39159,7 @@ function MapLayout({
 }
 
 // src/components/Chart/GaugeChart.tsx
-import { useEffect as useEffect14, useRef as useRef13, useState as useState18 } from "react";
+import { useEffect as useEffect14, useRef as useRef12, useState as useState18 } from "react";
 import { jsx as jsx48 } from "react/jsx-runtime";
 function GaugeChart({
   data,
@@ -39340,15 +39191,15 @@ function D3Gauge({
   colors,
   isAnimationActive
 }) {
-  const containerRef = useRef13(null);
-  const svgRef = useRef13(null);
-  const gaugeGroupRef = useRef13(null);
-  const needleRef = useRef13(null);
-  const needleOutlineRef = useRef13(null);
-  const textRef = useRef13(null);
-  const animationFrameRef = useRef13(null);
-  const previousPercentageRef = useRef13(0);
-  const firstMountRef = useRef13(true);
+  const containerRef = useRef12(null);
+  const svgRef = useRef12(null);
+  const gaugeGroupRef = useRef12(null);
+  const needleRef = useRef12(null);
+  const needleOutlineRef = useRef12(null);
+  const textRef = useRef12(null);
+  const animationFrameRef = useRef12(null);
+  const previousPercentageRef = useRef12(0);
+  const firstMountRef = useRef12(true);
   const startAngle = -(3 * Math.PI) / 4;
   const totalAngle = 3 * Math.PI / 2;
   const [arc, setArc] = useState18(null);
@@ -39885,7 +39736,7 @@ function Chart({
     filters,
     dashboardCustomFilters[allReportsById[reportId]?.dashboardName ?? ""]
   ]);
-  const previousFilters = useRef14(void 0);
+  const previousFilters = useRef13(void 0);
   if (!equal3(previousFilters.current, filters)) {
     previousFilters.current = filters;
   }
@@ -40944,7 +40795,7 @@ import {
   useContext as useContext20,
   useEffect as useEffect17,
   useMemo as useMemo17,
-  useRef as useRef15,
+  useRef as useRef14,
   useState as useState22
 } from "react";
 init_util();
@@ -41443,7 +41294,7 @@ var FilterPopoverWrapper = ({
   const [isOpen, setIsOpen] = useState22(false);
   const [uniqueValues, setUniqueValues] = useState22(void 0);
   const [uniqueValuesIsLoading, setUniqueValuesIsLoading] = useState22(false);
-  const prevFiltersRef = useRef15("");
+  const prevFiltersRef = useRef14("");
   const columnInternals = useMemo17(() => {
     if (!tables) {
       return null;
@@ -42702,7 +42553,7 @@ function DashboardLegacy({
     });
     return map;
   }, [data?.sections, data?.sectionOrder]);
-  const mounted = useRef16(false);
+  const mounted = useRef15(false);
   useEffect19(() => {
     if (!mounted.current) {
       mounted.current = true;
@@ -42744,16 +42595,16 @@ function DashboardLegacy({
     ) : defaultOptionsV2;
   }, [populatedDashboardFilters]);
   const [filterValues, setFilterValues] = useState26({});
-  const prevNameRef = useRef16(name2);
-  const prevFlagsRef = useRef16(flags);
-  const prevClientRef = useRef16(client?.id ?? "");
-  const addFilterPopoverButtonRef = useRef16(null);
-  const viewFiltersPopoverButtonRef = useRef16(null);
-  const previousFilters = useRef16(filters);
+  const prevNameRef = useRef15(name2);
+  const prevFlagsRef = useRef15(flags);
+  const prevClientRef = useRef15(client?.id ?? "");
+  const addFilterPopoverButtonRef = useRef15(null);
+  const viewFiltersPopoverButtonRef = useRef15(null);
+  const previousFilters = useRef15(filters);
   if (!equal4(previousFilters.current, filters)) {
     previousFilters.current = filters;
   }
-  const isInitialLoadOfDashboardRef = useRef16(false);
+  const isInitialLoadOfDashboardRef = useRef15(false);
   const referencedTables = useMemo19(() => {
     const sections = data?.sections || {};
     const tables2 = Object.values(sections).flatMap(
@@ -42781,7 +42632,7 @@ function DashboardLegacy({
       prevFlagsRef.current = flags;
     });
   }, [name2, isClientLoading]);
-  const tenantMounted = useRef16(false);
+  const tenantMounted = useRef15(false);
   useEffect19(() => {
     if (!tenantMounted.current) {
       tenantMounted.current = true;
@@ -44810,7 +44661,7 @@ import {
   useState as useState33,
   useContext as useContext30,
   useEffect as useEffect25,
-  useRef as useRef21,
+  useRef as useRef20,
   useMemo as useMemo27,
   useCallback as useCallback4
 } from "react";
@@ -44819,7 +44670,7 @@ import MonacoEditor from "@monaco-editor/react";
 // src/ChartBuilder.tsx
 import {
   useEffect as useEffect23,
-  useRef as useRef20,
+  useRef as useRef19,
   useState as useState31,
   useContext as useContext28,
   useMemo as useMemo26,
@@ -44849,7 +44700,7 @@ import {
   useMemo as useMemo23,
   useState as useState28,
   useEffect as useEffect21,
-  useRef as useRef17
+  useRef as useRef16
 } from "react";
 
 // src/internals/ReportBuilder/PivotList.tsx
@@ -45324,8 +45175,8 @@ var PivotModal = ({
   const [schemaData] = useContext25(SchemaDataContext);
   const { tenants } = useContext25(TenantContext);
   const { eventTracking } = useContext25(EventTrackingContext);
-  const rowFieldRef = useRef17(null);
-  const colFieldRef = useRef17(null);
+  const rowFieldRef = useRef16(null);
+  const colFieldRef = useRef16(null);
   const [pivotCardWidth, setPivotCardWidth] = useState28(420);
   const [samplePivotTable, setSamplePivotTable] = useState28(null);
   const [hasNoRecommendedPivots, sethasNoRecommendedPivots] = useState28(false);
@@ -45334,7 +45185,7 @@ var PivotModal = ({
   const [allowedRowFields, setAllowedRowFields] = useState28([]);
   const [allowedValueFields, setAllowedValueFields] = useState28([]);
   const [uniqueValues, setUniqueValues] = useState28(initialUniqueValues);
-  const buttonRef = useRef17(null);
+  const buttonRef = useRef16(null);
   const [dateRanges, setDateRanges] = useState28({});
   const [pivotError, setPivotError] = useState28("");
   const [limitInput, setLimitInput] = useState28(
@@ -45353,7 +45204,7 @@ var PivotModal = ({
   const [popoverPosition, setPopoverPosition] = useState28(
     "bottom"
   );
-  const popoverRef = useRef17(null);
+  const popoverRef = useRef16(null);
   const columnsToShow = useMemo23(() => {
     return (columns || []).reduce((map, col) => {
       map[col.field] = col.format;
@@ -45682,7 +45533,7 @@ var PivotModal = ({
     };
     fetchPivotTables();
   }, [selectedPivotIndex, data, dateRange, createdPivots]);
-  const previousUniqueValuesRef = useRef17();
+  const previousUniqueValuesRef = useRef16();
   useEffect21(() => {
     if (!uniqueValuesIsLoading && !equal5(uniqueValues, previousUniqueValuesRef.current)) {
       previousUniqueValuesRef.current = uniqueValues;
@@ -47094,7 +46945,7 @@ import {
   useEffect as useEffect22,
   useContext as useContext26,
   useMemo as useMemo24,
-  useRef as useRef18,
+  useRef as useRef17,
   useLayoutEffect as useLayoutEffect3
 } from "react";
 import { differenceInHours as differenceInHours2 } from "date-fns";
@@ -47216,7 +47067,7 @@ function InternalChart({
   const { dashboardConfig } = useContext26(DashboardConfigContext);
   const { eventTracking } = useContext26(EventTrackingContext);
   const [filtersPopoverOpen, setFiltersPopoverOpen] = useState29(false);
-  const filtersButtonRef = useRef18(null);
+  const filtersButtonRef = useRef17(null);
   const currentReportFilters = useMemo24(() => {
     const dashFilters = dashboardConfig[report?.dashboardName ?? ""]?.config.filters;
     if (!dashFilters)
@@ -47245,8 +47096,8 @@ function InternalChart({
     ) : defaultOptionsV2;
   }, [reportDateFilter]);
   const [filterValues, setFilterValues] = useState29({});
-  const multiselectDebounceRef = useRef18({});
-  const latestMultiselectValueRef = useRef18({});
+  const multiselectDebounceRef = useRef17({});
+  const latestMultiselectValueRef = useRef17({});
   const [lockedFilters, setLockedFilters] = useState29(
     {}
   );
@@ -47408,7 +47259,7 @@ function InternalChart({
     onDashboardFilterChange(filter.label, filterValue);
   };
   const [filtersExpanded, setFiltersExpanded] = useState29(false);
-  const filtersContainerRef = useRef18(null);
+  const filtersContainerRef = useRef17(null);
   const [visibleFilters, setVisibleFilters] = useState29([]);
   const filtersOverflowing = useMemo24(() => {
     return visibleFilters.some((visible) => visible);
@@ -47674,7 +47525,7 @@ init_dates();
 import React16, {
   useContext as useContext27,
   useMemo as useMemo25,
-  useRef as useRef19,
+  useRef as useRef18,
   useState as useState30
 } from "react";
 import { Fragment as Fragment12, jsx as jsx68, jsxs as jsxs49 } from "react/jsx-runtime";
@@ -47694,9 +47545,9 @@ function QuillMultiSelectSectionList({
 }) {
   const [theme] = useContext27(ThemeContext);
   const [showModal, setShowModal] = useState30(false);
-  const modalRef = useRef19(null);
-  const buttonRef = useRef19(null);
-  const debounceTimeoutId = useRef19(null);
+  const modalRef = useRef18(null);
+  const buttonRef = useRef18(null);
+  const debounceTimeoutId = useRef18(null);
   const [searchQuery, setSearchQuery] = React16.useState("");
   useOnClickOutside_default(
     modalRef,
@@ -48483,7 +48334,7 @@ function createReportFromForm(formData, report, eventTracking, selectedPivotTabl
   return newReport;
 }
 function ChartBuilderWithModal(props) {
-  const parentRef = useRef20(null);
+  const parentRef = useRef19(null);
   const [modalWidth, setModalWidth] = useState31(200);
   const [modalHeight, setModalHeight] = useState31(200);
   const { isOpen, setIsOpen, title, isHorizontalView } = props;
@@ -48650,8 +48501,8 @@ function ChartBuilder({
   const MIN_FORM_WIDTH = 700;
   const [pivotCardWidth, setPivotCardWidth] = useState31(MIN_FORM_WIDTH);
   const [formWidth, setFormWidth] = useState31(MIN_FORM_WIDTH);
-  const inputRef = useRef20(null);
-  const selectRef = useRef20(null);
+  const inputRef = useRef19(null);
+  const selectRef = useRef19(null);
   const processColumns = (columns2) => {
     if (schemaData.schemaWithCustomFields) {
       const newProcessedColumns = columns2?.map((col) => {
@@ -48710,8 +48561,8 @@ function ChartBuilder({
     processColumns(report?.columnInternal ?? [])
   );
   const [currentPage, setCurrentPage] = useState31(0);
-  const parentRef = useRef20(null);
-  const deleteRef = useRef20(null);
+  const parentRef = useRef19(null);
+  const deleteRef = useRef19(null);
   const modalPadding = 20;
   const deleteButtonMargin = -12;
   const { dashboardFilters } = useContext28(DashboardFiltersContext);
@@ -48764,7 +48615,7 @@ function ChartBuilder({
     abortLoadingFilters
   } = useContext28(ReportFiltersContext);
   const { reportsDispatch } = useContext28(ReportsContext);
-  const initialFilters = useRef20(reportFilters[report?.id ?? TEMP_REPORT_ID]);
+  const initialFilters = useRef19(reportFilters[report?.id ?? TEMP_REPORT_ID]);
   const [reportFiltersLoaded, setReportFiltersLoaded] = useState31(!filtersEnabled);
   const hasExistingData = useMemo26(() => {
     return report?.rows && report.rows.length > 0 || report?.pivotRows && report.pivotRows.length > 0;
@@ -49058,7 +48909,7 @@ function ChartBuilder({
       };
     }
   };
-  const initializedRef = useRef20(false);
+  const initializedRef = useRef19(false);
   const getCurrentSection = () => {
     let id = report?.id ?? "";
     if (id === "" || id === TEMP_REPORT_ID) {
@@ -49387,7 +49238,7 @@ function ChartBuilder({
       }));
     }
   }, [report?.triggerReload, report?.columns, formData.columns.length]);
-  const ranMountQuery = useRef20(false);
+  const ranMountQuery = useRef19(false);
   useEffect23(() => {
     if (runQueryOnMount && reportFiltersLoaded && filtersEnabled && !ranMountQuery.current) {
       ranMountQuery.current = true;
@@ -49624,7 +49475,7 @@ function ChartBuilder({
       return handleRunQuery(baseProcessing, updatedFilters);
     });
   };
-  const filtersEnabledRef = useRef20(filtersEnabled);
+  const filtersEnabledRef = useRef19(filtersEnabled);
   useEffect23(() => {
     if (filtersEnabledRef.current !== filtersEnabled) {
       filtersEnabledRef.current = filtersEnabled;
@@ -52629,7 +52480,7 @@ function SQLEditor({
 }) {
   const computedButtonLabel = addToDashboardButtonLabel === "Add to dashboard" ? reportId || report?.id ? "Save changes" : "Add to dashboard" : addToDashboardButtonLabel;
   const [sqlPrompt, setSqlPrompt] = useState33("");
-  const sqlPromptFormRef = useRef21(null);
+  const sqlPromptFormRef = useRef20(null);
   const sqlPromptInputWidth = useResponsiveFirstChildWidth_default(sqlPromptFormRef, {
     gap: 12,
     initialWidth: 320,
@@ -52689,7 +52540,7 @@ function SQLEditor({
     };
     return initial;
   });
-  const tableRef = useRef21(null);
+  const tableRef = useRef20(null);
   const [cachedHeight, setCachedHeight] = useState33(0);
   const DEFAULT_ROWS_PER_PAGE = 5;
   const ROW_HEIGHT = 37;
@@ -53691,7 +53542,7 @@ var SQLEditorComponent = ({
 }) => {
   const [editorKey, setEditorKey] = useState33(0);
   const { eventTracking } = useContext30(EventTrackingContext);
-  const currentProvider = useRef21(null);
+  const currentProvider = useRef20(null);
   useEffect25(() => {
     if (currentProvider.current) {
       currentProvider.current.dispose();
@@ -54163,7 +54014,7 @@ function SchemaItem({
 import {
   useContext as useContext34,
   useEffect as useEffect29,
-  useRef as useRef23,
+  useRef as useRef22,
   useState as useState39
 } from "react";
 init_constants();
@@ -55699,7 +55550,7 @@ var useReportBuilder = ({
 init_ReportBuilder();
 
 // src/components/ReportBuilder/AddColumnModal.tsx
-import { useState as useState35, useRef as useRef22, useMemo as useMemo29, useEffect as useEffect27, useContext as useContext32 } from "react";
+import { useState as useState35, useRef as useRef21, useMemo as useMemo29, useEffect as useEffect27, useContext as useContext32 } from "react";
 import {
   DndContext as DndContext2,
   closestCenter as closestCenter2,
@@ -55740,7 +55591,7 @@ function AddColumnModal({
   const [theme] = useContext32(ThemeContext);
   const [search, setSearch] = useState35("");
   const [initialLoad, setInitialLoad] = useState35(true);
-  const textInputContainerRef = useRef22(null);
+  const textInputContainerRef = useRef21(null);
   const [modalSelectedColumns, setModalSelectedColumns] = useState35(
     selectedColumns.map((col) => `${col.table}.${col.field}`)
   );
@@ -58194,8 +58045,8 @@ function ReportBuilder({
   const [theme] = useContext34(ThemeContext);
   const [client] = useContext34(ClientContext);
   const { getToken } = useContext34(FetchContext);
-  const parentRef = useRef23(null);
-  const askAIFormRef = useRef23(null);
+  const parentRef = useRef22(null);
+  const askAIFormRef = useRef22(null);
   const [isCopying, setIsCopying] = useState39(false);
   const [isChartBuilderOpen, setIsChartBuilderOpen] = useState39(false);
   const [isSaveQueryModalOpen, setIsSaveQueryModalOpen] = useState39(false);
@@ -58702,7 +58553,7 @@ import {
   useContext as useContext35,
   useEffect as useEffect30,
   useMemo as useMemo31,
-  useRef as useRef24,
+  useRef as useRef23,
   useState as useState40
 } from "react";
 import { jsx as jsx86 } from "react/jsx-runtime";
@@ -58751,7 +58602,7 @@ function ChartEditor({
   onClickChartElement,
   onClickChartError
 }) {
-  const parentRef = useRef24(null);
+  const parentRef = useRef23(null);
   const [modalWidth, setModalWidth] = useState40(200);
   const [modalHeight, setModalHeight] = useState40(200);
   const { allReportsById } = useAllReports();
@@ -58929,7 +58780,7 @@ function ChartEditor({
 }
 
 // src/Chat.tsx
-import { useContext as useContext37, useEffect as useEffect32, useRef as useRef26, useState as useState42 } from "react";
+import { useContext as useContext37, useEffect as useEffect32, useRef as useRef25, useState as useState42 } from "react";
 
 // src/ChatChartCard.tsx
 import { useMemo as useMemo33 } from "react";
@@ -58944,7 +58795,7 @@ import {
   useLayoutEffect as useLayoutEffect4,
   useMemo as useMemo32,
   useReducer as useReducer2,
-  useRef as useRef25,
+  useRef as useRef24,
   useState as useState41
 } from "react";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
@@ -60131,6 +59982,37 @@ function useFormReducer(state, action) {
   }
 }
 
+// src/utils/pivotDateBuckets.ts
+import {
+  eachDayOfInterval as eachDayOfInterval3,
+  eachMonthOfInterval as eachMonthOfInterval2,
+  eachWeekOfInterval as eachWeekOfInterval2,
+  eachYearOfInterval as eachYearOfInterval2
+} from "date-fns";
+function buildPivotDateBucketStarts(range, bucket) {
+  const min2 = new Date(range.min);
+  const max2 = new Date(range.max);
+  if (Number.isNaN(min2.getTime()) || Number.isNaN(max2.getTime())) return [];
+  const start = min2 <= max2 ? min2 : max2;
+  const end = min2 <= max2 ? max2 : min2;
+  const asLocalCalendarDate = (date) => new Date(
+    date.getUTCFullYear(),
+    date.getUTCMonth(),
+    date.getUTCDate(),
+    12
+  );
+  const interval = {
+    start: asLocalCalendarDate(start),
+    end: asLocalCalendarDate(end)
+  };
+  const dates = bucket === "day" ? eachDayOfInterval3(interval) : bucket === "week" ? eachWeekOfInterval2(interval, { weekStartsOn: 1 }) : bucket === "year" ? eachYearOfInterval2(interval) : eachMonthOfInterval2(interval);
+  return dates.map(
+    (date) => new Date(
+      Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())
+    ).toISOString()
+  );
+}
+
 // src/hooks/useForm.queries.ts
 var QUERY_KEY_UNDEFINED = "__undefined__";
 var QUERY_KEY_FUNCTION = "__function__";
@@ -60308,70 +60190,6 @@ var AXIS_FORMAT_OPTIONS = [
   { value: "MMM_dd_hh:mm_ap_pm", label: "date and time" },
   { value: "hh_ap_pm", label: "hour" }
 ];
-var USEFORM_FILTERS_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_FILTERS__";
-var USEFORM_REFRESH_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_REFRESH__";
-var USEFORM_PIVOT_SHAPE_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_PIVOT_SHAPE__";
-var USEFORM_TASK_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_TASKS__";
-var isUseFormFiltersDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_FILTERS_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_FILTERS ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var isUseFormRefreshDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_REFRESH_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_REFRESH ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var isUseFormTaskDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_TASK_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_TASKS ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var logUseFormTaskDebug = (label, payload) => {
-  if (!isUseFormTaskDebugEnabled()) return;
-  console.log(`[useReport][task] ${label}`, payload);
-};
-var isUseFormPivotShapeDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_PIVOT_SHAPE_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_PIVOT_SHAPE ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var logUseFormPivotShapeDebug = (label, payload) => {
-  if (!isUseFormPivotShapeDebugEnabled()) return;
-  console.log(`[useReport][pivot-shape] ${label}`, payload);
-};
 var BOOLEAN_FILTER_VALUE_OPTIONS = [
   { name: "true", label: "True", value: "true" },
   { name: "false", label: "False", value: "false" }
@@ -61263,30 +61081,24 @@ function shouldUsePivotRowFieldAsXAxis(chartType, pivotRowField, rowColumnFormat
 function normalizePivotChartForDisplay(chart) {
   const swapPivotRowsForChartRows = Boolean(chart?.pivot) && Array.isArray(chart?.pivotRows) && chart.pivotRows.length > 0;
   const syntheticAggregationOnlyRows = chart && !swapPivotRowsForChartRows ? buildSyntheticAggregationOnlyDisplayRows(chart) : null;
+  const hasExplicitEmptyGroupedPivot = Boolean(
+    String(chart?.pivot?.rowField ?? "").trim() || String(chart?.pivot?.columnField ?? "").trim()
+  ) && Array.isArray(chart?.pivotRows) && chart.pivotRows.length === 0;
   const detailRowsAreNotPivotBuckets = Boolean(chart) && !swapPivotRowsForChartRows && !syntheticAggregationOnlyRows && chartDetailRowsMissingPivotRowBucket(chart);
-  logUseFormPivotShapeDebug("normalizePivotChartForDisplay:gate", {
-    hasPivot: Boolean(chart?.pivot),
-    pivotRowField: chart?.pivot?.rowField,
-    pivotRowsIsArray: Array.isArray(chart?.pivotRows),
-    pivotRowsLength: Array.isArray(chart?.pivotRows) ? chart.pivotRows.length : null,
-    incomingChartRowsLength: Array.isArray(chart?.rows) ? chart.rows.length : null,
-    swapPivotRowsForChartRows
-  });
   const config = swapPivotRowsForChartRows ? {
     ...chart,
     rows: chart.pivotRows
   } : syntheticAggregationOnlyRows ? {
     ...chart,
     rows: syntheticAggregationOnlyRows
+  } : hasExplicitEmptyGroupedPivot ? {
+    ...chart,
+    rows: []
   } : detailRowsAreNotPivotBuckets ? {
     ...chart,
     rows: []
   } : chart;
   if (!config) return config;
-  logUseFormPivotShapeDebug("normalizePivotChartForDisplay:postGateRows", {
-    effectiveRowsLength: Array.isArray(config.rows) ? config.rows.length : null,
-    stillUsingDetailRows: Boolean(config.pivot) && !swapPivotRowsForChartRows && Array.isArray(config.rows) && config.rows.length > 0
-  });
   if (!config.pivot) return config;
   const pivotRowFieldEarly = String(config.pivot?.rowField ?? "").trim();
   const rowColumn = (config.pivotColumns ?? config.columns ?? []).find(
@@ -62326,7 +62138,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     effectiveReportBuilderTableNames,
     scopedSchemaColumns,
     displayColumns,
-    sourceReport
+    sourceReport,
+    includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
   const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
@@ -62347,6 +62160,21 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ...tableName ? { table: tableName } : {}
     };
   }).filter((column) => Boolean(column));
+  const normalizedSchemaColumns = includeSelectedSchemaFallback ? scopedSchemaColumns.filter(
+    (column) => selectedTableNames.has(String(column.table ?? "").trim())
+  ).map((column) => {
+    const field = String(column.field ?? "").trim();
+    if (!field) return null;
+    const label = String(column.label ?? "").trim() || field;
+    const format9 = String(column.format ?? "").trim() || "string";
+    const tableName = String(column.table ?? "").trim();
+    return {
+      label,
+      field,
+      format: format9,
+      ...tableName ? { table: tableName } : {}
+    };
+  }).filter((column) => Boolean(column)) : [];
   const normalizedDisplayColumns = (displayColumns ?? []).map((column) => {
     const field = String(column?.field ?? "").trim();
     if (!field) return null;
@@ -62371,7 +62199,10 @@ function mergeDisplayAndSourceForTableFormats(args) {
         sourceColumnsByKey.set(key, [column]);
       }
     };
-    for (const sourceColumn of normalizedSourceColumns) {
+    for (const sourceColumn of [
+      ...normalizedSourceColumns,
+      ...normalizedSchemaColumns
+    ]) {
       const tableName = String(sourceColumn.table ?? "").trim();
       addSourceColumnKey(sourceColumn.field, sourceColumn);
       addSourceColumnKey(sourceColumn.label, sourceColumn);
@@ -62929,9 +62760,6 @@ async function loadViaInMemoryEngines({
   pivot,
   reportBuilderState,
   allowReportTaskBootstrap = false,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const requestedTask = allowReportTaskBootstrap ? "report" : "item";
@@ -62941,17 +62769,6 @@ async function loadViaInMemoryEngines({
       rowsPerRequest: DEFAULT_USE_REPORT_ROWS_PER_REQUEST
     }
   } : {};
-  logUseFormTaskDebug("dispatch fetchReport", {
-    reportId,
-    task: requestedTask,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    allowReportTaskBootstrap,
-    filterCount: internalFilters.length,
-    hasPivot: Boolean(pivot),
-    hasReportBuilderState: Boolean(reportBuilderState)
-  });
   const { report, error } = await fetchReport({
     reportId,
     client,
@@ -63031,9 +62848,6 @@ async function loadViaPivotTemplate({
   reportBuilderState,
   baseReport,
   schema,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const pivotForTemplate = enrichPivotRowFieldTypeForTemplate(
@@ -63041,16 +62855,6 @@ async function loadViaPivotTemplate({
     schema,
     baseReport
   );
-  logUseFormTaskDebug("dispatch fetchReport", {
-    reportId,
-    task: "pivot-template",
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    filterCount: internalFilters.length,
-    hasPivot: Boolean(pivotForTemplate),
-    hasReportBuilderState: Boolean(reportBuilderState)
-  });
   const { report, error } = await fetchPivotTemplateReportForUseForm({
     reportId,
     client,
@@ -63278,19 +63082,8 @@ async function loadPivotTemplateInParallelWithReportTask({
   customFields,
   dashboardName,
   pivotRefreshOnly = false,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
-  logUseFormTaskDebug("parallel loader route", {
-    reportId,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    pivotRefreshOnly,
-    tasks: pivotRefreshOnly ? ["pivot-template"] : ["report", "pivot-template", "report-builder-state"]
-  });
   if (pivotRefreshOnly) {
     const pivotOnlyResult = await loadViaPivotTemplate({
       reportId,
@@ -63303,9 +63096,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       reportBuilderState,
       baseReport,
       schema,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
     return pivotOnlyResult;
@@ -63321,9 +63111,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       pivot,
       reportBuilderState,
       allowReportTaskBootstrap: true,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     }),
     loadViaPivotTemplate({
@@ -63337,9 +63124,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       reportBuilderState,
       baseReport,
       schema,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     }),
     fetchReportBuilderStateByReportId({
@@ -63522,9 +63306,6 @@ async function loadReportForUseForm({
   customFields,
   dashboardName,
   useInMemoryEngines,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const effectivePivot = pivot ?? initialReportBuilderState?.pivot ?? void 0;
@@ -63533,18 +63314,6 @@ async function loadReportForUseForm({
     ...initialReportBuilderState,
     pivot: effectivePivot ?? initialReportBuilderState.pivot ?? null
   } : void 0;
-  logUseFormTaskDebug("resolve loader route", {
-    reportId,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    hasPivot,
-    hasReportBuilderState: Boolean(reportBuilderStateForLoad),
-    allowReportTaskBootstrap,
-    includeReportBuilderStateInPivotTask,
-    filterCount: internalFilters.length,
-    useInMemoryEngines
-  });
   if (hasPivot) {
     const pivotResult = await loadPivotTemplateInParallelWithReportTask({
       reportId,
@@ -63560,9 +63329,6 @@ async function loadReportForUseForm({
       customFields,
       dashboardName,
       pivotRefreshOnly: includeReportBuilderStateInPivotTask,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
     const pivotRows = pivotResult.report?.pivotRows;
@@ -63571,7 +63337,7 @@ async function loadReportForUseForm({
     const hasRowBucketKey = !rowFieldTrimmed || Array.isArray(pivotRows) && pivotRows.some(
       (row) => row && typeof row === "object" && Object.prototype.hasOwnProperty.call(row, rowFieldTrimmed)
     );
-    const hasMatchingPivotData = pivotResult.report && !pivotResult.error && Array.isArray(pivotRows) && pivotRows.length > 0 && hasRowBucketKey;
+    const hasMatchingPivotData = pivotResult.report && !pivotResult.error && Array.isArray(pivotRows) && (pivotRows.length === 0 || hasRowBucketKey);
     if (hasMatchingPivotData) {
       return pivotResult;
     }
@@ -63611,25 +63377,12 @@ async function loadReportForUseForm({
         schema,
         customFields,
         dashboardName,
-        debugSource,
-        debugRunId,
-        debugLoadRequestId,
         draftSessionId
       });
       const normalizedBootstrapResult = bootstrapResult.report?.pivot == null ? stripPivotFromResult(bootstrapResult) : bootstrapResult;
       return normalizedBootstrapResult;
     }
     const shouldUseReportTaskForReload = internalFilters.length > 0;
-    const resolvedTask = shouldUseReportTaskForReload ? "report" : "item";
-    logUseFormTaskDebug("non-bootstrap task route", {
-      reportId,
-      task: resolvedTask,
-      source: debugSource ?? "unknown",
-      runId: debugRunId ?? null,
-      loadRequestId: debugLoadRequestId ?? null,
-      reason: shouldUseReportTaskForReload ? "live internal filters are present" : "no live internal filters are present",
-      filterCount: internalFilters.length
-    });
     return loadViaInMemoryEngines({
       reportId,
       client,
@@ -63638,9 +63391,6 @@ async function loadReportForUseForm({
       tenants,
       flags,
       allowReportTaskBootstrap: shouldUseReportTaskForReload,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
   }
@@ -63659,18 +63409,12 @@ async function loadReportForUseForm({
 function generateDraftSessionId() {
   return typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : `draft-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
 }
-var nextUseReportDebugRunId = 0;
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
   const [createdReportId, setCreatedReportId] = useState41(null);
   const effectiveReportId = propReportId || createdReportId || "";
   const { eventTracking } = useContext36(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = useState41(generateDraftSessionId);
-  const [taskDebugRunId] = useState41(() => {
-    nextUseReportDebugRunId += 1;
-    return nextUseReportDebugRunId;
-  });
-  const taskDebugLoadRequestIdRef = useRef25(0);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
   const restrictFieldOptionsToSelectedDatasources = options.restrictFieldOptionsToSelectedDatasources ?? true;
   const reportOverride = options.reportOverride ?? null;
@@ -63679,7 +63423,7 @@ function useReport(reportIdArg, options = {}) {
     options.destinationDashboardName ?? ""
   ).trim();
   const controlledPagination = options.state?.pagination;
-  const initialPaginationRef = useRef25({
+  const initialPaginationRef = useRef24({
     ...getDefaultPaginationState(),
     ...options.initialState?.pagination ?? {}
   });
@@ -63693,15 +63437,15 @@ function useReport(reportIdArg, options = {}) {
   );
   const pagination = controlledPagination ?? internalPagination;
   const paginationActive = paginationInteracted || Boolean(controlledPagination);
-  const paginationRef = useRef25(pagination);
+  const paginationRef = useRef24(pagination);
   paginationRef.current = pagination;
-  const onPaginationChangeRef = useRef25(options.onPaginationChange);
+  const onPaginationChangeRef = useRef24(options.onPaginationChange);
   onPaginationChangeRef.current = options.onPaginationChange;
-  const controlledPaginationRef = useRef25(Boolean(controlledPagination));
+  const controlledPaginationRef = useRef24(Boolean(controlledPagination));
   controlledPaginationRef.current = Boolean(controlledPagination);
-  const autoResetPageIndexRef = useRef25(true);
+  const autoResetPageIndexRef = useRef24(true);
   autoResetPageIndexRef.current = options.autoResetPageIndex ?? true;
-  const paginationPageCountRef = useRef25(-1);
+  const paginationPageCountRef = useRef24(-1);
   const applyPaginationUpdate = useCallback5(
     (updater, { activate = true } = {}) => {
       if (activate) {
@@ -63770,13 +63514,13 @@ function useReport(reportIdArg, options = {}) {
     () => setPageIndex(paginationPageCountRef.current - 1),
     [setPageIndex]
   );
-  const chartPivotHydratedFromSourceRef = useRef25(false);
-  const lastPivotHydrateCompletedSourceIdRef = useRef25(null);
-  const groupRowsBySetViaSetReportRef = useRef25(false);
-  const groupColumnsBySetViaSetReportRef = useRef25(false);
-  const dateBucketSetViaSetReportRef = useRef25(false);
-  const aggregationStateSetViaSetReportRef = useRef25(false);
-  const prevReportIdForChartPivotHydrationRef = useRef25(effectiveReportId);
+  const chartPivotHydratedFromSourceRef = useRef24(false);
+  const lastPivotHydrateCompletedSourceIdRef = useRef24(null);
+  const groupRowsBySetViaSetReportRef = useRef24(false);
+  const groupColumnsBySetViaSetReportRef = useRef24(false);
+  const dateBucketSetViaSetReportRef = useRef24(false);
+  const aggregationStateSetViaSetReportRef = useRef24(false);
+  const prevReportIdForChartPivotHydrationRef = useRef24(effectiveReportId);
   if (prevReportIdForChartPivotHydrationRef.current !== effectiveReportId) {
     prevReportIdForChartPivotHydrationRef.current = effectiveReportId;
     chartPivotHydratedFromSourceRef.current = false;
@@ -63790,11 +63534,11 @@ function useReport(reportIdArg, options = {}) {
     expandReportBuilderColumnsForFlatTable,
     setExpandReportBuilderColumnsForFlatTable
   ] = useState41(false);
-  const prevPivotStateForColumnExpansionRef = useRef25(null);
+  const prevPivotStateForColumnExpansionRef = useRef24(null);
   const [sourceReport, setSourceReport] = useState41(
     null
   );
-  const prevSourceReportIdForPivotHydrationRef = useRef25(null);
+  const prevSourceReportIdForPivotHydrationRef = useRef24(null);
   {
     const currentSourceId = sourceReport ? String(
       sourceReport.id ?? sourceReport._id ?? ""
@@ -63809,6 +63553,9 @@ function useReport(reportIdArg, options = {}) {
   const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = useState41(false);
   const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = useState41(null);
   const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = useState41(null);
+  useEffect31(() => {
+    setTableColumnsEditedSignature(null);
+  }, [effectiveReportId]);
   const [chartAxisEdits, setChartAxisEdits] = useState41({});
   const [chartVisibilityOverrides, setChartVisibilityOverrides] = useState41({});
   const [client] = useContext36(ClientContext);
@@ -63880,12 +63627,10 @@ function useReport(reportIdArg, options = {}) {
   const dashboardNameForNewReport = useMemo32(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
-  const filterStackRef = useRef25(filterStack);
+  const filterStackRef = useRef24(filterStack);
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
-  const useFormRefreshDebugEnabled = isUseFormRefreshDebugEnabled();
-  const useFormFiltersDebugEnabled = isUseFormFiltersDebugEnabled();
   useEffect31(() => {
     if (propReportId) {
       setCreatedReportId(null);
@@ -63895,8 +63640,8 @@ function useReport(reportIdArg, options = {}) {
     setChartAxisEdits({});
     setChartVisibilityOverrides({});
   }, [effectiveReportId]);
-  const bootstrapReportTaskUsedForReportIdRef = useRef25(null);
-  const schemaScopeInitializedForReportIdRef = useRef25(null);
+  const bootstrapReportTaskUsedForReportIdRef = useRef24(null);
+  const schemaScopeInitializedForReportIdRef = useRef24(null);
   const initializeSchemaScopeForReport = (report) => {
     if (!report) return;
     if (schemaScopeInitializedForReportIdRef.current === effectiveReportId)
@@ -63924,8 +63669,8 @@ function useReport(reportIdArg, options = {}) {
     }
     return schemaData.schema ?? [];
   }, [schemaData.schema, schemaData.schemaWithCustomFields]);
-  const schemaForReportBuilderStateRef = useRef25(schemaForReportBuilderState);
-  const customFieldsRef = useRef25(schemaData.customFields);
+  const schemaForReportBuilderStateRef = useRef24(schemaForReportBuilderState);
+  const customFieldsRef = useRef24(schemaData.customFields);
   schemaForReportBuilderStateRef.current = schemaForReportBuilderState;
   customFieldsRef.current = schemaData.customFields;
   const isBoolAggregationField = useCallback5(
@@ -64434,26 +64179,6 @@ function useReport(reportIdArg, options = {}) {
   const filterUniqueValuesEnabled = Boolean(
     client && client?.queryEndpoint && filterUniqueValuesRequest && filterUniqueValuesRequest.stringColumns.length > 0
   );
-  useEffect31(() => {
-    if (!useFormFiltersDebugEnabled) return;
-    const hasClient = Boolean(client);
-    const hasQueryEndpoint = Boolean(client?.queryEndpoint);
-    const hasRequest = Boolean(filterUniqueValuesRequest);
-    const stringColumnsCount = filterUniqueValuesRequest?.stringColumns.length ?? 0;
-    const stringColumnsByTableCount = filterUniqueValuesRequest?.stringColumnsByTable.length ?? 0;
-    const missingReasons = [];
-    if (!hasClient) missingReasons.push("missing-client");
-    if (!hasQueryEndpoint) missingReasons.push("missing-query-endpoint");
-    if (!hasRequest) missingReasons.push("missing-filterUniqueValuesRequest");
-    if (stringColumnsCount === 0) missingReasons.push("no-string-columns");
-  }, [
-    client,
-    filterUniqueValuesEnabled,
-    filterUniqueValuesRequest,
-    filterUniqueValuesRequestHash,
-    effectiveReportId,
-    useFormFiltersDebugEnabled
-  ]);
   const filterUniqueValuesQuery = useQuery({
     queryKey: [
       "useReport",
@@ -64557,22 +64282,6 @@ function useReport(reportIdArg, options = {}) {
     filterUniqueValuesQuery.data?.uniqueValuesByColumn,
     filterUniqueValuesRequest?.stringColumnsByTable
   ]);
-  useEffect31(() => {
-    if (!useFormFiltersDebugEnabled) return;
-    if (filterUniqueValuesQuery.status !== "success" && filterUniqueValuesQuery.status !== "error") {
-      return;
-    }
-    const uniqueValuesByColumn = filterUniqueValuesQuery.data?.uniqueValuesByColumn ?? {};
-    const uniqueValuesByColumnRecord = uniqueValuesByColumn && typeof uniqueValuesByColumn === "object" ? uniqueValuesByColumn : {};
-  }, [
-    backendUniqueValuesByFieldName,
-    filterUniqueValuesEnabled,
-    filterUniqueValuesQuery.data,
-    filterUniqueValuesQuery.status,
-    filterUniqueValuesRequest,
-    effectiveReportId,
-    useFormFiltersDebugEnabled
-  ]);
   const filterValueOptionsByFieldName = useMemo32(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     const selectedMultiselectByField = collectSelectedStringMultiselectValuesByField(queryFilters);
@@ -64740,8 +64449,8 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsStableReportIdRef = useRef25("");
-  const filterFieldsStableCacheRef = useRef25([]);
+  const filterFieldsStableReportIdRef = useRef24("");
+  const filterFieldsStableCacheRef = useRef24([]);
   const filterFields = useMemo32(() => {
     const rid = String(effectiveReportId ?? "");
     if (filterFieldsStableReportIdRef.current !== rid) {
@@ -64973,8 +64682,6 @@ function useReport(reportIdArg, options = {}) {
       clientHash
     }),
     queryFn: createUseFormQueryFn(async () => {
-      taskDebugLoadRequestIdRef.current += 1;
-      const debugLoadRequestId = taskDebugLoadRequestIdRef.current;
       const allowReportTaskBootstrap = !initialReportBuilderState && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
       const loadTargetId = String(effectiveReportId ?? "").trim();
       const sourceReportIdentity = String(
@@ -64998,9 +64705,6 @@ function useReport(reportIdArg, options = {}) {
         customFields: customFieldsRef.current,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        debugSource: "initial-load",
-        debugRunId: taskDebugRunId,
-        debugLoadRequestId,
         draftSessionId: draftSessionId || void 0
       });
       return loadResult;
@@ -65340,19 +65044,6 @@ function useReport(reportIdArg, options = {}) {
         resolveCache.set(fieldName, resolved);
         return resolved;
       }
-      if (isUseFormFiltersDebugEnabled()) {
-        console.error(
-          "[useForm-debug] normalizeQueryBuilderFieldNameForConfig ambiguous",
-          {
-            fieldName,
-            candidateKeys: candidates.map(([key]) => key),
-            preferredTableNames: Array.from(preferredTableNames),
-            primaryTableName,
-            effectiveReportBuilderTableNames,
-            baseReportBuilderTableNames
-          }
-        );
-      }
       return fieldName;
     };
   }, [
@@ -65630,7 +65321,7 @@ function useReport(reportIdArg, options = {}) {
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
-  const prevPaginationResetStateHashRef = useRef25(null);
+  const prevPaginationResetStateHashRef = useRef24(null);
   useEffect31(() => {
     const prevHash = prevPaginationResetStateHashRef.current;
     prevPaginationResetStateHashRef.current = effectiveReportBuilderStateHash;
@@ -65744,8 +65435,7 @@ function useReport(reportIdArg, options = {}) {
   }, [
     effectiveReportId,
     tableRefreshQuery.data,
-    tableRefreshQueryEnabled,
-    useFormRefreshDebugEnabled
+    tableRefreshQueryEnabled
   ]);
   const chartTypes = useMemo32(() => {
     return getChartTypeOptions2({ pivot: pivotState });
@@ -66308,7 +65998,6 @@ function useReport(reportIdArg, options = {}) {
         ...sourceReport,
         reportBuilderState: effectiveReportBuilderState
       };
-      taskDebugLoadRequestIdRef.current += 1;
       const pivotRefreshResult = await loadReportForUseForm({
         reportId: effectiveReportId,
         initialReportBuilderState: effectiveReportBuilderState,
@@ -66324,9 +66013,6 @@ function useReport(reportIdArg, options = {}) {
         customFields: schemaData.customFields,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        debugSource: "pivot-refresh",
-        debugRunId: taskDebugRunId,
-        debugLoadRequestId: taskDebugLoadRequestIdRef.current,
         draftSessionId: draftSessionId || void 0
       });
       return pivotRefreshResult;
@@ -66490,8 +66176,7 @@ function useReport(reportIdArg, options = {}) {
     pivotTableDataRefreshQuery.data,
     pivotTableDataRefreshQuery.status,
     pivotTableDataRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   useEffect31(() => {
     if (!pivotRefreshQueryEnabled) return;
@@ -66543,8 +66228,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQuery.data,
     pivotRefreshQuery.status,
     pivotRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   const chartData = useMemo32(() => {
     if (!sourceReport) return void 0;
@@ -66552,8 +66236,8 @@ function useReport(reportIdArg, options = {}) {
     const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
-    const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) && sourceReport.pivotRows.length > 0 ? sourceReport.pivotRows : [];
-    const rowCountForChartResolved = chartPivotForDisplay ? pivotRowsForChart.length > 0 ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
+    const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
+    const rowCountForChartResolved = chartPivotForDisplay ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
     const chartDataPayload = {
       ...sourceReport,
       rows: rowsForChart,
@@ -66564,15 +66248,8 @@ function useReport(reportIdArg, options = {}) {
       referencedTables: referencedTablesForChart && referencedTablesForChart.length > 0 ? referencedTablesForChart : sourceReport.referencedTables,
       pivotRows: pivotRowsForChart,
       pivotColumns: sourceReport.pivotColumns,
-      pivotRowCount: pivotRowsForChart.length
+      pivotRowCount: Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : sourceReport.pivotRowCount
     };
-    logUseFormPivotShapeDebug("chartData:memo", {
-      reportId: sourceReport.id,
-      detailRowsLength: rowsForChart.length,
-      pivotRowsIsArray: Array.isArray(sourceReport.pivotRows),
-      pivotRowsLength: Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : null,
-      hasNextPivot: Boolean(nextPivot)
-    });
     return chartDataPayload;
   }, [
     sourceReport,
@@ -66884,26 +66561,6 @@ function useReport(reportIdArg, options = {}) {
         xAxisLabel: resolvedXAxisLabel
       });
     }
-    logUseFormPivotShapeDebug("chart:formatting(yAxis+pivotColumns)", {
-      chartType: baseChart.chartType,
-      pivotRowField: baseChart.pivot?.rowField,
-      xAxisField: resolvedXAxisField,
-      xAxisFormat: resolvedXAxisFormat,
-      yAxisFieldsForDisplay: (resolvedYAxisFieldsForDisplay ?? []).map((y) => ({
-        field: y.field,
-        format: y.format,
-        label: y.label
-      })),
-      pivotColumnsSample: (baseChart.pivotColumns ?? []).slice(0, 12).map((c) => ({
-        field: c.field,
-        format: c.format,
-        label: c.label
-      })),
-      mergedColumnFormatsSample: (columns2 ?? baseChart.columns ?? []).slice(0, 12).map((c) => ({
-        field: c.field,
-        format: c.format
-      }))
-    });
     return {
       ...baseChart,
       xAxisField: resolvedXAxisField,
@@ -66919,6 +66576,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisLabel,
     resolvedYAxisFieldsForDisplay
   ]);
+  const pivotDateFilterRangeCacheRef = useRef24({ key: "", min: null, max: null });
   const filterOptions = useMemo32(() => {
     const out = [];
     for (const [field, values] of filterValueOptionsByFieldName) {
@@ -66934,25 +66592,43 @@ function useReport(reportIdArg, options = {}) {
     if (rowField && isDateType(String(pivot?.rowFieldType ?? ""))) {
       const field = pivot?.rowFieldTable ? `${pivot.rowFieldTable}.${rowField}` : rowField;
       const bucket = dateBucket || pivot?.dateBucket || "month";
-      const byRaw = /* @__PURE__ */ new Map();
+      const labelsByRaw = /* @__PURE__ */ new Map();
+      const cacheKey = `${String(effectiveReportId ?? "")}\0${field}\0${bucket}`;
+      if (pivotDateFilterRangeCacheRef.current.key !== cacheKey) {
+        pivotDateFilterRangeCacheRef.current = {
+          key: cacheKey,
+          min: null,
+          max: null
+        };
+      }
       for (const row of chart?.rows ?? []) {
         const record = row;
         const raw = record.__quillRawDate;
         if (raw == null || raw === "") continue;
         const key = String(raw);
-        if (!byRaw.has(key)) {
-          byRaw.set(key, String(record[rowField] ?? key));
+        const timestamp = new Date(key).getTime();
+        if (Number.isNaN(timestamp)) continue;
+        labelsByRaw.set(key, String(record[rowField] ?? key));
+        const cachedMin = pivotDateFilterRangeCacheRef.current.min;
+        const cachedMax = pivotDateFilterRangeCacheRef.current.max;
+        if (cachedMin == null || timestamp < new Date(cachedMin).getTime()) {
+          pivotDateFilterRangeCacheRef.current.min = key;
+        }
+        if (cachedMax == null || timestamp > new Date(cachedMax).getTime()) {
+          pivotDateFilterRangeCacheRef.current.max = key;
         }
       }
+      const { min: min2, max: max2 } = pivotDateFilterRangeCacheRef.current;
+      const options2 = min2 && max2 ? buildPivotDateBucketStarts({ min: min2, max: max2 }, bucket).map((value) => ({
+        value,
+        label: labelsByRaw.get(value) ?? getDateString(value, void 0, bucket)
+      })) : [];
       out.push({
         field,
         fieldType: "date",
         operator: "inBucket",
         dateBucket: bucket,
-        options: [...byRaw.keys()].sort().map((value) => ({
-          value,
-          label: byRaw.get(value) ?? value
-        }))
+        options: options2
       });
     }
     return out;
@@ -66960,6 +66636,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.pivot,
     chart?.rows,
     dateBucket,
+    effectiveReportId,
     filterValueOptionsByFieldName
   ]);
   const chartForUi = useMemo32(() => {
@@ -67189,19 +66866,21 @@ function useReport(reportIdArg, options = {}) {
     xAxisOptions,
     yAxisOptions
   ]);
-  const tableFormatCacheRef = useRef25(/* @__PURE__ */ new Map());
+  const tableFormatCacheRef = useRef24(/* @__PURE__ */ new Map());
   const tableFormatMerge = useMemo32(
     () => mergeDisplayAndSourceForTableFormats({
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     }),
     [
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      tableColumnsEditedSignature
     ]
   );
   const table = useMemo32(() => {
@@ -67211,7 +66890,8 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
     const pivotRowFieldForTable = String(
       sourceReport?.pivot?.rowField ?? ""
@@ -67312,6 +66992,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFieldsForDisplay,
     scopedSchemaColumns,
     sourceReport,
+    tableColumnsEditedSignature,
     pagination,
     paginationActive,
     paginationPageCount,
@@ -67564,7 +67245,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     tableFormatMerge
   ]);
-  const tableColumnSettingsCoalesceRef = useRef25(
+  const tableColumnSettingsCoalesceRef = useRef24(
     /* @__PURE__ */ new Map()
   );
   useLayoutEffect4(() => {
@@ -67806,6 +67487,17 @@ function useReport(reportIdArg, options = {}) {
   };
   applyReportChange = (nextState) => {
     const effectiveNextState = nextState;
+    const normalizedRequestedDisplayColumns = effectiveNextState.columns === void 0 ? void 0 : normalizeColumnsInput(
+      effectiveNextState.columns,
+      columnIdentifierLookup
+    );
+    const visibleDisplayColumnKeys = new Set(
+      activeTableColumnIds.map((id) => columnIdentifierLookup.get(id)).filter((column) => Boolean(column)).map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
+    );
+    const addedRequestedDisplayColumns = (normalizedRequestedDisplayColumns ?? []).filter((column) => {
+      const key = toReportBuilderColumnKey(column);
+      return Boolean(key) && !visibleDisplayColumnKeys.has(key);
+    });
     if (effectiveNextState.showLegend !== void 0) {
       setChartVisibilityOverrides((previous) => ({
         ...previous,
@@ -67901,7 +67593,7 @@ function useReport(reportIdArg, options = {}) {
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67967,19 +67659,8 @@ function useReport(reportIdArg, options = {}) {
           }
         }
         if (effectiveNextState.columns !== void 0) {
-          const normalizedDisplayColumns = normalizeColumnsInput(
-            effectiveNextState.columns,
-            columnIdentifierLookup
-          );
-          const previousDisplayColumnKeys = new Set(
-            next.columns.map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
-          );
-          const addedDisplayColumns = normalizedDisplayColumns.filter(
-            (column) => {
-              const key = toReportBuilderColumnKey(column);
-              return Boolean(key) && !previousDisplayColumnKeys.has(key);
-            }
-          );
+          const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
+          const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
           if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
@@ -68382,6 +68063,7 @@ function useReport(reportIdArg, options = {}) {
     } catch (error) {
       console.error("[useForm] setFilters swallowed error", {
         error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : void 0,
         requestedRules: (resolved?.rules ?? []).map((rule) => ({
           table: rule?.table,
           field: rule?.field,
@@ -68882,9 +68564,9 @@ function Chat({
   const [inputError, setInputError] = useState42("");
   const [isLoading, setIsLoading] = useState42(false);
   const [model, setModel] = useState42("gemini-3-flash-preview");
-  const containerRef = useRef26(null);
-  const textareaRef = useRef26(null);
-  const abortControllerRef = useRef26(null);
+  const containerRef = useRef25(null);
+  const textareaRef = useRef25(null);
+  const abortControllerRef = useRef25(null);
   useEffect32(() => {
     if (!containerRef.current) {
       return;
@@ -69319,7 +69001,7 @@ function Chat({
 }
 
 // src/hooks/useReportFilterDraft.ts
-import { useCallback as useCallback6, useMemo as useMemo34, useRef as useRef27, useState as useState43 } from "react";
+import { useCallback as useCallback6, useMemo as useMemo34, useRef as useRef26, useState as useState43 } from "react";
 var normalizeOperatorKey = (operator) => String(operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
 var defaultFilterRuleValueForOperator = (operator) => {
   const key = normalizeOperatorKey(operator);
@@ -69358,12 +69040,12 @@ function useReportFilterDraft(args) {
   const committed = queryBuilderFiltersForEditor(
     isQueryBuilderDisplayGroup(committedFilters) ? committedFilters : EMPTY_COMMITTED_FILTERS
   );
-  const committedRef = useRef27(committed);
+  const committedRef = useRef26(committed);
   committedRef.current = committed;
-  const setFiltersRef = useRef27(setFilters);
+  const setFiltersRef = useRef26(setFilters);
   setFiltersRef.current = setFilters;
-  const lastNonEmptyFieldsRef = useRef27([]);
-  const prevReportIdForFieldsRef = useRef27(reportId);
+  const lastNonEmptyFieldsRef = useRef26([]);
+  const prevReportIdForFieldsRef = useRef26(reportId);
   if (prevReportIdForFieldsRef.current !== reportId) {
     prevReportIdForFieldsRef.current = reportId;
     lastNonEmptyFieldsRef.current = [];
@@ -69385,7 +69067,7 @@ function useReportFilterDraft(args) {
   const [draftQuery, setDraftQuery] = useState43(committed);
   const [hasUnappliedFilterChanges, setHasUnappliedFilterChanges] = useState43(false);
   const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
-  const prevDraftResetKeyRef = useRef27(draftResetKey);
+  const prevDraftResetKeyRef = useRef26(draftResetKey);
   if (prevDraftResetKeyRef.current !== draftResetKey) {
     prevDraftResetKeyRef.current = draftResetKey;
     setDraftQuery(committed);
@@ -69478,7 +69160,7 @@ function useReportQueryBuilder(args) {
 import {
   useContext as useContext38,
   useLayoutEffect as useLayoutEffect5,
-  useRef as useRef28,
+  useRef as useRef27,
   useState as useState44
 } from "react";
 import { jsx as jsx89, jsxs as jsxs66 } from "react/jsx-runtime";
@@ -69579,7 +69261,7 @@ function ReportDetail({
   const isTableChart = type === "table";
   const useDetailTableFromUseForm = isTableChart && !isPivotTableChartConfig(chart);
   const showBottomRawTable = !isTableChart;
-  const chartSlotRef = useRef28(null);
+  const chartSlotRef = useRef27(null);
   const [chartHeightPx, setChartHeightPx] = useState44(360);
   useLayoutEffect5(() => {
     const el = chartSlotRef.current;