@wildo-ai/saas-frontend-lib 1.1.5 → 1.1.6

package/dist/esm/core/navigation/zone-collapse-migration.js

@@ -0,0 +1,116 @@
+import { NavigationZoneContentModel, NavigationZoneName, ResponsiveCollapseMode } from '@wildo-ai/saas-models';
+import { NavigationZone } from './navigation.schemas.js';
+import { resolveVisibleEntryIndex } from './zone-visible-entry.js';
+/**
+ * Evacuate `zone` while it is collapsed under `mode`. Returns `state` itself when there is nothing
+ * to move, so a caller can compare by identity.
+ *
+ * - **SINGLE** — the whole stack moves, in order, so the pane's history survives: Back in primary
+ *   walks it exactly as Back in the pane would have. An earlier version moved only the top, on the
+ *   theory that history "in a pane that no longer exists" is not a place the reader can return to;
+ *   but the pane DOES come back, and the contract (`ResponsiveCollapseMode`) says its content is
+ *   preserved.
+ * - **TABBED** — every tab moves, with the tab on SCREEN last so it is the one primary shows. Tabs
+ *   become history while the pane cannot be drawn: that is the only shape one column can give them,
+ *   and it keeps every tab reachable rather than stranding the ones not in front.
+ *
+ * Each moved entry is stamped with `collapsedFromZone` — the one field that lets it go home — and its
+ * `zone` becomes where it now IS. The content area renders an entry under `entry.zone`, so an entry
+ * that kept `zone: secondary` while sitting in primary rendered a surface that believed it was in
+ * the pane: its Back called `goBack(secondary)` on an empty stack and did nothing (Wonder Todos,
+ * a `?pane=` record held in primary at 820px, 2026-09-28). Moving an object is not the same as
+ * re-describing it, but where it lives is not a property it keeps.
+ */
+export function evacuateCollapsedZone(state, zone, mode, contentModel) {
+    const zoneState = state.zones[zone];
+    if (!zoneState || zoneState.stack.length === 0)
+        return state;
+    const visibleIndex = resolveVisibleEntryIndex(zoneState.stack, contentModel, zoneState.activeTabId);
+    const ordered = contentModel === NavigationZoneContentModel.TABBED
+        ? [...zoneState.stack.filter((_, index) => index !== visibleIndex), zoneState.stack[visibleIndex]]
+        : zoneState.stack;
+    const heldIn = mode === ResponsiveCollapseMode.OVERLAY ? NavigationZone.OVERLAY : NavigationZoneName.PRIMARY;
+    const moving = ordered.map((entry) => ({ ...entry, zone: heldIn, collapsedFromZone: zone }));
+    const emptied = { ...zoneState, stack: [], activeTabId: undefined, isVisible: false };
+    if (mode === ResponsiveCollapseMode.OVERLAY) {
+        return { ...state, overlay: [...state.overlay, ...moving], zones: { ...state.zones, [zone]: emptied } };
+    }
+    const primary = state.zones[NavigationZoneName.PRIMARY];
+    return {
+        ...state,
+        zones: {
+            ...state.zones,
+            [zone]: emptied,
+            [NavigationZoneName.PRIMARY]: { ...primary, stack: [...primary.stack, ...moving], isVisible: true },
+        },
+    };
+}
+/**
+ * The entries of `stack` held on behalf of `zone` that may still go home: those inside the TRAILING
+ * run of stamped entries.
+ *
+ * An entry the reader pushed on top of the borrowed content — an ordinary, unstamped navigation —
+ * ends the run. Everything beneath it is then history they walked through, and pulling it out from
+ * under the page they are standing on would be a worse surprise than leaving it where it is.
+ *
+ * Several zones may share one run (both panes collapse at MOBILE together), so the run is filtered
+ * by zone rather than required to be homogeneous. That is what makes the order in which zones are
+ * restored irrelevant — the defect the event-driven version had.
+ */
+function returnableEntries(stack, zone) {
+    let runStart = stack.length;
+    while (runStart > 0 && stack[runStart - 1].collapsedFromZone !== undefined)
+        runStart -= 1;
+    return stack.slice(runStart).filter(entry => entry.collapsedFromZone === zone);
+}
+/**
+ * Return to `zone` everything held for it while it was collapsed. Returns `state` itself when there
+ * is nothing to return.
+ *
+ * Entries go home as the same objects, with `zone` set back and without their `collapsedFromZone`
+ * stamp, so `hostedPane`, `persistent`, `ephemeral`, `appearance` and anything added to the entry
+ * later all survive. A
+ * TABBED zone's active tab becomes the last returned entry — the one primary was showing, i.e. the
+ * one the reader was looking at.
+ */
+export function restoreCollapsedZone(state, zone, contentModel) {
+    const primary = state.zones[NavigationZoneName.PRIMARY];
+    const fromPrimary = returnableEntries(primary.stack, zone);
+    const fromOverlay = returnableEntries(state.overlay, zone);
+    if (fromPrimary.length === 0 && fromOverlay.length === 0)
+        return state;
+    const leaving = new Set([...fromPrimary, ...fromOverlay].map(entry => entry.id));
+    const returning = [...fromPrimary, ...fromOverlay].map((entry) => {
+        const { collapsedFromZone: _home, ...rest } = entry;
+        return { ...rest, zone };
+    });
+    const zoneState = state.zones[zone];
+    const stack = [...zoneState.stack, ...returning];
+    return {
+        ...state,
+        overlay: fromOverlay.length > 0 ? state.overlay.filter(entry => !leaving.has(entry.id)) : state.overlay,
+        zones: {
+            ...state.zones,
+            [NavigationZoneName.PRIMARY]: fromPrimary.length > 0
+                ? { ...primary, stack: primary.stack.filter(entry => !leaving.has(entry.id)), isVisible: true }
+                : primary,
+            [zone]: {
+                ...zoneState,
+                stack,
+                isVisible: true,
+                activeTabId: contentModel === NavigationZoneContentModel.TABBED ? stack[stack.length - 1].id : zoneState.activeTabId,
+            },
+        },
+    };
+}
+/**
+ * Apply the invariant to every collapsible zone at once: evacuate each collapsed zone, return what
+ * is held for each shown one. Identity-preserving — the SAME state object comes back when nothing
+ * had to move — so it is safe to run on every render.
+ */
+export function reconcileCollapsedZones(state, situations) {
+    return situations.reduce((current, { zone, mode, contentModel }) => (mode !== undefined
+        ? evacuateCollapsedZone(current, zone, mode, contentModel)
+        : restoreCollapsedZone(current, zone, contentModel)), state);
+}
+//# sourceMappingURL=zone-collapse-migration.js.map

