@optifye/dashboard-core 6.12.6 → 6.12.7

package/dist/index.js

@@ -5257,46 +5257,83 @@ var dashboardService = {
     const dbConfig = config.databaseConfig ?? DEFAULT_DATABASE_CONFIG;
     const linesTable = getTable(dbConfig, "lines");
     const companyId = config.entityConfig?.companyId;
+    const baseLineSelect = `
+      id,
+      line_name,
+      factory_id,
+      factories!lines_factory_id_fkey(factory_name),
+      company_id,
+      companies!lines_company_id_fkey(company_name:name),
+      enable,
+      monitoring_mode,
+      assembly,
+      video_grid_metric_mode,
+      recent_flow_window_minutes
+    `;
+    const lineSelectWithArea = `
+      ${baseLineSelect},
+      factory_area_id,
+      factory_line_areas!lines_factory_area_id_factory_id_fkey(
+        area_key,
+        area_name,
+        sort_order,
+        enabled
+      )
+    `;
+    const shouldRetryWithoutFactoryArea = (error) => {
+      const errorText = [
+        error?.message,
+        error?.details,
+        error?.hint,
+        error?.code
+      ].filter(Boolean).join(" ").toLowerCase();
+      return errorText.includes("factory_area_id") || errorText.includes("factory_line_areas") || errorText.includes("lines_factory_area_id_factory_id_fkey");
+    };
     try {
-      let query = supabase.from(linesTable).select(`
-          id,
-          line_name,
-          factory_id,
-          factories!lines_factory_id_fkey(factory_name),
-          company_id,
-          companies!lines_company_id_fkey(company_name:name),
-          enable,
-          monitoring_mode,
-          assembly,
-          video_grid_metric_mode,
-          recent_flow_window_minutes
-        `).eq("enable", true);
-      if (companyId) {
-        query = query.eq("company_id", companyId);
-      }
-      const { data, error } = await query;
+      const fetchLines = async (selectClause) => {
+        let query = supabase.from(linesTable).select(selectClause).eq("enable", true);
+        if (companyId) {
+          query = query.eq("company_id", companyId);
+        }
+        return await query;
+      };
+      let { data, error } = await fetchLines(lineSelectWithArea);
+      if (error && shouldRetryWithoutFactoryArea(error)) {
+        console.warn("[dashboardService.getAllLines] Factory area metadata unavailable, falling back to line-only metadata:", error);
+        const fallbackResult = await fetchLines(baseLineSelect);
+        data = fallbackResult.data;
+        error = fallbackResult.error;
+      }
       if (error) {
         console.error("Error fetching all lines:", error);
         throw error;
       }
       if (!data) return [];
-      const transformedLines = data.map((line) => ({
-        id: line.id,
-        line_name: line.line_name,
-        factory_id: line.factory_id,
-        factory_name: line.factories?.factory_name ?? "N/A",
-        company_id: line.company_id,
-        company_name: line.companies?.company_name ?? "N/A",
-        enable: line.enable ?? true,
-        // Default to true if not specified
-        monitoring_mode: line.monitoring_mode ?? "output",
-        assembly: line.assembly ?? false,
-        video_grid_metric_mode: normalizeVideoGridMetricMode(
-          line.video_grid_metric_mode,
-          line.assembly ?? false
-        ),
-        recent_flow_window_minutes: line.recent_flow_window_minutes ?? 7
-      }));
+      const transformedLines = data.map((line) => {
+        const factoryArea = Array.isArray(line.factory_line_areas) ? line.factory_line_areas[0] : line.factory_line_areas;
+        return {
+          id: line.id,
+          line_name: line.line_name,
+          factory_id: line.factory_id,
+          factory_name: line.factories?.factory_name ?? "N/A",
+          company_id: line.company_id,
+          company_name: line.companies?.company_name ?? "N/A",
+          enable: line.enable ?? true,
+          // Default to true if not specified
+          monitoring_mode: line.monitoring_mode ?? "output",
+          assembly: line.assembly ?? false,
+          video_grid_metric_mode: normalizeVideoGridMetricMode(
+            line.video_grid_metric_mode,
+            line.assembly ?? false
+          ),
+          recent_flow_window_minutes: line.recent_flow_window_minutes ?? 7,
+          factory_area_id: line.factory_area_id ?? null,
+          factory_area_key: factoryArea?.area_key ?? null,
+          factory_area_name: factoryArea?.area_name ?? null,
+          factory_area_sort_order: factoryArea?.sort_order ?? null,
+          factory_area_enabled: factoryArea?.enabled ?? null
+        };
+      });
       return transformedLines;
     } catch (err) {
       console.error("Exception in getAllLines:", err);
@@ -14265,7 +14302,9 @@ var useLeaderboardMetrics = (date, shiftId, limit = 10, filter2 = "all") => {
         `/api/dashboard/leaderboard?${params.toString()}`
       );
       let entries = (data.entries || []).slice();
-      entries.sort((a, b) => (b.efficiency || 0) - (a.efficiency || 0));
+      entries.sort(
+        (a, b) => (b.leaderboard_value ?? b.efficiency ?? 0) - (a.leaderboard_value ?? a.efficiency ?? 0)
+      );
       if (filter2 === "top") {
         entries = entries.slice(0, limit);
       } else if (filter2 === "bottom") {
@@ -22029,6 +22068,84 @@ var aggregateKPIsFromLineMetricsRows = (rows) => {
   };
 };
 
+// src/lib/utils/kpiHierarchy.ts
+var FACTORY_LEVEL_MIN_FACTORY_COUNT = 3;
+var compareText = (left, right) => left.localeCompare(right, void 0, { sensitivity: "base", numeric: true });
+var compareLinesByName = (left, right) => compareText(left.line_name || "", right.line_name || "");
+var normalizeAreaSortOrder = (value) => {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim() !== "") {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+};
+var getEnabledAreaInfo = (line) => {
+  if (!line.factory_area_id) return null;
+  if (line.factory_area_enabled !== true) return null;
+  if (!line.factory_area_name || line.factory_area_name.trim().length === 0) return null;
+  return {
+    id: line.factory_area_id,
+    areaName: line.factory_area_name,
+    areaKey: line.factory_area_key ?? null,
+    sortOrder: normalizeAreaSortOrder(line.factory_area_sort_order)
+  };
+};
+var buildKpiLineHierarchy = (lines) => {
+  const factoryMap = /* @__PURE__ */ new Map();
+  lines.forEach((line) => {
+    const factoryId = line.factory_id || "unknown-factory";
+    let factory = factoryMap.get(factoryId);
+    if (!factory) {
+      factory = {
+        id: factoryId,
+        factoryName: line.factory_name || "Factory",
+        lines: [],
+        areas: [],
+        ungroupedLines: [],
+        areaMap: /* @__PURE__ */ new Map()
+      };
+      factoryMap.set(factoryId, factory);
+    }
+    factory.lines.push(line);
+    const areaInfo = getEnabledAreaInfo(line);
+    if (!areaInfo) {
+      factory.ungroupedLines.push(line);
+      return;
+    }
+    let area = factory.areaMap.get(areaInfo.id);
+    if (!area) {
+      area = {
+        id: areaInfo.id,
+        areaName: areaInfo.areaName,
+        areaKey: areaInfo.areaKey,
+        sortOrder: areaInfo.sortOrder,
+        lines: []
+      };
+      factory.areaMap.set(areaInfo.id, area);
+      factory.areas.push(area);
+    }
+    area.lines.push(line);
+  });
+  const factories = Array.from(factoryMap.values()).map(({ areaMap: _areaMap, ...factory }) => {
+    factory.lines.sort(compareLinesByName);
+    factory.ungroupedLines.sort(compareLinesByName);
+    factory.areas.forEach((area) => area.lines.sort(compareLinesByName));
+    factory.areas.sort((left, right) => {
+      const leftOrder = left.sortOrder ?? Number.POSITIVE_INFINITY;
+      const rightOrder = right.sortOrder ?? Number.POSITIVE_INFINITY;
+      if (leftOrder !== rightOrder) return leftOrder - rightOrder;
+      return compareText(left.areaName, right.areaName);
+    });
+    return factory;
+  });
+  factories.sort((left, right) => compareText(left.factoryName, right.factoryName));
+  return {
+    factories,
+    showFactoryLevel: factories.length >= FACTORY_LEVEL_MIN_FACTORY_COUNT
+  };
+};
+
 // src/lib/utils/awards.ts
 var toNumber2 = (value) => {
   if (typeof value === "number" && Number.isFinite(value)) return value;
@@ -38263,7 +38380,8 @@ var WorkspaceMetricCardsImpl = ({
   legend,
   skuAware,
   skuBreakdown,
-  activeSkuId
+  activeSkuId,
+  liveSkuId
 }) => {
   const effectiveLegend = legend || DEFAULT_EFFICIENCY_LEGEND;
   const activeSku = React144__namespace.default.useMemo(() => {
@@ -38272,6 +38390,13 @@ var WorkspaceMetricCardsImpl = ({
     }
     return null;
   }, [skuAware, activeSkuId, skuBreakdown]);
+  const displaySku = React144__namespace.default.useMemo(() => {
+    if (activeSku) return activeSku;
+    if (skuAware && !activeSkuId && liveSkuId && skuBreakdown) {
+      return skuBreakdown.find((s) => s.sku_id === liveSkuId) ?? null;
+    }
+    return null;
+  }, [activeSku, skuAware, activeSkuId, liveSkuId, skuBreakdown]);
   const pphValue = activeSku ? activeSku.avg_pph : workspace.avg_pph;
   const pphThreshold = activeSku ? activeSku.pph_threshold : workspace.pph_threshold;
   const cycleValue = activeSku ? activeSku.avg_cycle_time : workspace.avg_cycle_time;
@@ -38306,7 +38431,7 @@ var WorkspaceMetricCardsImpl = ({
     /* @__PURE__ */ jsxRuntime.jsxs(Card2, { className: "flex flex-col bg-white shadow-sm h-full min-h-[150px] sm:min-h-0", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(CardHeader2, { className: "pb-2 flex-none text-center", children: [
         /* @__PURE__ */ jsxRuntime.jsx(CardTitle2, { className: "text-lg", children: "PPH" }),
-        activeSku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: activeSku.sku_code, children: activeSku.sku_code })
+        displaySku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: displaySku.sku_code, children: displaySku.sku_code })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(CardContent2, { className: "flex-1 flex items-center justify-center py-6 sm:py-3", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-center", children: [
         /* @__PURE__ */ jsxRuntime.jsx("p", { className: `text-5xl font-bold ${pphValue >= pphThreshold ? "text-green-500" : "text-red-500"}`, children: pphValue.toFixed(1) }),
@@ -38319,7 +38444,7 @@ var WorkspaceMetricCardsImpl = ({
     /* @__PURE__ */ jsxRuntime.jsxs(Card2, { className: "flex flex-col bg-white shadow-sm h-full min-h-[150px] sm:min-h-0", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(CardHeader2, { className: "pb-2 flex-none text-center", children: [
         /* @__PURE__ */ jsxRuntime.jsx(CardTitle2, { className: "text-lg", children: "Avg. Cycle Time" }),
-        activeSku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: activeSku.sku_code, children: activeSku.sku_code })
+        displaySku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: displaySku.sku_code, children: displaySku.sku_code })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(CardContent2, { className: "flex-1 flex items-center justify-center py-6 sm:py-3", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-center", children: [
         /* @__PURE__ */ jsxRuntime.jsx("p", { className: `text-5xl font-bold ${cycleValue > (cycleStandard || 0) ? "text-red-500" : "text-green-500"}`, children: cycleValue.toFixed(1) }),
@@ -54301,7 +54426,8 @@ var WorkspaceCycleTimeMetricCards = ({
   idleTimeData,
   skuAware,
   skuBreakdown,
-  activeSkuId
+  activeSkuId,
+  liveSkuId
 }) => {
   const effectiveLegend = legend || DEFAULT_EFFICIENCY_LEGEND;
   const activeSku = React144__namespace.default.useMemo(() => {
@@ -54310,6 +54436,13 @@ var WorkspaceCycleTimeMetricCards = ({
     }
     return null;
   }, [skuAware, activeSkuId, skuBreakdown]);
+  const displaySku = React144__namespace.default.useMemo(() => {
+    if (activeSku) return activeSku;
+    if (skuAware && !activeSkuId && liveSkuId && skuBreakdown) {
+      return skuBreakdown.find((s) => s.sku_id === liveSkuId) ?? null;
+    }
+    return null;
+  }, [activeSku, skuAware, activeSkuId, liveSkuId, skuBreakdown]);
   const cycleValue = activeSku ? activeSku.avg_cycle_time : workspace.avg_cycle_time;
   const cycleStandard = activeSku ? activeSku.ideal_cycle_time : workspace.ideal_cycle_time;
   const efficiencyValue = workspace.avg_efficiency || 0;
@@ -54339,7 +54472,7 @@ var WorkspaceCycleTimeMetricCards = ({
     /* @__PURE__ */ jsxRuntime.jsxs(Card2, { className: "flex flex-col bg-white shadow-sm border border-gray-200 h-full min-h-[150px] sm:min-h-0 rounded-xl", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(CardHeader2, { className: "pb-1 pt-5 flex-none text-center", children: [
         /* @__PURE__ */ jsxRuntime.jsx(CardTitle2, { className: "text-[15px] font-bold text-gray-900 tracking-wide", children: "Cycle Time (s)" }),
-        activeSku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: activeSku.sku_code, children: activeSku.sku_code })
+        displaySku && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-blue-600 mt-1 truncate px-2", title: displaySku.sku_code, children: displaySku.sku_code })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(CardContent2, { className: "flex-1 flex flex-col items-center justify-center pb-6", children: [
         /* @__PURE__ */ jsxRuntime.jsx("p", { className: `text-5xl font-bold tracking-tight ${cycleValue > (cycleStandard || 0) ? "text-red-500" : "text-[#34C759]"}`, children: cycleValue.toFixed(1) }),
@@ -68429,6 +68562,9 @@ var KPIDetailView = ({
 var KPIDetailViewWithDisplayNames = withSelectedLineDisplayNames(KPIDetailView);
 var KPIDetailView_default = KPIDetailViewWithDisplayNames;
 var isNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
+var KPI_FACTORY_QUERY_PARAM = "factory_id";
+var KPI_FACTORY_AREA_QUERY_PARAM = "factory_area_id";
+var getSingleQueryValue = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
 var resolveCompanyId = (...candidates) => candidates.find(isNonEmptyString);
 var parseTimeToMinutes3 = (value) => {
   if (!value) return null;
@@ -68465,7 +68601,9 @@ var getMonthDateInfo = (timezone) => {
 var createKpisOverviewUrl = ({
   tab,
   date,
-  shift
+  shift,
+  factoryId,
+  factoryAreaId
 }) => {
   const params = new URLSearchParams();
   if (tab) {
@@ -68477,6 +68615,12 @@ var createKpisOverviewUrl = ({
   if (typeof shift === "number" && Number.isFinite(shift)) {
     params.set("shift", shift.toString());
   }
+  if (!tab && factoryId) {
+    params.set(KPI_FACTORY_QUERY_PARAM, factoryId);
+  }
+  if (!tab && factoryId && factoryAreaId) {
+    params.set(KPI_FACTORY_AREA_QUERY_PARAM, factoryAreaId);
+  }
   const queryString = params.toString();
   return queryString ? `/kpis?${queryString}` : "/kpis";
 };
@@ -68998,6 +69142,101 @@ var LineCard = ({
     }
   );
 };
+var KpiGroupCard = ({
+  title,
+  subtitle,
+  kpis,
+  isLoading,
+  error,
+  isUptimeMode,
+  onClick
+}) => {
+  const isOnTrack = React144__namespace.default.useMemo(() => {
+    if (!kpis) return null;
+    return isEfficiencyOnTrack(kpis.efficiency.value);
+  }, [kpis]);
+  const outputTarget = Number(kpis?.outputProgress?.target ?? 0);
+  const outputCurrent = Number(kpis?.outputProgress?.current ?? 0);
+  const progressPercent = outputTarget > 0 ? Math.min(outputCurrent / outputTarget * 100, 100) : 0;
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    motion.div,
+    {
+      initial: { opacity: 0, y: 20 },
+      animate: { opacity: 1, y: 0 },
+      transition: { duration: 0.3 },
+      onClick,
+      className: "relative bg-white border border-gray-200/80 shadow-sm hover:shadow-lg \n                 rounded-xl p-4 sm:p-5 md:p-6 transition-all duration-200 cursor-pointer \n                 hover:scale-[1.01] active:scale-[0.99] group",
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mb-4 sm:mb-5 md:mb-6", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-wrap items-start gap-2 sm:gap-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1 min-w-0", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              FittingTitle,
+              {
+                title,
+                className: "text-[10px] sm:text-xs md:text-sm"
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-1 text-xs font-medium text-gray-500", children: subtitle })
+          ] }),
+          !isUptimeMode && kpis && isOnTrack !== null && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex items-center gap-1.5 px-2.5 sm:px-3 py-1 sm:py-1.5 rounded-full text-xs font-medium flex-shrink-0 ${isOnTrack ? "bg-emerald-100 text-emerald-700 border border-emerald-200" : "bg-red-100 text-red-700 border border-red-200"}`, style: { minWidth: "fit-content" }, children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: `w-2 h-2 rounded-full ${isOnTrack ? "bg-emerald-500" : "bg-red-500"} animate-pulse` }),
+            /* @__PURE__ */ jsxRuntime.jsx("span", { children: isOnTrack ? "On Track" : "Behind" })
+          ] })
+        ] }) }),
+        isLoading && !kpis && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "animate-pulse", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-4 bg-gray-200 rounded w-1/3 mb-2" }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-8 bg-gray-200 rounded w-1/2" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "animate-pulse", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-4 bg-gray-200 rounded w-1/3 mb-2" }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-8 bg-gray-200 rounded w-3/4" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "animate-pulse", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-4 bg-gray-200 rounded w-1/3 mb-2" }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-8 bg-gray-200 rounded w-1/2" })
+          ] })
+        ] }),
+        error && !kpis && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-center py-8", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-gray-500", children: "Unable to load metrics" }) }),
+        kpis && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4 sm:space-y-5 pb-8 sm:pb-10", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs font-medium text-gray-500 uppercase tracking-wider mb-1.5 sm:mb-2", children: isUptimeMode ? "Utilization" : "Efficiency" }),
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-baseline justify-between", children: [
+              /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-2xl sm:text-3xl font-semibold text-gray-900", children: [
+                kpis.efficiency.value.toFixed(1),
+                "%"
+              ] }),
+              kpis.efficiency.change !== 0 && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: `text-xs sm:text-sm font-medium ${kpis.efficiency.change > 0 ? "text-emerald-600" : "text-red-600"}`, children: [
+                kpis.efficiency.change > 0 ? "+" : "",
+                kpis.efficiency.change.toFixed(1),
+                "%"
+              ] })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs font-medium text-gray-500 uppercase tracking-wider mb-1.5 sm:mb-2", children: isUptimeMode ? "Stoppages" : "Output Progress" }),
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-baseline justify-between mb-2 sm:mb-3", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("span", { className: `${isUptimeMode ? "text-2xl sm:text-3xl font-bold text-red-600" : "text-xl sm:text-2xl font-semibold text-gray-900"}`, children: kpis.outputProgress.current }),
+              !isUptimeMode && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs sm:text-sm text-gray-500 font-medium", children: [
+                "/ ",
+                kpis.outputProgress.target,
+                " units"
+              ] })
+            ] }),
+            !isUptimeMode && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full bg-gray-200 rounded-full h-2 sm:h-2.5", children: /* @__PURE__ */ jsxRuntime.jsx(
+              "div",
+              {
+                className: "bg-blue-600 h-2 sm:h-2.5 rounded-full transition-all duration-500 ease-out",
+                style: { width: `${progressPercent}%` }
+              }
+            ) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute bottom-3 right-3 sm:bottom-4 sm:right-4", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2 sm:p-2.5 rounded-full bg-gray-50 group-hover:bg-blue-50 transition-colors shadow-sm", children: /* @__PURE__ */ jsxRuntime.jsx(outline.ArrowRightIcon, { className: "w-4 h-4 sm:w-5 sm:h-5 text-gray-400 group-hover:text-blue-600 transition-colors" }) }) })
+      ]
+    }
+  );
+};
 var KPIsOverviewView = ({
   companyId,
   navigate,
@@ -69163,6 +69402,20 @@ var KPIsOverviewView = ({
   const effectiveLeaderboardDate = selectedLeaderboardDate || currentShiftDate;
   const effectiveLeaderboardShiftId = Number.isFinite(selectedLeaderboardShiftId) ? selectedLeaderboardShiftId : currentShiftId;
   const isHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && (effectiveLeaderboardDate !== currentShiftDate || effectiveLeaderboardShiftId !== currentShiftId);
+  const selectedFactoryIdFromUrl = getSingleQueryValue(router$1.query[KPI_FACTORY_QUERY_PARAM]);
+  const selectedFactoryAreaIdFromUrl = getSingleQueryValue(router$1.query[KPI_FACTORY_AREA_QUERY_PARAM]);
+  const kpiLineHierarchy = React144__namespace.default.useMemo(
+    () => buildKpiLineHierarchy(linesForView),
+    [linesForView]
+  );
+  const selectedFactoryNode = React144__namespace.default.useMemo(
+    () => kpiLineHierarchy.showFactoryLevel && selectedFactoryIdFromUrl ? kpiLineHierarchy.factories.find((factory) => factory.id === selectedFactoryIdFromUrl) : void 0,
+    [kpiLineHierarchy, selectedFactoryIdFromUrl]
+  );
+  const selectedFactoryAreaNode = React144__namespace.default.useMemo(
+    () => selectedFactoryNode && selectedFactoryAreaIdFromUrl ? selectedFactoryNode.areas.find((area) => area.id === selectedFactoryAreaIdFromUrl) : void 0,
+    [selectedFactoryNode, selectedFactoryAreaIdFromUrl]
+  );
   React144.useEffect(() => {
     if (!router$1.isReady) return;
     const tabQuery = router$1.query.tab;
@@ -69190,20 +69443,27 @@ var KPIsOverviewView = ({
   ]);
   React144.useEffect(() => {
     if (!router$1.isReady || !hasHydratedLeaderboardRouteState) return;
+    if (activeTab === "today" && loading) return;
     const expectedTab = activeTab === "leaderboard" ? "leaderboard" : void 0;
     const expectedDate = activeTab === "leaderboard" && timeRange === "today" && isHistoricalLeaderboardDaily ? effectiveLeaderboardDate : void 0;
     const expectedShift = expectedDate !== void 0 ? effectiveLeaderboardShiftId.toString() : void 0;
+    const expectedFactory = activeTab === "today" && selectedFactoryNode ? selectedFactoryNode.id : void 0;
+    const expectedFactoryArea = activeTab === "today" && selectedFactoryNode && selectedFactoryAreaNode ? selectedFactoryAreaNode.id : void 0;
     const currentTab = typeof router$1.query.tab === "string" ? router$1.query.tab : void 0;
     const currentDateQuery = typeof router$1.query.date === "string" ? router$1.query.date : void 0;
     const currentShiftQuery = typeof router$1.query.shift === "string" ? router$1.query.shift : void 0;
-    if (currentTab === expectedTab && currentDateQuery === expectedDate && currentShiftQuery === expectedShift) {
+    const currentFactoryQuery = getSingleQueryValue(router$1.query[KPI_FACTORY_QUERY_PARAM]);
+    const currentFactoryAreaQuery = getSingleQueryValue(router$1.query[KPI_FACTORY_AREA_QUERY_PARAM]);
+    if (currentTab === expectedTab && currentDateQuery === expectedDate && currentShiftQuery === expectedShift && currentFactoryQuery === expectedFactory && currentFactoryAreaQuery === expectedFactoryArea) {
       return;
     }
     void router$1.replace(
       createKpisOverviewUrl({
         tab: expectedTab === "leaderboard" ? "leaderboard" : void 0,
         date: expectedDate,
-        shift: expectedShift !== void 0 ? Number.parseInt(expectedShift, 10) : void 0
+        shift: expectedShift !== void 0 ? Number.parseInt(expectedShift, 10) : void 0,
+        factoryId: expectedFactory,
+        factoryAreaId: expectedFactoryArea
       }),
       void 0,
       { shallow: true }
@@ -69215,7 +69475,10 @@ var KPIsOverviewView = ({
     effectiveLeaderboardDate,
     effectiveLeaderboardShiftId,
     hasHydratedLeaderboardRouteState,
-    isHistoricalLeaderboardDaily
+    isHistoricalLeaderboardDaily,
+    loading,
+    selectedFactoryNode,
+    selectedFactoryAreaNode
   ]);
   const factoryViewId = entityConfig.factoryViewId || "factory";
   const {
@@ -69227,13 +69490,42 @@ var KPIsOverviewView = ({
     userAccessibleLineIds: metricsLineIds
   });
   const defaultKPIs = React144__namespace.default.useMemo(() => createDefaultKPIs(), []);
-  const kpisByLineId = React144__namespace.default.useMemo(() => {
+  const lineModeById = React144__namespace.default.useMemo(() => {
+    const map = /* @__PURE__ */ new Map();
+    linesForView.forEach((line) => {
+      map.set(line.id, line.monitoring_mode ?? "output");
+    });
+    return map;
+  }, [linesForView]);
+  const lineMetricRowsByLineId = React144__namespace.default.useMemo(() => {
     const map = /* @__PURE__ */ new Map();
     lineMetrics.forEach((row) => {
-      if (row?.line_id) map.set(row.line_id, buildKPIsFromLineMetricsRow(row));
+      if (!row?.line_id) return;
+      const monitoringMode = lineModeById.get(row.line_id);
+      map.set(
+        row.line_id,
+        monitoringMode ? { ...row, monitoring_mode: monitoringMode } : row
+      );
     });
     return map;
-  }, [lineMetrics]);
+  }, [lineMetrics, lineModeById]);
+  const kpisByLineId = React144__namespace.default.useMemo(() => {
+    const map = /* @__PURE__ */ new Map();
+    lineMetricRowsByLineId.forEach((row, lineId) => {
+      map.set(lineId, buildKPIsFromLineMetricsRow(row));
+    });
+    return map;
+  }, [lineMetricRowsByLineId]);
+  const getLineCardKpis = React144__namespace.default.useCallback((line) => {
+    if (metricsError) return null;
+    return kpisByLineId.get(line.id) ?? (metricsLoading ? null : defaultKPIs);
+  }, [defaultKPIs, kpisByLineId, metricsError, metricsLoading]);
+  const getAggregateCardKpis = React144__namespace.default.useCallback((cardLines) => {
+    if (metricsError) return null;
+    const rows = cardLines.map((line) => lineMetricRowsByLineId.get(line.id)).filter(Boolean);
+    if (metricsLoading && rows.length === 0) return null;
+    return aggregateKPIsFromLineMetricsRows(rows);
+  }, [lineMetricRowsByLineId, metricsError, metricsLoading]);
   const supervisorLineIds = React144__namespace.default.useMemo(
     () => (leaderboardLines.length > 0 ? leaderboardLines : lines).map((l) => l.id),
     [leaderboardLines, lines]
@@ -69437,6 +69729,20 @@ var KPIsOverviewView = ({
     if (activeTab !== "leaderboard" || timeRange !== "today") return;
     fetchDailyLeaderboard();
   }, [activeTab, timeRange, fetchDailyLeaderboard]);
+  const navigateTodayHierarchy = React144.useCallback((factoryId, factoryAreaId) => {
+    void router$1.push(
+      createKpisOverviewUrl({ factoryId, factoryAreaId }),
+      void 0,
+      { shallow: true }
+    );
+  }, [router$1]);
+  const lineDetailReturnTo = React144__namespace.default.useMemo(() => {
+    if (activeTab !== "today" || !selectedFactoryNode) return void 0;
+    return createKpisOverviewUrl({
+      factoryId: selectedFactoryNode.id,
+      factoryAreaId: selectedFactoryAreaNode?.id
+    });
+  }, [activeTab, selectedFactoryNode, selectedFactoryAreaNode]);
   const formatTopPerformerWeek = (periodStart, periodEnd) => {
     const dateToUse = periodStart ? /* @__PURE__ */ new Date(`${periodStart}T00:00:00`) : /* @__PURE__ */ new Date();
     if (Number.isNaN(dateToUse.getTime())) {
@@ -69523,7 +69829,8 @@ var KPIsOverviewView = ({
       );
       return;
     }
-    navigation.navigate(`/kpis/${line.id}`);
+    const returnToQuery = lineDetailReturnTo ? `?returnTo=${encodeURIComponent(lineDetailReturnTo)}` : "";
+    navigation.navigate(`/kpis/${line.id}${returnToQuery}`);
   };
   const handleBackClick = React144.useCallback(() => {
     trackCoreEvent("Back Button Clicked", {
@@ -69592,6 +69899,70 @@ var KPIsOverviewView = ({
     }
     return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
   };
+  const renderLineCard = (line) => /* @__PURE__ */ jsxRuntime.jsx(
+    LineCard,
+    {
+      line,
+      kpis: getLineCardKpis(line),
+      isLoading: metricsLoading,
+      error: metricsError,
+      onClick: (kpis) => handleLineClick(line, kpis),
+      supervisorEnabled,
+      supervisorName: supervisorNamesByLineId.get(line.id) || null,
+      supervisors: supervisorsByLineId?.get(line.id)
+    },
+    line.id
+  );
+  const renderGroupCard = ({
+    key,
+    title,
+    subtitle,
+    lines: cardLines,
+    onClick
+  }) => /* @__PURE__ */ jsxRuntime.jsx(
+    KpiGroupCard,
+    {
+      title,
+      subtitle,
+      kpis: getAggregateCardKpis(cardLines),
+      isLoading: metricsLoading,
+      error: metricsError,
+      isUptimeMode: viewType === "machine",
+      onClick
+    },
+    key
+  );
+  const renderTodayCards = () => {
+    if (!kpiLineHierarchy.showFactoryLevel) {
+      return linesForView.map(renderLineCard);
+    }
+    if (selectedFactoryNode && selectedFactoryAreaNode) {
+      return selectedFactoryAreaNode.lines.map(renderLineCard);
+    }
+    if (selectedFactoryNode) {
+      return [
+        ...selectedFactoryNode.areas.map(
+          (area) => renderGroupCard({
+            key: `area-${area.id}`,
+            title: area.areaName,
+            subtitle: `${area.lines.length} ${area.lines.length === 1 ? "line" : "lines"}`,
+            lines: area.lines,
+            onClick: () => navigateTodayHierarchy(selectedFactoryNode.id, area.id)
+          })
+        ),
+        ...selectedFactoryNode.ungroupedLines.map(renderLineCard)
+      ];
+    }
+    return kpiLineHierarchy.factories.map(
+      (factory) => renderGroupCard({
+        key: `factory-${factory.id}`,
+        title: factory.factoryName,
+        subtitle: `${factory.lines.length} ${factory.lines.length === 1 ? "line" : "lines"}`,
+        lines: factory.lines,
+        onClick: () => navigateTodayHierarchy(factory.id)
+      })
+    );
+  };
   if (loading || isShiftConfigLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx(LoadingPage, { message: "Loading production lines..." });
   }
@@ -70024,23 +70395,34 @@ var KPIsOverviewView = ({
         ] })
       ] })
     ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsx("main", { className: `flex-1 p-3 sm:p-4 md:p-6 bg-slate-50 ${activeTab === "leaderboard" ? "overflow-hidden flex flex-col" : "overflow-y-auto"}`, children: activeTab === "today" ? (
-      /* Line Cards Grid */
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-3 sm:gap-4 md:gap-6", children: linesForView.map((line) => /* @__PURE__ */ jsxRuntime.jsx(
-        LineCard,
-        {
-          line,
-          kpis: metricsError ? null : kpisByLineId.get(line.id) ?? (metricsLoading ? null : defaultKPIs),
-          isLoading: metricsLoading,
-          error: metricsError,
-          onClick: (kpis) => handleLineClick(line, kpis),
-          supervisorEnabled,
-          supervisorName: supervisorNamesByLineId.get(line.id) || null,
-          supervisors: supervisorsByLineId?.get(line.id)
-        },
-        line.id
-      )) })
-    ) : showLeaderboardLoader ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 flex flex-col items-center justify-center bg-white rounded-2xl border border-gray-100 shadow-sm m-2 sm:m-4", children: /* @__PURE__ */ jsxRuntime.jsx(
+    /* @__PURE__ */ jsxRuntime.jsx("main", { className: `flex-1 p-3 sm:p-4 md:p-6 bg-slate-50 ${activeTab === "leaderboard" ? "overflow-hidden flex flex-col" : "overflow-y-auto"}`, children: activeTab === "today" ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3 sm:space-y-4", children: [
+      kpiLineHierarchy.showFactoryLevel && selectedFactoryNode && /* @__PURE__ */ jsxRuntime.jsxs("nav", { className: "flex flex-wrap items-center gap-2 text-sm", "aria-label": "KPI hierarchy", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            onClick: () => navigateTodayHierarchy(),
+            className: "font-medium text-gray-500 hover:text-blue-600 transition-colors",
+            children: "Factories"
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-gray-300", children: "/" }),
+        selectedFactoryAreaNode ? /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            onClick: () => navigateTodayHierarchy(selectedFactoryNode.id),
+            className: "font-medium text-gray-500 hover:text-blue-600 transition-colors",
+            children: selectedFactoryNode.factoryName
+          }
+        ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "font-semibold text-gray-900", children: selectedFactoryNode.factoryName }),
+        selectedFactoryAreaNode && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-gray-300", children: "/" }),
+          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "font-semibold text-gray-900", children: selectedFactoryAreaNode.areaName })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-3 sm:gap-4 md:gap-6", children: renderTodayCards() })
+    ] }) : showLeaderboardLoader ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 flex flex-col items-center justify-center bg-white rounded-2xl border border-gray-100 shadow-sm m-2 sm:m-4", children: /* @__PURE__ */ jsxRuntime.jsx(
       OptifyeLogoLoader_default,
       {
         size: "lg",
@@ -70087,6 +70469,27 @@ var AnimatedEfficiency = React144.memo(({ value }) => {
   return prevProps.value === nextProps.value;
 });
 AnimatedEfficiency.displayName = "AnimatedEfficiency";
+var getWorkspaceLeaderboardMetricValue = (workspace) => {
+  if (workspace.monitoring_mode === "output") {
+    return toFiniteNumber(workspace.efficiency);
+  }
+  if (workspace.leaderboard_metric_kind === "recent_flow_shift_average") {
+    return toFiniteNumber(workspace.leaderboard_value);
+  }
+  return toFiniteNumber(workspace.leaderboard_value) ?? toFiniteNumber(workspace.efficiency);
+};
+var getWorkspaceDisplayedMetricValue = (workspace) => getWorkspaceLeaderboardMetricValue(workspace);
+var getWorkspaceLeaderboardMetricLabel = (workspace, defaultLabel) => workspace.monitoring_mode !== "output" && workspace.leaderboard_metric_kind === "recent_flow_shift_average" ? "Avg Flow" : defaultLabel;
+var renderWorkspaceLeaderboardMetric = (workspace, isAssemblyMode) => {
+  if (isAssemblyMode) {
+    return /* @__PURE__ */ jsxRuntime.jsx(CycleTimeComparison, { workspace });
+  }
+  const displayedMetricValue = getWorkspaceDisplayedMetricValue(workspace);
+  if (displayedMetricValue === null) {
+    return /* @__PURE__ */ jsxRuntime.jsx("span", { className: "tabular-nums", children: "--" });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(AnimatedEfficiency, { value: displayedMetricValue });
+};
 var HeaderRibbon = React144.memo(({
   currentDate,
   currentMobileDate,
@@ -70165,13 +70568,13 @@ var MobileWorkspaceCard = React144.memo(({
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-right", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-bold text-gray-900 text-lg flex justify-end", children: isAssemblyMode ? /* @__PURE__ */ jsxRuntime.jsx(CycleTimeComparison, { workspace }) : /* @__PURE__ */ jsxRuntime.jsx(AnimatedEfficiency, { value: workspace.efficiency || 0 }) }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-gray-500", children: metricLabel })
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-bold text-gray-900 text-lg flex justify-end", children: renderWorkspaceLeaderboardMetric(workspace, isAssemblyMode) }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-gray-500", children: getWorkspaceLeaderboardMetricLabel(workspace, metricLabel) })
       ] })
     ] })
   }
 ), (prevProps, nextProps) => {
-  return prevProps.metricLabel === nextProps.metricLabel && prevProps.isAssemblyMode === nextProps.isAssemblyMode && prevProps.rank === nextProps.rank && prevProps.cardClass === nextProps.cardClass && prevProps.isClickable === nextProps.isClickable && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.ideal_cycle_time === nextProps.workspace.ideal_cycle_time && prevProps.workspace.action_count === nextProps.workspace.action_count && prevProps.workspace.action_threshold === nextProps.workspace.action_threshold && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
+  return prevProps.metricLabel === nextProps.metricLabel && prevProps.isAssemblyMode === nextProps.isAssemblyMode && prevProps.rank === nextProps.rank && prevProps.cardClass === nextProps.cardClass && prevProps.isClickable === nextProps.isClickable && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.leaderboard_value === nextProps.workspace.leaderboard_value && prevProps.workspace.leaderboard_metric_kind === nextProps.workspace.leaderboard_metric_kind && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.ideal_cycle_time === nextProps.workspace.ideal_cycle_time && prevProps.workspace.action_count === nextProps.workspace.action_count && prevProps.workspace.action_threshold === nextProps.workspace.action_threshold && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
 });
 MobileWorkspaceCard.displayName = "MobileWorkspaceCard";
 var DesktopWorkspaceRow = React144.memo(({
@@ -70198,11 +70601,11 @@ var DesktopWorkspaceRow = React144.memo(({
       ] }) }),
       /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-3 py-2.5 sm:p-4 text-sm sm:text-base whitespace-nowrap", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-medium", children: workspace.displayName }) }),
       /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-3 py-2.5 sm:p-4 text-sm sm:text-base whitespace-nowrap", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-medium", children: workspace.lineName }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("td", { className: `px-3 py-2.5 sm:p-4 text-sm sm:text-base font-medium ${isAssemblyMode ? "" : "whitespace-nowrap"}`, children: isAssemblyMode ? /* @__PURE__ */ jsxRuntime.jsx(CycleTimeComparison, { workspace }) : /* @__PURE__ */ jsxRuntime.jsx(AnimatedEfficiency, { value: workspace.efficiency || 0 }) })
+      /* @__PURE__ */ jsxRuntime.jsx("td", { className: `px-3 py-2.5 sm:p-4 text-sm sm:text-base font-medium ${isAssemblyMode ? "" : "whitespace-nowrap"}`, children: isAssemblyMode ? renderWorkspaceLeaderboardMetric(workspace, true) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col", children: renderWorkspaceLeaderboardMetric(workspace, false) }) })
     ]
   }
 ), (prevProps, nextProps) => {
-  return prevProps.index === nextProps.index && prevProps.rowClass === nextProps.rowClass && prevProps.isClickable === nextProps.isClickable && prevProps.isAssemblyMode === nextProps.isAssemblyMode && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.ideal_cycle_time === nextProps.workspace.ideal_cycle_time && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
+  return prevProps.index === nextProps.index && prevProps.rowClass === nextProps.rowClass && prevProps.isClickable === nextProps.isClickable && prevProps.isAssemblyMode === nextProps.isAssemblyMode && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.leaderboard_value === nextProps.workspace.leaderboard_value && prevProps.workspace.leaderboard_metric_kind === nextProps.workspace.leaderboard_metric_kind && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.ideal_cycle_time === nextProps.workspace.ideal_cycle_time && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
 });
 DesktopWorkspaceRow.displayName = "DesktopWorkspaceRow";
 var LeaderboardDetailView = React144.memo(({
@@ -70301,6 +70704,8 @@ var LeaderboardDetailView = React144.memo(({
   const [monthlyError, setMonthlyError] = React144.useState(null);
   const todayRequestKeyRef = React144.useRef(null);
   const monthlyRequestKeyRef = React144.useRef(null);
+  const monthlyLoadKeyRef = React144.useRef(null);
+  const monthlyLoadPromiseRef = React144.useRef(null);
   const leaderboardUpdateQueuedRef = React144.useRef(false);
   const leaderboardUpdateTimerRef = React144.useRef(null);
   const leaderboardViewTrackedRef = React144.useRef(null);
@@ -70575,6 +70980,9 @@ var LeaderboardDetailView = React144.memo(({
       trend: 0,
       predicted_output: 0,
       efficiency: entry.efficiency || 0,
+      avg_recent_flow: toFiniteNumber(entry.avg_recent_flow),
+      leaderboard_value: toFiniteNumber(entry.leaderboard_value),
+      leaderboard_metric_kind: entry.leaderboard_metric_kind ?? "efficiency",
       action_threshold: entry.total_day_output || 0,
       displayName: entry.workspace_display_name,
       monitoring_mode: entry.monitoring_mode ?? "output"
@@ -70605,7 +71013,10 @@ var LeaderboardDetailView = React144.memo(({
     searchParams.set("monitoring_mode", viewType === "machine" ? "uptime" : "output");
     const data = await fetchBackendJson(
       supabase,
-      `/api/dashboard/leaderboard?${searchParams.toString()}`
+      `/api/dashboard/leaderboard?${searchParams.toString()}`,
+      {
+        timeoutMs: params.startDate && params.endDate ? 3e4 : void 0
+      }
     );
     return data.entries || [];
   }, [supabase, entityConfig.companyId, configuredLineIds, viewType]);
@@ -70683,15 +71094,21 @@ var LeaderboardDetailView = React144.memo(({
     setMonthlyLoading(true);
     setMonthlyError(null);
     try {
-      const entries = await fetchLeaderboardEntries({
-        startDate: normalizedRange.startKey,
-        endDate: normalizedRange.endKey,
-        shiftId: monthlyShiftId
-      });
+      const loadPromise = monthlyLoadPromiseRef.current && monthlyLoadKeyRef.current === requestKey ? monthlyLoadPromiseRef.current : (async () => {
+        const entries = await fetchLeaderboardEntries({
+          startDate: normalizedRange.startKey,
+          endDate: normalizedRange.endKey,
+          shiftId: monthlyShiftId
+        });
+        return mapEntriesToWorkspaces(entries, normalizedRange.endKey, monthlyShiftId);
+      })();
+      monthlyLoadKeyRef.current = requestKey;
+      monthlyLoadPromiseRef.current = loadPromise;
+      const workspaces = await loadPromise;
       if (monthlyRequestKeyRef.current !== requestKey) {
         return;
       }
-      setMonthlyEntries(mapEntriesToWorkspaces(entries, normalizedRange.endKey, monthlyShiftId));
+      setMonthlyEntries(workspaces);
     } catch (err) {
       console.error("[LeaderboardDetailView] Error fetching monthly leaderboard:", err);
       if (monthlyRequestKeyRef.current !== requestKey) {
@@ -70700,6 +71117,9 @@ var LeaderboardDetailView = React144.memo(({
       setMonthlyError({ message: err.message, code: err.code || "FETCH_ERROR" });
       setMonthlyEntries([]);
     } finally {
+      if (monthlyLoadKeyRef.current === requestKey && monthlyLoadPromiseRef.current) {
+        monthlyLoadPromiseRef.current = null;
+      }
       if (monthlyRequestKeyRef.current === requestKey) {
         setMonthlyLoading(false);
       }
@@ -70712,6 +71132,46 @@ var LeaderboardDetailView = React144.memo(({
     monthlyShiftId,
     lineKey
   ]);
+  React144.useEffect(() => {
+    if (activeTab !== "today") {
+      return;
+    }
+    const requestKey = `${normalizedRange.startKey}|${normalizedRange.endKey}|${monthlyShiftId}|${lineKey}|${viewType}`;
+    let cancelled = false;
+    const loadPromise = monthlyLoadPromiseRef.current && monthlyLoadKeyRef.current === requestKey ? monthlyLoadPromiseRef.current : (async () => {
+      const entries = await fetchLeaderboardEntries({
+        startDate: normalizedRange.startKey,
+        endDate: normalizedRange.endKey,
+        shiftId: monthlyShiftId
+      });
+      return mapEntriesToWorkspaces(entries, normalizedRange.endKey, monthlyShiftId);
+    })();
+    monthlyLoadKeyRef.current = requestKey;
+    monthlyLoadPromiseRef.current = loadPromise;
+    loadPromise.then((workspaces) => {
+      if (cancelled) {
+        return;
+      }
+      setMonthlyEntries(workspaces);
+    }).catch(() => {
+    }).finally(() => {
+      if (!cancelled && monthlyLoadKeyRef.current === requestKey && monthlyLoadPromiseRef.current === loadPromise) {
+        monthlyLoadPromiseRef.current = null;
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    activeTab,
+    fetchLeaderboardEntries,
+    mapEntriesToWorkspaces,
+    normalizedRange.endKey,
+    normalizedRange.startKey,
+    monthlyShiftId,
+    lineKey,
+    viewType
+  ]);
   React144.useEffect(() => {
     if (activeTab === "today") {
       fetchTodayLeaderboard();
@@ -70846,6 +71306,9 @@ var LeaderboardDetailView = React144.memo(({
       total_workspaces: workspacesLengthRef.current,
       // Use ref instead of state to avoid dependency
       metric_context: viewType === "machine" ? "machine" : outputCategory,
+      leaderboard_value: getWorkspaceLeaderboardMetricValue(workspace),
+      leaderboard_metric_kind: workspace.leaderboard_metric_kind ?? "efficiency",
+      avg_recent_flow: workspace.avg_recent_flow ?? null,
       efficiency: workspace.efficiency,
       action_count: workspace.action_count,
       action_threshold: workspace.action_threshold,
@@ -70926,9 +71389,12 @@ var LeaderboardDetailView = React144.memo(({
         if (ratioB === null) return -1;
         return sortAscending ? ratioA - ratioB : ratioB - ratioA;
       }
-      const effA = a.efficiency || 0;
-      const effB = b.efficiency || 0;
-      return sortAscending ? effA - effB : effB - effA;
+      const metricA = getWorkspaceLeaderboardMetricValue(a);
+      const metricB = getWorkspaceLeaderboardMetricValue(b);
+      if (metricA === null && metricB === null) return 0;
+      if (metricA === null) return 1;
+      if (metricB === null) return -1;
+      return sortAscending ? metricA - metricB : metricB - metricA;
     });
   }, [workspaceDisplayData, sortAscending, selectedLineFilter, selectedShiftFilter, activeTab, viewType, isAssemblyMode]);
   const loading = activeTab === "today" ? todayLoading : monthlyLoading;
@@ -70957,6 +71423,8 @@ var LeaderboardDetailView = React144.memo(({
       workspace_count: sortedWorkspaces.length,
       top_workspace_id: topWorkspace?.workspace_uuid ?? null,
       top_workspace_name: topWorkspace?.workspace_name ?? null,
+      top_leaderboard_value: topWorkspace ? getWorkspaceLeaderboardMetricValue(topWorkspace) : null,
+      top_leaderboard_metric_kind: topWorkspace?.leaderboard_metric_kind ?? null,
       top_efficiency: topWorkspace?.efficiency ?? null,
       top_avg_cycle_time: topWorkspace?.avg_cycle_time ?? null,
       top_ideal_cycle_time: topWorkspace?.ideal_cycle_time ?? null,
@@ -76102,7 +76570,11 @@ var WorkspaceDetailView = ({
                   workspace,
                   legend: efficiencyLegend,
                   layout: "stack",
-                  idleTimeData: idleTimeVlmEnabled ? idleTimeData : void 0
+                  idleTimeData: idleTimeVlmEnabled ? idleTimeData : void 0,
+                  skuAware: isSkuAware,
+                  skuBreakdown: isSkuAware ? realSkuBreakdown : void 0,
+                  activeSkuId,
+                  liveSkuId: isHistoricView ? null : liveSkuId
                 }
               ) : /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
                 WorkspaceMetricCards,
@@ -76112,7 +76584,8 @@ var WorkspaceDetailView = ({
                   className: "flex-1",
                   skuAware: isSkuAware,
                   skuBreakdown: isSkuAware ? realSkuBreakdown : void 0,
-                  activeSkuId
+                  activeSkuId,
+                  liveSkuId: isHistoricView ? null : liveSkuId
                 }
               ) })
             ] }),
@@ -76255,7 +76728,11 @@ var WorkspaceDetailView = ({
                   legend: efficiencyLegend,
                   layout: "grid",
                   className: desktopBottomSectionClass,
-                  idleTimeData: idleTimeVlmEnabled ? idleTimeData : void 0
+                  idleTimeData: idleTimeVlmEnabled ? idleTimeData : void 0,
+                  skuAware: isSkuAware,
+                  skuBreakdown: isSkuAware ? realSkuBreakdown : void 0,
+                  activeSkuId,
+                  liveSkuId: isHistoricView ? null : liveSkuId
                 }
               ) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: clsx("flex min-h-0", desktopBottomSectionClass), children: /* @__PURE__ */ jsxRuntime.jsx(
                 WorkspaceMetricCards,
@@ -76265,7 +76742,8 @@ var WorkspaceDetailView = ({
                   className: "flex-1",
                   skuAware: isSkuAware,
                   skuBreakdown: isSkuAware ? realSkuBreakdown : void 0,
-                  activeSkuId
+                  activeSkuId,
+                  liveSkuId: isHistoricView ? null : liveSkuId
                 }
               ) })
             ] })
@@ -85553,6 +86031,7 @@ exports.authRateLimitService = authRateLimitService;
 exports.awardsService = awardsService;
 exports.buildDateKey = buildDateKey;
 exports.buildKPIsFromLineMetricsRow = buildKPIsFromLineMetricsRow;
+exports.buildKpiLineHierarchy = buildKpiLineHierarchy;
 exports.buildLineSkuBreakdown = buildLineSkuBreakdown;
 exports.buildShiftGroupsKey = buildShiftGroupsKey;
 exports.canRoleAccessDashboardPath = canRoleAccessDashboardPath;