@omerdlw/base-framework 2.0.1 → 3.0.1

package/README.md

@@ -33,6 +33,7 @@ For in-depth architecture guides and module-by-module references, explore the [`
 - 🖱️ **[Context Menu (`context-menu`)](./docs/modules/context-menu.md)** — Viewport clamping, declarative menus
 - 🎛️ **[Controls Module (`controls`)](./docs/modules/controls.md)** — Paired HUD action rails beside the dock
 - ⏳ **[Loading & Skeleton (`loading`)](./docs/modules/loading.md)** — Coordinated loading, anti-flicker delay
+- 🧭 **[Navigation (`navigation`)](./docs/modules/navigation.md)** — Exit holds, payload for the next page, back-button hold, intent prefetch
 - 🎵 **[Media Transport (`media`)](./docs/modules/media.md)** — Session sync, leader vs audible displacement
 - 🔒 **[Result Pattern (`result`)](./docs/modules/result.md)** — Functional `Result<T, E>`, `ok()`, `err()`
 - 🛡️ **[Error Boundary (`error-boundary`)](./docs/modules/error-boundary.md)** — Isolated boundaries, deduplicating reporter
@@ -42,7 +43,7 @@ For in-depth architecture guides and module-by-module references, explore the [`
 ## ✨ Features
 
 - ⚡ **Microkernel Architecture:** Ultra-lean orchestration host with topological module dependency sorting, transactional multi-source registry, and atomic route lifecycle commits.
-- 🧩 **First-Party Declarative UI Modules:** 9 production-tested modules (`dock`, `modal`, `notification`, `ambient`, `background`, `context-menu`, `controls`, `loading`, `media`) that communicate strictly through typed contracts without tight coupling.
+- 🧩 **First-Party Declarative UI Modules:** 10 production-tested modules (`dock`, `modal`, `notification`, `ambient`, `background`, `context-menu`, `controls`, `loading`, `media`, `navigation`) that communicate strictly through typed contracts without tight coupling.
 - 🎯 **Single Route Declaration (`usePage`):** Cleanly declare titles, navigation cards, modals, loading states, and background media in a single atomic hook call.
 - 🔒 **Type-Safe Result Pattern (`Result<T, E>`):** Functional, bulletproof error handling with `ok()`, `err()`, and direct feedback bridging via `toast.fromResult()`.
 - 🛡️ **Cross-Bundle Context Deduplication:** Guarantees stable React Context singletons across Next.js split chunks and monorepo boundaries.
@@ -76,6 +77,7 @@ import { notificationModule } from "@omerdlw/base-framework/modules/notification
 import { ambientModule } from "@omerdlw/base-framework/modules/ambient";
 import { backgroundModule } from "@omerdlw/base-framework/modules/background";
 import { loadingModule } from "@omerdlw/base-framework/modules/loading";
+import { navigationModule } from "@omerdlw/base-framework/modules/navigation";
 
 const modules = [
   dockModule,
@@ -84,6 +86,7 @@ const modules = [
   ambientModule,
   backgroundModule,
   loadingModule,
+  navigationModule,
 ];
 
 export function Providers({ children }: { children: React.ReactNode }) {

package/dist/{chunk-XASQT4CQ.js → chunk-66EYJBIP.js}

@@ -68,6 +68,7 @@ function calculateRemainingMinDuration(startTime, minDuration, now = Date.now())
   return remaining > 0 ? remaining : 0;
 }
 var LoadingContext = getOrCreateGlobalContext("LoadingContext", null);
+var MANUAL_TASK = "manual";
 var NOOP_LOADING_STORE = createStore(
   DEFAULT_LOADING_STATE_WITH_PAGE
 );
@@ -78,6 +79,8 @@ function LoadingProvider({ children }) {
   const startTimeRef = useRef(null);
   const minDurationRef = useRef(0);
   const stopTimerRef = useRef(null);
+  const tasksRef = useRef([]);
+  const nextTaskRef = useRef(1);
   const registryLoading = useRegistryValue(
     "loading",
     LOADING_REGISTRY_KEY
@@ -94,31 +97,47 @@ function LoadingProvider({ children }) {
     startTimeRef.current = null;
     setManualState(DEFAULT_LOADING_STATE);
   }, [clearStopTimer]);
-  const startLoading = useCallback(
-    (options = {}) => {
+  const beginTask = useCallback(
+    (key, options) => {
       clearStopTimer();
       const nextState = normalizeLoadingOptions(options);
-      startTimeRef.current = Date.now();
-      minDurationRef.current = nextState.minDuration;
-      setManualState({
-        ...nextState,
-        isLoading: true
-      });
+      const tasks = tasksRef.current.filter((task) => task.key !== key);
+      tasks.push({ key, state: nextState });
+      tasksRef.current = tasks;
+      startTimeRef.current ??= Date.now();
+      minDurationRef.current = Math.max(minDurationRef.current, nextState.minDuration);
+      setManualState({ ...nextState, isLoading: true });
     },
     [clearStopTimer]
   );
-  const stopLoading = useCallback(() => {
-    const remaining = calculateRemainingMinDuration(
-      startTimeRef.current,
-      minDurationRef.current
-    );
-    if (remaining <= 0) {
-      resetState();
-      return;
-    }
-    clearStopTimer();
-    stopTimerRef.current = setTimeout(resetState, remaining);
-  }, [clearStopTimer, resetState]);
+  const endTask = useCallback(
+    (key) => {
+      const tasks = tasksRef.current;
+      if (!tasks.some((task) => task.key === key)) return;
+      tasksRef.current = tasks.filter((task) => task.key !== key);
+      const latest = tasksRef.current.at(-1);
+      if (latest) {
+        setManualState({ ...latest.state, isLoading: true });
+        return;
+      }
+      const remaining = calculateRemainingMinDuration(
+        startTimeRef.current,
+        minDurationRef.current
+      );
+      if (remaining <= 0) {
+        resetState();
+        return;
+      }
+      clearStopTimer();
+      stopTimerRef.current = setTimeout(resetState, remaining);
+    },
+    [clearStopTimer, resetState]
+  );
+  const startLoading = useCallback(
+    (options = {}) => beginTask(MANUAL_TASK, options),
+    [beginTask]
+  );
+  const stopLoading = useCallback(() => endTask(MANUAL_TASK), [endTask]);
   const setLoading = useCallback(
     (value2) => {
       if (value2) startLoading();
@@ -129,21 +148,22 @@ function LoadingProvider({ children }) {
   const setSkeleton = useCallback((nextSkeleton) => {
     setManualState((currentState) => {
       const skeleton = typeof nextSkeleton === "function" ? nextSkeleton(currentState.skeleton) : nextSkeleton;
+      const latest = tasksRef.current.at(-1);
+      if (latest) latest.state = { ...latest.state, skeleton };
       return currentState.skeleton === skeleton ? currentState : { ...currentState, skeleton };
     });
   }, []);
   const withLoading = useCallback(
     async (task, options = {}) => {
-      startLoading(
-        typeof options === "string" ? { message: options } : options
-      );
+      const key = nextTaskRef.current++;
+      beginTask(key, typeof options === "string" ? { message: options } : options);
       try {
         return typeof task === "function" ? await task() : await task;
       } finally {
-        stopLoading();
+        endTask(key);
       }
     },
-    [startLoading, stopLoading]
+    [beginTask, endTask]
   );
   useEffect(() => clearStopTimer, [clearStopTimer]);
   const state = useMemo(
@@ -276,5 +296,5 @@ var loadingModule = defineModule({
 });
 
 export { DEFAULT_LOADING_STATE, DEFAULT_LOADING_STATE_WITH_PAGE, INERT_LOADING_ACTIONS, LOADING_REGISTRY_KEY, LoadingContext, LoadingOverlay, LoadingProvider, NOOP_LOADING_STORE, calculateRemainingMinDuration, defineLoading, loadingModule, loadingTheme, normalizeLoadingOptions, resolveLoadingState, selectPageLoading, useLoading, useLoadingActions, useLoadingOverlayModel, useLoadingRegistration, useLoadingState, useOptionalLoadingActions, useOptionalLoadingState };
-//# sourceMappingURL=chunk-XASQT4CQ.js.map
-//# sourceMappingURL=chunk-XASQT4CQ.js.map
+//# sourceMappingURL=chunk-66EYJBIP.js.map
+//# sourceMappingURL=chunk-66EYJBIP.js.map

package/dist/chunk-66EYJBIP.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/modules/loading/constants.ts","../src/modules/loading/state.ts","../src/modules/loading/context.tsx","../src/modules/loading/hooks.ts","../src/modules/loading/overlay.tsx","../src/modules/loading/module.tsx"],"names":["value","useMemo","jsx"],"mappings":"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","file":"chunk-66EYJBIP.js","sourcesContent":["import { defineThemeSpec } from \"@/theme\";\nimport {\n  type LoadingActions,\n  type LoadingState,\n  type LoadingStateWithPage,\n  type LoadingThemeSlot,\n} from \"./types\";\n\nexport const DEFAULT_LOADING_STATE: LoadingState = Object.freeze({\n  isLoading: false,\n  skeleton: null,\n  minDuration: 0,\n  showOverlay: true,\n  message: null,\n});\n\nexport const DEFAULT_LOADING_STATE_WITH_PAGE: LoadingStateWithPage = Object.freeze({\n  ...DEFAULT_LOADING_STATE,\n  isPageLoading: false,\n});\n\nexport const INERT_LOADING_ACTIONS: LoadingActions = Object.freeze({\n  setLoading: () => {},\n  setSkeleton: () => {},\n  startLoading: () => {},\n  stopLoading: () => {},\n  withLoading: async <T,>(task: Promise<T> | (() => Promise<T>)) =>\n    typeof task === \"function\" ? task() : task,\n});\n\nexport const LOADING_REGISTRY_KEY = \"page-loading\";\n\nexport const loadingTheme = defineThemeSpec<LoadingThemeSlot>(\"loading\");\n","import {\n  type LoadingOptions,\n  type LoadingPageConfig,\n  type LoadingState,\n  type LoadingStateWithPage,\n} from \"./types\";\n\nexport function normalizeLoadingOptions(\n  options: LoadingOptions = {},\n): Omit<LoadingState, \"isLoading\"> {\n  const minDuration = Number(options.minDuration);\n  return {\n    message: typeof options.message === \"string\" ? options.message : null,\n    minDuration:\n      Number.isFinite(minDuration) && minDuration > 0 ? minDuration : 0,\n    showOverlay: options.showOverlay !== false,\n    skeleton: options.skeleton ?? null,\n  };\n}\n\nexport function selectPageLoading(\n  loading: LoadingPageConfig | null | undefined,\n): LoadingOptions | null {\n  if (loading === undefined || loading === null) return null;\n  if (typeof loading === \"boolean\") return { isLoading: loading };\n  if (typeof loading === \"string\") return { isLoading: true, message: loading };\n  return loading;\n}\n\nexport function resolveLoadingState(\n  manualState: LoadingState,\n  registryLoading?: LoadingOptions | null,\n): LoadingStateWithPage {\n  if (registryLoading?.isLoading) {\n    const normalized = normalizeLoadingOptions(registryLoading);\n    return {\n      ...normalized,\n      isLoading: true,\n      isPageLoading: true,\n    };\n  }\n  return {\n    ...manualState,\n    isPageLoading: manualState.isLoading,\n  };\n}\n\nexport function calculateRemainingMinDuration(\n  startTime: number | null,\n  minDuration: number,\n  now = Date.now(),\n): number {\n  if (startTime === null || minDuration <= 0) return 0;\n  const elapsed = now - startTime;\n  const remaining = minDuration - elapsed;\n  return remaining > 0 ? remaining : 0;\n}\n","\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport { useIsomorphicLayoutEffect } from \"@/hooks\";\nimport {\n  getOrCreateGlobalContext,\n  useRegistryValue,\n} from \"@/kernel\";\nimport { createStore } from \"@/utils\";\nimport {\n  DEFAULT_LOADING_STATE,\n  DEFAULT_LOADING_STATE_WITH_PAGE,\n  LOADING_REGISTRY_KEY,\n} from \"./constants\";\nimport {\n  calculateRemainingMinDuration,\n  normalizeLoadingOptions,\n  resolveLoadingState,\n} from \"./state\";\nimport {\n  type LoadingActions,\n  type LoadingContextValue,\n  type LoadingOptions,\n  type LoadingProviderProps,\n  type LoadingState,\n  type LoadingStateWithPage,\n  type SkeletonValue,\n} from \"./types\";\n\nexport const LoadingContext =\n  getOrCreateGlobalContext<LoadingContextValue | null>(\"LoadingContext\", null);\n\nconst MANUAL_TASK = \"manual\";\ntype LoadingTaskKey = typeof MANUAL_TASK | number;\n\ninterface LoadingTask {\n  key: LoadingTaskKey;\n  state: Omit<LoadingState, \"isLoading\">;\n}\n\nexport const NOOP_LOADING_STORE = createStore<LoadingStateWithPage>(\n  DEFAULT_LOADING_STATE_WITH_PAGE,\n);\n\nexport function LoadingProvider({ children }: LoadingProviderProps) {\n  const [manualState, setManualState] = useState<LoadingState>(\n    DEFAULT_LOADING_STATE,\n  );\n\n  const startTimeRef = useRef<number | null>(null);\n  const minDurationRef = useRef<number>(0);\n  const stopTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);\n  // What is loading, oldest first: the `startLoading` switch and each\n  // `withLoading` task. The overlay shows the latest and stays up until the\n  // last one ends, so one task finishing does not hide another.\n  const tasksRef = useRef<LoadingTask[]>([]);\n  const nextTaskRef = useRef(1);\n\n  const registryLoading = useRegistryValue<\"loading\", LoadingOptions>(\n    \"loading\",\n    LOADING_REGISTRY_KEY,\n  );\n\n  const clearStopTimer = useCallback(() => {\n    if (stopTimerRef.current !== null) {\n      clearTimeout(stopTimerRef.current);\n      stopTimerRef.current = null;\n    }\n  }, []);\n\n  const resetState = useCallback(() => {\n    clearStopTimer();\n    minDurationRef.current = 0;\n    startTimeRef.current = null;\n    setManualState(DEFAULT_LOADING_STATE);\n  }, [clearStopTimer]);\n\n  const beginTask = useCallback(\n    (key: LoadingTaskKey, options: LoadingOptions) => {\n      clearStopTimer();\n      const nextState = normalizeLoadingOptions(options);\n      const tasks = tasksRef.current.filter((task) => task.key !== key);\n      tasks.push({ key, state: nextState });\n      tasksRef.current = tasks;\n      startTimeRef.current ??= Date.now();\n      minDurationRef.current = Math.max(minDurationRef.current, nextState.minDuration);\n      setManualState({ ...nextState, isLoading: true });\n    },\n    [clearStopTimer],\n  );\n\n  const endTask = useCallback(\n    (key: LoadingTaskKey) => {\n      const tasks = tasksRef.current;\n      if (!tasks.some((task) => task.key === key)) return;\n      tasksRef.current = tasks.filter((task) => task.key !== key);\n      const latest = tasksRef.current.at(-1);\n      if (latest) {\n        setManualState({ ...latest.state, isLoading: true });\n        return;\n      }\n\n      const remaining = calculateRemainingMinDuration(\n        startTimeRef.current,\n        minDurationRef.current,\n      );\n      if (remaining <= 0) {\n        resetState();\n        return;\n      }\n      clearStopTimer();\n      stopTimerRef.current = setTimeout(resetState, remaining);\n    },\n    [clearStopTimer, resetState],\n  );\n\n  const startLoading = useCallback(\n    (options: LoadingOptions = {}) => beginTask(MANUAL_TASK, options),\n    [beginTask],\n  );\n\n  const stopLoading = useCallback(() => endTask(MANUAL_TASK), [endTask]);\n\n  const setLoading = useCallback(\n    (value: boolean) => {\n      if (value) startLoading();\n      else stopLoading();\n    },\n    [startLoading, stopLoading],\n  );\n\n  const setSkeleton = useCallback((nextSkeleton: SkeletonValue) => {\n    setManualState((currentState) => {\n      const skeleton =\n        typeof nextSkeleton === \"function\"\n          ? nextSkeleton(currentState.skeleton)\n          : nextSkeleton;\n\n      const latest = tasksRef.current.at(-1);\n      if (latest) latest.state = { ...latest.state, skeleton };\n      return currentState.skeleton === skeleton\n        ? currentState\n        : { ...currentState, skeleton };\n    });\n  }, []);\n\n  const withLoading = useCallback(\n    async <T,>(\n      task: Promise<T> | (() => Promise<T>),\n      options: LoadingOptions | string = {},\n    ): Promise<T> => {\n      const key = nextTaskRef.current++;\n      beginTask(key, typeof options === \"string\" ? { message: options } : options);\n      try {\n        return typeof task === \"function\" ? await task() : await task;\n      } finally {\n        endTask(key);\n      }\n    },\n    [beginTask, endTask],\n  );\n\n  useEffect(() => clearStopTimer, [clearStopTimer]);\n\n  const state = useMemo<LoadingStateWithPage>(\n    () => resolveLoadingState(manualState, registryLoading),\n    [manualState, registryLoading],\n  );\n\n  const actions = useMemo<LoadingActions>(\n    () => ({\n      setLoading,\n      setSkeleton,\n      startLoading,\n      stopLoading,\n      withLoading,\n    }),\n    [setLoading, setSkeleton, startLoading, stopLoading, withLoading],\n  );\n\n  const [store] = useState(() =>\n    createStore<LoadingStateWithPage>(state, { freezeSnapshots: false }),\n  );\n  useIsomorphicLayoutEffect(() => {\n    store.publish(state);\n  }, [state, store]);\n\n  const value = useMemo<LoadingContextValue>(\n    () => ({ actions, store }),\n    [actions, store],\n  );\n\n  return <LoadingContext value={value}>{children}</LoadingContext>;\n}\n","\"use client\";\n\nimport { useContext, useMemo } from \"react\";\nimport {\n  useIsFullscreenStateActive,\n  useRequiredContext,\n  useStore,\n} from \"@/hooks\";\nimport {\n  useModuleRegistration,\n  type RegistryMetadata,\n} from \"@/kernel\";\nimport { useModuleTheme } from \"@/theme\";\nimport {\n  INERT_LOADING_ACTIONS,\n  loadingTheme,\n} from \"./constants\";\nimport {\n  LoadingContext,\n  NOOP_LOADING_STORE,\n} from \"./context\";\nimport {\n  type LoadingActions,\n  type LoadingPageConfig,\n  type LoadingStateWithPage,\n  type LoadingTheme,\n} from \"./types\";\n\nexport function useLoadingRegistration(\n  config: LoadingPageConfig | null | undefined,\n  options?: RegistryMetadata & { enabled?: boolean },\n): void {\n  useModuleRegistration(\"loading\", config, options);\n}\n\nexport function useLoadingState(): LoadingStateWithPage {\n  const { store } = useRequiredContext(\n    LoadingContext,\n    \"useLoadingState\",\n    \"LoadingProvider\",\n  );\n  return useStore(store);\n}\n\nexport function useLoadingActions(): LoadingActions {\n  return useRequiredContext(\n    LoadingContext,\n    \"useLoadingActions\",\n    \"LoadingProvider\",\n  ).actions;\n}\n\nexport function useLoading(\n  config?: LoadingPageConfig | null,\n  options?: RegistryMetadata & { enabled?: boolean },\n): LoadingStateWithPage & LoadingActions {\n  useLoadingRegistration(config, options);\n\n  const actions = useLoadingActions();\n  const state = useLoadingState();\n\n  return useMemo(() => ({ ...state, ...actions }), [actions, state]);\n}\n\nexport function useOptionalLoadingState(): LoadingStateWithPage;\nexport function useOptionalLoadingState<T>(\n  selector: (state: LoadingStateWithPage) => T,\n  isEqual?: (a: T, b: T) => boolean,\n): T;\nexport function useOptionalLoadingState<T = LoadingStateWithPage>(\n  selector?: (state: LoadingStateWithPage) => T,\n  isEqual?: (a: T, b: T) => boolean,\n): T {\n  const ctx = useContext(LoadingContext);\n  return useStore(\n    ctx?.store ?? NOOP_LOADING_STORE,\n    selector as (state: LoadingStateWithPage) => T,\n    isEqual,\n  );\n}\n\nexport function useOptionalLoadingActions(): LoadingActions {\n  const ctx = useContext(LoadingContext);\n  return ctx?.actions ?? INERT_LOADING_ACTIONS;\n}\n\nexport function useLoadingOverlayModel(): {\n  skeleton: React.ReactNode | null;\n  isVisible: boolean;\n  theme: LoadingTheme;\n} {\n  const { isLoading, skeleton, showOverlay } = useLoadingState();\n  const isFullscreenStateActive = useIsFullscreenStateActive();\n  const isVisible = isLoading && showOverlay && !isFullscreenStateActive;\n\n  const theme = useModuleTheme(loadingTheme);\n\n  return { skeleton, isVisible, theme };\n}\n","\"use client\";\n\nimport { Spinner } from \"@/atoms\";\nimport { useLoadingOverlayModel } from \"./hooks\";\n\nexport function LoadingOverlay() {\n  const { skeleton, isVisible, theme } = useLoadingOverlayModel();\n  if (!isVisible) return null;\n  return (\n    <div\n      className={theme.slots.overlay}\n      aria-label=\"Loading\"\n      aria-busy=\"true\"\n      role=\"status\"\n      style={theme.styles.overlay}\n    >\n      {skeleton || <Spinner size={30} />}\n    </div>\n  );\n}\n","\"use client\";\n\nimport { useMemo } from \"react\";\nimport { defineModule, type PageModuleApi } from \"@/kernel\";\nimport { LOADING_REGISTRY_KEY } from \"./constants\";\nimport {\n  LoadingContext,\n  LoadingProvider,\n} from \"./context\";\nimport {\n  useLoading,\n  useLoadingActions,\n} from \"./hooks\";\nimport { selectPageLoading } from \"./state\";\nimport { LoadingOverlay } from \"./overlay\";\nimport {\n  type DefinedLoading,\n  type LoadingOptions,\n  type LoadingPageApi,\n  type LoadingPageConfig,\n} from \"./types\";\n\nfunction useLoadingPage(\n  _slice: LoadingOptions | null,\n  page: PageModuleApi,\n): LoadingPageApi {\n  const actions = useLoadingActions();\n  return useMemo(\n    () => ({\n      ...actions,\n      set: (loading: LoadingPageConfig) => page.set({ loading }),\n    }),\n    [actions, page],\n  );\n}\n\nexport function defineLoading(\n  definition: (LoadingOptions & { id?: string }) | string = {},\n): DefinedLoading {\n  const { id = \"loading\", ...config }: LoadingOptions & { id?: string } =\n    selectPageLoading(definition) ?? {};\n\n  return Object.freeze({\n    config,\n    id,\n    use: function useDefinedLoading(overrides = {}, options = {}) {\n      return useLoading(\n        { ...config, ...selectPageLoading(overrides) },\n        options,\n      );\n    },\n  });\n}\n\nexport const loadingModule = defineModule({\n  id: \"loading\",\n  context: LoadingContext,\n  Provider: LoadingProvider,\n  Overlay: LoadingOverlay,\n  registry: {\n    cleanupDelayMs: 600,\n    keyPolicy: \"singleton\",\n    lifecycle: \"graceful\",\n    singletonKey: LOADING_REGISTRY_KEY,\n  },\n  page: {\n    select: (config) => selectPageLoading(config.loading),\n    entries: (slice: LoadingOptions) => [\n      { key: LOADING_REGISTRY_KEY, value: slice },\n    ],\n    use: useLoadingPage,\n  },\n});\n\ndeclare module \"@omerdlw/base-framework/kernel\" {\n  interface CoreModules {\n    loading: typeof loadingModule;\n  }\n  interface PageConfig {\n    loading?: LoadingPageConfig;\n  }\n}\n"]}

package/dist/{chunk-6SG7V77J.js → chunk-HHWRTQKQ.js}

@@ -130,10 +130,12 @@ var DEFAULT_CSS_VAR_NAMES = Object.freeze({
   tone: "--ambient-{role}-{tone}"
 });
 var DEFAULT_PROXY = "/api/ambient/proxy?url=";
+var DEFAULT_LINGER_MS = 3e3;
 var createDefaults = () => ({
   analysis: { ...DEFAULT_ANALYSIS },
   cacheLimit: 100,
   cssVars: { ...DEFAULT_CSS_VAR_NAMES, tones: AMBIENT_TONES },
+  linger: DEFAULT_LINGER_MS,
   proxy: DEFAULT_PROXY,
   strategy: "auto",
   worker: null
@@ -148,6 +150,7 @@ function mergeAmbientSettings(base, input) {
     analysis: { ...base.analysis, ...input.analysis },
     cacheLimit: input.cacheLimit ?? base.cacheLimit,
     cssVars: { ...base.cssVars, ...input.cssVars },
+    linger: input.linger ?? base.linger,
     proxy: input.proxy === void 0 ? base.proxy : input.proxy,
     strategy: input.strategy ?? base.strategy,
     worker: input.worker === void 0 ? base.worker : input.worker
@@ -238,6 +241,7 @@ function kmeans(points, weights, requested, { iterations = 16, lightnessWeight =
 }
 
 // src/modules/ambient/analyze.ts
+var AMBIENT_ANALYSIS_VERSION = 2;
 var MIN_CHROMA = 0.022;
 var MIN_PRESENCE = 0.03;
 var MIN_POPULATION = 4e-3;
@@ -294,26 +298,47 @@ function pickBest(items, score) {
   return best;
 }
 var round3 = (value) => Math.round(value * 1e3) / 1e3;
-function buildSwatch(source, { cap, max, min, rel }, fallback, fromImage, minContrast) {
-  const h = source?.h ?? fallback.h;
-  const l = clamp(source?.l ?? fallback.l, min, max);
-  const tone = toneOf(h, l, rel, cap);
+function skinLikeness({ c, h, l }) {
+  return (1 - smoothstep(12, 26, hueDistance(h, 54))) * smoothstep(0.02, 0.035, c) * (1 - smoothstep(0.11, 0.15, c)) * smoothstep(0.26, 0.38, l) * (1 - smoothstep(0.88, 0.95, l));
+}
+var warmth = (h) => 1 - smoothstep(22, 50, hueDistance(h, 42));
+var salience = (color) => 1 - 0.65 * skinLikeness(color);
+var roleChroma = (source, { cap, gain }) => Math.min(
+  cap * (1 - 0.3 * warmth(source.h)),
+  // A faint tint is raised further, so it still reads as a colour.
+  Math.max(source.c * gain, Math.min(0.05, source.c * 1.6)) * (1 - 0.3 * skinLikeness(source))
+);
+var fitTone = (h, l, c) => ({
+  c: Math.max(0, Math.min(c, maxChroma(l, h) * 0.96)),
+  h,
+  l
+});
+function buildSwatch(tone, population, fromImage, minContrast) {
+  const room = maxChroma(tone.l, tone.h) * 0.96;
+  const rel = room > 0 ? tone.c / room : 0;
   const ramp = {};
   for (const step of AMBIENT_TONES) {
-    ramp[step] = formatOklch(toneOf(h, step / 100, rel, cap));
+    ramp[step] = formatOklch(toneOf(tone.h, step / 100, rel, Math.max(tone.c, 0.04)));
   }
   return {
     c: round3(tone.c),
     color: formatOklch(tone),
     fromImage,
-    h: Math.round(h * 10) / 10,
+    h: Math.round(tone.h * 10) / 10,
     l: round3(tone.l),
     on: formatOklch(onColorFor(tone, minContrast)),
-    population: round3(source?.pop ?? 0),
+    population: round3(population),
     ramp
   };
 }
-var lift = (rel, base, gain, ceiling) => clamp(base + gain * rel, 0, ceiling);
+function roleTone(source, spec, fallback, dilution = 1) {
+  if (!source) return fitTone(fallback.h, clamp(fallback.l, spec.min, spec.max), fallback.c);
+  return fitTone(
+    source.h,
+    clamp(source.l, spec.min, spec.max),
+    roleChroma(source, spec) * dilution
+  );
+}
 function clusterAmbientPixels(pixels, options) {
   const { data, width, height } = pixels;
   const bounds = options.letterbox ? findContentBounds(pixels) : { bottom: height, left: 0, right: width, top: 0 };
@@ -385,18 +410,23 @@ function clusterAmbientPixels(pixels, options) {
       points[i * 3 + 2] = b;
       weights[i] = w * (1 + 5 * Math.sqrt(a * a + b * b));
     });
-    const { assignment, centroids, k } = kmeans(points, weights, budgets[group]);
-    const pop = new Float64Array(k);
-    members.forEach((bin, i) => pop[assignment[i]] += binSums[bin * 4 + 3]);
+    const { assignment, k } = kmeans(points, weights, budgets[group]);
+    const sums = new Float64Array(k * 4);
+    members.forEach((bin, i) => {
+      for (let channel = 0; channel < 4; channel++) {
+        sums[assignment[i] * 4 + channel] += binSums[bin * 4 + channel];
+      }
+    });
     const index = new Int32Array(k).fill(-1);
     for (let j = 0; j < k; j++) {
-      if (pop[j] <= 0) continue;
-      const lch = labToLch([centroids[j * 3], centroids[j * 3 + 1], centroids[j * 3 + 2]]);
+      const pop = sums[j * 4 + 3];
+      if (pop <= 0) continue;
+      const lch = labToLch([sums[j * 4] / pop, sums[j * 4 + 1] / pop, sums[j * 4 + 2] / pop]);
       const room = maxChroma(lch.l, lch.h);
       index[j] = clusters.length;
       clusters.push({
         ...lch,
-        pop: pop[j] / total,
+        pop: pop / total,
         rel: room > 0 ? clamp(lch.c / room, 0, 1) : 0,
         rely: reliability(lch.l)
       });
@@ -404,20 +434,26 @@ function clusterAmbientPixels(pixels, options) {
     members.forEach((bin, i) => clusterOfBin[bin] = index[assignment[i]]);
   });
   const regionWeights = AMBIENT_REGIONS.map(() => new Float64Array(clusters.length));
+  const regionLab = AMBIENT_REGIONS.map(() => new Float64Array(clusters.length * 3));
   for (let i = 0; i < pixelBins.length; i++) {
     const bin = pixelBins[i];
     if (bin < 0) continue;
     const cluster = clusterOfBin[bin];
     const bits = pixelRegions[i];
+    const w = binSums[bin * 4 + 3];
     AMBIENT_REGIONS.forEach((region, r) => {
-      if (bits & REGION_BITS[region]) regionWeights[r][cluster] += 1;
+      if (!(bits & REGION_BITS[region])) return;
+      regionWeights[r][cluster] += 1;
+      for (let channel = 0; channel < 3; channel++) {
+        regionLab[r][cluster * 3 + channel] += binSums[bin * 4 + channel] / w;
+      }
     });
   }
-  return { clusters, meanL, regionWeights };
+  return { clusters, meanL, regionLab, regionWeights };
 }
 function analyzeAmbientPixels(pixels, overrides = {}) {
   const options = { ...DEFAULT_ANALYSIS, ...overrides };
-  const { clusters, meanL, regionWeights } = clusterAmbientPixels(pixels, options);
+  const { clusters, meanL, regionLab, regionWeights } = clusterAmbientPixels(pixels, options);
   const chromatic = clusters.filter(isChromatic);
   const presence = chromatic.reduce(
     (sum, cluster) => sum + cluster.pop * colorfulness(cluster.c) * cluster.rely,
@@ -426,7 +462,7 @@ function analyzeAmbientPixels(pixels, overrides = {}) {
   const neutral = presence < MIN_PRESENCE;
   const dilution = 0.55 + 0.45 * Math.min(1, presence / 0.25);
   const { minContrast, minHueDistance } = options;
-  const grey = { h: 0, l: clamp(meanL, 0.3, 0.8) };
+  const grey = { c: 0, h: 0, l: clamp(meanL, 0.3, 0.8) };
   const family = /* @__PURE__ */ new Map();
   for (const cluster of chromatic) {
     let share2 = 0;
@@ -436,69 +472,62 @@ function analyzeAmbientPixels(pixels, overrides = {}) {
     family.set(cluster, share2);
   }
   const share = (cluster) => family.get(cluster) ?? cluster.pop;
-  const withShare = (cluster) => cluster ? { ...cluster, pop: share(cluster) } : null;
-  const dominantPick = neutral ? null : pickBest(chromatic, (cluster) => share(cluster) * cluster.c * cluster.rely);
+  const dominantPick = neutral ? null : pickBest(
+    chromatic,
+    (cluster) => share(cluster) * cluster.c * cluster.rely * salience(cluster)
+  );
   const vividPick = neutral ? null : pickBest(
     chromatic.filter((cluster) => share(cluster) >= MIN_POPULATION),
-    (cluster) => cluster.c * cluster.c * Math.pow(share(cluster), 0.3) * cluster.rely
+    (cluster) => cluster.c * cluster.c * Math.pow(share(cluster), 0.3) * cluster.rely * salience(cluster)
   );
   const accentPick = pickBest(
     chromatic.filter(
       (cluster) => neutral ? share(cluster) >= 6e-3 && cluster.c >= 0.06 : share(cluster) >= MIN_POPULATION && cluster.c >= 0.035 && (!dominantPick || hueDistance(cluster.h, dominantPick.h) >= minHueDistance)
     ),
-    (cluster) => Math.pow(share(cluster), 0.6) * cluster.c * cluster.rely
+    (cluster) => Math.pow(share(cluster), 0.6) * cluster.c * cluster.rely * salience(cluster)
   );
   const mutedPick = neutral ? null : pickBest(
     chromatic.filter((cluster) => cluster.c <= 0.09),
     (cluster) => share(cluster) * cluster.rely * (1 - cluster.c / 0.12)
   );
   const dominantHue = dominantPick?.h ?? vividPick?.h ?? 0;
+  const accentSource = accentPick ?? vividPick;
   const roles = {
     dominant: buildSwatch(
-      withShare(dominantPick),
-      {
-        cap: 0.22,
-        max: 0.74,
-        min: 0.42,
-        rel: dominantPick ? lift(dominantPick.rel, 0.25, 0.85, 0.9) : 0
-      },
-      grey,
+      roleTone(dominantPick, { cap: 0.2, gain: 1.15, max: 0.74, min: 0.42 }, grey),
+      dominantPick ? share(dominantPick) : 0,
       true,
       minContrast
     ),
     vibrant: buildSwatch(
-      withShare(vividPick),
-      {
-        cap: 0.24,
-        max: 0.84,
-        min: 0.62,
-        rel: vividPick ? lift(vividPick.rel, 0.4, 0.75, 0.95) * dilution : 0
-      },
-      { h: dominantHue, l: 0.78 },
+      roleTone(
+        vividPick,
+        { cap: 0.22, gain: 1.35, max: 0.84, min: 0.62 },
+        { c: 0, h: dominantHue, l: 0.78 },
+        dilution
+      ),
+      vividPick ? share(vividPick) : 0,
       true,
       minContrast
     ),
     muted: buildSwatch(
-      withShare(mutedPick),
-      {
-        cap: 0.08,
-        max: 0.66,
-        min: 0.38,
-        rel: mutedPick ? clamp(mutedPick.rel, 0.1, 0.3) : dominantPick ? 0.2 : 0
-      },
-      { h: dominantHue, l: clamp(meanL, 0.38, 0.66) },
+      roleTone(
+        mutedPick,
+        { cap: 0.07, gain: 1, max: 0.66, min: 0.38 },
+        { c: dominantPick ? 0.035 : 0, h: dominantHue, l: clamp(meanL, 0.38, 0.66) }
+      ),
+      mutedPick ? share(mutedPick) : 0,
       Boolean(mutedPick) || neutral,
       minContrast
     ),
     accent: buildSwatch(
-      withShare(accentPick ?? vividPick),
-      {
-        cap: 0.24,
-        max: 0.8,
-        min: 0.55,
-        rel: accentPick ?? vividPick ? lift((accentPick ?? vividPick).rel, 0.35, 0.75, 0.92) * dilution : 0
-      },
-      { h: dominantHue, l: 0.72 },
+      roleTone(
+        accentSource,
+        { cap: 0.22, gain: 1.3, max: 0.8, min: 0.55 },
+        { c: 0, h: dominantHue, l: 0.72 },
+        dilution
+      ),
+      accentSource ? share(accentSource) : 0,
       Boolean(accentPick),
       minContrast
     )
@@ -515,35 +544,39 @@ function analyzeAmbientPixels(pixels, overrides = {}) {
     options.shadowLightness - 0.02,
     options.shadowLightness + 0.02
   );
-  const shadow = deepSource ? toneOf(deepSource.h, shadowL, lift(deepSource.rel, 0.3, 0.7, 0.85), 0.1) : { c: 0, h: 0, l: shadowL };
+  const shadow = deepSource ? toneOf(deepSource.h, shadowL, clamp(0.3 + 0.7 * deepSource.rel, 0, 0.85), 0.1) : { c: 0, h: 0, l: shadowL };
   const regions = {};
   AMBIENT_REGIONS.forEach((region, r) => {
     const weights = regionWeights[r];
+    const lab = regionLab[r];
     let regionTotal = 0;
     let regionL = 0;
     clusters.forEach((cluster, j) => {
       regionTotal += weights[j];
       regionL += cluster.l * weights[j];
     });
-    const share2 = (j) => regionTotal > 0 ? weights[j] / regionTotal : 0;
     let strength = 0;
     let pick = null;
     let pickScore = 0;
-    clusters.forEach((cluster, j) => {
-      if (!isChromatic(cluster)) return;
-      strength += share2(j) * colorfulness(cluster.c) * cluster.rely;
-      const score = share2(j) * cluster.c * cluster.rely;
+    clusters.forEach((_, j) => {
+      const count = weights[j];
+      if (count <= 0) return;
+      const local = labToLch([lab[j * 3] / count, lab[j * 3 + 1] / count, lab[j * 3 + 2] / count]);
+      const rely = reliability(local.l);
+      if (local.c < MIN_CHROMA || rely <= 0) return;
+      const part = count / regionTotal;
+      strength += part * colorfulness(local.c) * rely;
+      const score = part * local.c * rely * salience(local);
       if (score > pickScore) {
         pickScore = score;
-        pick = cluster;
+        pick = local;
       }
     });
     const chosen = neutral || strength < MIN_PRESENCE ? null : pick;
-    const tone = chosen ? toneOf(
+    const tone = chosen ? fitTone(
       chosen.h,
       clamp(chosen.l, 0.42, 0.72),
-      lift(chosen.rel, 0.25, 0.85, 0.9),
-      0.22
+      roleChroma(chosen, { cap: 0.18, gain: 1.15 })
     ) : {
       c: 0,
       h: 0,
@@ -572,6 +605,6 @@ function fitSample(width, height, size) {
   };
 }
 
-export { analyzeAmbientPixels, configureAmbient, contrastRatio, findContentBounds, fitSample, formatOklch, getAmbientSettings, maxChroma, onColorFor, resolveAnalysis, srgbToOklab, toneOf };
-//# sourceMappingURL=chunk-6SG7V77J.js.map
-//# sourceMappingURL=chunk-6SG7V77J.js.map
+export { AMBIENT_ANALYSIS_VERSION, analyzeAmbientPixels, configureAmbient, contrastRatio, findContentBounds, fitSample, formatOklch, getAmbientSettings, maxChroma, onColorFor, resolveAnalysis, srgbToOklab, toneOf };
+//# sourceMappingURL=chunk-HHWRTQKQ.js.map
+//# sourceMappingURL=chunk-HHWRTQKQ.js.map