package/dist/esm/core/navigation/zone-collapse-migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-collapse-migration.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-collapse-migration.ts"],"names":[],"mappings":"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","sourcesContent":["import { NavigationZoneContentModel, NavigationZoneName, ResponsiveCollapseMode } from '@wildo-ai/saas-models';\n\nimport { NavigationZone } from './navigation.schemas';\nimport type { NavigationStackEntry, NavigationState, NavigationZoneState } from './navigation.schemas';\nimport { resolveVisibleEntryIndex } from './zone-visible-entry';\n\n/**\n * Moving a collapsed zone's content somewhere it can be SEEN, and home again — as pure state\n * transforms the reducer applies in ONE update.\n *\n * ## Why this is a reducer transform and not a sequence of events\n *\n * The first implementation (2026-09-25, `c8c8a7dc`) emitted `NAVIGATION_PUSH` / `CLEAR_ZONE` /\n * `POP` / `REPLACE` from a hook, one entry at a time. Each of those three defects followed from that\n * shape, and none of them could have been patched inside it:\n *\n * - **It read stale state.** `getZoneState` answers from the last RENDER, so within one pass the\n *   hook could not see the POP it had just emitted. When both panes collapsed and then widened, the\n *   secondary's restore saw the companion's entry on primary's top, skipped, and marked itself\n *   done — the secondary's record stayed full-width beside an empty pane.\n * - **It lost what the entry was.** Every emit passes through a payload schema that STRIPS keys it\n *   does not declare, and the migration re-described the entry field by field. `hostedPane`,\n *   `persistent` and `ephemeral` did not make the round trip, so a hosted pane came home unflagged\n *   under a URL still carrying its `?pane=`.\n * - **It moved one entry.** A pane's history came back as its last record, and a TABBED pane's\n *   last tab was moved rather than the one on screen.\n *\n * A transform over `NavigationState` moves the entry OBJECTS — nothing is re-described, so nothing\n * can be dropped — and sees every zone at once, so two panes collapsing together are one decision.\n *\n * ## The invariant, which is what makes the caller a reconciler rather than an event handler\n *\n * **A collapsed zone holds nothing.** Content can reach one by any path — a click the resolver\n * already retargeted, a URL restored before the content area was measured, a `?pane=` reload —\n * and the rule does not care which: whatever sits in a collapsed zone is moved out. The inverse is\n * **nothing is held on behalf of a zone that is showing**. Both transforms are idempotent (a second\n * application changes nothing and returns the SAME object), so the caller may apply them on every\n * render without looping and without remembering what it did last time.\n */\n\n/** A zone's content model, as the layout declares it; `SINGLE` when undeclared. */\nexport type CollapsibleZoneContentModel = NavigationZoneContentModel | undefined;\n\n/**\n * Evacuate `zone` while it is collapsed under `mode`. Returns `state` itself when there is nothing\n * to move, so a caller can compare by identity.\n *\n * - **SINGLE** — the whole stack moves, in order, so the pane's history survives: Back in primary\n *   walks it exactly as Back in the pane would have. An earlier version moved only the top, on the\n *   theory that history \"in a pane that no longer exists\" is not a place the reader can return to;\n *   but the pane DOES come back, and the contract (`ResponsiveCollapseMode`) says its content is\n *   preserved.\n * - **TABBED** — every tab moves, with the tab on SCREEN last so it is the one primary shows. Tabs\n *   become history while the pane cannot be drawn: that is the only shape one column can give them,\n *   and it keeps every tab reachable rather than stranding the ones not in front.\n *\n * Each moved entry is stamped with `collapsedFromZone` — the one field that lets it go home — and its\n * `zone` becomes where it now IS. The content area renders an entry under `entry.zone`, so an entry\n * that kept `zone: secondary` while sitting in primary rendered a surface that believed it was in\n * the pane: its Back called `goBack(secondary)` on an empty stack and did nothing (Wonder Todos,\n * a `?pane=` record held in primary at 820px, 2026-09-28). Moving an object is not the same as\n * re-describing it, but where it lives is not a property it keeps.\n */\nexport function evacuateCollapsedZone(\n  state: NavigationState,\n  zone: NavigationZoneName,\n  mode: ResponsiveCollapseMode,\n  contentModel: CollapsibleZoneContentModel,\n): NavigationState {\n  const zoneState = state.zones[zone];\n  if (!zoneState || zoneState.stack.length === 0) return state;\n\n  const visibleIndex = resolveVisibleEntryIndex(zoneState.stack, contentModel, zoneState.activeTabId);\n  const ordered = contentModel === NavigationZoneContentModel.TABBED\n    ? [...zoneState.stack.filter((_, index) => index !== visibleIndex), zoneState.stack[visibleIndex]!]\n    : zoneState.stack;\n  const heldIn = mode === ResponsiveCollapseMode.OVERLAY ? NavigationZone.OVERLAY : NavigationZoneName.PRIMARY;\n  const moving = ordered.map((entry): NavigationStackEntry => ({ ...entry, zone: heldIn, collapsedFromZone: zone }));\n\n  const emptied: NavigationZoneState = { ...zoneState, stack: [], activeTabId: undefined, isVisible: false };\n  if (mode === ResponsiveCollapseMode.OVERLAY) {\n    return { ...state, overlay: [...state.overlay, ...moving], zones: { ...state.zones, [zone]: emptied } };\n  }\n  const primary = state.zones[NavigationZoneName.PRIMARY];\n  return {\n    ...state,\n    zones: {\n      ...state.zones,\n      [zone]: emptied,\n      [NavigationZoneName.PRIMARY]: { ...primary, stack: [...primary.stack, ...moving], isVisible: true },\n    },\n  };\n}\n\n/**\n * The entries of `stack` held on behalf of `zone` that may still go home: those inside the TRAILING\n * run of stamped entries.\n *\n * An entry the reader pushed on top of the borrowed content — an ordinary, unstamped navigation —\n * ends the run. Everything beneath it is then history they walked through, and pulling it out from\n * under the page they are standing on would be a worse surprise than leaving it where it is.\n *\n * Several zones may share one run (both panes collapse at MOBILE together), so the run is filtered\n * by zone rather than required to be homogeneous. That is what makes the order in which zones are\n * restored irrelevant — the defect the event-driven version had.\n */\nfunction returnableEntries(stack: NavigationStackEntry[], zone: NavigationZoneName): NavigationStackEntry[] {\n  let runStart = stack.length;\n  while (runStart > 0 && stack[runStart - 1]!.collapsedFromZone !== undefined) runStart -= 1;\n  return stack.slice(runStart).filter(entry => entry.collapsedFromZone === zone);\n}\n\n/**\n * Return to `zone` everything held for it while it was collapsed. Returns `state` itself when there\n * is nothing to return.\n *\n * Entries go home as the same objects, with `zone` set back and without their `collapsedFromZone`\n * stamp, so `hostedPane`, `persistent`, `ephemeral`, `appearance` and anything added to the entry\n * later all survive. A\n * TABBED zone's active tab becomes the last returned entry — the one primary was showing, i.e. the\n * one the reader was looking at.\n */\nexport function restoreCollapsedZone(\n  state: NavigationState,\n  zone: NavigationZoneName,\n  contentModel: CollapsibleZoneContentModel,\n): NavigationState {\n  const primary = state.zones[NavigationZoneName.PRIMARY];\n  const fromPrimary = returnableEntries(primary.stack, zone);\n  const fromOverlay = returnableEntries(state.overlay, zone);\n  if (fromPrimary.length === 0 && fromOverlay.length === 0) return state;\n\n  const leaving = new Set([...fromPrimary, ...fromOverlay].map(entry => entry.id));\n  const returning = [...fromPrimary, ...fromOverlay].map((entry): NavigationStackEntry => {\n    const { collapsedFromZone: _home, ...rest } = entry;\n    return { ...rest, zone };\n  });\n  const zoneState = state.zones[zone];\n  const stack = [...zoneState.stack, ...returning];\n\n  return {\n    ...state,\n    overlay: fromOverlay.length > 0 ? state.overlay.filter(entry => !leaving.has(entry.id)) : state.overlay,\n    zones: {\n      ...state.zones,\n      [NavigationZoneName.PRIMARY]: fromPrimary.length > 0\n        ? { ...primary, stack: primary.stack.filter(entry => !leaving.has(entry.id)), isVisible: true }\n        : primary,\n      [zone]: {\n        ...zoneState,\n        stack,\n        isVisible: true,\n        activeTabId: contentModel === NavigationZoneContentModel.TABBED ? stack[stack.length - 1]!.id : zoneState.activeTabId,\n      },\n    },\n  };\n}\n\n/** One collapsible zone's situation at this width, as the reconciler sees it. */\nexport interface CollapsibleZoneSituation {\n  zone: NavigationZoneName;\n  /** `undefined` when the zone is shown; otherwise the declared way it collapses. */\n  mode: ResponsiveCollapseMode | undefined;\n  contentModel: CollapsibleZoneContentModel;\n}\n\n/**\n * Apply the invariant to every collapsible zone at once: evacuate each collapsed zone, return what\n * is held for each shown one. Identity-preserving — the SAME state object comes back when nothing\n * had to move — so it is safe to run on every render.\n */\nexport function reconcileCollapsedZones(state: NavigationState, situations: CollapsibleZoneSituation[]): NavigationState {\n  return situations.reduce(\n    (current, { zone, mode, contentModel }) => (mode !== undefined\n      ? evacuateCollapsedZone(current, zone, mode, contentModel)\n      : restoreCollapsedZone(current, zone, contentModel)),\n    state,\n  );\n}\n"]}

