@sybilion/uilib 1.3.61 → 1.3.63

package/dist/esm/components/ui/Chat/ChatSheet/chatPanelOpenSync.js

@@ -0,0 +1,28 @@
+/** Pure guards for chat panel URL ↔ shell sync (unit-tested). */
+function shouldOpenChatFromUrl(chatOpen, layoutDismissed) {
+    return chatOpen && !layoutDismissed;
+}
+function shouldHealChatShellDesync(chatOpen, shellChatPanelOpen, layoutDismissed, isOpen) {
+    if (!chatOpen || shellChatPanelOpen) {
+        return false;
+    }
+    if (layoutDismissed && !isOpen) {
+        return false;
+    }
+    return true;
+}
+function shouldCloseStaleLocalChatOpen(shellChatPanelOpen, chatOpen, isOpen) {
+    return !shellChatPanelOpen && !chatOpen && isOpen;
+}
+function shouldDismissChatAfterShellClosed(params) {
+    const { shellChatPanelOpen, wasShellChatPanelOpen, chatOpen, isOpen, openedShellChat, } = params;
+    if (shellChatPanelOpen || !wasShellChatPanelOpen || !chatOpen) {
+        return false;
+    }
+    return isOpen || openedShellChat;
+}
+function isChatPanelVisible(isOpen, shellChatPanelOpen) {
+    return isOpen && shellChatPanelOpen;
+}
+
+export { isChatPanelVisible, shouldCloseStaleLocalChatOpen, shouldDismissChatAfterShellClosed, shouldHealChatShellDesync, shouldOpenChatFromUrl };

package/dist/esm/components/ui/Chat/ChatSheet/useChatPanelChromeModel.js

@@ -11,8 +11,9 @@ import { useIsMobile } from '../../../../hooks/useIsMobile.js';
 import { useQueryParams } from '../../../../hooks/useQueryParams.js';
 import logger from '../../../../lib/logger.js';
 import { mergePresetFreeformDefaults } from '../../../../utils/chatPresetMerge.js';
-import { useSidebar } from '../../Sidebar/Sidebar.js';
+import { useSidebar, DISMISS_CHAT_FOR_LAYOUT_EVENT } from '../../Sidebar/Sidebar.js';
 import { Chat } from '../Chat.js';
+import { shouldOpenChatFromUrl, shouldHealChatShellDesync, shouldCloseStaleLocalChatOpen, shouldDismissChatAfterShellClosed, isChatPanelVisible } from './chatPanelOpenSync.js';
 
 /** Fallback when `scopeId` prop omitted; apps should pass an explicit composite scope (e.g. `${userId}-dashboard`). */
 const NO_SCOPE_FALLBACK = '__uilib_chat_scope_unset__';
@@ -33,11 +34,16 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
     useSyncChatPanelBusy(isLoading);
     const { searchParams, addSearchParams, removeSearchParams, mutateSearchParams, } = useQueryParams();
     const chatOpen = searchParams.has(CHAT_QUERY_PARAM);
-    const [isOpen, setIsOpen] = useState(false);
+    const [isOpen, setIsOpen] = useState(() => !embedAsPage && chatOpen);
     /** `?prompt=` deep link text for one-shot composer pre-fill (see ChatPrompt). */
     const [promptLinkPrefill, setPromptLinkPrefill] = useState(null);
     /** Deduplicate Strict Mode double `useEffect` on the same mount. */
     const promptParamHandledInEffectRef = useRef(false);
+    const prevShellChatPanelOpenRef = useRef(shellChatPanelOpen);
+    /** This instance requested shell chat width (ignore other ChatSheet instances on the page). */
+    const openedShellChatRef = useRef(false);
+    /** Nav-forced chat close; blocks URL sync from reopening chat in the same tick. */
+    const layoutDismissedRef = useRef(false);
     const panelActive = embedAsPage || isOpen;
     // Ensure valid currentChatId when chat opens
     useEffect(() => {
@@ -124,13 +130,17 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
             return;
         }
         if (open) {
-            setIsOpen(true);
+            layoutDismissedRef.current = false;
+            openedShellChatRef.current = true;
             setChatPanelOpen(true);
+            setIsOpen(true);
             if (!searchParams.has(CHAT_QUERY_PARAM)) {
                 addSearchParams({ [CHAT_QUERY_PARAM]: CHAT_OPEN_VALUE });
             }
             return;
         }
+        openedShellChatRef.current = false;
+        removeSearchParams(CHAT_QUERY_PARAM);
         const applyClose = () => {
             setIsOpen(false);
             setChatPanelOpen(false);
@@ -143,7 +153,6 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
         else {
             applyClose();
         }
-        removeSearchParams(CHAT_QUERY_PARAM);
     };
     const isEmpty = isChatEmpty(chat) && !isLoading;
     const openNewChatWithPrefill = useCallback((prompt) => {
@@ -624,50 +633,93 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
             }
         })();
     }, [currentChatId, scriptByChatId, addMessage, onScriptComplete]);