package/dist/esm/core/navigation/zone-collapse.d.ts

@@ -0,0 +1,51 @@
+import { ViewportBreakpoint } from '@wildo-ai/zod-decorators';
+import type { NavigationLayout, ZoneConfig } from '@wildo-ai/saas-models';
+import { NavigationZoneName } from '@wildo-ai/saas-models';
+/**
+ * Is an adjacent zone COLLAPSED right now — too narrow a viewport, or too narrow a content area?
+ *
+ * ## Why this is one function and not three conditions
+ *
+ * Three places answer this question, and until 2026-09-25 only one of them answered it completely:
+ *
+ * | asker | what it decides | what it used to read |
+ * |---|---|---|
+ * | `navigationPolicyResolver.resolveCollapseMode` | where a CLICK's content lands | viewport + content-area fit — correct |
+ * | `NavigationContentAreas` | whether the pane is RENDERED | `isMobile` only |
+ * | `NavigationUtils.resolveResourceTargetZone` | where a URL's content lands | nothing — it took no viewport at all |
+ *
+ * Both gaps produced a silent wrong result:
+ *
+ * - **The renderer's**: at VERT_TABLET (768–1023px) a declared `responsiveCollapse` retargets every
+ *   click away from the pane while the pane keeps rendering — so a zone with `onEmpty: EMPTY_STATE`
+ *   showed its "select an item" placeholder permanently, next to a list whose clicks went elsewhere.
+ * - **The URL path's**: a depth ≥ 1 resource was routed to SECONDARY regardless of viewport, and the
+ *   mobile render branch draws PRIMARY and nothing else — so a bookmarked or refreshed nested record
+ *   on a phone showed its PARENT, silently. The click path was correct the whole time, which is what
+ *   made it invisible: the same content reached the right place when clicked and the wrong place when
+ *   linked to. Note the viewport WAS threaded into the adjacent depth-0 branch
+ *   (`prefersAdjacentZoneForDetail`) and not into this one — one invariant, two sites, one of them
+ *   done (`.claude/rules/invariant-call-site-enumeration.md`).
+ *
+ * @param contentAreaWidth  `undefined` until the first measurement, which answers "fits" — an
+ *                          unmeasured area is not a narrow one. See `contentAreaFitsSplit`.
+ */
+export declare function zoneIsCollapsedAtViewport(params: {
+    zoneConfig: ZoneConfig | undefined;
+    viewport: ViewportBreakpoint | undefined;
+    contentAreaWidth?: number;
+}): boolean;
+/**
+ * The adjacent zone a URL-restored resource may actually be placed in, or `undefined` when every
+ * adjacent zone is collapsed and the content belongs in PRIMARY.
+ *
+ * The URL path's counterpart to the resolver's collapse handling: same predicate, same inputs, so a
+ * deep link and a click cannot disagree about where a record lives at a given width.
+ */
+export declare function adjacentZoneUsableAtViewport(params: {
+    zone: NavigationZoneName;
+    layout: NavigationLayout | undefined;
+    viewport: ViewportBreakpoint | undefined;
+    contentAreaWidth?: number;
+}): boolean;
+//# sourceMappingURL=zone-collapse.d.ts.map

package/dist/esm/core/navigation/zone-collapse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-collapse.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-collapse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAI3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IAChD,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,OAAO,CAQV;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE;IACnD,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,OAAO,CAOV"}

package/dist/esm/core/navigation/zone-collapse.js

@@ -0,0 +1,59 @@
+import { ViewportBreakpoint } from '@wildo-ai/zod-decorators';
+import { NavigationZoneName } from '@wildo-ai/saas-models';
+import { contentAreaFitsSplit } from './split-fit.js';
+/**
+ * Is an adjacent zone COLLAPSED right now — too narrow a viewport, or too narrow a content area?
+ *
+ * ## Why this is one function and not three conditions
+ *
+ * Three places answer this question, and until 2026-09-25 only one of them answered it completely:
+ *
+ * | asker | what it decides | what it used to read |
+ * |---|---|---|
+ * | `navigationPolicyResolver.resolveCollapseMode` | where a CLICK's content lands | viewport + content-area fit — correct |
+ * | `NavigationContentAreas` | whether the pane is RENDERED | `isMobile` only |
+ * | `NavigationUtils.resolveResourceTargetZone` | where a URL's content lands | nothing — it took no viewport at all |
+ *
+ * Both gaps produced a silent wrong result:
+ *
+ * - **The renderer's**: at VERT_TABLET (768–1023px) a declared `responsiveCollapse` retargets every
+ *   click away from the pane while the pane keeps rendering — so a zone with `onEmpty: EMPTY_STATE`
+ *   showed its "select an item" placeholder permanently, next to a list whose clicks went elsewhere.
+ * - **The URL path's**: a depth ≥ 1 resource was routed to SECONDARY regardless of viewport, and the
+ *   mobile render branch draws PRIMARY and nothing else — so a bookmarked or refreshed nested record
+ *   on a phone showed its PARENT, silently. The click path was correct the whole time, which is what
+ *   made it invisible: the same content reached the right place when clicked and the wrong place when
+ *   linked to. Note the viewport WAS threaded into the adjacent depth-0 branch
+ *   (`prefersAdjacentZoneForDetail`) and not into this one — one invariant, two sites, one of them
+ *   done (`.claude/rules/invariant-call-site-enumeration.md`).
+ *
+ * @param contentAreaWidth  `undefined` until the first measurement, which answers "fits" — an
+ *                          unmeasured area is not a narrow one. See `contentAreaFitsSplit`.
+ */
+export function zoneIsCollapsedAtViewport(params) {
+    const narrowViewport = params.viewport === ViewportBreakpoint.MOBILE
+        || params.viewport === ViewportBreakpoint.VERT_TABLET;
+    if (narrowViewport)
+        return true;
+    return !contentAreaFitsSplit({
+        contentAreaWidth: params.contentAreaWidth,
+        paneMinWidthPx: params.zoneConfig?.minWidth,
+    });
+}
+/**
+ * The adjacent zone a URL-restored resource may actually be placed in, or `undefined` when every
+ * adjacent zone is collapsed and the content belongs in PRIMARY.
+ *
+ * The URL path's counterpart to the resolver's collapse handling: same predicate, same inputs, so a
+ * deep link and a click cannot disagree about where a record lives at a given width.
+ */
+export function adjacentZoneUsableAtViewport(params) {
+    if (params.zone === NavigationZoneName.PRIMARY)
+        return true;
+    return !zoneIsCollapsedAtViewport({
+        zoneConfig: params.layout?.zones?.[params.zone],
+        viewport: params.viewport,
+        contentAreaWidth: params.contentAreaWidth,
+    });
+}
+//# sourceMappingURL=zone-collapse.js.map

package/dist/esm/core/navigation/zone-collapse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-collapse.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-collapse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAIzC;IACC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,KAAK,kBAAkB,CAAC,MAAM;WAC/D,MAAM,CAAC,QAAQ,KAAK,kBAAkB,CAAC,WAAW,CAAC;IACxD,IAAI,cAAc;QAAE,OAAO,IAAI,CAAC;IAChC,OAAO,CAAC,oBAAoB,CAAC;QAC3B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,cAAc,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ;KAC5C,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAK5C;IACC,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO,CAAC,yBAAyB,CAAC;QAChC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QAC/C,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;KAC1C,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { ViewportBreakpoint } from '@wildo-ai/zod-decorators';\nimport type { NavigationLayout, ZoneConfig } from '@wildo-ai/saas-models';\nimport { NavigationZoneName } from '@wildo-ai/saas-models';\n\nimport { contentAreaFitsSplit } from './split-fit';\n\n/**\n * Is an adjacent zone COLLAPSED right now — too narrow a viewport, or too narrow a content area?\n *\n * ## Why this is one function and not three conditions\n *\n * Three places answer this question, and until 2026-09-25 only one of them answered it completely:\n *\n * | asker | what it decides | what it used to read |\n * |---|---|---|\n * | `navigationPolicyResolver.resolveCollapseMode` | where a CLICK's content lands | viewport + content-area fit — correct |\n * | `NavigationContentAreas` | whether the pane is RENDERED | `isMobile` only |\n * | `NavigationUtils.resolveResourceTargetZone` | where a URL's content lands | nothing — it took no viewport at all |\n *\n * Both gaps produced a silent wrong result:\n *\n * - **The renderer's**: at VERT_TABLET (768–1023px) a declared `responsiveCollapse` retargets every\n *   click away from the pane while the pane keeps rendering — so a zone with `onEmpty: EMPTY_STATE`\n *   showed its \"select an item\" placeholder permanently, next to a list whose clicks went elsewhere.\n * - **The URL path's**: a depth ≥ 1 resource was routed to SECONDARY regardless of viewport, and the\n *   mobile render branch draws PRIMARY and nothing else — so a bookmarked or refreshed nested record\n *   on a phone showed its PARENT, silently. The click path was correct the whole time, which is what\n *   made it invisible: the same content reached the right place when clicked and the wrong place when\n *   linked to. Note the viewport WAS threaded into the adjacent depth-0 branch\n *   (`prefersAdjacentZoneForDetail`) and not into this one — one invariant, two sites, one of them\n *   done (`.claude/rules/invariant-call-site-enumeration.md`).\n *\n * @param contentAreaWidth  `undefined` until the first measurement, which answers \"fits\" — an\n *                          unmeasured area is not a narrow one. See `contentAreaFitsSplit`.\n */\nexport function zoneIsCollapsedAtViewport(params: {\n  zoneConfig: ZoneConfig | undefined;\n  viewport: ViewportBreakpoint | undefined;\n  contentAreaWidth?: number;\n}): boolean {\n  const narrowViewport = params.viewport === ViewportBreakpoint.MOBILE\n    || params.viewport === ViewportBreakpoint.VERT_TABLET;\n  if (narrowViewport) return true;\n  return !contentAreaFitsSplit({\n    contentAreaWidth: params.contentAreaWidth,\n    paneMinWidthPx: params.zoneConfig?.minWidth,\n  });\n}\n\n/**\n * The adjacent zone a URL-restored resource may actually be placed in, or `undefined` when every\n * adjacent zone is collapsed and the content belongs in PRIMARY.\n *\n * The URL path's counterpart to the resolver's collapse handling: same predicate, same inputs, so a\n * deep link and a click cannot disagree about where a record lives at a given width.\n */\nexport function adjacentZoneUsableAtViewport(params: {\n  zone: NavigationZoneName;\n  layout: NavigationLayout | undefined;\n  viewport: ViewportBreakpoint | undefined;\n  contentAreaWidth?: number;\n}): boolean {\n  if (params.zone === NavigationZoneName.PRIMARY) return true;\n  return !zoneIsCollapsedAtViewport({\n    zoneConfig: params.layout?.zones?.[params.zone],\n    viewport: params.viewport,\n    contentAreaWidth: params.contentAreaWidth,\n  });\n}\n"]}

package/dist/esm/core/navigation/zone-emphasis.d.ts

@@ -23,6 +23,9 @@ export declare function resolveEmphasizedZone(input: {
     isMobile: boolean;
     secondaryShown: boolean;
     companionShown: boolean;
+    /** Does the zone actually HOLD something? See the emptiness rule below. */
+    secondaryHasContent: boolean;
+    companionHasContent: boolean;
 }): NavigationZoneName.SECONDARY | NavigationZoneName.COMPANION | null;
 /**
  * Whether a keyboard Escape should restore the split.

package/dist/esm/core/navigation/zone-emphasis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zone-emphasis.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-emphasis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;CACzB,GAAG,kBAAkB,CAAC,SAAS,GAAG,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAKrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;CAC5B,GAAG,OAAO,CAOV"}
+{"version":3,"file":"zone-emphasis.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-emphasis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;GAkBG;AAqBH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,2EAA2E;IAC3E,mBAAmB,EAAE,OAAO,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,GAAG,kBAAkB,CAAC,SAAS,GAAG,kBAAkB,CAAC,SAAS,GAAG,IAAI,CASrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;CAC5B,GAAG,OAAO,CAOV"}

package/dist/esm/core/navigation/zone-emphasis.js

@@ -18,13 +18,35 @@ import { NavigationZoneName } from '@wildo-ai/saas-models';
  * to a responsive collapse and got it back should find it expanded again; clearing the request on
  * every non-honouring render would make emphasis flicker off under them.
  */