+    const dismissChatForLayout = useCallback(() => {
+        if (embedAsPage) {
+            return;
+        }
+        layoutDismissedRef.current = true;
+        openedShellChatRef.current = false;
+        setIsOpen(false);
+        setChatPanelOpen(false);
+        removeSearchParams(CHAT_QUERY_PARAM);
+    }, [embedAsPage, removeSearchParams, setChatPanelOpen]);
+    useEvent({
+        event: DISMISS_CHAT_FOR_LAYOUT_EVENT,
+        callback: dismissChatForLayout,
+    });
+    /** `?chat=open` in URL — open local UI + shell (skip right after nav evicted chat). */
     useEffect(() => {
         if (embedAsPage) {
             return;
         }
         if (!chatOpen) {
-            setIsOpen(false);
-            setChatPanelOpen(false);
+            layoutDismissedRef.current = false;
             return;
         }
-        if (!shellChatPanelOpen && sidebarNavOpen) {
-            removeSearchParams(CHAT_QUERY_PARAM);
+        if (!shouldOpenChatFromUrl(chatOpen, layoutDismissedRef.current)) {
             return;
         }
         setIsOpen(true);
+        openedShellChatRef.current = true;
         setChatPanelOpen(true);
-    }, [
-        embedAsPage,
-        chatOpen,
-        setChatPanelOpen,
-        sidebarNavOpen,
-        shellChatPanelOpen,
-        removeSearchParams,
-    ]);
-    /** Shell closed chat for space (e.g. nav opened); keep UI and URL in sync. */
+    }, [embedAsPage, chatOpen, setChatPanelOpen]);
+    /** Heal desync: `?chat=open` but shell collapsed while this instance still wants panel open. */
     useEffect(() => {
-        if (embedAsPage || shellChatPanelOpen || !isOpen) {
+        if (embedAsPage) {
+            return;
+        }
+        if (!shouldHealChatShellDesync(chatOpen, shellChatPanelOpen, layoutDismissedRef.current, isOpen)) {
+            return;
+        }
+        layoutDismissedRef.current = false;
+        if (!isOpen) {
+            setIsOpen(true);
+        }
+        openedShellChatRef.current = true;
+        setChatPanelOpen(true);
+    }, [embedAsPage, chatOpen, isOpen, shellChatPanelOpen, setChatPanelOpen]);
+    /** Stale local open after shell closed without `?chat=` (e.g. another instance or aborted open). */
+    useEffect(() => {
+        if (embedAsPage) {
+            return;
+        }
+        if (!shouldCloseStaleLocalChatOpen(shellChatPanelOpen, chatOpen, isOpen)) {
             return;
         }
         setIsOpen(false);
-        removeSearchParams(CHAT_QUERY_PARAM);
-    }, [embedAsPage, shellChatPanelOpen, isOpen, removeSearchParams]);
-    /** When this instance unmounts (e.g. route hides ChatSheet), release shell layout — URL sync alone does not run. */
+    }, [embedAsPage, shellChatPanelOpen, chatOpen, isOpen]);
+    /** Shell chat closed while `?chat=` still set (fallback if layout event was missed). */
+    useEffect(() => {
+        if (embedAsPage) {
+            return;
+        }
+        const wasShellChatOpen = prevShellChatPanelOpenRef.current;
+        prevShellChatPanelOpenRef.current = shellChatPanelOpen;
+        if (!shouldDismissChatAfterShellClosed({
+            shellChatPanelOpen,
+            wasShellChatPanelOpen: wasShellChatOpen,
+            chatOpen,
+            isOpen,
+            openedShellChat: openedShellChatRef.current,
+        })) {
+            return;
+        }
+        dismissChatForLayout();
+    }, [embedAsPage, shellChatPanelOpen, chatOpen, dismissChatForLayout, isOpen]);
+    /** Route change: release shell slot only if this instance opened it (not Strict Mode remount). */
     useEffect(() => {
         return () => {
-            if (!embedAsPage) {
+            if (!embedAsPage && openedShellChatRef.current && !chatOpen) {
+                openedShellChatRef.current = false;
                 setChatPanelOpen(false);
             }
         };
-    }, [embedAsPage, setChatPanelOpen]);
+    }, [embedAsPage, chatOpen, setChatPanelOpen]);
     useEffect(() => {
         if (embedAsPage) {
             return;
         }
-        if (!isOpen || !sidebarNavOpen)
+        if (!shellChatPanelOpen || !sidebarNavOpen)
             return;
         const collapseNavIfNoSpace = () => {
             const shellW = getShellWidth();
@@ -686,7 +738,7 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
         return () => window.removeEventListener('resize', collapseNavIfNoSpace);
     }, [
         embedAsPage,
-        isOpen,
+        shellChatPanelOpen,
         sidebarNavOpen,
         setSidebarNavOpen,
         getShellWidth,
@@ -808,7 +860,13 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
         slashCommandItems,
         onSlashItemCommand,
     };
-    const toggleOpen = () => onOpenChange(!isOpen);
+    const toggleOpen = () => {
+        if (!isChatPanelVisible(isOpen, shellChatPanelOpen)) {
+            onOpenChange(true);
+            return;
+        }
+        onOpenChange(false);
+    };
     return {
         chromeProps,
         isOpen,

package/dist/esm/components/ui/Sidebar/Sidebar.js

@@ -20,6 +20,8 @@ import SidebarStem from './Sidebar.styl.js';
 const SIDEBAR_WIDTH_MOBILE = '18rem';
 const SIDEBAR_WIDTH_ICON = '3rem';
 const SIDEBAR_KEYBOARD_SHORTCUT = 'b';
+/** Fired when nav open closes chat for layout; ChatSheet clears `?chat=` so URL sync does not reopen chat. */
+const DISMISS_CHAT_FOR_LAYOUT_EVENT = 'sybilion:dismiss-chat-for-layout';
 function isEditableKeyboardTarget(el) {
     if (!el)
         return false;
@@ -219,6 +221,9 @@ function SidebarProvider({ defaultOpen = getCookie('isSidebarOpen') ?? true, cla
             return;
         if (openingMain && chatPanelOpen) {
             _setChatPanelOpen(false);
+            if (typeof window !== 'undefined') {
+                window.dispatchEvent(new CustomEvent(DISMISS_CHAT_FOR_LAYOUT_EVENT));
+            }
         }
         else if (openingChat && isOpen) {
             setIsOpen(false);
@@ -482,4 +487,4 @@ function SidebarMenuSubButton({ asChild = false, size = 'md', isActive = false,
     return (jsxs(Tooltip, { children: [jsx(TooltipTrigger, { asChild: true, children: button }), jsx(TooltipContent, { side: "right", align: "center", hidden: !isOpen || isSidebarSheetLayout, ...tooltip })] }));
 }
 
-export { PanelResizeHandle, Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarResizeHandle, SidebarSeparator, SidebarTrigger, useSidebar };
+export { DISMISS_CHAT_FOR_LAYOUT_EVENT, PanelResizeHandle, Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarResizeHandle, SidebarSeparator, SidebarTrigger, useSidebar };

package/dist/esm/components/widgets/DriversComparisonChart/DriversComparisonChart.js

@@ -83,8 +83,8 @@ function DriversComparisonChart({ payload, datasetHistorical = [], loading = fal
     const mergedChartData = useMemo(() => mergeBacktestsChartData(payloadForView), [payloadForView]);
     const mergedWithHistorical = useMemo(() => mergeDatasetHistoricalWithBacktestsChartData(datasetHistorical, mergedChartData), [datasetHistorical, mergedChartData]);
     const historicalWindowFloor = useMemo(() => {
-        const overlappedMerged = mergeBacktestsChartData(payload);
-        const merged = mergeDatasetHistoricalWithBacktestsChartData(datasetHistorical, overlappedMerged);
+        const laggedMerged = mergeBacktestsChartData(payload);
+        const merged = mergeDatasetHistoricalWithBacktestsChartData(datasetHistorical, laggedMerged);
         const sortedDrivers = [...(payload?.drivers ?? [])]
             .filter(d => d.normalized_series &&
             Object.keys(d.normalized_series).some(key => d.normalized_series[key] != null))

package/dist/esm/components/widgets/DriversComparisonChart/driversComparisonChart.helpers.js

@@ -57,7 +57,7 @@ function formatLagMonthsLabel(months) {
     return `${months} month(s)`;
 }
 function getLagDisplayForView(lag, tab) {
-    if (tab === 'overlapped') {
+    if (tab === 'lagged') {
         return lag?.trim() ? lag : '—';
     }
     const months = parseLagMonthsFromLabel(lag);
@@ -78,8 +78,24 @@ function shiftNormalizedSeriesForward(series, lagMonths) {
     }
     return out;
 }
+/** Shift driver points left (earlier months) by lag — overlapped alignment vs target. */
+function shiftNormalizedSeriesBackward(series, lagMonths) {
+    if (lagMonths <= 0)
+        return { ...series };
+    const out = {};
+    for (const [dateStr, val] of Object.entries(series)) {
+        if (val === null || val === undefined)
+            continue;
+        let shifted = normalizeToMonthStart(dateStr);
+        for (let i = 0; i < lagMonths; i++) {
+            shifted = getPreviousMonth(shifted);
+        }
+        out[shifted] = val;
+    }
+    return out;
+}
 function applyDriversComparisonViewToPayload(payload, tab) {
-    if (!payload || tab === 'overlapped')
+    if (!payload || tab === 'lagged')
         return payload;
     return {
         target: {
@@ -90,7 +106,7 @@ function applyDriversComparisonViewToPayload(payload, tab) {
             const lagMonths = parseLagMonthsFromLabel(resolveDriverLagLabel(driver));
             const series = driver.normalized_series ?? {};
             const normalized_series = lagMonths != null && lagMonths > 0
-                ? shiftNormalizedSeriesForward(series, lagMonths)
+                ? shiftNormalizedSeriesBackward(series, lagMonths)
                 : { ...series };
             return {
                 ...driver,
@@ -231,7 +247,7 @@ function prependHistoricalLeadFromDataset(points, datasetHistorical, xMin) {
     }
     return [...lead, ...points];
 }
-/** Overlapped (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
+/** Lagged (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
 function computeDriversComparisonHistoricalWindowFloor(mergedWithHistorical, forecastIds) {
     if (mergedWithHistorical.length === 0 || forecastIds.length === 0)
         return null;
@@ -253,4 +269,4 @@ function buildDriversComparisonChartData(mergedWithHistorical, datasetHistorical
     return withLead.filter(p => normalizeToMonthStart(p.date) >= xMin);
 }
 
-export { DRIVER_COMPARISON_CHART_LEAD_MONTHS, DRIVER_FORECAST_ID_BASE, INITIAL_VISIBLE_SERIES_COUNT, applyDriversComparisonViewToPayload, buildDriversComparisonChartData, computeDriversComparisonHistoricalWindowFloor, formatLagMonthsLabel, formatSeriesImportance, getLagDisplayForView, getZoomAnchorMonthFromDriverMaterialStarts, mergeBacktestsChartData, mergeDatasetHistoricalWithBacktestsChartData, parseLagMonthsFromLabel, prependHistoricalLeadFromDataset, resolveDriverLagLabel, shiftNormalizedSeriesForward, subtractMonthsFromMonthStart };
+export { DRIVER_COMPARISON_CHART_LEAD_MONTHS, DRIVER_FORECAST_ID_BASE, INITIAL_VISIBLE_SERIES_COUNT, applyDriversComparisonViewToPayload, buildDriversComparisonChartData, computeDriversComparisonHistoricalWindowFloor, formatLagMonthsLabel, formatSeriesImportance, getLagDisplayForView, getZoomAnchorMonthFromDriverMaterialStarts, mergeBacktestsChartData, mergeDatasetHistoricalWithBacktestsChartData, parseLagMonthsFromLabel, prependHistoricalLeadFromDataset, resolveDriverLagLabel, shiftNormalizedSeriesBackward, shiftNormalizedSeriesForward, subtractMonthsFromMonthStart };

package/dist/esm/index.js

@@ -77,7 +77,7 @@ export { Renamer } from './components/ui/Renamer/Renamer.js';
 export { Select, SelectContent, SelectGroup, SelectItem, SelectScrollDownButton, SelectScrollUpButton, SelectSeparator, SelectTrigger, SelectValue } from './components/ui/Select/Select.js';
 export { Separator } from './components/ui/Separator/Separator.js';
 export { Sheet, SheetClose, SheetContent, SheetDescription, SheetFooter, SheetHeader, SheetTitle, SheetTrigger } from './components/ui/Sheet/Sheet.js';
-export { PanelResizeHandle, Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarResizeHandle, SidebarSeparator, SidebarTrigger, useSidebar } from './components/ui/Sidebar/Sidebar.js';
+export { DISMISS_CHAT_FOR_LAYOUT_EVENT, PanelResizeHandle, Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarResizeHandle, SidebarSeparator, SidebarTrigger, useSidebar } from './components/ui/Sidebar/Sidebar.js';
 export { Skeleton } from './components/ui/Skeleton/Skeleton.js';
 export { Slider } from './components/ui/Slider/Slider.js';
 export { SmartTextTruncate } from './components/ui/SmartTextTruncate/SmartTextTruncate.js';

package/dist/esm/types/src/components/ui/Chat/ChatSheet/chatPanelOpenSync.d.ts

@@ -0,0 +1,12 @@
+/** Pure guards for chat panel URL ↔ shell sync (unit-tested). */
+export declare function shouldOpenChatFromUrl(chatOpen: boolean, layoutDismissed: boolean): boolean;
+export declare function shouldHealChatShellDesync(chatOpen: boolean, shellChatPanelOpen: boolean, layoutDismissed: boolean, isOpen: boolean): boolean;
+export declare function shouldCloseStaleLocalChatOpen(shellChatPanelOpen: boolean, chatOpen: boolean, isOpen: boolean): boolean;
+export declare function shouldDismissChatAfterShellClosed(params: {
+    shellChatPanelOpen: boolean;
+    wasShellChatPanelOpen: boolean;
+    chatOpen: boolean;
+    isOpen: boolean;
+    openedShellChat: boolean;
+}): boolean;
+export declare function isChatPanelVisible(isOpen: boolean, shellChatPanelOpen: boolean): boolean;

package/dist/esm/types/src/components/ui/Chat/ChatSheet/chatPanelOpenSync.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/types/src/components/ui/Sidebar/Sidebar.d.ts

@@ -4,6 +4,8 @@ import type { ButtonProps } from '#uilib/components/ui/Button/Button.types';
 import { Separator } from '#uilib/components/ui/Separator';
 import { TooltipContent } from '#uilib/components/ui/Tooltip';
 import { Scroll } from '@homecode/ui';
+/** Fired when nav open closes chat for layout; ChatSheet clears `?chat=` so URL sync does not reopen chat. */
+export declare const DISMISS_CHAT_FOR_LAYOUT_EVENT = "sybilion:dismiss-chat-for-layout";
 type SetPanelWidthOptions = {
     persist?: boolean;
 };

package/dist/esm/types/src/components/widgets/DriversComparisonChart/driversComparisonChart.helpers.d.ts

@@ -16,6 +16,8 @@ export declare function parseLagMonthsFromLabel(lag: string | null | undefined):
 export declare function formatLagMonthsLabel(months: number): string;
 export declare function getLagDisplayForView(lag: string | null | undefined, tab: DriversComparisonViewTab): string;
 export declare function shiftNormalizedSeriesForward(series: Record<string, number | null>, lagMonths: number): Record<string, number | null>;
+/** Shift driver points left (earlier months) by lag — overlapped alignment vs target. */
+export declare function shiftNormalizedSeriesBackward(series: Record<string, number | null>, lagMonths: number): Record<string, number | null>;
 export declare function applyDriversComparisonViewToPayload(payload: BacktestsComponentPayload | null, tab: DriversComparisonViewTab): BacktestsComponentPayload | null;
 export declare function mergeBacktestsChartData(payload: BacktestsComponentPayload | null): ChartDataPoint[];
 /** While drivers comparison is not loaded: dataset historical only. After load: normalized historical from target.normalized_series (see mergeBacktestsChartData) replaces it. */
@@ -35,6 +37,6 @@ export declare function subtractMonthsFromMonthStart(date: string, count: number
  * (scaled to the first normalized point) so the lead-in shows the target line alone.
  */
 export declare function prependHistoricalLeadFromDataset(points: ChartDataPoint[], datasetHistorical: ChartDataPoint[], xMin: string): ChartDataPoint[];
-/** Overlapped (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
+/** Lagged (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
 export declare function computeDriversComparisonHistoricalWindowFloor(mergedWithHistorical: ChartDataPoint[], forecastIds: number[]): string | null;
 export declare function buildDriversComparisonChartData(mergedWithHistorical: ChartDataPoint[], datasetHistorical: ChartDataPoint[], forecastIds: number[], historicalWindowFloor?: string | null): ChartDataPoint[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sybilion/uilib",
-  "version": "1.3.61",
+  "version": "1.3.63",
   "description": "Sybilion Design System — React UI components (Webpack + Stylus)",
   "publishConfig": {
     "access": "public",

package/src/components/ui/Chat/ChatSheet/chatPanelOpenSync.test.ts

@@ -0,0 +1,83 @@
+import {
+  isChatPanelVisible,
+  shouldCloseStaleLocalChatOpen,
+  shouldDismissChatAfterShellClosed,
+  shouldHealChatShellDesync,
+  shouldOpenChatFromUrl,
+} from './chatPanelOpenSync';
+
+describe('shouldOpenChatFromUrl', () => {
+  it('opens when ?chat= is set and layout has not dismissed chat', () => {
+    expect(shouldOpenChatFromUrl(true, false)).toBe(true);
+  });
+
+  it('blocks reopen in the same tick after nav layout dismiss', () => {
+    expect(shouldOpenChatFromUrl(true, true)).toBe(false);
+  });
+});
+
+describe('shouldHealChatShellDesync', () => {
+  it('heals when URL requests chat but shell slot is closed', () => {
+    expect(shouldHealChatShellDesync(true, false, false, false)).toBe(true);
+  });
+
+  it('skips heal after layout dismiss cleared local open', () => {
+    expect(shouldHealChatShellDesync(true, false, true, false)).toBe(false);
+  });
+});
+
+describe('shouldCloseStaleLocalChatOpen', () => {
+  it('closes local open when shell and URL are both closed', () => {
+    expect(shouldCloseStaleLocalChatOpen(false, false, true)).toBe(true);
+  });
+
+  it('keeps local open while ?chat= remains', () => {
+    expect(shouldCloseStaleLocalChatOpen(false, true, true)).toBe(false);
+  });
+});
+
+describe('shouldDismissChatAfterShellClosed', () => {
+  it('dismisses when shell closes with ?chat= and this instance opened chat', () => {
+    expect(
+      shouldDismissChatAfterShellClosed({
+        shellChatPanelOpen: false,
+        wasShellChatPanelOpen: true,
+        chatOpen: true,
+        isOpen: true,
+        openedShellChat: true,
+      }),
+    ).toBe(true);
+  });
+
+  it('ignores shell close when URL has no chat param', () => {
+    expect(
+      shouldDismissChatAfterShellClosed({
+        shellChatPanelOpen: false,
+        wasShellChatPanelOpen: true,
+        chatOpen: false,
+        isOpen: true,
+        openedShellChat: true,
+      }),
+    ).toBe(false);
+  });
+
+  it('ignores unrelated shell close without local or instance ownership', () => {
+    expect(
+      shouldDismissChatAfterShellClosed({
+        shellChatPanelOpen: false,
+        wasShellChatPanelOpen: true,
+        chatOpen: true,
+        isOpen: false,
+        openedShellChat: false,
+      }),
+    ).toBe(false);
+  });
+});
+
+describe('isChatPanelVisible', () => {
+  it('is visible only when local and shell are both open', () => {
+    expect(isChatPanelVisible(true, true)).toBe(true);
+    expect(isChatPanelVisible(true, false)).toBe(false);
+    expect(isChatPanelVisible(false, true)).toBe(false);
+  });
+});

package/src/components/ui/Chat/ChatSheet/chatPanelOpenSync.ts

@@ -0,0 +1,58 @@
+/** Pure guards for chat panel URL ↔ shell sync (unit-tested). */
+
+export function shouldOpenChatFromUrl(
+  chatOpen: boolean,
+  layoutDismissed: boolean,
+): boolean {
+  return chatOpen && !layoutDismissed;
+}
+
+export function shouldHealChatShellDesync(
+  chatOpen: boolean,
+  shellChatPanelOpen: boolean,
+  layoutDismissed: boolean,
+  isOpen: boolean,
+): boolean {
+  if (!chatOpen || shellChatPanelOpen) {
+    return false;
+  }
+  if (layoutDismissed && !isOpen) {
+    return false;
+  }
+  return true;
+}
+
+export function shouldCloseStaleLocalChatOpen(
+  shellChatPanelOpen: boolean,
+  chatOpen: boolean,
+  isOpen: boolean,
+): boolean {
+  return !shellChatPanelOpen && !chatOpen && isOpen;
+}
+
+export function shouldDismissChatAfterShellClosed(params: {
+  shellChatPanelOpen: boolean;
+  wasShellChatPanelOpen: boolean;
+  chatOpen: boolean;
+  isOpen: boolean;
+  openedShellChat: boolean;
+}): boolean {
+  const {
+    shellChatPanelOpen,
+    wasShellChatPanelOpen,
+    chatOpen,
+    isOpen,
+    openedShellChat,
+  } = params;
+  if (shellChatPanelOpen || !wasShellChatPanelOpen || !chatOpen) {
+    return false;
+  }
+  return isOpen || openedShellChat;
+}
+
+export function isChatPanelVisible(
+  isOpen: boolean,
+  shellChatPanelOpen: boolean,
+): boolean {
+  return isOpen && shellChatPanelOpen;
+}

package/src/components/ui/Chat/ChatSheet/useChatPanelChromeModel.tsx

@@ -43,12 +43,22 @@ import type {
 import { mergePresetFreeformDefaults } from '#uilib/utils/chatPresetMerge';
 import { ScrollRef } from '@homecode/ui';
 
-import { useSidebar } from '../../Sidebar/Sidebar';
+import {
+  DISMISS_CHAT_FOR_LAYOUT_EVENT,
+  useSidebar,
+} from '../../Sidebar/Sidebar';
 import { Chat } from '../Chat';
 import type { ChatChromeProps } from '../ChatChrome';
 import type { ChatAttachmentDropItem } from '../ChatChrome/ChatChrome.types';
 import type { ChatEmptyStateConfig } from '../ChatEmptyState/ChatEmptyState.types';
 import type { ChatEmptyStateProps } from '../ChatEmptyState/ChatEmptyState.types';
+import {
+  isChatPanelVisible,
+  shouldCloseStaleLocalChatOpen,
+  shouldDismissChatAfterShellClosed,
+  shouldHealChatShellDesync,
+  shouldOpenChatFromUrl,
+} from './chatPanelOpenSync';
 
 export type UseChatPanelChromeModelInput = {
   /** When true, skip sidebar chat slot, URL `?chat=`, and portal behavior (e.g. page main content). */
@@ -173,13 +183,18 @@ export function useChatPanelChromeModel({
     mutateSearchParams,
   } = useQueryParams();
   const chatOpen = searchParams.has(CHAT_QUERY_PARAM);
-  const [isOpen, setIsOpen] = useState(false);
+  const [isOpen, setIsOpen] = useState(() => !embedAsPage && chatOpen);
   /** `?prompt=` deep link text for one-shot composer pre-fill (see ChatPrompt). */
   const [promptLinkPrefill, setPromptLinkPrefill] = useState<string | null>(
     null,
   );
   /** Deduplicate Strict Mode double `useEffect` on the same mount. */
   const promptParamHandledInEffectRef = useRef(false);
+  const prevShellChatPanelOpenRef = useRef(shellChatPanelOpen);
+  /** This instance requested shell chat width (ignore other ChatSheet instances on the page). */
+  const openedShellChatRef = useRef(false);
+  /** Nav-forced chat close; blocks URL sync from reopening chat in the same tick. */
+  const layoutDismissedRef = useRef(false);
   const panelActive = embedAsPage || isOpen;
 
   // Ensure valid currentChatId when chat opens
@@ -288,14 +303,18 @@ export function useChatPanelChromeModel({
       return;
     }
     if (open) {
-      setIsOpen(true);
+      layoutDismissedRef.current = false;
+      openedShellChatRef.current = true;
       setChatPanelOpen(true);
+      setIsOpen(true);
       if (!searchParams.has(CHAT_QUERY_PARAM)) {
         addSearchParams({ [CHAT_QUERY_PARAM]: CHAT_OPEN_VALUE });
       }
       return;
     }
 
+    openedShellChatRef.current = false;
+    removeSearchParams(CHAT_QUERY_PARAM);
     const applyClose = () => {
       setIsOpen(false);
       setChatPanelOpen(false);
@@ -309,7 +328,6 @@ export function useChatPanelChromeModel({
     } else {
       applyClose();
     }
-    removeSearchParams(CHAT_QUERY_PARAM);
   };
 
   const isEmpty = isChatEmpty(chat) && !isLoading;
@@ -851,53 +869,109 @@ export function useChatPanelChromeModel({
     })();
   }, [currentChatId, scriptByChatId, addMessage, onScriptComplete]);
 
+  const dismissChatForLayout = useCallback(() => {
+    if (embedAsPage) {
+      return;
+    }
+    layoutDismissedRef.current = true;
+    openedShellChatRef.current = false;
+    setIsOpen(false);
+    setChatPanelOpen(false);
+    removeSearchParams(CHAT_QUERY_PARAM);
+  }, [embedAsPage, removeSearchParams, setChatPanelOpen]);
+
+  useEvent({
+    event: DISMISS_CHAT_FOR_LAYOUT_EVENT,
+    callback: dismissChatForLayout,
+  });
+
+  /** `?chat=open` in URL — open local UI + shell (skip right after nav evicted chat). */
   useEffect(() => {
     if (embedAsPage) {
       return;
     }
     if (!chatOpen) {
-      setIsOpen(false);
-      setChatPanelOpen(false);
+      layoutDismissedRef.current = false;
       return;
     }
-    if (!shellChatPanelOpen && sidebarNavOpen) {
-      removeSearchParams(CHAT_QUERY_PARAM);
+    if (!shouldOpenChatFromUrl(chatOpen, layoutDismissedRef.current)) {
       return;
     }
     setIsOpen(true);
+    openedShellChatRef.current = true;
     setChatPanelOpen(true);
-  }, [
-    embedAsPage,
-    chatOpen,
-    setChatPanelOpen,
-    sidebarNavOpen,
-    shellChatPanelOpen,
-    removeSearchParams,
-  ]);
+  }, [embedAsPage, chatOpen, setChatPanelOpen]);
 
-  /** Shell closed chat for space (e.g. nav opened); keep UI and URL in sync. */
+  /** Heal desync: `?chat=open` but shell collapsed while this instance still wants panel open. */
   useEffect(() => {
-    if (embedAsPage || shellChatPanelOpen || !isOpen) {
+    if (embedAsPage) {
+      return;
+    }
+    if (
+      !shouldHealChatShellDesync(
+        chatOpen,
+        shellChatPanelOpen,
+        layoutDismissedRef.current,
+        isOpen,
+      )
+    ) {
+      return;
+    }
+    layoutDismissedRef.current = false;
+    if (!isOpen) {
+      setIsOpen(true);
+    }
+    openedShellChatRef.current = true;
+    setChatPanelOpen(true);
+  }, [embedAsPage, chatOpen, isOpen, shellChatPanelOpen, setChatPanelOpen]);
+
+  /** Stale local open after shell closed without `?chat=` (e.g. another instance or aborted open). */
+  useEffect(() => {
+    if (embedAsPage) {
+      return;
+    }
+    if (!shouldCloseStaleLocalChatOpen(shellChatPanelOpen, chatOpen, isOpen)) {
       return;
     }
     setIsOpen(false);
-    removeSearchParams(CHAT_QUERY_PARAM);
-  }, [embedAsPage, shellChatPanelOpen, isOpen, removeSearchParams]);
+  }, [embedAsPage, shellChatPanelOpen, chatOpen, isOpen]);
 
-  /** When this instance unmounts (e.g. route hides ChatSheet), release shell layout — URL sync alone does not run. */
+  /** Shell chat closed while `?chat=` still set (fallback if layout event was missed). */
+  useEffect(() => {
+    if (embedAsPage) {
+      return;
+    }
+    const wasShellChatOpen = prevShellChatPanelOpenRef.current;
+    prevShellChatPanelOpenRef.current = shellChatPanelOpen;
+    if (
+      !shouldDismissChatAfterShellClosed({
+        shellChatPanelOpen,
+        wasShellChatPanelOpen: wasShellChatOpen,
+        chatOpen,
+        isOpen,
+        openedShellChat: openedShellChatRef.current,
+      })
+    ) {
+      return;
+    }
+    dismissChatForLayout();
+  }, [embedAsPage, shellChatPanelOpen, chatOpen, dismissChatForLayout, isOpen]);
+
+  /** Route change: release shell slot only if this instance opened it (not Strict Mode remount). */
   useEffect(() => {
     return () => {
-      if (!embedAsPage) {
+      if (!embedAsPage && openedShellChatRef.current && !chatOpen) {
+        openedShellChatRef.current = false;
         setChatPanelOpen(false);
       }
     };
-  }, [embedAsPage, setChatPanelOpen]);
+  }, [embedAsPage, chatOpen, setChatPanelOpen]);
 
   useEffect(() => {
     if (embedAsPage) {
       return;
     }
-    if (!isOpen || !sidebarNavOpen) return;
+    if (!shellChatPanelOpen || !sidebarNavOpen) return;
 
     const collapseNavIfNoSpace = () => {
       const shellW = getShellWidth();
@@ -919,7 +993,7 @@ export function useChatPanelChromeModel({
     return () => window.removeEventListener('resize', collapseNavIfNoSpace);
   }, [
     embedAsPage,
-    isOpen,
+    shellChatPanelOpen,
     sidebarNavOpen,
     setSidebarNavOpen,
     getShellWidth,
@@ -1096,7 +1170,13 @@ export function useChatPanelChromeModel({
     onSlashItemCommand,
   };
 
-  const toggleOpen = () => onOpenChange(!isOpen);
+  const toggleOpen = () => {
+    if (!isChatPanelVisible(isOpen, shellChatPanelOpen)) {
+      onOpenChange(true);
+      return;
+    }
+    onOpenChange(false);
+  };
 
   return {
     chromeProps,

package/src/components/ui/Sidebar/Sidebar.tsx

@@ -52,6 +52,9 @@ const SIDEBAR_WIDTH_MOBILE = '18rem';
 const SIDEBAR_WIDTH_ICON = '3rem';
 const SIDEBAR_KEYBOARD_SHORTCUT = 'b';
 
+/** Fired when nav open closes chat for layout; ChatSheet clears `?chat=` so URL sync does not reopen chat. */
+export const DISMISS_CHAT_FOR_LAYOUT_EVENT = 'sybilion:dismiss-chat-for-layout';
+
 function isEditableKeyboardTarget(el: Element | null): boolean {
   if (!el) return false;
   if (el instanceof HTMLElement && el.isContentEditable) return true;
@@ -325,6 +328,9 @@ function SidebarProvider({
       if (shellFitsSidebarsLayout(shellW, layoutAfterOpen)) return;
       if (openingMain && chatPanelOpen) {
         _setChatPanelOpen(false);
+        if (typeof window !== 'undefined') {
+          window.dispatchEvent(new CustomEvent(DISMISS_CHAT_FOR_LAYOUT_EVENT));
+        }
       } else if (openingChat && isOpen) {
         setIsOpen(false);
         if (getCookiePreferences(userId)?.functional) {

package/src/components/widgets/DriversComparisonChart/AGENT.md

@@ -10,7 +10,7 @@ Host provides:
 - `payload`: BacktestsComponentPayload from platform SDK (host fetch per analysis)
 - Optional `datasetHistorical` overlay
 - `seriesInitKey` when selected analysis changes
-- `viewTab` / `onViewTabChange`: `overlapped` (calendar-aligned) or `lagged` (driver series shifted forward by parsed lag months)
+- `viewTab` / `onViewTabChange`: `lagged` (calendar-aligned, raw dates) or `overlapped` (driver series shifted backward by parsed lag months)
 
 View tabs: host should render uilib `Tabs variant="button"` with **Lagged** / **Overlapped** in the toolbar (analysis selector left, tabs right). Chart applies `applyDriversComparisonViewToPayload` internally.
 
@@ -18,8 +18,8 @@ Report tile: `drivers_comparison_chart` — host loads normalized backtests payl
 
 Requires: `payload` — target + driver normalized_series; `loading` / `chartLoading` — spinners; `seriesInitKey` — reset visible series on analysis or view tab change; `runAnalysisHint` / `statusHint` — empty/error text.
 
-Lag column: **Overlapped** shows API `lag` string (may be a range). **Lagged** shows single `N month(s)` from `parseLagMonthsFromLabel` (range uses max month).
+Lag column: **Lagged** shows API `lag` string (may be a range). **Overlapped** shows single `N month(s)` from `parseLagMonthsFromLabel` (range uses max month).
 
-Historical window: lead-in is anchored to the **overlapped** view (`computeDriversComparisonHistoricalWindowFloor`); lagged tab shifts driver lines only — switching tabs does not change historical extent.
+Historical window: lead-in is anchored to the **lagged** (unshifted) view (`computeDriversComparisonHistoricalWindowFloor`); overlapped tab shifts driver lines backward only — switching tabs does not change historical extent when floor is pinned.
 
 Empty/loading: loading props shimmer chart; null `payload` with `runAnalysisHint` prompts to run analysis.

package/src/components/widgets/DriversComparisonChart/DriversComparisonChart.tsx

@@ -160,10 +160,10 @@ export function DriversComparisonChart({
   );
 
   const historicalWindowFloor = useMemo(() => {
-    const overlappedMerged = mergeBacktestsChartData(payload);
+    const laggedMerged = mergeBacktestsChartData(payload);
     const merged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
-      overlappedMerged,
+      laggedMerged,
     );
     const sortedDrivers = [...(payload?.drivers ?? [])]
       .filter(

package/src/components/widgets/DriversComparisonChart/driversComparisonChart.helpers.test.ts

@@ -12,6 +12,7 @@ import {
   mergeDatasetHistoricalWithBacktestsChartData,
   parseLagMonthsFromLabel,
   resolveDriverLagLabel,
+  shiftNormalizedSeriesBackward,
   shiftNormalizedSeriesForward,
   subtractMonthsFromMonthStart,
 } from './driversComparisonChart.helpers';
@@ -58,17 +59,17 @@ describe('formatLagMonthsLabel', () => {
 });
 
 describe('getLagDisplayForView', () => {
-  it('shows API lag on overlapped tab', () => {
-    expect(getLagDisplayForView('9 to 12 month(s)', 'overlapped')).toBe(
+  it('shows API lag on lagged tab', () => {
+    expect(getLagDisplayForView('9 to 12 month(s)', 'lagged')).toBe(
       '9 to 12 month(s)',
     );
   });
 
-  it('shows parsed month on lagged tab', () => {
-    expect(getLagDisplayForView('9 to 12 month(s)', 'lagged')).toBe(
+  it('shows parsed month on overlapped tab', () => {
+    expect(getLagDisplayForView('9 to 12 month(s)', 'overlapped')).toBe(
       '12 month(s)',
     );
-    expect(getLagDisplayForView('Unknown', 'lagged')).toBe('—');
+    expect(getLagDisplayForView('Unknown', 'overlapped')).toBe('—');
   });
 });
 
@@ -90,6 +91,24 @@ describe('shiftNormalizedSeriesForward', () => {
   });
 });
 
+describe('shiftNormalizedSeriesBackward', () => {
+  it('moves points backward by lag months', () => {
+    const shifted = shiftNormalizedSeriesBackward(
+      { '2015-03-01': 1.2, '2015-04-01': 1.4 },
+      2,
+    );
+    expect(shifted['2015-01-01']).toBe(1.2);
+    expect(shifted['2015-02-01']).toBe(1.4);
+  });
+
+  it('returns a shallow copy when lag is zero', () => {
+    const series = { '2015-01-01': 1 };
+    const shifted = shiftNormalizedSeriesBackward(series, 0);
+    expect(shifted).toEqual(series);
+    expect(shifted).not.toBe(series);
+  });
+});
+
 describe('applyDriversComparisonViewToPayload', () => {
   const payload = {
     target: {
@@ -107,18 +126,19 @@ describe('applyDriversComparisonViewToPayload', () => {
     ],
   };
 
-  it('returns original payload for overlapped tab', () => {
-    expect(applyDriversComparisonViewToPayload(payload, 'overlapped')).toBe(
-      payload,
-    );
+  it('returns original payload for lagged tab', () => {
+    expect(applyDriversComparisonViewToPayload(payload, 'lagged')).toBe(payload);
   });
 
-  it('shifts driver series for lagged tab without mutating source', () => {
-    const lagged = applyDriversComparisonViewToPayload(payload, 'lagged');
-    expect(lagged).not.toBe(payload);
+  it('shifts driver series backward for overlapped tab without mutating source', () => {
+    const overlapped = applyDriversComparisonViewToPayload(
+      payload,
+      'overlapped',
+    );
+    expect(overlapped).not.toBe(payload);
     expect(payload.drivers[0].normalized_series['2015-01-01']).toBe(0.5);
-    expect(lagged?.drivers[0].normalized_series['2015-03-01']).toBe(0.5);
-    expect(lagged?.target.normalized_series).toEqual(
+    expect(overlapped?.drivers[0].normalized_series['2014-11-01']).toBe(0.5);
+    expect(overlapped?.target.normalized_series).toEqual(
       payload.target.normalized_series,
     );
   });
@@ -135,11 +155,11 @@ describe('applyDriversComparisonViewToPayload', () => {
         },
       ],
     };
-    const lagged = applyDriversComparisonViewToPayload(
+    const overlapped = applyDriversComparisonViewToPayload(
       withOverallLag,
-      'lagged',
+      'overlapped',
     );
-    expect(lagged?.drivers[0].normalized_series['2015-07-01']).toBe(0.8);
+    expect(overlapped?.drivers[0].normalized_series['2015-05-01']).toBe(0.8);
   });
 });
 
@@ -184,7 +204,7 @@ describe('computeDriversComparisonHistoricalWindowFloor', () => {
 
   const forecastIds = [DRIVER_FORECAST_ID_BASE];
 
-  it('returns anchor minus lead months from overlapped merged data', () => {
+  it('returns anchor minus lead months from lagged (unshifted) merged data', () => {
     const merged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
       mergeBacktestsChartData(laggedDriverPayload),
@@ -245,70 +265,70 @@ describe('buildDriversComparisonChartData historical window floor', () => {
   const forecastIds = [DRIVER_FORECAST_ID_BASE];
 
   it('keeps same xMin for lagged and overlapped when floor is pinned', () => {
-    const overlappedMerged = mergeDatasetHistoricalWithBacktestsChartData(
+    const laggedMerged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
       mergeBacktestsChartData(laggedDriverPayload),
     );
-    const laggedPayload = applyDriversComparisonViewToPayload(
+    const overlappedPayload = applyDriversComparisonViewToPayload(
       laggedDriverPayload,
-      'lagged',
+      'overlapped',
     );
-    const laggedMerged = mergeDatasetHistoricalWithBacktestsChartData(
+    const overlappedMerged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
-      mergeBacktestsChartData(laggedPayload),
+      mergeBacktestsChartData(overlappedPayload),
     );
     const floor = computeDriversComparisonHistoricalWindowFloor(
-      overlappedMerged,
+      laggedMerged,
       forecastIds,
     )!;
 
-    const overlappedChart = buildDriversComparisonChartData(
-      overlappedMerged,
+    const laggedChart = buildDriversComparisonChartData(
+      laggedMerged,
       datasetHistorical,
       forecastIds,
       floor,
     );
-    const laggedChart = buildDriversComparisonChartData(
-      laggedMerged,
+    const overlappedChart = buildDriversComparisonChartData(
+      overlappedMerged,
       datasetHistorical,
       forecastIds,
       floor,
     );
 
-    expect(overlappedChart[0]?.date).toBe('2014-10-01');
     expect(laggedChart[0]?.date).toBe('2014-10-01');
-    expect(laggedChart[0]?.date).toBe(overlappedChart[0]?.date);
+    expect(overlappedChart[0]?.date).toBe('2014-10-01');
+    expect(overlappedChart[0]?.date).toBe(laggedChart[0]?.date);
   });
 
-  it('without floor override lagged chart starts later than overlapped', () => {
-    const overlappedMerged = mergeDatasetHistoricalWithBacktestsChartData(
+  it('without floor override overlapped chart starts earlier than lagged', () => {
+    const laggedMerged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
       mergeBacktestsChartData(laggedDriverPayload),
     );
-    const laggedPayload = applyDriversComparisonViewToPayload(
+    const overlappedPayload = applyDriversComparisonViewToPayload(
       laggedDriverPayload,
-      'lagged',
+      'overlapped',
     );
-    const laggedMerged = mergeDatasetHistoricalWithBacktestsChartData(
+    const overlappedMerged = mergeDatasetHistoricalWithBacktestsChartData(
       datasetHistorical,
-      mergeBacktestsChartData(laggedPayload),
+      mergeBacktestsChartData(overlappedPayload),
     );
 
-    const overlappedChart = buildDriversComparisonChartData(
-      overlappedMerged,
+    const laggedChart = buildDriversComparisonChartData(
+      laggedMerged,
       datasetHistorical,
       forecastIds,
     );
-    const laggedChart = buildDriversComparisonChartData(
-      laggedMerged,
+    const overlappedChart = buildDriversComparisonChartData(
+      overlappedMerged,
       datasetHistorical,
       forecastIds,
     );
 
-    expect(overlappedChart[0]?.date).toBe('2014-10-01');
-    expect(laggedChart[0]?.date).toBe('2015-01-01');
-    expect(laggedChart[0]?.date!.localeCompare(overlappedChart[0]?.date!)).toBe(
-      1,
-    );
+    expect(laggedChart[0]?.date).toBe('2014-10-01');
+    expect(overlappedChart[0]?.date).toBe('2014-07-01');
+    expect(
+      overlappedChart[0]?.date!.localeCompare(laggedChart[0]?.date!),
+    ).toBe(-1);
   });
 });

package/src/components/widgets/DriversComparisonChart/driversComparisonChart.helpers.ts

@@ -78,7 +78,7 @@ export function getLagDisplayForView(
   lag: string | null | undefined,
   tab: DriversComparisonViewTab,
 ): string {
-  if (tab === 'overlapped') {
+  if (tab === 'lagged') {
     return lag?.trim() ? lag : '—';
   }
   const months = parseLagMonthsFromLabel(lag);
@@ -102,11 +102,29 @@ export function shiftNormalizedSeriesForward(
   return out;
 }
 
+/** Shift driver points left (earlier months) by lag — overlapped alignment vs target. */
+export function shiftNormalizedSeriesBackward(
+  series: Record<string, number | null>,
+  lagMonths: number,
+): Record<string, number | null> {
+  if (lagMonths <= 0) return { ...series };
+  const out: Record<string, number | null> = {};
+  for (const [dateStr, val] of Object.entries(series)) {
+    if (val === null || val === undefined) continue;
+    let shifted = normalizeToMonthStart(dateStr);
+    for (let i = 0; i < lagMonths; i++) {
+      shifted = getPreviousMonth(shifted);
+    }
+    out[shifted] = val;
+  }
+  return out;
+}
+
 export function applyDriversComparisonViewToPayload(
   payload: BacktestsComponentPayload | null,
   tab: DriversComparisonViewTab,
 ): BacktestsComponentPayload | null {
-  if (!payload || tab === 'overlapped') return payload;
+  if (!payload || tab === 'lagged') return payload;
 
   return {
     target: {
@@ -118,7 +136,7 @@ export function applyDriversComparisonViewToPayload(
       const series = driver.normalized_series ?? {};
       const normalized_series =
         lagMonths != null && lagMonths > 0
-          ? shiftNormalizedSeriesForward(series, lagMonths)
+          ? shiftNormalizedSeriesBackward(series, lagMonths)
           : { ...series };
       return {
         ...driver,
@@ -290,7 +308,7 @@ export function prependHistoricalLeadFromDataset(
   return [...lead, ...points];
 }
 
-/** Overlapped (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
+/** Lagged (unshifted) anchor minus lead months — stable xMin across lagged/overlapped tabs. */
 export function computeDriversComparisonHistoricalWindowFloor(
   mergedWithHistorical: ChartDataPoint[],
   forecastIds: number[],