+/*
+ * ─── AN EMPTY ZONE IS NEVER EMPHASIZED, and that closes two ways of hiding the whole page ────────
+ *
+ * Emphasis hides every other structural zone, PRIMARY included (`primaryHidden = emphasized !== null`).
+ * Until 2026-09-25 it was released only when the requested zone was not SHOWN — and a zone whose
+ * `onEmpty` resolves to `EMPTY_STATE` is shown WHILE EMPTY, by construction.
+ *
+ * 1. **The pane empties while emphasized.** Navigate primary, let the dependency cleanup clear the
+ *    pane, or pop its last entry: the zone keeps its width, keeps being shown, keeps being
+ *    emphasized — and the entire content area becomes the pane's empty-state placeholder with the
+ *    page behind it `display: none`. An `EMPTY_STATE` zone is deliberately NOT dismissable
+ *    (`zoneIsDismissable`), so the only ways out were Escape and the emphasis toggle.
+ * 2. **The reader navigates the app.** Nothing cleared emphasis on navigation, so a sidebar click
+ *    mounted the new destination in a hidden PRIMARY. This rule covers that case too rather than
+ *    needing its own: an app-level navigation is a clean break, the clean break clears the adjacent
+ *    zones, and a cleared zone now releases emphasis.
+ *
+ * "Shown" and "holds something" are different questions, and emphasis needs both. Asking only the
+ * first is what made an empty pane able to take the whole window.
+ */
 export function resolveEmphasizedZone(input) {
     if (input.requested === null || input.isMobile)
         return null;
-    if (input.requested === NavigationZoneName.SECONDARY)
-        return input.secondaryShown ? NavigationZoneName.SECONDARY : null;
-    if (input.requested === NavigationZoneName.COMPANION)
-        return input.companionShown ? NavigationZoneName.COMPANION : null;
+    if (input.requested === NavigationZoneName.SECONDARY) {
+        return input.secondaryShown && input.secondaryHasContent ? NavigationZoneName.SECONDARY : null;
+    }
+    if (input.requested === NavigationZoneName.COMPANION) {
+        return input.companionShown && input.companionHasContent ? NavigationZoneName.COMPANION : null;
+    }
     return null;
 }
 /**

package/dist/esm/core/navigation/zone-emphasis.js.map

@@ -1 +1 @@
-{"version":3,"file":"zone-emphasis.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-emphasis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAKrC;IACC,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,KAAK,CAAC,SAAS,KAAK,kBAAkB,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxH,IAAI,KAAK,CAAC,SAAS,KAAK,kBAAkB,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxH,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAKtC;IACC,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACnF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,YAAY,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1E,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,OAAO,CAAC,iBAAiB;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAC5B,OAAO,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,QAAQ,CAAC;AACnE,CAAC","sourcesContent":["import { NavigationZoneName } from '@wildo-ai/saas-models';\n\n/**\n * The zone that actually takes the whole content area this render, given what the reader asked for\n * and what the layout can currently show.\n *\n * Pure, so the rule is pinned without a provider stack. The reader's request\n * (`NavigationContextType.emphasizedZone`) is a wish; this is the decision, and it yields the area\n * back in every case where honouring the wish would hide the page:\n *\n * - on MOBILE there is one zone already, so emphasis means nothing;\n * - a zone with NOTHING IN IT cannot be emphasized — an empty full-width pane over a hidden list is\n *   the blank screen the request was never about;\n * - PRIMARY is never emphasized: it has the whole area whenever nothing is beside it, and hiding the\n *   adjacent zones to \"emphasize\" primary would be the same as closing them, which is a navigation\n *   act with its own verbs.\n *\n * The request itself is left standing when it is not honoured. A reader who expanded a pane, lost it\n * to a responsive collapse and got it back should find it expanded again; clearing the request on\n * every non-honouring render would make emphasis flicker off under them.\n */\nexport function resolveEmphasizedZone(input: {\n  requested: NavigationZoneName | null;\n  isMobile: boolean;\n  secondaryShown: boolean;\n  companionShown: boolean;\n}): NavigationZoneName.SECONDARY | NavigationZoneName.COMPANION | null {\n  if (input.requested === null || input.isMobile) return null;\n  if (input.requested === NavigationZoneName.SECONDARY) return input.secondaryShown ? NavigationZoneName.SECONDARY : null;\n  if (input.requested === NavigationZoneName.COMPANION) return input.companionShown ? NavigationZoneName.COMPANION : null;\n  return null;\n}\n\n/**\n * Whether a keyboard Escape should restore the split.\n *\n * Escape is the universal \"leave this mode\" key and it is also what every text control, menu and\n * dialog listens for. Emphasis yields to all of them: a key pressed inside an editable control is\n * that control's, and a key pressed while an overlay is open belongs to the overlay (the overlay\n * layer sits above the content areas and has its own dismissal). What is left — Escape on the page\n * itself while a pane is emphasized — restores the split.\n */\nexport function escapeRestoresEmphasis(input: {\n  key: string;\n  emphasized: boolean;\n  overlayOpen: boolean;\n  target: EventTarget | null;\n}): boolean {\n  if (input.key !== 'Escape' || !input.emphasized || input.overlayOpen) return false;\n  const element = input.target instanceof HTMLElement ? input.target : null;\n  if (element === null) return true;\n  if (element.isContentEditable) return false;\n  const tag = element.tagName;\n  return tag !== 'INPUT' && tag !== 'TEXTAREA' && tag !== 'SELECT';\n}\n"]}
+{"version":3,"file":"zone-emphasis.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-emphasis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;GAkBG;AACH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAQrC;IACC,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,KAAK,CAAC,SAAS,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAKtC;IACC,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACnF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,YAAY,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1E,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,OAAO,CAAC,iBAAiB;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAC5B,OAAO,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,QAAQ,CAAC;AACnE,CAAC","sourcesContent":["import { NavigationZoneName } from '@wildo-ai/saas-models';\n\n/**\n * The zone that actually takes the whole content area this render, given what the reader asked for\n * and what the layout can currently show.\n *\n * Pure, so the rule is pinned without a provider stack. The reader's request\n * (`NavigationContextType.emphasizedZone`) is a wish; this is the decision, and it yields the area\n * back in every case where honouring the wish would hide the page:\n *\n * - on MOBILE there is one zone already, so emphasis means nothing;\n * - a zone with NOTHING IN IT cannot be emphasized — an empty full-width pane over a hidden list is\n *   the blank screen the request was never about;\n * - PRIMARY is never emphasized: it has the whole area whenever nothing is beside it, and hiding the\n *   adjacent zones to \"emphasize\" primary would be the same as closing them, which is a navigation\n *   act with its own verbs.\n *\n * The request itself is left standing when it is not honoured. A reader who expanded a pane, lost it\n * to a responsive collapse and got it back should find it expanded again; clearing the request on\n * every non-honouring render would make emphasis flicker off under them.\n */\n/*\n * ─── AN EMPTY ZONE IS NEVER EMPHASIZED, and that closes two ways of hiding the whole page ────────\n *\n * Emphasis hides every other structural zone, PRIMARY included (`primaryHidden = emphasized !== null`).\n * Until 2026-09-25 it was released only when the requested zone was not SHOWN — and a zone whose\n * `onEmpty` resolves to `EMPTY_STATE` is shown WHILE EMPTY, by construction.\n *\n * 1. **The pane empties while emphasized.** Navigate primary, let the dependency cleanup clear the\n *    pane, or pop its last entry: the zone keeps its width, keeps being shown, keeps being\n *    emphasized — and the entire content area becomes the pane's empty-state placeholder with the\n *    page behind it `display: none`. An `EMPTY_STATE` zone is deliberately NOT dismissable\n *    (`zoneIsDismissable`), so the only ways out were Escape and the emphasis toggle.\n * 2. **The reader navigates the app.** Nothing cleared emphasis on navigation, so a sidebar click\n *    mounted the new destination in a hidden PRIMARY. This rule covers that case too rather than\n *    needing its own: an app-level navigation is a clean break, the clean break clears the adjacent\n *    zones, and a cleared zone now releases emphasis.\n *\n * \"Shown\" and \"holds something\" are different questions, and emphasis needs both. Asking only the\n * first is what made an empty pane able to take the whole window.\n */\nexport function resolveEmphasizedZone(input: {\n  requested: NavigationZoneName | null;\n  isMobile: boolean;\n  secondaryShown: boolean;\n  companionShown: boolean;\n  /** Does the zone actually HOLD something? See the emptiness rule below. */\n  secondaryHasContent: boolean;\n  companionHasContent: boolean;\n}): NavigationZoneName.SECONDARY | NavigationZoneName.COMPANION | null {\n  if (input.requested === null || input.isMobile) return null;\n  if (input.requested === NavigationZoneName.SECONDARY) {\n    return input.secondaryShown && input.secondaryHasContent ? NavigationZoneName.SECONDARY : null;\n  }\n  if (input.requested === NavigationZoneName.COMPANION) {\n    return input.companionShown && input.companionHasContent ? NavigationZoneName.COMPANION : null;\n  }\n  return null;\n}\n\n/**\n * Whether a keyboard Escape should restore the split.\n *\n * Escape is the universal \"leave this mode\" key and it is also what every text control, menu and\n * dialog listens for. Emphasis yields to all of them: a key pressed inside an editable control is\n * that control's, and a key pressed while an overlay is open belongs to the overlay (the overlay\n * layer sits above the content areas and has its own dismissal). What is left — Escape on the page\n * itself while a pane is emphasized — restores the split.\n */\nexport function escapeRestoresEmphasis(input: {\n  key: string;\n  emphasized: boolean;\n  overlayOpen: boolean;\n  target: EventTarget | null;\n}): boolean {\n  if (input.key !== 'Escape' || !input.emphasized || input.overlayOpen) return false;\n  const element = input.target instanceof HTMLElement ? input.target : null;\n  if (element === null) return true;\n  if (element.isContentEditable) return false;\n  const tag = element.tagName;\n  return tag !== 'INPUT' && tag !== 'TEXTAREA' && tag !== 'SELECT';\n}\n"]}

package/dist/esm/core/navigation/zone-visible-entry.d.ts

@@ -23,4 +23,26 @@ import type { NavigationStackEntry } from './navigation.schemas';
  * @returns The index to render, or `-1` for an empty stack.
  */
 export declare function resolveVisibleEntryIndex(stack: NavigationStackEntry[], contentModel: NavigationZoneContentModel | undefined, activeTabId: string | undefined): number;
+/**
+ * Which entry a zone MUTATION acts on — the reducer's counterpart to {@link resolveVisibleEntryIndex}.
+ *
+ * ## Why it does not take the content model
+ *
+ * `resolveVisibleEntryIndex` is the renderer's answer and reads `contentModel` off the LAYOUT. The
+ * reducer has no layout, so it reads the one thing that is only ever written for a TABBED zone:
+ * `NavigationZoneState.activeTabId`. Absent, the acted-on entry is the top of the stack, which is
+ * the SINGLE contract exactly.
+ *
+ * ## Why it is a function and not two inline copies
+ *
+ * It was two, briefly, on 2026-09-25 — one in `replaceEntry` and one in `popEntry` — added in the
+ * change that deleted `useIsStackEntryActive` for being a third answer to the same question. Two
+ * copies with a rule of their own is the thing that change existed to remove, so they became this.
+ *
+ * A stale `activeTabId` matching no entry falls back to the top rather than dropping the write: a
+ * tab closed from under an id must not make the zone unwritable.
+ */
+export declare function zoneMutationTargetIndex(stack: readonly {
+    id: string;
+}[], activeTabId: string | undefined): number;
 //# sourceMappingURL=zone-visible-entry.d.ts.map

package/dist/esm/core/navigation/zone-visible-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zone-visible-entry.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-visible-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,oBAAoB,EAAE,EAC7B,YAAY,EAAE,0BAA0B,GAAG,SAAS,EACpD,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,CAuDR"}
+{"version":3,"file":"zone-visible-entry.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-visible-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,oBAAoB,EAAE,EAC7B,YAAY,EAAE,0BAA0B,GAAG,SAAS,EACpD,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,CAuDR;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAChC,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,CAIR"}

package/dist/esm/core/navigation/zone-visible-entry.js

@@ -73,4 +73,29 @@ export function resolveVisibleEntryIndex(stack, contentModel, activeTabId) {
     const activeIndex = stack.findIndex(entry => entry.id === activeTabId);
     return activeIndex >= 0 ? activeIndex : topIndex;
 }
+/**
+ * Which entry a zone MUTATION acts on — the reducer's counterpart to {@link resolveVisibleEntryIndex}.
+ *
+ * ## Why it does not take the content model
+ *
+ * `resolveVisibleEntryIndex` is the renderer's answer and reads `contentModel` off the LAYOUT. The
+ * reducer has no layout, so it reads the one thing that is only ever written for a TABBED zone:
+ * `NavigationZoneState.activeTabId`. Absent, the acted-on entry is the top of the stack, which is
+ * the SINGLE contract exactly.
+ *
+ * ## Why it is a function and not two inline copies
+ *
+ * It was two, briefly, on 2026-09-25 — one in `replaceEntry` and one in `popEntry` — added in the
+ * change that deleted `useIsStackEntryActive` for being a third answer to the same question. Two
+ * copies with a rule of their own is the thing that change existed to remove, so they became this.
+ *
+ * A stale `activeTabId` matching no entry falls back to the top rather than dropping the write: a
+ * tab closed from under an id must not make the zone unwritable.
+ */
+export function zoneMutationTargetIndex(stack, activeTabId) {
+    if (stack.length === 0)
+        return -1;
+    const activeIndex = activeTabId !== undefined ? stack.findIndex(entry => entry.id === activeTabId) : -1;
+    return activeIndex >= 0 ? activeIndex : stack.length - 1;
+}
 //# sourceMappingURL=zone-visible-entry.js.map

package/dist/esm/core/navigation/zone-visible-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"zone-visible-entry.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-visible-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAInE;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAA6B,EAC7B,YAAoD,EACpD,WAA+B;IAE/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAElC;;;;;;;;;;;;;;;;OAgBG;IACH,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAEhD,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,0BAA0B,CAAC,MAAM;YACpC,OAAO,QAAQ,CAAC;QAClB,KAAK,0BAA0B,CAAC,MAAM;YACpC,MAAM;QACR,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,sBAAsB,GAAU,YAAY,CAAC;YACnD;;;;;eAKG;YACH,MAAM,IAAI,KAAK,CACb,oCAAoC,MAAM,CAAC,sBAAsB,CAAC,yBAAyB;kBACzF,8EAA8E,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;IACvE,OAAO,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;AACnD,CAAC","sourcesContent":["/**\n * Which entry of a zone's stack is the VISIBLE one — the single behavioural difference between the\n * two `NavigationZoneContentModel` members (#411).\n *\n * Both models keep every entry mounted. `SINGLE` shows the TOP of the stack and BACK pops it;\n * `TABBED` shows the ACTIVE tab and the rest are one click away. Everything else about the two\n * renderings is identical, so this function is the whole distinction and is the only place it is\n * decided.\n *\n * It exists as a named pure function rather than an expression inside `ZoneContentRenderer` because\n * that expression is what `TABBED` was missing for its entire life: the member was declared,\n * documented as \"parallel tabs, tab bar visible\", validated by the layout schema and selected by one\n * of the framework's own shipped presets, while the renderer showed the top of the stack — with no\n * error. A behaviour that is one inline ternary is a behaviour nothing can pin.\n */\n\nimport { NavigationZoneContentModel } from '@wildo-ai/saas-models';\n\nimport type { NavigationStackEntry } from './navigation.schemas';\n\n/**\n * @param stack        The zone's entries, oldest first.\n * @param contentModel The zone's DECLARED content model. `undefined` reads as `SINGLE` — the schema\n *                     default, and the behaviour every zone had before a model was declarable.\n * @param activeTabId  `NavigationZoneState.activeTabId`. Ignored outside `TABBED`.\n * @returns The index to render, or `-1` for an empty stack.\n */\nexport function resolveVisibleEntryIndex(\n  stack: NavigationStackEntry[],\n  contentModel: NavigationZoneContentModel | undefined,\n  activeTabId: string | undefined,\n): number {\n  if (stack.length === 0) return -1;\n\n  const topIndex = stack.length - 1;\n\n  /*\n   * ─── EXHAUSTIVE ON PURPOSE: a new content model must not be able to ship silently ───────────────\n   *\n   * This switch is the fourth item of #411, and it is the one that outlives the other three. All\n   * three behaviours that issue fixed failed the SAME way — declared in a vocabulary, validated by a\n   * schema, selected by a config, and read by no renderer, with no error — and `TABBED` is the\n   * clearest case because the framework's own preset chose it and got a single stack.\n   *\n   * A `switch` with a `never` assignment turns the next such member into a COMPILE error at the\n   * exact place a renderer has to exist. That is strictly stronger than a runtime warning, which\n   * fires only if someone happens to configure the member and happens to be reading the console;\n   * `preset-navigation.ts` selected TABBED for months with nobody reading anything.\n   *\n   * `undefined` (the schema default, and every zone that predates the field) is handled BEFORE the\n   * switch so that adding a member cannot be satisfied by widening a `default:` arm — there is no\n   * `default:` arm to widen.\n   */\n  if (contentModel === undefined) return topIndex;\n\n  switch (contentModel) {\n    case NavigationZoneContentModel.SINGLE:\n      return topIndex;\n    case NavigationZoneContentModel.TABBED:\n      break;\n    default: {\n      const unrenderedContentModel: never = contentModel;\n      /*\n       * Unreachable while the switch is exhaustive. Kept as a THROW rather than a silent fallback\n       * because the alternative — quietly returning the top entry — is precisely the degradation\n       * this whole guard exists to make impossible, and a build that somehow reaches here (a value\n       * from an older bundle, a cast) should say so rather than pretend.\n       */\n      throw new Error(\n        `[navigation] Zone content model '${String(unrenderedContentModel)}' reaches no renderer. `\n        + 'Add a case to resolveVisibleEntryIndex, and the rendering that case implies.',\n      );\n    }\n  }\n\n  /*\n   * The TOP entry is the fallback in two situations, and both are ordinary rather than exceptional:\n   * nothing has been activated yet (the frame after the first tab opens), and `activeTabId` names an\n   * entry the stack no longer holds (a tab closed while it was active). Rendering nothing in either\n   * case would blank the zone under a full tab bar.\n   *\n   * Falling back to the TOP rather than the FIRST is deliberate: the newest tab is the one the user\n   * just caused to exist, so it is the one they are looking for.\n   */\n  const activeIndex = stack.findIndex(entry => entry.id === activeTabId);\n  return activeIndex >= 0 ? activeIndex : topIndex;\n}\n"]}
+{"version":3,"file":"zone-visible-entry.js","sourceRoot":"","sources":["../../../../../src/core/navigation/zone-visible-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAInE;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAA6B,EAC7B,YAAoD,EACpD,WAA+B;IAE/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAElC;;;;;;;;;;;;;;;;OAgBG;IACH,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAEhD,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,0BAA0B,CAAC,MAAM;YACpC,OAAO,QAAQ,CAAC;QAClB,KAAK,0BAA0B,CAAC,MAAM;YACpC,MAAM;QACR,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,sBAAsB,GAAU,YAAY,CAAC;YACnD;;;;;eAKG;YACH,MAAM,IAAI,KAAK,CACb,oCAAoC,MAAM,CAAC,sBAAsB,CAAC,yBAAyB;kBACzF,8EAA8E,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;IACvE,OAAO,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;AACnD,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAgC,EAChC,WAA+B;IAE/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxG,OAAO,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3D,CAAC","sourcesContent":["/**\n * Which entry of a zone's stack is the VISIBLE one — the single behavioural difference between the\n * two `NavigationZoneContentModel` members (#411).\n *\n * Both models keep every entry mounted. `SINGLE` shows the TOP of the stack and BACK pops it;\n * `TABBED` shows the ACTIVE tab and the rest are one click away. Everything else about the two\n * renderings is identical, so this function is the whole distinction and is the only place it is\n * decided.\n *\n * It exists as a named pure function rather than an expression inside `ZoneContentRenderer` because\n * that expression is what `TABBED` was missing for its entire life: the member was declared,\n * documented as \"parallel tabs, tab bar visible\", validated by the layout schema and selected by one\n * of the framework's own shipped presets, while the renderer showed the top of the stack — with no\n * error. A behaviour that is one inline ternary is a behaviour nothing can pin.\n */\n\nimport { NavigationZoneContentModel } from '@wildo-ai/saas-models';\n\nimport type { NavigationStackEntry } from './navigation.schemas';\n\n/**\n * @param stack        The zone's entries, oldest first.\n * @param contentModel The zone's DECLARED content model. `undefined` reads as `SINGLE` — the schema\n *                     default, and the behaviour every zone had before a model was declarable.\n * @param activeTabId  `NavigationZoneState.activeTabId`. Ignored outside `TABBED`.\n * @returns The index to render, or `-1` for an empty stack.\n */\nexport function resolveVisibleEntryIndex(\n  stack: NavigationStackEntry[],\n  contentModel: NavigationZoneContentModel | undefined,\n  activeTabId: string | undefined,\n): number {\n  if (stack.length === 0) return -1;\n\n  const topIndex = stack.length - 1;\n\n  /*\n   * ─── EXHAUSTIVE ON PURPOSE: a new content model must not be able to ship silently ───────────────\n   *\n   * This switch is the fourth item of #411, and it is the one that outlives the other three. All\n   * three behaviours that issue fixed failed the SAME way — declared in a vocabulary, validated by a\n   * schema, selected by a config, and read by no renderer, with no error — and `TABBED` is the\n   * clearest case because the framework's own preset chose it and got a single stack.\n   *\n   * A `switch` with a `never` assignment turns the next such member into a COMPILE error at the\n   * exact place a renderer has to exist. That is strictly stronger than a runtime warning, which\n   * fires only if someone happens to configure the member and happens to be reading the console;\n   * `preset-navigation.ts` selected TABBED for months with nobody reading anything.\n   *\n   * `undefined` (the schema default, and every zone that predates the field) is handled BEFORE the\n   * switch so that adding a member cannot be satisfied by widening a `default:` arm — there is no\n   * `default:` arm to widen.\n   */\n  if (contentModel === undefined) return topIndex;\n\n  switch (contentModel) {\n    case NavigationZoneContentModel.SINGLE:\n      return topIndex;\n    case NavigationZoneContentModel.TABBED:\n      break;\n    default: {\n      const unrenderedContentModel: never = contentModel;\n      /*\n       * Unreachable while the switch is exhaustive. Kept as a THROW rather than a silent fallback\n       * because the alternative — quietly returning the top entry — is precisely the degradation\n       * this whole guard exists to make impossible, and a build that somehow reaches here (a value\n       * from an older bundle, a cast) should say so rather than pretend.\n       */\n      throw new Error(\n        `[navigation] Zone content model '${String(unrenderedContentModel)}' reaches no renderer. `\n        + 'Add a case to resolveVisibleEntryIndex, and the rendering that case implies.',\n      );\n    }\n  }\n\n  /*\n   * The TOP entry is the fallback in two situations, and both are ordinary rather than exceptional:\n   * nothing has been activated yet (the frame after the first tab opens), and `activeTabId` names an\n   * entry the stack no longer holds (a tab closed while it was active). Rendering nothing in either\n   * case would blank the zone under a full tab bar.\n   *\n   * Falling back to the TOP rather than the FIRST is deliberate: the newest tab is the one the user\n   * just caused to exist, so it is the one they are looking for.\n   */\n  const activeIndex = stack.findIndex(entry => entry.id === activeTabId);\n  return activeIndex >= 0 ? activeIndex : topIndex;\n}\n\n/**\n * Which entry a zone MUTATION acts on — the reducer's counterpart to {@link resolveVisibleEntryIndex}.\n *\n * ## Why it does not take the content model\n *\n * `resolveVisibleEntryIndex` is the renderer's answer and reads `contentModel` off the LAYOUT. The\n * reducer has no layout, so it reads the one thing that is only ever written for a TABBED zone:\n * `NavigationZoneState.activeTabId`. Absent, the acted-on entry is the top of the stack, which is\n * the SINGLE contract exactly.\n *\n * ## Why it is a function and not two inline copies\n *\n * It was two, briefly, on 2026-09-25 — one in `replaceEntry` and one in `popEntry` — added in the\n * change that deleted `useIsStackEntryActive` for being a third answer to the same question. Two\n * copies with a rule of their own is the thing that change existed to remove, so they became this.\n *\n * A stale `activeTabId` matching no entry falls back to the top rather than dropping the write: a\n * tab closed from under an id must not make the zone unwritable.\n */\nexport function zoneMutationTargetIndex(\n  stack: readonly { id: string }[],\n  activeTabId: string | undefined,\n): number {\n  if (stack.length === 0) return -1;\n  const activeIndex = activeTabId !== undefined ? stack.findIndex(entry => entry.id === activeTabId) : -1;\n  return activeIndex >= 0 ? activeIndex : stack.length - 1;\n}\n"]}

package/dist/esm/core/requests/websockets/WebSocketContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketContext.d.ts","sourceRoot":"","sources":["../../../../../../src/core/requests/websockets/WebSocketContext.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebSocketContext.d.ts","sourceRoot":"","sources":["../../../../../../src/core/requests/websockets/WebSocketContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAA2B,SAAS,EAA2C,MAAM,OAAO,CAAC;AAM3G,OAAO,EAaL,sBAAsB,EASvB,MAAM,uBAAuB,CAAC;AA6E/B;;;;GAIG;AAEH,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,YAAY,iBAAiB;CAC9B;AAED,KAAK,+BAA+B,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAsDlH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;;;;;;OAkBG;IACH,qBAAqB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8CAA8C;IAC9C,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpD;AAoCD,MAAM,WAAW,oBAAoB;IAEnC,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,cAAc,EAAE,CAAC;IAGlC,OAAO,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IAC3C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAGtF,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC9E,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,IAAI,CAAC;IACpE,IAAI,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;IAGvD,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAC5B,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,0BAA0B,EAAE,+BAA+B,CAAC;KAC7D,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAC7D,iBAAiB,EAAE,CAAC,MAAM,EAAE;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,0BAA0B,EAAE,+BAA+B,CAAC;KAC7D,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAC7D,uBAAuB,EAAE,CAAC,MAAM,EAAE;QAChC,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,0BAA0B,EAAE,+BAA+B,CAAC;KAC7D,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,0BAA0B,EAAE,+BAA+B,CAAC;KAC7D,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGpB,YAAY,EAAE,CAAC,MAAM,EAAE;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,0BAA0B,EAAE,+BAA+B,CAAC;KAC7D,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvB,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAK,IAAI,CAAC;IAGX,eAAe,EAAE,CAAC,MAAM,EAAE;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,0BAA0B,EAAE,+BAA+B,CAAC;QAC5D,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,KAAK,IAAI,CAAC;IAGX,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClF,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAGlF,iBAAiB,EAAE,MAAM;QACvB,MAAM,EAAE,eAAe,CAAC;QACxB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QACnB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;KAC1B,CAAC;CACH;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAA8D,CAAC;AAa5I,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,CA46C/D,CAAC"}

package/dist/esm/core/requests/websockets/WebSocketContext.js

@@ -4,7 +4,7 @@ import { io } from 'socket.io-client';
 import axios from 'axios';
 import { errorManagement } from '../../../core/errors/error-management.frontend.service.js';
 import { ResourceOperationRiskLevel, WildoHeaderKeys } from '@wildo-ai/saas-models';
-import { CoreWebSocketEvent, CoreWebSocketConnectionErrorCode, buildResourceRoomName, buildScopeRoomName, safeValidateWebSocketPayload, WebSocketEventSchemas, } from '@wildo-ai/saas-models';
+import { CoreWebSocketEvent, CoreWebSocketConnectionErrorCode, WebSocketSystemErrorCode, buildResourceRoomName, buildScopeRoomName, safeValidateWebSocketPayload, WebSocketEventSchemas, } from '@wildo-ai/saas-models';
 import { fullJitterBackoffMs } from '../../../core/requests/network-backoff.frontend.utils.js';
 import { getClientInstanceId } from '../../../core/requests/client-instance-id.frontend.service.js';
 import { envLoader } from '../../../core/runtime/env-variable-loader.frontend.service.js';
@@ -216,6 +216,9 @@ export const WebSocketProvider = ({ children }) => {
     // still renew once the backend returns), so this never suppresses legitimate
     // recovery. See `MAX_CONSECUTIVE_WS_AUTH_RENEWALS`.
     const authRenewalStreakRef = useRef(0);
+    // The organization a refused ORGANIZATION_SWITCH already triggered a re-handshake for (#1597). One resync per
+    // intended organization, reset by the next switch, so a switch the server keeps refusing cannot loop.
+    const switchResyncForOrganizationRef = useRef(null);
     const reconnectTimeoutRef = useRef(null);
     const reconnectAttemptsRef = useRef(0);
     // Backoff counter for the connectivity SUPERVISOR's watchdog probes (see the
@@ -567,7 +570,7 @@ export const WebSocketProvider = ({ children }) => {
             authRenewalStreakRef.current = 0;
         });
         socket.on(CoreWebSocketEvent.SYSTEM_ERROR, (payload) => {
-            if (payload?.code === 'AUTH_REFRESH_FAILED') {
+            if (payload?.code === WebSocketSystemErrorCode.AUTH_REFRESH_FAILED) {
                 // A live in-place `AUTH_REFRESH` emit was rejected — the token we believed
                 // fresh did not validate (clock skew, a sub-second expiry race, or the
                 // credential genuinely went stale on a long-lived connected socket while
@@ -580,7 +583,23 @@ export const WebSocketProvider = ({ children }) => {
                 requestAuthRenewal('live refresh rejected');
                 return;
             }
-            if (payload?.code === 'RATE_LIMIT_EXCEEDED') {
+            if (payload?.code === WebSocketSystemErrorCode.ORGANIZATION_SWITCH_FORBIDDEN) {
+                // The server kept this connection in its PREVIOUS organization — its rooms, its subscription checks — while the
+                // UI has moved on (#1597). Left alone that lasts until some later reconnect. Re-handshake ONCE per intended
+                // organization: the handshake carries the latest token and the organization the user switched to, and the
+                // server re-derives everything from them. The handshake applies its own rules — a revoked session or an
+                // expired token fails it, an organization the user is not in is not honoured — and the once-per-organization
+                // guard keeps a refusal from looping.
+                const intendedOrganizationId = authStateRef.current.organizationId;
+                if (intendedOrganizationId && switchResyncForOrganizationRef.current !== intendedOrganizationId) {
+                    switchResyncForOrganizationRef.current = intendedOrganizationId;
+                    console.warn('WebSocket: Organization switch refused; re-handshaking into the intended organization', payload);
+                    socket.disconnect();
+                    socket.connect();
+                }
+                return;
+            }
+            if (payload?.code === WebSocketSystemErrorCode.RATE_LIMIT_EXCEEDED) {
                 const errorMessage = payload.message || 'Too many real-time requests. Please slow down.';
                 const detailsContext = normalizeSystemErrorDetails(payload.details);
                 console.warn('WebSocket: Rate limit exceeded', payload);
@@ -1179,28 +1198,44 @@ export const WebSocketProvider = ({ children }) => {
      * Switch organization context
      */
     const switchOrganization = useCallback((organizationId, previousOrganizationId) => {
+        // The organization this connection should be in from now on — recorded FIRST, connected or not (review 4). Every
+        // later handshake must carry it: a transport drop, the resync after a refused switch, a revival that rebuilds the
+        // socket from the stored config. A switch made while the socket was down used to return before this, so the
+        // reconnect reopened the PREVIOUS organization with nothing left to correct it.
+        authStateRef.current = { ...authStateRef.current, organizationId };
+        if (configRef.current)
+            configRef.current = { ...configRef.current, organizationId };
+        switchResyncForOrganizationRef.current = null;
+        // The previous organization's rooms are released whether or not the socket is up (#1597, review 5). Released while
+        // connected, each release unsubscribes; released while disconnected, the claims are simply dropped — otherwise the
+        // reconnect replays every claimed room, and the previous organization's rooms would be re-requested under the new
+        // one, where they no longer belong.
+        const releasePreviousOrganizationRooms = () => {
+            if (!previousOrganizationId)
+                return;
+            const roomsToRelease = Array.from(roomClaimsRef.current.values())
+                .filter((room) => roomMatchesOrganization(room, previousOrganizationId))
+                .flatMap((room) => Array.from(room.ownerKeys).map((ownerKey) => ({
+                ownerKey,
+                resourceType: room.resourceType,
+                resourceId: room.resourceId,
+                scopeKey: room.scopeKey,
+                scopeId: room.scopeId,
+                contextResourceIdentifiers: room.ownerContexts.get(ownerKey) ?? room.contextResourceIdentifiers,
+            })));
+            void Promise.all(roomsToRelease.map((room) => releaseResourceRoom(room)));
+        };
         if (!socketRef.current?.connected) {
-            console.warn('Cannot switch organization: not connected');
+            // Nothing to emit: the next handshake carries the organization recorded above.
+            console.warn('Organization switch recorded while not connected; the next handshake will carry it');
+            releasePreviousOrganizationRooms();
             return;
         }
         socketRef.current.emit(CoreWebSocketEvent.ORGANIZATION_SWITCH, {
             organizationId,
             previousOrganizationId,
         });
-        if (!previousOrganizationId) {
-            return;
-        }
-        const roomsToRelease = Array.from(roomClaimsRef.current.values())
-            .filter((room) => roomMatchesOrganization(room, previousOrganizationId))
-            .flatMap((room) => Array.from(room.ownerKeys).map((ownerKey) => ({
-            ownerKey,
-            resourceType: room.resourceType,
-            resourceId: room.resourceId,
-            scopeKey: room.scopeKey,
-            scopeId: room.scopeId,
-            contextResourceIdentifiers: room.ownerContexts.get(ownerKey) ?? room.contextResourceIdentifiers,
-        })));
-        void Promise.all(roomsToRelease.map((room) => releaseResourceRoom(room)));
+        releasePreviousOrganizationRooms();
     }, [releaseResourceRoom]);
     /**
      * Start editing a resource (acquire lock)