refactor: limit runtimeState core exports to consumed seams

Only the cores exercised by tests remain exported (startCore, addTimeCore, updateCore, getExpectedTimesCore, loadGroupFlagAndEndCore). The rest stay parameterized but module private until a consumer needs them. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD
test: cover hot reload and add direct calculation tests for runtimeState cores
2026-09-10 16:49:41 +00:00 · 2026-07-04 14:54:56 +00:00 · 2026-07-04 14:53:01 +00:00 · 2026-07-04 10:01:02 +00:00 · 2026-07-04 09:57:06 +00:00 · 2026-07-04 09:55:56 +00:00
164 changed files with 4158 additions and 6403 deletions
@@ -1,5 +0,0 @@
 # CodeGraph data files — local to each machine, not for committing.
 # Ignore everything in .codegraph/ except this file itself, so transient
 # files (the database, daemon.pid, sockets, logs) never show up in git.
 *
 !.gitignore
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/cli",
-  "version": "4.11.0",
+  "version": "4.10.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "4.11.0",
+  "version": "4.10.0",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -6,7 +6,6 @@ import {
  ProjectRundownsList,
  RenumberCues,
  Rundown,
  RundownImportPayload,
  TransientEventPayload,
 } from 'ontime-types';
@@ -83,15 +82,6 @@ export async function deleteRundown(rundownId: RundownId): Promise<AxiosResponse
  return axios.delete(`${rundownPath}/${rundownId}`);
 }
 /**
 * HTTP request to apply an imported rundown using a merge strategy or into a new rundown
 */
 export async function importRundownWithOptions(
  payload: RundownImportPayload,
 ): Promise<AxiosResponse<ProjectRundownsList>> {
  return axios.post(`${rundownPath}/import`, payload);
 }
 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================
@@ -1,14 +0,0 @@
 .kbd {
  display: inline-block;
  min-width: 1.5rem;
  padding: 0.0625rem 0.375rem;
  border-radius: 2px;
  background-color: $gray-1100;
  color: $ui-white;
  box-shadow: 0 0 3px rgba(0, 0, 0, 0.4);
  font-family: monospace;
  font-size: calc(1rem - 4px);
  line-height: 1.5;
  text-align: center;
  white-space: nowrap;
 }
@@ -1,7 +0,0 @@
 import { PropsWithChildren } from 'react';
 import style from './Kbd.module.scss';
 export default function Kbd({ children }: PropsWithChildren) {
  return <kbd className={style.kbd}>{children}</kbd>;
 }
@@ -20,7 +20,7 @@
 .wide {
  top: 4vh;
  min-width: min(1280px, 96vw);
-  max-width: min(1800px, 98vw);
+  max-width: min(1600px, 96vw);
  height: 88vh;
  max-height: 88vh;
  display: flex;
@@ -38,6 +38,8 @@ $progress-bar-br: 3px;
 .multiprogress-bar__indicator-bar {
  background-color: var(--background-color-override, $ui-black);
  opacity: 0.8;
  transition: 1s linear;
  transition-property: width;
  .multiprogress-bar--ignore-css-override & {
    background-color: $ui-black;
@@ -1,6 +1,5 @@
 import { MaybeNumber } from 'ontime-types';
 import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
 import { getProgress } from '../../utils/getProgress';
 import { cx } from '../../utils/styleUtils';
@@ -35,7 +34,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
    className = '',
  } = props;
-  const percentRemaining = 100 - useAnimatedProgress(now, complete);
+  const percentRemaining = 100 - getProgress(now, complete);
  const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
  const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
  const isOvertime = now !== null && now < 0;
@@ -1,8 +1,6 @@
 import { useDisclosure, useHotkeys } from '@mantine/hooks';
 import { memo } from 'react';
 import { useSearchParams } from 'react-router';
 import { hasCustomParams, useSavedViewParams } from '../../stores/savedViewParams';
 import { useViewParamsEditorStore } from '../view-params-editor/viewParamsEditor.store';
 import FloatingNavigation from './floating-navigation/FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
@@ -19,9 +17,6 @@ export default memo(ViewNavigationMenu);
 function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNavigationMenuProps) {
  const [isMenuOpen, menuHandler] = useDisclosure();
  const { open: showEditFormDrawer } = useViewParamsEditorStore();
  const [searchParams] = useSearchParams();
  const savedParams = useSavedViewParams((store) => store.params);
  const hasSavedChanges = hasCustomParams(searchParams) || Object.keys(savedParams).length > 0;
  useHotkeys([
    [
@@ -51,7 +46,6 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
      <FloatingNavigation
        toggleMenu={isNavigationLocked ? undefined : menuHandler.toggle}
        toggleSettings={suppressSettings ? undefined : showEditFormDrawer}
        hasSavedChanges={hasSavedChanges}
      />
      {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />}
    </>
@@ -1,29 +1,4 @@
 .trailing {
  display: inline-flex;
  align-items: center;
  gap: 0.5rem;
  margin-left: auto;
 }
 .linkIcon {
  margin-left: auto;
  @include rotate-fourty-five;
 }
 .indicator {
  width: 0.5rem;
  height: 0.5rem;
  border-radius: 50%;
  background-color: $active-indicator;
  pointer-events: none;
  flex-shrink: 0;
 }
 .clear {
  opacity: 0.6;
  transition: opacity $transition-time-action;
  &:hover,
  &:focus-visible {
    opacity: 1;
  }
 }
@@ -1,17 +1,9 @@
-import { MouseEvent, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
-import { IoArrowUp, IoCloseOutline } from 'react-icons/io5';
+import { IoArrowUp } from 'react-icons/io5';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
+import { useNavigate } from 'react-router';
 import { useElectronEvent } from '../../../hooks/useElectronEvent';
 import {
  hasCustomParams,
  reservedParams,
  stripReservedParams,
  useSavedViewParams,
 } from '../../../stores/savedViewParams';
 import { handleLinks } from '../../../utils/linkUtils';
 import IconButton from '../../buttons/IconButton';
 import Tooltip from '../../tooltip/Tooltip';
 import NavigationMenuItem from '../navigation-menu-item/NavigationMenuItem';
 import style from './ClientLink.module.scss';
@@ -24,104 +16,32 @@ interface ClientLinkProps {
 export default function ClientLink({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
  const { isElectron } = useElectronEvent();
  const navigate = useNavigate();
  if (isElectron) {
    return (
-      <ElectronNavigationItem current={current} to={to} postAction={postAction}>
+      <NavigationMenuItem
        active={current}
        onClick={() => {
          handleLinks(to);
          postAction?.();
        }}
      >
        {children}
-      </ElectronNavigationItem>
+        <IoArrowUp className={style.linkIcon} />
      </NavigationMenuItem>
    );
  }
  return (
-    <BrowserNavigationItem current={current} to={to} postAction={postAction}>
+    <NavigationMenuItem
      active={current}
      onClick={() => {
        navigate(`/${to}`);
        postAction?.();
      }}
    >
      {children}
    </BrowserNavigationItem>
  );
 }
 function ElectronNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
  const navigateToLink = () => {
    handleLinks(to);
    postAction?.();
  };
  return (
    <NavigationMenuItem active={current} onClick={navigateToLink}>
      {children}
      <span className={style.trailing}>
        <IoArrowUp className={style.linkIcon} />
      </span>
    </NavigationMenuItem>
  );
 }
 function BrowserNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
  const navigate = useNavigate();
  const location = useLocation();
  const [searchParams, setSearchParams] = useSearchParams();
  const { params: savedParams, save, clear } = useSavedViewParams();
  /**
   * Save the params of the view we are leaving and resolve the destination,
   * restoring any params previously saved for the target view.
   */
  const resolveDestination = () => {
    const currentView = location.pathname.replace(/^\//, '');
    save(currentView, stripReservedParams(location.search));
    const restored = savedParams[to];
    return `${to}${restored ? `?${restored}` : ''}`;
  };
  const isCustomised = current ? hasCustomParams(searchParams) : Boolean(savedParams[to]);
  const navigateToLink = () => {
    const destination = resolveDestination();
    navigate(`/${destination}`);
    postAction?.();
  };
  /**
   * Clear the saved settings for this route without navigating to it.
   * When it is the current view, also reset the live URL to its defaults.
   */
  const clearViewSettings = (event: MouseEvent) => {
    event.stopPropagation();
    clear(to);
    // if mounted, clear the URL params
    if (current) {
      const preserved = new URLSearchParams();
      reservedParams.forEach((key) => {
        const value = searchParams.get(key);
        if (value !== null) preserved.set(key, value);
      });
      setSearchParams(preserved);
    }
  };
  return (
    <NavigationMenuItem active={current} onClick={navigateToLink}>
      {children}
      {isCustomised && (
        <span className={style.trailing}>
          <span className={style.indicator} aria-hidden data-testid='client-link__saved-indicator' />
          <Tooltip
            text='Reset to default'
            render={
              <IconButton
                variant='ghosted-white'
                size='small'
                className={style.clear}
                aria-label='Reset to default'
                onClick={clearViewSettings}
              />
            }
          >
            <IoCloseOutline />
          </Tooltip>
        </span>
      )}
    </NavigationMenuItem>
  );
 }
@@ -22,19 +22,3 @@
  top: 0;
  z-index: $zindex-nav;
 }
 .buttonWithIndicator {
  position: relative;
  display: inline-flex;
 }
 .indicator {
  position: absolute;
  top: -0.15rem;
  right: -0.15rem;
  width: 0.6rem;
  height: 0.6rem;
  border-radius: 50%;
  background-color: $active-indicator;
  pointer-events: none;
 }
@@ -9,10 +9,9 @@ import style from './FloatingNavigation.module.scss';
 interface FloatingNavigationProps {
  toggleMenu?: () => void;
  toggleSettings?: () => void;
  hasSavedChanges?: boolean;
 }
-export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSavedChanges }: FloatingNavigationProps) {
+export default function FloatingNavigation({ toggleMenu, toggleSettings }: FloatingNavigationProps) {
  const isButtonShown = useFadeOutOnInactivity(true);
  return (
@@ -21,18 +20,15 @@ export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSave
      className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}
    >
      {toggleMenu && (
-        <div className={style.buttonWithIndicator}>
+        <IconButton
-          <IconButton
+          variant='subtle-white'
-            variant='subtle-white'
+          size='xlarge'
-            size='xlarge'
+          onClick={toggleMenu}
-            onClick={toggleMenu}
+          aria-label='toggle menu'
-            aria-label='toggle menu'
+          data-testid='navigation__toggle-menu'
-            data-testid='navigation__toggle-menu'
+        >
-          >
+          <IoApps />
-            <IoApps />
+        </IconButton>
          </IconButton>
          {hasSavedChanges && <span className={style.indicator} data-testid='navigation__saved-indicator' />}
        </div>
      )}
      {toggleSettings && (
        <IconButton
@@ -14,4 +14,6 @@ $progress-bar-br: 3px;
 .progress-bar__indicator {
  height: $progress-bar-size;
  background-color: var(--timer-progress-override, $accent-color);
  transition: 1s linear;
  transition-property: width;
 }
@@ -1,6 +1,6 @@
 import { MaybeNumber } from 'ontime-types';
-import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
+import { getProgress } from '../../utils/getProgress';
 import './ProgressBar.scss';
@@ -12,7 +12,7 @@ interface ProgressBarProps {
 export default function ProgressBar(props: ProgressBarProps) {
  const { current, duration, className } = props;
-  const progress = useAnimatedProgress(current, duration);
+  const progress = getProgress(current, duration);
  return (
    <div className={`progress-bar__bg ${className}`}>
@@ -4,9 +4,7 @@
  color: $white-10;
  .empty {
-    display: block;
+    width: 100%;
    width: min(100%, 24rem);
    margin-inline: auto;
    opacity: 0.8;
  }
@@ -15,6 +13,6 @@
    margin-inline: auto;
    font-weight: 600;
    font-size: 2em;
-    max-width: min(100%, 600px);
+    max-width: 600px;
  }
 }
@@ -6,7 +6,6 @@ import { useSearchParams } from 'react-router';
 import useViewSettings from '../../hooks-query/useViewSettings';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useSavedViewParams } from '../../stores/savedViewParams';
 import Button from '../buttons/Button';
 import IconButton from '../buttons/IconButton';
 import Info from '../info/Info';
@@ -28,7 +27,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
  const [searchParams, setSearchParams] = useSearchParams();
  const { data: viewSettings } = useViewSettings();
  const { isOpen, close } = useViewParamsEditorStore();
  const clearSavedParams = useSavedViewParams((store) => store.clear);
  const isSmallScreen = useIsSmallScreen();
  const getPreservedParams = () => getPreservedSearchParams(searchParams, viewOptions);
@@ -38,7 +36,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
  };
  const resetParams = () => {
    clearSavedParams(target);
    setSearchParams(getPreservedParams());
  };
@@ -1,41 +0,0 @@
 import { MaybeNumber, Playback } from 'ontime-types';
 import { useEffect, useRef, useState } from 'react';
 import { getProgress } from '../utils/getProgress';
 import { usePlayback } from './useSocket';
 /**
 * Returns the live completion percentage (0–100) of a countdown, interpolated locally.
 */
 export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber): number {
  const playback = usePlayback();
  const isRunning = playback === Playback.Play || playback === Playback.Roll;
  const baseline = useRef({ current, at: performance.now() });
  const [, setTick] = useState(0);
  // there is only something to animate while a running timer is counting down towards 0
  const shouldAnimate = isRunning && current !== null && current > 0 && duration !== null;
  // re-anchor to the authoritative value whenever the server pushes a new timer update
  useEffect(() => {
    baseline.current = { current, at: performance.now() };
  }, [current, duration, playback]);
  // while counting down, re-render every animation frame so the derived progress stays smooth
  useEffect(() => {
    if (!shouldAnimate) {
      return;
    }
    let frame = requestAnimationFrame(function tick() {
      setTick((value) => value + 1);
      frame = requestAnimationFrame(tick);
    });
    return () => cancelAnimationFrame(frame);
  }, [shouldAnimate]);
  // derive from the anchor plus elapsed time at render; frozen to the anchor when not running
  const anchored = baseline.current.current;
  const value = isRunning && anchored !== null ? anchored - (performance.now() - baseline.current.at) : anchored;
  return getProgress(value, duration);
 }
@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
  EntryId,
  InsertOptions,
  MaybeString,
  OntimeDelay,
  OntimeEntry,
@@ -59,15 +60,9 @@ export type EventOptions = Partial<{
  before: MaybeString;
  // options of entries of type OntimeEvent
  linkPrevious: boolean;
  /** the timing reference for the new entry, usually the same as after */
  lastEventId: MaybeString;
 }>;
 type ClientInsertOptions = {
  after?: EntryId;
  before?: EntryId;
 };
 /**
 * Gather utilities for actions on entries in the loaded rundown.
 */
@@ -125,7 +120,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
   * @private
   */
  const { mutateAsync: addEntryMutation } = useMutation({
-    mutationFn: ([rundownId, entry]: [string, PatchWithId & ClientInsertOptions]) => postAddEntry(rundownId, entry),
+    mutationFn: ([rundownId, entry]: [string, PatchWithId & InsertOptions]) => postAddEntry(rundownId, entry),
    onMutate: async ([_rundownId, entry]) => {
      const queryKey = resolveCurrentRundownQueryKey();
      await queryClient.cancelQueries({ queryKey });
@@ -154,9 +149,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        addToRundown(
          newRundown,
          optimisticEntry,
          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
          afterId,
-          entry.before ?? null,
+          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
        );
        queryClient.setQueryData<Rundown>(queryKey, newRundown);
@@ -199,7 +193,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        throw new Error('Rundown not initialised');
      }
-      const newEntry: PatchWithId & ClientInsertOptions = { ...entry, id: generateId() };
+      const newEntry: PatchWithId & InsertOptions = { ...entry, id: generateId() };
      // handle adding options that concern all event types
      if (options?.after) {
@@ -211,8 +205,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEntry)) {
        // last event id is the timing reference of the previous OntimeEvent in rundown
        if (options?.lastEventId) {
          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
          const previousEvent = rundownData.entries[options?.lastEventId];
          if (isOntimeEvent(previousEvent)) {
            newEntry.timeStart = previousEvent.timeEnd;
@@ -290,7 +284,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
   * Clone an entry
   */
  const clone = useCallback(
-    async (entryId: EntryId, options?: ClientInsertOptions) => {
+    async (entryId: EntryId, options?: InsertOptions) => {
      try {
        const rundownId = getCurrentRundownData()?.id;
        if (!rundownId) {
@@ -1063,7 +1057,7 @@ function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
 /**
 * Utility to create an optimistic entry for immediate cache insertion
 */
-function createOptimisticEntry(payload: PatchWithId & ClientInsertOptions): OntimeEntry {
+function createOptimisticEntry(payload: PatchWithId & InsertOptions): OntimeEntry {
  const { after: _after, before: _before, ...entryData } = payload;
  const id = entryData.id;
  let parent: EntryId | null = null;
@@ -139,17 +139,6 @@ export const setEventPlayback = {
  pause: () => sendSocket('pause', undefined),
 };
 export const useTimerProgress = createSelector((state: RuntimeStore) => ({
  playback: state.timer.playback,
  phase: state.timer.phase,
  addedTime: state.timer.addedTime,
  secondaryTimer: state.timer.secondaryTimer,
  current: state.timer.current,
  expectedFinish: state.timer.expectedFinish,
  startedAt: state.timer.startedAt,
  isCountToEnd: state.eventNow?.countToEnd ?? false,
 }));
 export const useTimer = createSelector((state: RuntimeStore) => ({
  ...state.timer,
 }));
@@ -1,87 +0,0 @@
 import { hasCustomParams, stripReservedParams, useSavedViewParams } from '../savedViewParams';
 describe('savedViewParams store', () => {
  beforeEach(() => {
    useSavedViewParams.getState().clearAll();
  });
  it('saves and restores params per view', () => {
    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
    useSavedViewParams.getState().save('backstage', 'showProgress=false');
    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=true');
    expect(useSavedViewParams.getState().params.backstage).toBe('showProgress=false');
  });
  it('overwrites the saved params for a view on subsequent saves', () => {
    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
    useSavedViewParams.getState().save('timer', 'hideSeconds=false');
    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=false');
  });
  it('does not store an entry for an empty search string', () => {
    useSavedViewParams.getState().save('timer', '');
    expect(useSavedViewParams.getState().params).toEqual({});
  });
  it('removes a previously saved entry when saved with an empty search string', () => {
    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
    useSavedViewParams.getState().save('timer', '');
    expect(useSavedViewParams.getState().params).toEqual({});
  });
  it('ignores empty view keys', () => {
    useSavedViewParams.getState().save('', 'hideSeconds=true');
    expect(useSavedViewParams.getState().params).toEqual({});
  });
  it('clears the saved params for a single view without touching others', () => {
    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
    useSavedViewParams.getState().save('backstage', 'showProgress=false');
    useSavedViewParams.getState().clear('timer');
    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
  });
  it('is a no-op when clearing a view without saved params', () => {
    useSavedViewParams.getState().save('backstage', 'showProgress=false');
    useSavedViewParams.getState().clear('timer');
    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
  });
  it('clears all saved params', () => {
    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
    useSavedViewParams.getState().clearAll();
    expect(useSavedViewParams.getState().params).toEqual({});
  });
 });
 describe('stripReservedParams', () => {
  it('removes reserved auth/preset params while keeping view customisation', () => {
    expect(stripReservedParams('hideSeconds=true&token=abc&n=1&alias=my')).toBe('hideSeconds=true');
  });
  it('returns an empty string when only reserved params are present', () => {
    expect(stripReservedParams('token=abc&n=1&alias=my')).toBe('');
  });
 });
 describe('hasCustomParams', () => {
  it('is true when a non-reserved param is present', () => {
    expect(hasCustomParams(new URLSearchParams('hideSeconds=true&token=abc'))).toBe(true);
  });
  it('is false when only reserved params are present', () => {
    expect(hasCustomParams(new URLSearchParams('token=abc&n=1&alias=my'))).toBe(false);
  });
  it('is false when there are no params', () => {
    expect(hasCustomParams(new URLSearchParams(''))).toBe(false);
  });
 });
@@ -1,62 +0,0 @@
 import { create } from 'zustand';
 // params that are auth/preset markers, not user view customisation (see common/utils/urlPresets.ts)
 export const reservedParams = new Set(['token', 'n', 'alias']);
 interface SavedViewParamsStore {
  params: Record<string, string>; // view key (e.g. "timer") -> search string without leading "?"
  save: (view: string, search: string) => void;
  clear: (view: string) => void;
  clearAll: () => void;
 }
 /**
 * Remembers the last view parameters used for each view so they can be
 * restored when the user navigates back to that view through the menu.
 * In-memory only: persists across SPA navigation, resets on a full page reload.
 */
 export const useSavedViewParams = create<SavedViewParamsStore>((set) => ({
  params: {},
  save: (view, search) =>
    set((state) => {
      // ignore empty view keys and do not store empty entries, so the
      // "saved changes" indicator only reflects genuine customisation
      if (!view) return state;
      const params = { ...state.params };
      if (search) {
        params[view] = search;
      } else {
        delete params[view];
      }
      return { params };
    }),
  clear: (view) =>
    set((state) => {
      if (!state.params[view]) return state;
      const params = { ...state.params };
      delete params[view];
      return { params };
    }),
  clearAll: () => set({ params: {} }),
 }));
 /**
 * Removes reserved (auth/preset) params from a search string, keeping only
 * genuine view customisation.
 */
 export function stripReservedParams(search: string): string {
  const sp = new URLSearchParams(search);
  reservedParams.forEach((key) => sp.delete(key));
  return sp.toString();
 }
 /**
 * Whether the search params contain any genuine view customisation,
 * ignoring reserved params.
 */
 export function hasCustomParams(searchParams: URLSearchParams): boolean {
  for (const key of searchParams.keys()) {
    if (!reservedParams.has(key)) return true;
  }
  return false;
 }
@@ -1,4 +1,4 @@
-import { hostToBaseUrl, linkToOtherHost } from '../linkUtils';
+import { linkToOtherHost } from '../linkUtils';
 describe('linkToOTherHost', () => {
  it('should handle electron links', () => {
@@ -22,18 +22,3 @@ describe('linkToOTherHost', () => {
    expect(destination).toBe('https://app.getontime.no/user-hash/path');
  });
 });
 describe('hostToBaseUrl', () => {
  it('uses http when the page is plain http', () => {
    expect(hostToBaseUrl('192.168.10.166', 4001, 'http://localhost:4001')).toBe('http://192.168.10.166:4001');
  });
  it('keeps https when the page reaches the server over TLS on the same port', () => {
    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://localhost:4001')).toBe('https://192.168.10.166:4001');
  });
  it('falls back to http when the page is https on a different port (TLS proxy)', () => {
    // the raw server port does not speak TLS, an https link to it would fail
    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://ontime.example.com')).toBe('http://192.168.10.166:4001');
  });
 });
@@ -1,25 +0,0 @@
 import { describe, expect, it } from 'vitest';
 import { removeFileExtension } from '../uploadUtils';
 describe('removeFileExtension()', () => {
  it('removes a trailing extension', () => {
    expect(removeFileExtension('show.xlsx')).toBe('show');
  });
  it('only removes the last extension', () => {
    expect(removeFileExtension('my.show.xlsx')).toBe('my.show');
  });
  it('returns the name unchanged when there is no extension', () => {
    expect(removeFileExtension('rundown')).toBe('rundown');
  });
  it('does not treat a leading dot as an extension', () => {
    expect(removeFileExtension('.gitignore')).toBe('.gitignore');
  });
  it('handles an empty string', () => {
    expect(removeFileExtension('')).toBe('');
  });
 });
@@ -37,12 +37,7 @@ export function handleLinks(
  event?.preventDefault();
  const destination = new URL(externalServerUrl);
-  // split off any query string so it is not encoded into the pathname
+  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
  const [pathname, search] = location.split('?');
  destination.pathname = externalBaseURI ? `${externalBaseURI}/${pathname}` : pathname;
  if (search) {
    destination.search = search;
  }
  openLink(destination.toString());
 }
@@ -59,17 +54,3 @@ export function linkToOtherHost(
  }
  return destination.toString();
 }
 /**
 * Builds a base URL for reaching the Ontime server on a given network interface.
 * The Ontime server itself only speaks HTTP, so we only keep https when the page
 * already reaches the server over TLS on that same port (eg. a proxy in front of it);
 * any other explicit server port gets http.
 * externalServerUrl is used for testing
 */
 export function hostToBaseUrl(host: string, port: number, externalServerUrl: string = serverURL): string {
  const page = new URL(externalServerUrl);
  const pagePort = page.port === '' ? (page.protocol === 'https:' ? 443 : 80) : Number(page.port);
  const scheme = page.protocol === 'https:' && pagePort === port ? 'https' : 'http';
  return `${scheme}://${host}:${port}`;
 }
@@ -3,9 +3,7 @@ import {
  MILLIS_PER_HOUR,
  MILLIS_PER_MINUTE,
  MILLIS_PER_SECOND,
  dayInMs,
  formatFromMillis,
  getExpectedEnd,
  getExpectedStart,
 } from 'ontime-utils';
@@ -31,11 +29,6 @@ export function nowInMillis(): number {
  return elapsed;
 }
 export function normaliseWallClock(time: number): number {
  const timeOfDay = time % dayInMs;
  return timeOfDay < 0 ? timeOfDay + dayInMs : timeOfDay;
 }
 /**
 * @description Resolves format from url and store
 * @return {string|null} A format string like "hh:mm:ss a" or null
@@ -187,13 +180,15 @@ export function getExpectedTimesFromExtendedEvent(
      ...state,
    },
  );
-  const expectedEnd = getExpectedEnd(event, expectedStart, state.currentDay);
+
  const plannedEnd = event.timeStart + event.duration + event.delay;
  return {
    expectedStart,
    timeToStart: expectedStart - state.clock,
-    expectedEnd,
+    expectedEnd: event.countToEnd
      ? Math.max(expectedStart + event.duration, plannedEnd)
      : expectedStart + event.duration,
    plannedEnd,
  };
 }
@@ -38,18 +38,6 @@ export function validateProjectFile(file: File) {
  }
 }
 /**
 * Removes a trailing file extension from a file name (e.g. "show.xlsx" -> "show")
 * A leading dot (dotfiles like ".gitignore") is not treated as an extension
 */
 export function removeFileExtension(fileName: string): string {
  const lastDot = fileName.lastIndexOf('.');
  if (lastDot <= 0) {
    return fileName;
  }
  return fileName.slice(0, lastDot);
 }
 export function isExcelFile(file: File | null) {
  return file?.name.endsWith('.xlsx');
 }
@@ -38,7 +38,7 @@ $inner-padding: 1rem;
 .section {
  position: relative;
  margin-top: 2rem;
-  max-width: 1024px;
+  max-width: 850px;
 }
 .indent {
@@ -293,9 +293,8 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
        <h3>Outputs</h3>
        <Info>
          Automation outputs can be used to send data from Ontime to external software <br />
-          or to change properties of Ontime itself. <br /> <br />
+          or to change properties of Ontime itself.
-          Use Ontime runtime data in these fields with template strings. Type {'{{'} to see autocomplete, or{' '}
+          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
          <ExternalLink href={integrationsDocsUrl}>read the docs</ExternalLink>
        </Info>
        {fieldOutputs.map((output, index) => {
@@ -342,17 +341,12 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                  </label>
                  <label>
                    Address
-                    <TemplateInput
+                    <Input {...register(`outputs.${index}.address`)} fluid placeholder='/cue/start' />
                      {...register(`outputs.${index}.address`)}
                      value={output.address}
                      fluid
                      placeholder='/cue/start'
                    />
                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
                  </label>
                  <label>
                    Arguments
-                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} fluid placeholder='1' />
+                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} placeholder='1' />
                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                  </label>
                  <div>
@@ -382,7 +376,7 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                <div className={style.httpSection}>
                  <label>
                    Target URL
-                    <TemplateInput
+                    <Input
                      {...register(`outputs.${index}.url`, {
                        required: { value: true, message: 'Required field' },
                        pattern: {
@@ -390,7 +384,6 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                          message: 'HTTP messages should target http:// or https://',
                        },
                      })}
                      value={output.url}
                      fluid
                      placeholder='http://127.0.0.1/start/1'
                    />
@@ -5,7 +5,6 @@ import { UseFormRegister, UseFormSetValue, UseFormWatch } from 'react-hook-form'
 import Input from '../../../../common/components/input/input/Input';
 import Select from '../../../../common/components/select/Select';
 import * as Panel from '../../panel-utils/PanelUtils';
 import TemplateInput from './template-input/TemplateInput';
 import style from './AutomationForm.module.scss';
@@ -72,8 +71,8 @@ export default function OntimeActionForm({
            { value: 'playback-pause', label: 'Playback: pause' },
            { value: 'playback-roll', label: 'Playback: roll' },
-            { value: 'message-set', label: 'Primary Message' },
+            { value: 'message-set', label: 'Primary Message: set' },
-            { value: 'message-secondary', label: 'Secondary Message' },
+            { value: 'message-secondary', label: 'Secondary Message: source' },
          ]}
        />
        <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
@@ -97,12 +96,7 @@ export default function OntimeActionForm({
        <>
          <label>
            Text (leave empty for no change)
-            <TemplateInput
+            <Input {...register(`outputs.${index}.text`)} fluid placeholder='eg: Timer is finished' />
              {...register(`outputs.${index}.text`)}
              value={watch(`outputs.${index}.text`) ?? ''}
              fluid
              placeholder='eg: Timer is finished'
            />
            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
          </label>
          <label>
@@ -126,48 +120,31 @@ export default function OntimeActionForm({
      )}
      {selectedAction === 'message-secondary' && (
-        <>
+        <label>
-          <label>
+          Timer secondary source
-            Text (leave empty for no change)
+          <Select<SecondarySource | 'null' | null>
-            <TemplateInput
+            onValueChange={(value) => {
-              {...register(`outputs.${index}.text`)}
+              // null -> no selection
-              value={watch(`outputs.${index}.text`) ?? ''}
+              if (value === null) return;
-              fluid
+              // 'null' -> clear the secondary source
-              placeholder='eg: Next up: keynote'
+              if (value === 'null') {
-            />
+                setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
-            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
+                return;
-          </label>
+              }
-          <label>
+              setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
-            Timer secondary source
+            }}
-            <Select<SecondarySource | 'no-change' | 'null' | null>
+            value={watch(`outputs.${index}.secondarySource`)}
-              onValueChange={(value) => {
+            options={[
-                // null -> no selection
+              { value: null, label: 'Select secondary source' },
-                if (value === null) return;
+              { value: 'aux1', label: 'Auxiliary timer 1' },
-                // no-change -> leave the current secondary source untouched
+              { value: 'aux2', label: 'Auxiliary timer 2' },
-                if (value === 'no-change') {
+              { value: 'aux3', label: 'Auxiliary timer 3' },
-                  setValue(`outputs.${index}.secondarySource`, undefined, { shouldDirty: true });
+              { value: 'secondary', label: 'Secondary' },
-                  return;
+              { value: 'null', label: 'None' }, // allow the user to clear the secondary source
-                }
+            ]}
-                // 'null' -> clear the secondary source
+          />
-                if (value === 'null') {
+          <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
-                  setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
+        </label>
                  return;
                }
                setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
              }}
              value={watch(`outputs.${index}.secondarySource`) ?? 'no-change'}
              options={[
                { value: 'no-change', label: 'No change' },
                { value: 'aux1', label: 'Auxiliary timer 1' },
                { value: 'aux2', label: 'Auxiliary timer 2' },
                { value: 'aux3', label: 'Auxiliary timer 3' },
                { value: 'secondary', label: 'Secondary' },
                { value: 'null', label: 'None' }, // allow the user to clear the secondary source
              ]}
            />
            <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
          </label>
        </>
      )}
      <div className={style.test}>{children}</div>
@@ -79,7 +79,7 @@ export default function TriggersList(props: TriggersListProps) {
          <tbody>
            {!showForm && triggers.length === 0 && (
              <Panel.TableEmpty
-                label='Create a trigger to run an automation'
+                label='Create an automation to attach triggers to'
                handleClick={canAdd ? () => setShowForm(true) : undefined}
              />
            )}
@@ -1,67 +1,29 @@
-.inputShell {
+.wrapper {
  position: relative;
 }
-.fluid {
+.suggestions {
  width: 100%;
 }
 .input {
  padding-right: 2rem;
 }
 .expandButton {
  position: absolute;
  top: 50%;
  right: 0.25rem;
  transform: translateY(-50%);
 }
 .positioner {
  outline: 0;
 }
 .popup {
  box-sizing: border-box;
  min-width: var(--anchor-width);
  max-width: var(--available-width);
  border: 1px solid $gray-1000;
  border-radius: $component-border-radius-md;
  background: $gray-1250;
-  color: $label-gray;
+  color: $ui-white;
 }
-.list {
+  position: absolute;
-  box-sizing: border-box;
+  top: 100%;
-  max-height: min(20rem, var(--available-height));
+  left: 0;
-  overflow-y: auto;
+  width: 100%;
-  overscroll-behavior: contain;
+  margin: 0;
  z-index: $zindex-floating;
  padding-block: 0.25rem;
  outline: 0;
 }
-.item {
+  max-height: 200px;
-  box-sizing: border-box;
+  overflow-y: auto;
-  padding: 0.25rem 0.5rem;
+  color: $label-gray;
  outline: 0;
  cursor: default;
  user-select: none;
  overflow-wrap: anywhere;
-  &[data-highlighted] {
+  li {
    padding: 0.25rem;
  }
  li:hover {
    color: $ui-white;
    background: $blue-700;
  }
 }
 .expandedEditor {
  min-height: min(18rem, 45vh);
  font-family: monospace;
  line-height: 1.4;
 }
 .footerHint {
  margin-right: auto;
  color: $label-gray;
  font-size: calc(1rem - 2px);
 }
@@ -1,258 +1,69 @@
-import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
+import { mergeRefs, useClickOutside } from '@mantine/hooks';
-import type { ChangeEvent, ReactNode, Ref } from 'react';
+import { forwardRef, useMemo, useState } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { IoExpandOutline } from 'react-icons/io5';
-import Button from '../../../../../common/components/buttons/Button';
+import Input, { type InputProps } from '../../../../../common/components/input/input/Input';
 import IconButton from '../../../../../common/components/buttons/IconButton';
 import { type InputProps } from '../../../../../common/components/input/input/Input';
 import Textarea from '../../../../../common/components/input/textarea/Textarea';
 import Modal from '../../../../../common/components/modal/Modal';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import { cx } from '../../../../../common/utils/styleUtils';
+import { makeAutoCompleteList, matchRemaining, selectFromLastTemplate } from './templateInput.utils';
 import { makeAutoCompleteList } from './templateInput.utils';
 import { useTemplateAutocomplete } from './useTemplateAutocomplete';
 import inputStyle from '../../../../../common/components/input/input/Input.module.scss';
 import style from './TemplateInput.module.scss';
-interface TemplateInputProps extends Omit<InputProps, 'value'> {
+interface TemplateInputProps extends InputProps {}
  ref?: Ref<HTMLInputElement>;
  value?: string;
 }
-interface TemplateEditorModalProps {
+const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
-  autocompleteList: string[];
+  const { value, onChange, ...rest } = props;
  isOpen: boolean;
  onClose: () => void;
  onSave: (value: string) => void;
  value: string;
 }
 type TemplateAutocompleteState = ReturnType<typeof useTemplateAutocomplete<HTMLInputElement>>;
 interface TemplateAutocompleteRootProps {
  autocomplete: TemplateAutocompleteState;
  children: ReactNode;
  value: string;
 }
 function assignRef<T>(ref: Ref<T> | undefined, value: T | null) {
  if (typeof ref === 'function') {
    ref(value);
  } else if (ref) {
    ref.current = value;
  }
 }
 function emitInputChange(name: string | undefined, value: string, onChange: InputProps['onChange']) {
  onChange?.({
    target: { name, value },
    currentTarget: { name, value },
  } as ChangeEvent<HTMLInputElement>);
 }
 export default function TemplateInput({
  className,
  disabled,
  fluid,
  height = 'medium',
  onChange,
  readOnly,
  ref,
  value,
  variant = 'subtle',
  ...rest
 }: TemplateInputProps) {
  const { data } = useCustomFields();
-  const inputRef = useRef<HTMLInputElement | null>(null);
+  const localRef = useClickOutside(() => setShowSuggestions(false));
  const [inputValue, setInputValue] = useState(value || '');
  const [isExpanded, setIsExpanded] = useState(false);
  const autocompleteList = useMemo(() => {
    return makeAutoCompleteList(data);
  }, [data]);
-  const updateInputValue = useCallback(
+  const [inputValue, setInputValue] = useState(value || '');
-    (nextValue: string) => {
+  const [suggestions, setSuggestions] = useState<string[]>([]);
-      setInputValue(nextValue);
+  const [showSuggestions, setShowSuggestions] = useState(false);
      emitInputChange(rest.name, nextValue, onChange);
    },
    [onChange, rest.name],
  );
-  const autocomplete = useTemplateAutocomplete(inputValue, autocompleteList, inputRef, updateInputValue);
+  const updateSuggestions = (value: string) => {
-  const { setCursorForValue } = autocomplete;
+    const template = selectFromLastTemplate(value);
-
+    return autocompleteList.filter((suggestion) => suggestion.startsWith(template));
  // Keep the local autocomplete input in sync when react-hook-form resets or swaps field-array values.
  useEffect(() => {
    const nextValue = value || '';
    setInputValue(nextValue);
    setCursorForValue(nextValue, nextValue.length);
  }, [setCursorForValue, value]);
  const setInputRef = useCallback(
    (element: HTMLInputElement | null) => {
      inputRef.current = element;
      assignRef(ref, element);
    },
    [ref],
  );
  const openExpandedEditor = () => {
    autocomplete.setShowSuggestions(false);
    setIsExpanded(true);
  };
-  const closeExpandedEditor = () => {
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setIsExpanded(false);
+    setInputValue(event.target.value);
  };
-  const saveExpandedEditor = (nextValue: string) => {
+    if (event.target.value.endsWith('{')) {
-    updateInputValue(nextValue);
+      setShowSuggestions(true);
-    autocomplete.setCursorForValue(nextValue, nextValue.length);
+      setSuggestions(updateSuggestions(event.target.value));
-    setIsExpanded(false);
+    } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
-  };
+      setShowSuggestions(false);
-
+    } else if (showSuggestions) {
-  return (
+      setSuggestions(updateSuggestions(event.target.value));
    <>
      <TemplateAutocompleteRoot autocomplete={autocomplete} value={inputValue}>
        <div className={cx([style.inputShell, fluid && style.fluid])}>
          <BaseAutocomplete.Input
            ref={setInputRef}
            className={cx([
              inputStyle.input,
              inputStyle[variant],
              inputStyle[height],
              fluid && inputStyle.fluid,
              style.input,
              className,
            ])}
            {...rest}
            disabled={disabled}
            onClick={autocomplete.updateCursor}
            onFocus={autocomplete.updateCursor}
            onKeyUp={autocomplete.updateCursor}
            onSelect={autocomplete.updateCursor}
            readOnly={readOnly}
          />
          <IconButton
            aria-label='Expand template editor'
            className={style.expandButton}
            disabled={disabled || readOnly}
            onClick={openExpandedEditor}
            size='small'
            title='Expand template editor'
            variant='ghosted-white'
          >
            <IoExpandOutline />
          </IconButton>
        </div>
      </TemplateAutocompleteRoot>
      <TemplateEditorModal
        autocompleteList={autocompleteList}
        isOpen={isExpanded}
        onClose={closeExpandedEditor}
        onSave={saveExpandedEditor}
        value={inputValue}
      />
    </>
  );
 }
 function TemplateAutocompleteRoot({ autocomplete, children, value }: TemplateAutocompleteRootProps) {
  return (
    <BaseAutocomplete.Root
      items={autocomplete.suggestions}
      autoHighlight
      highlightItemOnHover
      mode='none'
      open={autocomplete.open}
      value={value}
      onOpenChange={autocomplete.setShowSuggestions}
      onValueChange={autocomplete.handleValueChange}
    >
      {children}
      <TemplateSuggestionPopup />
    </BaseAutocomplete.Root>
  );
 }
 function TemplateEditorModal({ autocompleteList, isOpen, onClose, onSave, value }: TemplateEditorModalProps) {
  const expandedInputRef = useRef<HTMLTextAreaElement | null>(null);
  const [draftValue, setDraftValue] = useState(value);
  const autocomplete = useTemplateAutocomplete(draftValue, autocompleteList, expandedInputRef, setDraftValue);
  const { setShowSuggestions } = autocomplete;
  // Reset the draft whenever the modal opens so cancel never leaks unsaved changes.
  useEffect(() => {
    if (!isOpen) {
      return;
    }
-    setDraftValue(value);
+    onChange?.(event);
    setShowSuggestions(false);
  }, [isOpen, setShowSuggestions, value]);
  const handleClose = () => {
    setShowSuggestions(false);
    onClose();
  };
-  const handleSave = () => {
+  const handleSuggestion = (value: string) => {
    setInputValue((prev) => {
      const remaining = matchRemaining(prev as string, value);
      return prev + remaining;
    });
    setShowSuggestions(false);
    onSave(draftValue);
  };
  return (
-    <Modal
+    <div className={style.wrapper} ref={mergeRefs(localRef, ref)}>
-      isOpen={isOpen}
+      <Input value={inputValue} {...rest} onChange={handleInputChange} fluid />
-      onClose={handleClose}
+      {showSuggestions && suggestions.length > 0 && (
-      showBackdrop
+        <ul className={style.suggestions}>
-      showCloseButton
+          {suggestions.map((suggestion) => (
-      title='Edit template'
+            <li key={suggestion} onClick={() => handleSuggestion(suggestion)}>
-      bodyElements={
+              {suggestion}
-        <TemplateAutocompleteRoot autocomplete={autocomplete} value={draftValue}>
+            </li>
-          <BaseAutocomplete.Input
+          ))}
-            autoFocus
+        </ul>
-            className={style.expandedEditor}
+      )}
-            onClick={autocomplete.updateCursor}
+    </div>
            onFocus={autocomplete.updateCursor}
            onKeyUp={autocomplete.updateCursor}
            onSelect={autocomplete.updateCursor}
            render={<Textarea ref={expandedInputRef} fluid resize='none' rows={8} />}
          />
        </TemplateAutocompleteRoot>
      }
      footerElements={
        <>
          <span className={style.footerHint}>Start a template with {'{{'} to see autocomplete.</span>
          <Button onClick={handleClose}>Cancel</Button>
          <Button onClick={handleSave} variant='primary'>
            Save
          </Button>
        </>
      }
    />
  );
-}
+});
-function TemplateSuggestionPopup() {
+export default TemplateInput;
  return (
    <BaseAutocomplete.Portal>
      <BaseAutocomplete.Positioner side='bottom' align='start' className={style.positioner}>
        <BaseAutocomplete.Popup className={style.popup}>
          <BaseAutocomplete.List className={style.list}>
            <BaseAutocomplete.Collection>
              {(suggestion: string) => (
                <BaseAutocomplete.Item key={suggestion} value={suggestion} className={style.item}>
                  {suggestion}
                </BaseAutocomplete.Item>
              )}
            </BaseAutocomplete.Collection>
          </BaseAutocomplete.List>
        </BaseAutocomplete.Popup>
      </BaseAutocomplete.Positioner>
    </BaseAutocomplete.Portal>
  );
 }
@@ -1,4 +1,4 @@
-import { completeTemplateAtCursor, matchRemaining, selectActiveTemplate } from '../templateInput.utils';
+import { matchRemaining } from '../templateInput.utils';
 describe('matchRemaining()', () => {
  it('should return a partial string needed for autocomplete', () => {
@@ -15,54 +15,3 @@ describe('matchRemaining()', () => {
    expect(matchRemaining('test', 'test')).toBe('');
  });
 });
 describe('selectActiveTemplate()', () => {
  it('returns the last unclosed template fragment', () => {
    expect(selectActiveTemplate('send {{event')).toBe('{{event');
    expect(selectActiveTemplate('send {{eventNow.title}} and {{event')).toBe('{{event');
  });
  it('ignores single braces and closed templates', () => {
    expect(selectActiveTemplate('send {')).toBe('');
    expect(selectActiveTemplate('send {{eventNow.title}}')).toBe('');
  });
  it('only considers templates before the cursor', () => {
    expect(selectActiveTemplate('send {{event}} then {{timer', 14)).toBe('');
    expect(selectActiveTemplate('send {{event}} then {{timer', 27)).toBe('{{timer');
  });
  it('selects a partial template when the cursor is inside a completed template', () => {
    expect(selectActiveTemplate('send {{timer.current}} after', 12)).toBe('{{timer');
  });
 });
 describe('completeTemplateAtCursor()', () => {
  it('completes the active template before the cursor', () => {
    expect(completeTemplateAtCursor('send {{timer after', '{{timer.current}}', 12)).toEqual({
      value: 'send {{timer.current}} after',
      cursorIndex: 22,
    });
  });
  it('preserves text before and after the cursor', () => {
    expect(completeTemplateAtCursor('before {{event after', '{{eventNow.title}}', 14)).toEqual({
      value: 'before {{eventNow.title}} after',
      cursorIndex: 25,
    });
  });
  it('preserves a following template when completing between templates', () => {
    expect(completeTemplateAtCursor('{{clock}} and {{timer then {{eventNow.title}}', '{{timer.current}}', 21)).toEqual({
      value: '{{clock}} and {{timer.current}} then {{eventNow.title}}',
      cursorIndex: 31,
    });
  });
  it('replaces the whole template when the cursor is inside a completed template', () => {
    expect(completeTemplateAtCursor('before {{timer.current}} after', '{{timer.duration}}', 15)).toEqual({
      value: 'before {{timer.duration}} after',
      cursorIndex: 25,
    });
  });
 });
@@ -54,16 +54,6 @@ const eventStaticPropertiesNext = [
  '{{eventNext.delay}}',
 ];
 const groupStaticPropertiesNow = [
  '{{groupNow.id}}',
  '{{groupNow.title}}',
  '{{groupNow.note}}',
  '{{groupNow.colour}}',
  '{{groupNow.timeStart}}',
  '{{groupNow.timeEnd}}',
  '{{groupNow.duration}}',
 ];
 const staticAuxProperties = (index: 1 | 2 | 3) => [
  `{{auxtimer${index}.current}}`,
  `{{auxtimer${index}.duration}}`,
@@ -85,19 +75,12 @@ export function makeAutoCompleteList(customFields: CustomFields): string[] {
    ...Object.entries(customFields).map(([key]) => `{{eventNow.custom.${key}}}`),
    ...eventStaticPropertiesNext,
    ...Object.entries(customFields).map(([key]) => `{{eventNext.custom.${key}}}`),
    ...groupStaticPropertiesNow,
    ...Object.entries(customFields).map(([key]) => `{{groupNow.custom.${key}}}`),
    ...staticAuxProperties(1),
    ...staticAuxProperties(2),
    ...staticAuxProperties(3),
  ];
 }
 interface TemplateCompletion {
  cursorIndex: number;
  value: string;
 }
 /**
 * Returns the partial string b needed to autocomplete string a
 * @example matchRemaining('te', 'test') -> 'st'
@@ -128,54 +111,13 @@ export function matchRemaining(a: string, b: string) {
  return '';
 }
 function getActiveTemplateRange(text: string, cursorIndex = text.length) {
  const textBeforeCursor = text.slice(0, cursorIndex);
  const start = textBeforeCursor.lastIndexOf('{{');
  if (start === -1) {
    return null;
  }
  const closeBeforeCursor = textBeforeCursor.lastIndexOf('}}');
  if (closeBeforeCursor > start) {
    return null;
  }
  const closeAfterStart = text.indexOf('}}', start);
  const nextStartAfterCursor = text.indexOf('{{', cursorIndex);
  const closesBeforeNextTemplate = nextStartAfterCursor === -1 || closeAfterStart < nextStartAfterCursor;
  const end = closeAfterStart !== -1 && closesBeforeNextTemplate ? closeAfterStart + 2 : cursorIndex;
  return {
    end,
    start,
    template: text.slice(start, cursorIndex),
  };
 }
 /**
- * Selects the last unclosed starting template before the cursor.
+ * Selects the last starting template in a string
 */
-export function selectActiveTemplate(text: string, cursorIndex = text.length) {
+export function selectFromLastTemplate(text: string) {
-  return getActiveTemplateRange(text, cursorIndex)?.template ?? '';
+  const lastBraceIndex = text.lastIndexOf('{{');
-}
+  if (lastBraceIndex !== -1) {
-
+    return text.slice(lastBraceIndex);
 /**
 * Replaces the active template fragment before the cursor with the selected suggestion.
 */
 export function completeTemplateAtCursor(
  text: string,
  suggestion: string,
  cursorIndex = text.length,
 ): TemplateCompletion {
  const activeTemplateRange = getActiveTemplateRange(text, cursorIndex);
  if (!activeTemplateRange) {
    const value = text + matchRemaining(text, suggestion);
    return { value, cursorIndex: value.length };
  }
-
+  return '';
  const value = `${text.slice(0, activeTemplateRange.start)}${suggestion}${text.slice(activeTemplateRange.end)}`;
  return {
    value,
    cursorIndex: activeTemplateRange.start + suggestion.length,
  };
 }
@@ -1,72 +0,0 @@
 import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
 import { useCallback, useMemo, useState, type RefObject } from 'react';
 import { completeTemplateAtCursor, selectActiveTemplate } from './templateInput.utils';
 type TemplateElement = HTMLInputElement | HTMLTextAreaElement;
 function getCursorIndex(element: TemplateElement | null, fallback: string) {
  return element?.selectionStart ?? fallback.length;
 }
 function focusCursor(element: TemplateElement | null, cursorIndex: number) {
  requestAnimationFrame(() => {
    element?.focus();
    element?.setSelectionRange(cursorIndex, cursorIndex);
  });
 }
 export function useTemplateAutocomplete<T extends TemplateElement>(
  value: string,
  autocompleteList: string[],
  elementRef: RefObject<T | null>,
  onValueChange: (value: string) => void,
 ) {
  const [showSuggestions, setShowSuggestions] = useState(false);
  const [cursor, setCursor] = useState(value.length);
  const activeTemplate = selectActiveTemplate(value, cursor);
  const suggestions = useMemo(() => {
    if (!activeTemplate) {
      return [];
    }
    return autocompleteList.filter((suggestion) => suggestion.startsWith(activeTemplate));
  }, [activeTemplate, autocompleteList]);
  const setCursorForValue = useCallback((nextValue: string, cursorIndex: number) => {
    setCursor(cursorIndex);
    setShowSuggestions(Boolean(selectActiveTemplate(nextValue, cursorIndex)));
  }, []);
  const updateCursor = useCallback(() => {
    const cursorIndex = getCursorIndex(elementRef.current, value);
    setCursorForValue(value, cursorIndex);
  }, [elementRef, setCursorForValue, value]);
  const handleValueChange = useCallback(
    (nextValue: string, eventDetails: BaseAutocomplete.Root.ChangeEventDetails) => {
      if (eventDetails.reason === 'item-press') {
        eventDetails.cancel();
        const completed = completeTemplateAtCursor(value, nextValue, cursor);
        setCursorForValue(completed.value, completed.cursorIndex);
        onValueChange(completed.value);
        focusCursor(elementRef.current, completed.cursorIndex);
        return;
      }
      const cursorIndex = getCursorIndex(elementRef.current, nextValue);
      setCursorForValue(nextValue, cursorIndex);
      onValueChange(nextValue);
    },
    [cursor, elementRef, onValueChange, setCursorForValue, value],
  );
  return {
    handleValueChange,
    open: showSuggestions && suggestions.length > 0,
    setCursorForValue,
    setShowSuggestions,
    suggestions,
    updateCursor,
  };
 }
@@ -25,13 +25,6 @@
  margin-top: 1rem;
 }
 .finishActions {
  display: flex;
  flex-wrap: wrap;
  justify-content: center;
  gap: 0.5rem;
 }
 .sourceGrid {
  display: grid;
  grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -1,6 +1,4 @@
 import type {
  ImportedFields,
  RundownImportMode,
  SpreadsheetPreviewResponse,
  SpreadsheetWorksheetMetadata,
  SpreadsheetWorksheetOptions,
@@ -8,7 +6,6 @@ import type {
 import { getErrorMessage, ImportMap } from 'ontime-utils';
 import { ChangeEvent, useCallback, useRef, useState } from 'react';
 import { IoCloudOutline, IoDownloadOutline } from 'react-icons/io5';
 import { useNavigate } from 'react-router';
 import {
  getWorksheetMetadata as getExcelWorksheetMetadata,
@@ -25,7 +22,7 @@ import Info from '../../../../../common/components/info/Info';
 import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink';
 import Modal from '../../../../../common/components/modal/Modal';
 import useRundown from '../../../../../common/hooks-query/useRundown';
-import { removeFileExtension, validateExcelImport } from '../../../../../common/utils/uploadUtils';
+import { validateExcelImport } from '../../../../../common/utils/uploadUtils';
 import * as Panel from '../../../panel-utils/PanelUtils';
 import GSheetSetup from './GSheetSetup';
 import SheetImportEditor from './sheet-import/SheetImportEditor';
@@ -38,7 +35,6 @@ const googleSheetDocsUrl = 'https://docs.getontime.no/features/import-spreadshee
 type ActiveSource =
  | {
      kind: 'excel';
      fileName: string;
      worksheetNames: string[];
      initialWorksheetMetadata: SpreadsheetWorksheetMetadata | null;
      closedByUser: boolean;
@@ -57,11 +53,9 @@ export default function SourcesPanel() {
  const [error, setError] = useState('');
  const [hasFile, setHasFile] = useState<'none' | 'loading' | 'done'>('none');
  const [activeSource, setActiveSource] = useState<ActiveSource | null>(null);
  const [completedRundownTitle, setCompletedRundownTitle] = useState('');
  const { data: currentRundown } = useRundown();
-  const { applyImport } = useSpreadsheetImport();
+  const { importRundown } = useSpreadsheetImport();
  const navigate = useNavigate();
  const fileInputRef = useRef<HTMLInputElement>(null);
@@ -80,7 +74,6 @@ export default function SourcesPanel() {
      const worksheetOptions = await uploadExcel(fileToUpload);
      setActiveSource({
        kind: 'excel',
        fileName: fileToUpload.name,
        worksheetNames: worksheetOptions.worksheets,
        initialWorksheetMetadata: worksheetOptions.metadata,
        closedByUser: false,
@@ -104,7 +97,6 @@ export default function SourcesPanel() {
    setHasFile('none');
    setActiveSource(null);
    setError('');
    setCompletedRundownTitle('');
  };
  const openGSheetFlow = () => {
@@ -127,41 +119,29 @@ export default function SourcesPanel() {
    }
  };
-  const handleFinished = (rundownTitle: string) => {
+  const handleFinished = () => {
    setImportFlow('finished');
    setHasFile('none');
    setActiveSource(null);
    setError('');
    setCompletedRundownTitle(rundownTitle);
  };
-  const handleApplyImport = async (
+  const handleApplyImport = async (preview: SpreadsheetPreviewResponse) => {
    preview: SpreadsheetPreviewResponse,
    mode: RundownImportMode,
    newRundownTitle: string,
    providedFields: ImportedFields,
  ) => {
    if (mode === 'new') {
      const title = newRundownTitle.trim() || preview.rundown.title;
      await applyImport({ mode: 'new', rundown: { ...preview.rundown, title }, customFields: preview.customFields });
      handleFinished(title);
      return;
    }
    if (!currentRundown) {
      throw new Error('No current rundown loaded');
    }
-    // override or merge into the current rundown; merge uses providedFields to know which columns
+    await importRundown(
-    // the sheet supplied so matched events keep the rest (e.g. automations)
+      {
-    await applyImport({
+        [currentRundown.id]: {
-      mode,
+          ...preview.rundown,
-      targetRundownId: currentRundown.id,
+          id: currentRundown.id,
-      rundown: preview.rundown,
+          title: currentRundown.title,
-      customFields: preview.customFields,
+        },
-      providedFields,
+      },
-    });
+      preview.customFields,
-    handleFinished(currentRundown.title);
+    );
    handleFinished();
  };
  const loadWorksheetMetadata = useCallback(
@@ -228,13 +208,6 @@ export default function SourcesPanel() {
    if (activeSource.kind === 'excel') return 'excel';
    return `gsheet:${activeSource.sheetId}`;
  })();
  // suggested name when importing into a new rundown: the spreadsheet file name (without extension)
  // for Excel, or the document title for Google Sheets
  const spreadsheetName = (() => {
    if (!activeSource) return '';
    if (activeSource.kind === 'excel') return removeFileExtension(activeSource.fileName);
    return activeSource.title;
  })();
  return (
    <Panel.Section>
@@ -294,20 +267,11 @@ export default function SourcesPanel() {
        {showCompleted && (
          <div className={style.finishSection}>
            <span className={style.finishBadge}>Import complete</span>
-            <div className={style.finishTitle}>
+            <div className={style.finishTitle}>Spreadsheet data applied.</div>
-              Spreadsheet data applied to {completedRundownTitle || 'your rundown'}.
+            <div className={style.finishDescription}>You can close this flow or start another import.</div>
-            </div>
+            <Button variant='subtle-white' onClick={resetFlow}>
-            <div className={style.finishDescription}>
+              Reset flow
-              Review the imported rundown in the editor or start another import.
+            </Button>
            </div>
            <div className={style.finishActions}>
              <Button variant='primary' onClick={() => navigate('/editor')}>
                Open editor
              </Button>
              <Button variant='subtle-white' onClick={resetFlow}>
                Import another
              </Button>
            </div>
          </div>
        )}
        {isGSheetFlow && (
@@ -323,7 +287,6 @@ export default function SourcesPanel() {
          bodyElements={
            <SheetImportEditor
              sourceKey={sourceKey ?? 'spreadsheet'}
              defaultRundownName={spreadsheetName}
              worksheetNames={activeSource?.worksheetNames ?? []}
              initialMetadata={activeSource?.initialWorksheetMetadata ?? null}
              loadMetadata={loadWorksheetMetadata}
@@ -1,55 +0,0 @@
 import type { RundownImportMode, SpreadsheetPreviewResponse } from 'ontime-types';
 import { isOntimeEvent, isPlayableEvent, Playback } from 'ontime-types';
 import { useEffect, useState } from 'react';
 import Button from '../../../../../../common/components/buttons/Button';
 import { usePlayback, useSelectedEventId } from '../../../../../../common/hooks/useSocket';
 interface ApplyImportButtonProps {
  preview: SpreadsheetPreviewResponse | null;
  mode: RundownImportMode;
  disabled: boolean;
  loading: boolean;
  onApply: () => void;
 }
 /**
 * Apply action for the spreadsheet import.
 * Subscribes to playback state on its own so playback updates do not re-render the whole editor.
 * Requires a second click to confirm when applying would stop a running playback.
 */
 export default function ApplyImportButton({ preview, mode, disabled, loading, onApply }: ApplyImportButtonProps) {
  const playback = usePlayback();
  const loadedEventId = useSelectedEventId();
  // the loaded (playing) event loses its playback unless it still exists as a playable event after the import
  const loadedEntry = loadedEventId ? preview?.rundown.entries[loadedEventId] : undefined;
  const willLoadedEventBeOverriden = !(
    loadedEntry !== undefined &&
    isOntimeEvent(loadedEntry) &&
    isPlayableEvent(loadedEntry)
  );
  // applying stops playback when creating a new rundown, or when the playing event does not survive
  const willStopPlayback = playback !== Playback.Stop && (mode === 'new' || willLoadedEventBeOverriden);
  // two-step confirmation before applying an import that stops playback
  const [confirmStop, setConfirmStop] = useState(false);
  useEffect(() => {
    setConfirmStop(false);
  }, [mode, preview]);
  const handleClick = () => {
    if (willStopPlayback && !confirmStop) {
      setConfirmStop(true);
      return;
    }
    onApply();
  };
  return (
    <Button variant='primary' onClick={handleClick} disabled={disabled} loading={loading}>
      {willStopPlayback && confirmStop ? 'Confirm — stop playback & apply import' : 'Apply import'}
    </Button>
  );
 }
@@ -33,11 +33,6 @@
  white-space: nowrap;
 }
 .importModeTrigger {
  min-width: 12rem;
  justify-content: space-between;
 }
 .addColumnTrigger {
  justify-content: center;
  white-space: nowrap;
@@ -92,10 +87,6 @@
  font-weight: 600;
 }
 .toolbarWarning {
  color: $orange-400;
 }
 .mappingPaneTitle {
  align-self: center;
 }
@@ -1,20 +1,10 @@
-import type {
+import type { SpreadsheetPreviewResponse, SpreadsheetWorksheetMetadata } from 'ontime-types';
  ImportedFields,
  RundownImportMode,
  SpreadsheetPreviewResponse,
  SpreadsheetWorksheetMetadata,
 } from 'ontime-types';
 import type { ImportMap } from 'ontime-utils';
-import { useMemo } from 'react';
+import { IoArrowUpOutline, IoEye } from 'react-icons/io5';
 import { IoArrowUpOutline, IoCheckmark, IoChevronDown, IoEye, IoWarningOutline } from 'react-icons/io5';
 import Button from '../../../../../../common/components/buttons/Button';
 import { DropdownMenu, DropdownMenuOption } from '../../../../../../common/components/dropdown-menu/DropdownMenu';
 import Input from '../../../../../../common/components/input/input/Input';
 import Select from '../../../../../../common/components/select/Select';
 import * as Panel from '../../../../panel-utils/PanelUtils';
 import ApplyImportButton from './ApplyImportButton';
 import { isIdColumnMapped } from './importMapUtils';
 import PreviewTable from './preview/PreviewTable';
 import SheetImportMappingPane from './SheetImportMappingPane';
 import { useSheetImportForm } from './useSheetImportForm';
@@ -23,46 +13,17 @@ import style from './SheetImportEditor.module.scss';
 interface SheetImportEditorProps {
  sourceKey: string;
  defaultRundownName: string;
  worksheetNames: string[];
  initialMetadata: SpreadsheetWorksheetMetadata | null;
  loadMetadata: (worksheet: string) => Promise<SpreadsheetWorksheetMetadata>;
  previewImport: (importMap: ImportMap) => Promise<SpreadsheetPreviewResponse>;
-  onApply: (
+  onApply: (preview: SpreadsheetPreviewResponse) => Promise<void>;
    preview: SpreadsheetPreviewResponse,
    mode: RundownImportMode,
    newRundownTitle: string,
    providedFields: ImportedFields,
  ) => Promise<void>;
  onCancel: () => void;
  onExport?: (importMap: ImportMap) => Promise<void>;
 }
 const importModeOptions: Array<{
  value: RundownImportMode;
  label: string;
  description: string;
 }> = [
  {
    value: 'override',
    label: 'Replace current rundown',
    description: 'Spreadsheet data completely replaces current rundown',
  },
  {
    value: 'merge',
    label: 'Merge with current rundown',
    description: 'Merge entries referencing their IDs, entries not present in spreadsheet rundown are deleted',
  },
  {
    value: 'new',
    label: 'New rundown',
    description: 'Create a new rundown to import the data into. Loads the new rundown',
  },
 ];
 export default function SheetImportEditor({
  sourceKey,
  defaultRundownName,
  worksheetNames,
  initialMetadata,
  loadMetadata,
@@ -88,16 +49,11 @@ export default function SheetImportEditor({
    isBusy,
    canPreview,
    displayError,
    importMode,
    setImportMode,
    newRundownTitle,
    setNewRundownTitle,
    handlePreviewSubmit,
    handleExportSubmit,
    handleApply,
  } = useSheetImportForm({
    sourceKey,
    defaultRundownName,
    worksheetNames,
    initialMetadata,
    loadMetadata,
@@ -106,19 +62,6 @@ export default function SheetImportEditor({
    onExport,
  });
  const selectedImportMode = importModeOptions.find((option) => option.value === importMode) ?? importModeOptions[0];
  const importModeItems = useMemo<DropdownMenuOption[]>(
    () =>
      importModeOptions.map((option) => ({
        type: 'item',
        label: option.label,
        description: option.description,
        icon: importMode === option.value ? IoCheckmark : undefined,
        onClick: () => setImportMode(option.value),
      })),
    [importMode, setImportMode],
  );
  return (
    <Panel.Section as='form' id='spreadsheet-import-workspace' className={style.editor} onSubmit={handlePreviewSubmit}>
      <Panel.InlineElements align='apart' wrap='wrap' className={style.editorToolbar}>
@@ -132,16 +75,7 @@ export default function SheetImportEditor({
            }
          />
        </label>
-        {toolbarStatus && (
+        {toolbarStatus && <Panel.Description>{toolbarStatus}</Panel.Description>}
          <Panel.Description>
            {toolbarStatus.entries === '–'
              ? 'No import preview yet'
              : `${toolbarStatus.entries} entries · ${toolbarStatus.groups} groups · ${toolbarStatus.milestones} milestones · ${toolbarStatus.start}–${toolbarStatus.end} · ${toolbarStatus.duration}`}
            {toolbarStatus.warnings > 0 && (
              <span className={style.toolbarWarning}> · {toolbarStatus.warnings} warnings</span>
            )}
          </Panel.Description>
        )}
      </Panel.InlineElements>
      <div className={style.editorBody}>
@@ -159,19 +93,13 @@ export default function SheetImportEditor({
        <section className={style.previewPane}>
          <div className={style.previewPaneHeader}>
-            <div className={style.previewPaneHeading}>
+            <span className={style.previewPaneTitle}>Import preview</span>
              <span className={style.previewPaneTitle}>Import preview</span>
            </div>
          </div>
          <div className={style.tableShell}>
            <PreviewTable
              preview={state.preview}
              columnLabels={columnLabels}
              canRefresh={canPreview}
              isLoadingMetadata={isLoadingMetadata}
              isRefreshing={state.loading === 'preview'}
              needsPreviewRefresh={state.needsPreviewRefresh}
              onRefresh={handlePreviewSubmit}
              worksheetHeaders={worksheetHeaders}
            />
          </div>
@@ -179,63 +107,33 @@ export default function SheetImportEditor({
      </div>
      {displayError && <Panel.Error>{displayError}</Panel.Error>}
-      {importMode === 'merge' && !isIdColumnMapped(values) && (
+      <Panel.InlineElements align='end' wrap='wrap' className={style.editorFooter}>
-        <Panel.Description tone='warning'>
+        <Button onClick={onCancel} disabled={isBusy}>
-          <IoWarningOutline /> No ID column mapped — merge matches entries by ID, so it will behave like Replace. Export
+          Cancel
-          your rundown to a spreadsheet first to keep its IDs.
+        </Button>
-        </Panel.Description>
+        {onExport && (
-      )}
+          <Button onClick={handleExportSubmit} disabled={!canPreview} loading={state.loading === 'export'}>
-      <Panel.InlineElements align='apart' wrap='wrap' className={style.editorFooter}>
+            <IoArrowUpOutline />
-        <Panel.InlineElements wrap='wrap'>
+            Export
          <label className={style.worksheetControl}>
            <span className={style.worksheetLabel}>Import mode</span>
            <DropdownMenu
              render={<Button className={style.importModeTrigger} variant='subtle-white' />}
              items={importModeItems}
            >
              {selectedImportMode.label}
              <IoChevronDown />
            </DropdownMenu>
          </label>
          {importMode === 'new' && (
            <label className={style.worksheetControl}>
              <span className={style.worksheetLabel}>New rundown name</span>
              <Input
                value={newRundownTitle}
                onChange={(event) => setNewRundownTitle(event.target.value)}
                placeholder={state.preview?.rundown.title || 'Imported rundown'}
                aria-label='New rundown name'
              />
            </label>
          )}
        </Panel.InlineElements>
        <Panel.InlineElements wrap='wrap'>
          <Button onClick={onCancel} disabled={isBusy}>
            Cancel
          </Button>
-          {onExport && (
+        )}
-            <Button onClick={handleExportSubmit} disabled={!canPreview} loading={state.loading === 'export'}>
+        <Button
-              <IoArrowUpOutline />
+          variant={state.preview ? undefined : 'primary'}
-              Export
+          onClick={handlePreviewSubmit}
-            </Button>
+          disabled={!canPreview}
-          )}
+          loading={state.loading === 'preview'}
-          <Button
+        >
-            variant={state.preview ? undefined : 'primary'}
+          <IoEye />
-            onClick={handlePreviewSubmit}
+          Preview import
-            disabled={!canPreview}
+        </Button>
-            loading={state.loading === 'preview'}
+        <Button
-          >
+          variant='primary'
-            <IoEye />
+          onClick={handleApply}
-            Preview import
+          disabled={!state.preview || isBusy}
-          </Button>
+          loading={state.loading === 'apply'}
-          <ApplyImportButton
+        >
-            preview={state.preview}
+          Apply import
-            mode={importMode}
+        </Button>
            disabled={!state.preview || isBusy}
            loading={state.loading === 'apply'}
            onApply={handleApply}
          />
        </Panel.InlineElements>
      </Panel.InlineElements>
    </Panel.Section>
  );
@@ -1,21 +1,15 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import {
  builtInFieldDefs,
  convertToImportMap,
  createDefaultFormValues,
  defaultImportMode,
  getImportWarnings,
  getPersistedImportMode,
  getProvidedImportFields,
  getResolvedCustomFields,
  isIdColumnMapped,
  persistImportMode,
 } from '../importMapUtils';
 const cueIndex = builtInFieldDefs.findIndex((field) => field.label === 'Cue');
 const titleIndex = builtInFieldDefs.findIndex((field) => field.label === 'Title');
 const idIndex = builtInFieldDefs.findIndex((field) => field.importKey === 'id');
 describe('getImportWarnings()', () => {
  it('warns when two mappings target the same spreadsheet column', () => {
@@ -134,64 +128,3 @@ describe('convertToImportMap()', () => {
    });
  });
 });
 describe('getProvidedImportFields()', () => {
  it('reports the mapped built-in and custom fields the sheet supplies', () => {
    const values = createDefaultFormValues();
    values.builtIn[titleIndex] = { header: 'title', enabled: true };
    values.builtIn[cueIndex] = { header: '', enabled: false };
    values.custom = [{ ontimeName: 'ignored', importName: 'FOH/Monitor' }];
    const provided = getProvidedImportFields(convertToImportMap(values));
    // enabled built-in mappings are reported as event fields, disabled ones are not
    expect(provided.event).toContain('title');
    expect(provided.event).not.toContain('cue');
    // the id column is only used for matching, never overwritten
    expect(provided.event).not.toContain('id');
    // custom fields are reported symmetrically by their resolved Ontime name
    expect(provided.custom).toStrictEqual(['FOH Monitor']);
  });
 });
 describe('isIdColumnMapped()', () => {
  it('is true when the ID field is enabled with a header', () => {
    // the default form maps the ID column
    expect(isIdColumnMapped(createDefaultFormValues())).toBe(true);
  });
  it('is false when the ID field is disabled', () => {
    const values = createDefaultFormValues();
    values.builtIn[idIndex] = { header: 'id', enabled: false };
    expect(isIdColumnMapped(values)).toBe(false);
  });
  it('is false when the ID field header is blank', () => {
    const values = createDefaultFormValues();
    values.builtIn[idIndex] = { header: '   ', enabled: true };
    expect(isIdColumnMapped(values)).toBe(false);
  });
 });
 describe('import mode persistence', () => {
  const sourceKey = 'excel-test';
  beforeEach(() => {
    localStorage.clear();
  });
  it('defaults to override when nothing is persisted', () => {
    expect(getPersistedImportMode(sourceKey)).toBe('override');
    expect(defaultImportMode).toBe('override');
  });
  it('round-trips a persisted value', () => {
    persistImportMode(sourceKey, 'merge');
    expect(getPersistedImportMode(sourceKey)).toBe('merge');
  });
  it('falls back to the default when the persisted value is invalid', () => {
    persistImportMode(sourceKey, 'nonsense' as never);
    expect(getPersistedImportMode(sourceKey)).toBe('override');
  });
 });
@@ -1,4 +1,3 @@
 import type { ImportedFields, RundownImportMode } from 'ontime-types';
 import type { ImportMap } from 'ontime-utils';
 import { makeStageKey } from '../../../../../../common/utils/localStorage';
@@ -50,16 +49,6 @@ export function createDefaultFormValues(): ImportFormValues {
  };
 }
 /**
 * Whether the mapping supplies an ID column. Merge matches entries by ID, so without one every
 * imported entry gets a fresh id and nothing can reconcile with the current rundown.
 */
 export function isIdColumnMapped(values: ImportFormValues): boolean {
  const idIndex = builtInFieldDefs.findIndex((def) => def.importKey === 'id');
  const field = values.builtIn[idIndex];
  return Boolean(field?.enabled && field.header.trim());
 }
 function sanitiseOntimeCustomFieldLabel(importName: string): string {
  // Replace punctuation with spaces, then collapse repeated whitespace into single spaces.
  const sanitised = importName
@@ -92,24 +81,6 @@ export function getResolvedCustomFields(customFields: ImportFormValues['custom']
  });
 }
 /**
 * Returns the fields the import map supplies — the complete description of what the incoming data
 * provides, for both built-in and custom fields. A merge uses this to patch exactly these fields
 * onto a matched event and keep everything else (e.g. automations) untouched.
 * Import-map keys are OntimeEvent field names; `worksheet`/`custom` are meta and `id` is only used
 * for matching, not overwritten.
 */
 export function getProvidedImportFields(importMap: ImportMap): ImportedFields {
  const event: string[] = [];
  for (const [key, value] of Object.entries(importMap)) {
    if (key === 'worksheet' || key === 'custom' || key === 'id') continue;
    if (typeof value === 'string' && value.trim() !== '') {
      event.push(key);
    }
  }
  return { event, custom: Object.keys(importMap.custom) };
 }
 export function convertToImportMap(values: ImportFormValues): ImportMap {
  const custom = getResolvedCustomFields(values.custom).reduce<Record<string, string>>(
    (accumulator, { ontimeName, importName }) => {
@@ -159,12 +130,12 @@ function isPersistedFormValues(obj: unknown): obj is ImportFormValues {
 export function getPersistedImportState(sourceKey: string): { values: ImportFormValues; isPersisted: boolean } {
  const storageKey = getImportMapKey(sourceKey);
  try {
-    const persistedData = localStorage.getItem(storageKey);
+    const raw = localStorage.getItem(storageKey);
-    if (!persistedData) {
+    if (!raw) {
      return { values: createDefaultFormValues(), isPersisted: false };
    }
-    const parsed: unknown = JSON.parse(persistedData);
+    const parsed: unknown = JSON.parse(raw);
    if (isPersistedFormValues(parsed)) {
      return { values: parsed, isPersisted: true };
    }
@@ -179,32 +150,6 @@ export function getPersistedImportState(sourceKey: string): { values: ImportForm
  }
 }
 /**
 * The import mode (new / merge / override) is persisted separately from the field mapping
 * so the mapping schema guard stays untouched.
 */
 /** Default import mode: replace matched elements in the current rundown */
 export const defaultImportMode: RundownImportMode = 'override';
 function getImportModeKey(sourceKey: string) {
  return makeStageKey(`import-mode:${sourceKey}`);
 }
 /** Persists the import mode for a given source */
 export function persistImportMode(sourceKey: string, mode: RundownImportMode) {
  localStorage.setItem(getImportModeKey(sourceKey), mode);
 }
 /** Reads the persisted import mode for a source, falling back to the default when absent or invalid */
 export function getPersistedImportMode(sourceKey: string): RundownImportMode {
  const persisted = localStorage.getItem(getImportModeKey(sourceKey));
  if (persisted === 'new' || persisted === 'merge' || persisted === 'override') {
    return persisted;
  }
  return defaultImportMode;
 }
 /**
 * Validates import mappings and generates warnings for duplicate or missing spreadsheet columns.
 */
@@ -1,35 +1,27 @@
 .emptyState {
-  padding: 3rem 1.5rem;
+  height: 100%;
  min-height: 16rem;
  display: grid;
  place-content: center;
  gap: 0.35rem;
  padding: 1.5rem;
  text-align: center;
 }
 .emptyMessage {
  width: min(30rem, 100%);
  margin-inline: auto;
 }
 .emptyTitle {
-  margin-bottom: 0.25rem;
+  color: $ui-white;
-  color: rgba($gray-200, 0.72);
+  font-size: 1rem;
-  font-size: calc(1rem + 2px);
+  font-weight: 600;
  font-weight: 400;
 }
 .emptyBody {
-  color: rgba($gray-200, 0.55);
+  color: $gray-400;
-  font-size: calc(1rem - 3px);
+  font-size: 0.95rem;
  line-height: 1.5;
 }
 .emptyAction {
  margin: 1rem auto 0;
 }
 .table {
  width: 100%;
-  border-collapse: separate;
+  border-collapse: collapse;
  border-spacing: 0;
  color: $ui-white;
  font-size: calc(1rem - 2px);
  text-align: left;
  table-layout: auto;
@@ -42,101 +34,31 @@
  }
  th {
-    color: $gray-300;
+    font-weight: 400;
-    font-size: 0.8rem;
+    color: $gray-400;
-    font-weight: 600;
+    text-transform: capitalize;
-    letter-spacing: 0.02em;
+    vertical-align: top;
    text-transform: uppercase;
    vertical-align: bottom;
    white-space: normal;
  }
  th,
  td {
-    box-sizing: border-box;
+    padding: 0.5rem;
    min-width: 8rem;
-    max-width: 20rem;
+    vertical-align: top;
    padding: 0.55rem 0.65rem;
    border-bottom: 1px solid $white-10;
    overflow: hidden;
    text-overflow: ellipsis;
    vertical-align: middle;
    white-space: nowrap;
  }
-  tbody tr {
+  tr:nth-child(even) {
-    --entry-colour: transparent;
+    background-color: $white-1;
    background-color: color-mix(in srgb, $gray-1300 96%, var(--entry-colour) 4%);
    box-shadow: inset 3px 0 var(--entry-colour);
  }
  td[data-empty='true'] {
    color: $gray-600;
  }
 }
 .rowNumber,
 .rowType {
  position: sticky;
  z-index: 1;
  background-color: inherit;
 }
 .rowNumber {
-  left: 0;
+  width: 4.5rem;
-  width: 3.25rem;
+  min-width: 4.5rem;
  min-width: 3.25rem !important;
  color: $gray-400;
  text-align: right;
 }
 .rowType {
-  left: 3.25rem;
+  width: 7rem;
-  width: 6.25rem;
+  min-width: 7rem;
  min-width: 6.25rem !important;
  color: $gray-400;
  font-size: 0.8rem;
  box-shadow: 1px 0 $white-10;
 }
 thead .rowNumber,
 thead .rowType {
  z-index: 2;
  background-color: $gray-1350;
 }
 .numericCell {
  font-variant-numeric: tabular-nums;
  text-align: right;
 }
 .multilineCell {
  max-width: 30rem !important;
  overflow-wrap: anywhere;
  text-overflow: clip !important;
  white-space: pre-wrap !important;
 }
 .eventRow {
  .rowNumber {
    font-variant-numeric: tabular-nums;
  }
 }
 .groupRow {
  background-color: color-mix(in srgb, $gray-1300 88%, var(--entry-colour) 12%) !important;
  box-shadow: inset 4px 0 var(--entry-colour) !important;
  font-weight: 600;
  td {
    min-height: 3.25rem;
    border-top: 0.75rem solid $gray-1350;
  }
 }
 .milestoneRow {
  background-color: color-mix(in srgb, $gray-1300 93%, var(--entry-colour) 7%) !important;
  box-shadow: inset 3px 0 var(--entry-colour) !important;
  color: $gray-300;
  font-style: italic;
 }
@@ -1,11 +1,7 @@
 import type { CustomField, CustomFieldKey, SpreadsheetPreviewResponse } from 'ontime-types';
-import { isOntimeDelay, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import type { CSSProperties } from 'react';
 import { useMemo } from 'react';
 import Button from '../../../../../../../common/components/buttons/Button';
 import Tag from '../../../../../../../common/components/tag/Tag';
 import { getRundownMetadata } from '../../../../../../../common/utils/rundownMetadata';
 import { getCellValue } from './previewTableUtils';
 import style from './PreviewTable.module.scss';
@@ -13,85 +9,14 @@ import style from './PreviewTable.module.scss';
 interface PreviewTableProps {
  preview: SpreadsheetPreviewResponse | null;
  columnLabels: string[];
  canRefresh: boolean;
  isLoadingMetadata: boolean;
  isRefreshing: boolean;
  needsPreviewRefresh: boolean;
  onRefresh: () => void;
  worksheetHeaders: string[];
 }
 const priorityColumns = ['Title', 'Cue', 'Start', 'End', 'Duration'];
 const numericColumns = new Set(['Start', 'End', 'Duration', 'Time warning', 'Time danger']);
 const transparentColour = 'transparent';
 type PreviewEntry = SpreadsheetPreviewResponse['rundown']['entries'][string];
 function getEntryDisplay(entry: PreviewEntry, groupColour?: string) {
  if (isOntimeGroup(entry)) {
    return {
      rowClassName: style.groupRow,
      entryColour: entry.colour,
      entryType: 'Group',
    };
  }
  const entryColour = groupColour ?? transparentColour;
  if (isOntimeMilestone(entry)) {
    return {
      rowClassName: style.milestoneRow,
      entryColour,
      entryType: 'Milestone',
    };
  }
  if (isOntimeDelay(entry)) {
    return {
      rowClassName: style.eventRow,
      entryColour,
      entryType: 'Delay',
    };
  }
  return {
    rowClassName: style.eventRow,
    entryColour,
    entryType: 'Event',
  };
 }
 function getCellClassName(label: string, value: string) {
  if (value.includes('\n')) {
    return style.multilineCell;
  }
  if (numericColumns.has(label)) {
    return style.numericCell;
  }
  return undefined;
 }
 function getDisplayColumns(columnLabels: string[]) {
  return [...columnLabels].sort((left, right) => {
    const leftPriority = priorityColumns.indexOf(left);
    const rightPriority = priorityColumns.indexOf(right);
    return (
      (leftPriority === -1 ? priorityColumns.length : leftPriority) -
      (rightPriority === -1 ? priorityColumns.length : rightPriority)
    );
  });
 }
 export default function PreviewTable({
  preview,
  columnLabels,
  canRefresh,
  isLoadingMetadata,
  isRefreshing,
  needsPreviewRefresh,
  onRefresh,
  worksheetHeaders,
 }: PreviewTableProps) {
  const customFieldKeyByLabel = useMemo(() => {
@@ -99,57 +24,33 @@ export default function PreviewTable({
    return new Map(Object.entries(preview.customFields).map(([fieldId, field]) => [field.label, fieldId]));
  }, [preview]);
  const displayColumns = useMemo(() => getDisplayColumns(columnLabels), [columnLabels]);
  const previewMetadata = useMemo(() => {
    if (!preview) return null;
    return getRundownMetadata(preview.rundown, null);
  }, [preview]);
  if (!preview) {
    let emptyTitle = 'Preview not generated';
    let emptyContent = 'Select the fields you want to import, then click Preview import.';
    if (isLoadingMetadata) {
      emptyTitle = 'Loading worksheet';
      emptyContent = 'Loading worksheet metadata...';
    } else if (worksheetHeaders.length === 0) {
      emptyTitle = 'No headers found';
      emptyContent =
        'No column headers detected in this worksheet. Try a different worksheet or ensure the first row contains column headers.';
    } else if (needsPreviewRefresh) {
      emptyTitle = 'Preview needs updating';
      emptyContent = 'Your column mapping changed. Preview the import again to update this table.';
    }
    return (
      <div className={style.emptyState}>
-        <div className={style.emptyMessage}>
+        <div className={style.emptyTitle}>Preview not generated</div>
-          <div className={style.emptyTitle}>{emptyTitle}</div>
+        <div className={style.emptyBody}>{emptyContent}</div>
          <div className={style.emptyBody}>{emptyContent}</div>
          {needsPreviewRefresh && (
            <Button
              className={style.emptyAction}
              variant='primary'
              onClick={onRefresh}
              disabled={!canRefresh}
              loading={isRefreshing}
            >
              Refresh preview
            </Button>
          )}
        </div>
      </div>
    );
  }
  let eventIndex = 0;
  return (
    <table className={style.table}>
      <thead>
        <tr>
          <th className={style.rowNumber}>#</th>
          <th className={style.rowType}>Type</th>
-          {displayColumns.map((label, index) => (
+          {columnLabels.map((label, index) => (
            <th key={`${label}-${index}`}>{label}</th>
          ))}
        </tr>
@@ -158,29 +59,16 @@ export default function PreviewTable({
        {preview.rundown.flatOrder.map((entryId) => {
          const entry = preview.rundown.entries[entryId];
          const isEvent = isOntimeEvent(entry);
-          const entryMetadata = previewMetadata?.[entryId];
+          if (isEvent) eventIndex++;
-          const { rowClassName, entryColour, entryType } = getEntryDisplay(entry, entryMetadata?.groupColour);
+          const hasType = isEvent || isOntimeGroup(entry) || isOntimeMilestone(entry);
          return (
-            <tr key={entryId} className={rowClassName} style={{ '--entry-colour': entryColour } as CSSProperties}>
+            <tr key={entryId}>
-              <td className={style.rowNumber}>{isEvent ? entryMetadata?.eventIndex : ''}</td>
+              <td className={style.rowNumber}>{isEvent ? eventIndex : ''}</td>
-              <td className={style.rowType}>
+              <td className={style.rowType}>{hasType ? entry.type : ''}</td>
-                <Tag>{entryType}</Tag>
+              {columnLabels.map((label, colIndex) => (
-              </td>
+                <td key={`${entryId}-${colIndex}`}>{getCellValue(label, entry, customFieldKeyByLabel)}</td>
-              {displayColumns.map((label, colIndex) => {
+              ))}
                const value = getCellValue(label, entry, customFieldKeyByLabel);
                const cellClassName = getCellClassName(label, value);
                return (
                  <td
                    key={`${entryId}-${colIndex}`}
                    className={cellClassName}
                    data-empty={value === ''}
                    title={value || undefined}
                  >
                    {value}
                  </td>
                );
              })}
            </tr>
          );
        })}
@@ -1,13 +1,7 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import type {
+import type { SpreadsheetPreviewResponse, SpreadsheetWorksheetMetadata } from 'ontime-types';
-  ImportedFields,
+import { millisToString } from 'ontime-utils';
-  RundownImportMode,
+import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
  SpreadsheetPreviewResponse,
  SpreadsheetWorksheetMetadata,
 } from 'ontime-types';
 import { isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { millisToString, removeTrailingZero } from 'ontime-utils';
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { maybeAxiosError } from '../../../../../../common/api/utils';
@@ -17,11 +11,8 @@ import {
  builtInFieldDefs,
  convertToImportMap,
  getImportWarnings,
  getPersistedImportMode,
  getPersistedImportState,
  getProvidedImportFields,
  getResolvedCustomFields,
  persistImportMode,
  persistImportState,
 } from './importMapUtils';
 import { deriveHeaderOptionsState } from './spreadsheetImportUtils';
@@ -33,7 +24,7 @@ type ImportAction =
  | { type: 'previewSuccess'; preview: SpreadsheetPreviewResponse }
  | { type: 'applySuccess' }
  | { type: 'exportSuccess' }
-  | { type: 'clearPreview'; error?: string; needsRefresh?: boolean }
+  | { type: 'clearPreview'; error?: string }
  | { type: 'failure'; error: string }
  | { type: 'reset' };
@@ -41,14 +32,12 @@ type ImportState = {
  loading: '' | 'preview' | 'apply' | 'export';
  error: string;
  preview: SpreadsheetPreviewResponse | null;
  needsPreviewRefresh: boolean;
 };
 const initialImportState: ImportState = {
  loading: '',
  error: '',
  preview: null,
  needsPreviewRefresh: false,
 };
 function importReducer(state: ImportState, action: ImportAction): ImportState {
@@ -60,15 +49,15 @@ function importReducer(state: ImportState, action: ImportAction): ImportState {
    case 'startExport':
      return { ...state, loading: 'export', error: '' };
    case 'previewSuccess':
-      return { loading: '', error: '', preview: action.preview, needsPreviewRefresh: false };
+      return { loading: '', error: '', preview: action.preview };
    case 'applySuccess':
    case 'exportSuccess':
      return { ...state, loading: '' };
    case 'clearPreview':
-      return { ...state, error: action.error ?? '', preview: null, needsPreviewRefresh: action.needsRefresh ?? false };
+      return { ...state, error: action.error ?? '', preview: null };
    case 'failure': {
      if (state.loading === 'preview') {
-        return { loading: '', error: action.error, preview: null, needsPreviewRefresh: false };
+        return { loading: '', error: action.error, preview: null };
      }
      return { ...state, loading: '', error: action.error };
    }
@@ -111,23 +100,16 @@ function buildColumnLabels(values: ImportFormValues): string[] {
 interface UseSheetImportFormProps {
  sourceKey: string;
  defaultRundownName: string;
  worksheetNames: string[];
  initialMetadata: SpreadsheetWorksheetMetadata | null;
  loadMetadata: (worksheet: string) => Promise<SpreadsheetWorksheetMetadata>;
  previewImport: (importMap: ReturnType<typeof convertToImportMap>) => Promise<SpreadsheetPreviewResponse>;
-  onApply: (
+  onApply: (preview: SpreadsheetPreviewResponse) => Promise<void>;
    preview: SpreadsheetPreviewResponse,
    mode: RundownImportMode,
    newRundownTitle: string,
    providedFields: ImportedFields,
  ) => Promise<void>;
  onExport?: (importMap: ReturnType<typeof convertToImportMap>) => Promise<void>;
 }
 export function useSheetImportForm({
  sourceKey,
  defaultRundownName,
  worksheetNames,
  initialMetadata,
  loadMetadata,
@@ -188,8 +170,6 @@ export function useSheetImportForm({
  const columnLabels = buildColumnLabels(values);
  const [state, dispatch] = useReducer(importReducer, initialImportState);
  const [importMode, setImportMode] = useState<RundownImportMode>(() => getPersistedImportMode(sourceKey));
  const [newRundownTitle, setNewRundownTitle] = useState(defaultRundownName);
  const warnings = getImportWarnings(values, headers);
  const warningCount = Object.values(warnings).filter(Boolean).length;
  const previewRef = useRef<SpreadsheetPreviewResponse | null>(null);
@@ -202,12 +182,6 @@ export function useSheetImportForm({
    dispatch({ type: 'reset' });
  }, [initialFormValues, reset]);
  // Update import mode and rundown name if the source changes
  useEffect(() => {
    setImportMode(getPersistedImportMode(sourceKey));
    setNewRundownTitle(defaultRundownName);
  }, [sourceKey, defaultRundownName]);
  // Keep the worksheet selection valid if the available worksheets change underneath the form.
  useEffect(() => {
    if (worksheetNames.length === 0) return;
@@ -224,7 +198,7 @@ export function useSheetImportForm({
    const sub = watch(() => {
      if (!previewRef.current) return;
      previewRef.current = null;
-      dispatch({ type: 'clearPreview', needsRefresh: true });
+      dispatch({ type: 'clearPreview' });
    });
    return () => sub.unsubscribe();
  }, [watch]);
@@ -267,15 +241,13 @@ export function useSheetImportForm({
    try {
      dispatch({ type: 'startApply' });
-      const providedFields = getProvidedImportFields(convertToImportMap(getValues()));
+      await onApply(state.preview);
      await onApply(state.preview, importMode, newRundownTitle, providedFields);
      persistImportState(sourceKey, getValues());
      persistImportMode(sourceKey, importMode);
      dispatch({ type: 'applySuccess' });
    } catch (error) {
      dispatch({ type: 'failure', error: maybeAxiosError(error) });
    }
-  }, [getValues, importMode, newRundownTitle, onApply, sourceKey, state.preview]);
+  }, [getValues, onApply, sourceKey, state.preview]);
  const handleExport = useCallback(
    async (formValues: ImportFormValues) => {
@@ -300,37 +272,15 @@ export function useSheetImportForm({
  }, [append]);
  const toolbarStatus = (() => {
    const warningText = warningCount > 0 ? ` | warnings: ${warningCount}` : '';
    if (!state.preview) {
-      return {
+      return `entries: – | start: – | end: – | duration: –${warningText}`;
        entries: '–',
        groups: '–',
        milestones: '–',
        start: '–',
        end: '–',
        duration: '–',
        warnings: warningCount,
      };
    }
-    const { entries, flatOrder } = state.preview.rundown;
+    const { flatOrder } = state.preview.rundown;
    const { start, end, duration } = state.preview.summary;
-    let groups = 0;
+    return `entries: ${flatOrder.length} | start: ${millisToString(start)} | end: ${millisToString(end)} | duration: ${formatDuration(duration)}${warningText}`;
    let milestones = 0;
    for (const entryId of flatOrder) {
      const entry = entries[entryId];
      if (isOntimeGroup(entry)) groups++;
      else if (isOntimeMilestone(entry)) milestones++;
    }
    return {
      entries: flatOrder.length,
      groups,
      milestones,
      start: removeTrailingZero(millisToString(start)),
      end: removeTrailingZero(millisToString(end)),
      duration: formatDuration(duration),
      warnings: warningCount,
    };
  })();
  return {
@@ -350,10 +300,6 @@ export function useSheetImportForm({
    isBusy,
    canPreview,
    displayError,
    importMode,
    setImportMode,
    newRundownTitle,
    setNewRundownTitle,
    handlePreviewSubmit: handleSubmit(handlePreview),
    handleExportSubmit: handleSubmit(handleExport),
    handleApply,
@@ -1,17 +1,30 @@
-import { RundownImportPayload } from 'ontime-types';
+import { useQueryClient } from '@tanstack/react-query';
 import { CustomFields, ProjectRundowns } from 'ontime-types';
 import { useCallback } from 'react';
-import { importRundownWithOptions } from '../../../../../common/api/rundown';
+import { CUSTOM_FIELDS, RUNDOWN } from '../../../../../common/api/constants';
 import { patchData } from '../../../../../common/api/db';
 export default function useSpreadsheetImport() {
-  /** applies a spreadsheet import: override or merge into the current rundown, or create a new one */
+  const queryClient = useQueryClient();
-  const applyImport = useCallback(async (payload: RundownImportPayload) => {
+
-    // the backend broadcasts a refetch once the rundown is parsed and applied, so the caches update
+  /** applies rundown and customFields to current project */
-    // through that single path rather than racing it with an optimistic write from here
+  const importRundown = useCallback(
-    await importRundownWithOptions(payload);
+    async (rundowns: ProjectRundowns, customFields: CustomFields) => {
-  }, []);
+      await patchData({ rundowns, customFields });
      // we are unable to optimistically set the rundown since we need
      // it to be normalised
      await queryClient.invalidateQueries({
        queryKey: RUNDOWN,
      });
      await queryClient.invalidateQueries({
        queryKey: CUSTOM_FIELDS,
      });
    },
    [queryClient],
  );
  return {
-    applyImport,
+    importRundown,
  };
 }
@@ -2,23 +2,33 @@ import { useEffect, useState } from 'react';
 import { generateUrl } from '../../../../common/api/session';
 import CopyTag from '../../../../common/components/copy-tag/CopyTag';
-import { serverURL } from '../../../../externals';
+import useInfo from '../../../../common/hooks-query/useInfo';
 import { isOntimeCloud, serverURL } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 export default function McpSection() {
  const { data: infoData } = useInfo();
  const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
  // generate url
  useEffect(() => {
-    // the page origin is reachable wherever the user is browsing from,
+    const baseUrl = (() => {
-    // and follows the deployment (cloud, reverse proxy, port mappings)
+      if (isOntimeCloud) return serverURL;
      // for local setups we prefer the localhost IP to avoid remote access
      if (infoData.networkInterfaces.length > 0) {
        return `http://${infoData.networkInterfaces[0].address}:${infoData.serverPort}`;
      }
      return serverURL;
    })();
    // we are reusing the endpoint, so locking config and nav have no effect
-    generateUrl({ baseUrl: serverURL, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
+    generateUrl({ baseUrl, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
      .then(setMcpEndpointUrl)
      .catch(() => {
        setMcpEndpointUrl('');
      });
-  }, []);
+  }, [infoData]);
  const mcpClientConfig = mcpEndpointUrl
    ? JSON.stringify({ mcpServers: { ontime: { url: mcpEndpointUrl } } }, null, 2)
@@ -30,19 +40,14 @@ export default function McpSection() {
        <Panel.SubHeader>MCP Server</Panel.SubHeader>
        <Panel.Paragraph>Connect any MCP-compatible AI agent to Ontime using the endpoint below.</Panel.Paragraph>
        <Panel.Divider />
-        <Panel.ListGroup>
+        <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
-          <Panel.ListItem>
+        {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
-            <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
+        <Panel.Divider />
-            {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
+        <Panel.Field
-          </Panel.ListItem>
+          title='Client configuration snippet'
-          <Panel.ListItem>
+          description='Paste this into your AI agent settings under "mcpServers"'
-            <Panel.Field
+        />
-              title='Client configuration snippet'
+        {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
              description='Paste this into your AI agent settings under "mcpServers"'
            />
            {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
          </Panel.ListItem>
        </Panel.ListGroup>
      </Panel.Card>
    </Panel.Section>
  );
@@ -73,10 +73,6 @@
  margin-right: 0.25rem;
 }
 .tagOvertime {
  color: $playback-over;
 }
 .time {
  color: $section-white;
  font-size: $text-body-size;
@@ -1,13 +1,12 @@
 import { MaybeNumber, Playback, TimerPhase } from 'ontime-types';
-import { millisToString } from 'ontime-utils';
+import { dayInMs, millisToString } from 'ontime-utils';
 import { PropsWithChildren } from 'react';
 import AppLink from '../../../../common/components/link/app-link/AppLink';
 import Tooltip from '../../../../common/components/tooltip/Tooltip';
 import useReport from '../../../../common/hooks-query/useReport';
-import { useTimerProgress } from '../../../../common/hooks/useSocket';
+import { useTimer } from '../../../../common/hooks/useSocket';
-import { cx } from '../../../../common/utils/styleUtils';
+import { formatDuration } from '../../../../common/utils/time';
 import { formatDuration, normaliseWallClock } from '../../../../common/utils/time';
 import TimerDisplay from '../timer-display/TimerDisplay';
 import style from './PlaybackTimer.module.scss';
@@ -25,14 +24,15 @@ function resolveAddedTimeLabel(addedTime: number) {
 }
 export default function PlaybackTimer({ children }: PropsWithChildren) {
-  'use memo';
+  const timer = useTimer();
  const timer = useTimerProgress();
  const isRolling = timer.playback === Playback.Roll;
  const isWaiting = timer.phase === TimerPhase.Pending;
  const isOvertime = timer.phase === TimerPhase.Overtime;
  const hasAddedTime = Boolean(timer.addedTime);
  const rollLabel = isRolling ? 'Roll mode active' : '';
  const addedTimeLabel = resolveAddedTimeLabel(timer.addedTime);
  return (
@@ -51,13 +51,7 @@ export default function PlaybackTimer({ children }: PropsWithChildren) {
        {isWaiting ? (
          <span className={style.rolltag}>Roll: Countdown to start</span>
        ) : (
-          <RunningStatus
+          <RunningStatus startedAt={timer.startedAt} expectedFinish={timer.expectedFinish} playback={timer.playback} />
            startedAt={timer.startedAt}
            expectedFinish={timer.expectedFinish}
            isStopped={timer.playback === Playback.Stop}
            isCountToEnd={timer.isCountToEnd}
            isOvertime={isOvertime}
          />
        )}
      </div>
      {children}
@@ -68,18 +62,16 @@ export default function PlaybackTimer({ children }: PropsWithChildren) {
 interface RunningStatusProps {
  startedAt: MaybeNumber;
  expectedFinish: MaybeNumber;
-  isStopped: boolean;
+  playback: Playback;
  isCountToEnd: boolean;
  isOvertime: boolean;
 }
-
+function RunningStatus({ startedAt, expectedFinish, playback }: RunningStatusProps) {
-function RunningStatus({ startedAt, expectedFinish, isStopped, isCountToEnd, isOvertime }: RunningStatusProps) {
+  if (playback === Playback.Stop) {
  if (isStopped) {
    return <StoppedStatus />;
  }
  const started = millisToString(startedAt);
-  const finish = millisToString(expectedFinish === null ? null : normaliseWallClock(expectedFinish));
+  const finishedMs = expectedFinish !== null ? expectedFinish % dayInMs : null;
  const finish = millisToString(finishedMs);
  return (
    <>
@@ -88,9 +80,7 @@ function RunningStatus({ startedAt, expectedFinish, isStopped, isCountToEnd, isO
        <span className={style.time}>{started}</span>
      </span>
      <span className={style.finish}>
-        <span className={cx([style.tag, isOvertime && style.tagOvertime])}>
+        <span className={style.tag}>Expect end</span>
          {isCountToEnd ? 'Scheduled end' : 'Expected end'}
        </span>
        <span className={style.time}>{finish}</span>
      </span>
    </>
@@ -180,13 +180,7 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
            return (
              <Fragment key={entry.id}>
-                <OperatorGroup
+                <OperatorGroup key={entry.id} title={entry.title} />
                  key={entry.id}
                  title={entry.title}
                  colour={entry.colour}
                  count={entry.entries.length}
                  duration={entry.duration}
                />
                {entry.entries.map((nestedEntryId) => {
                  const nestedEntry = rundown.entries[nestedEntryId];
                  if (!isOntimeEvent(nestedEntry)) {
@@ -223,7 +217,6 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
                      isLinkedToLoaded={isLinkedToLoaded}
                      isSelected={isLoaded}
                      isPast={isPast}
                      groupColour={entry.colour}
                      selectedRef={isLoaded ? selectedRef : undefined}
                      showStart={showStart}
                      subscribed={subscribedData}
@@ -22,39 +22,17 @@
    background-color: $gray-1250;
  }
  &.grouped {
    position: relative;
    padding-left: 0.35rem;
    background:
      linear-gradient(90deg, color-mix(in srgb, transparent 88%, var(--group-colour, $gray-500) 12%), transparent 8rem),
      $viewer-card-bg-color;
  }
  &.running {
    border-top: 1px solid $gray-1300;
    background-color: var(--operator-running-bg-override, $active-green);
  }
  &.grouped.running {
    background:
      linear-gradient(90deg, color-mix(in srgb, transparent 82%, var(--group-colour, $gray-500) 18%), transparent 8rem),
      var(--operator-running-bg-override, $active-green);
  }
  &.past {
    border-top: 1px solid transparent;
    opacity: 0.2;
  }
 }
 .groupRail {
  position: absolute;
  inset-block: 0;
  left: 0;
  width: 0.35rem;
  background-color: var(--group-colour, $gray-500);
 }
 .binder {
  grid-area: binder;
  color: $section-white;
@@ -96,9 +74,6 @@
 .plannedStart,
 .timeUntil,
 .runningTime {
  display: flex;
  align-items: center;
  gap: 0.25rem;
  border-radius: $component-border-radius-md;
  padding: 0.25rem 0.5rem;
  line-height: 1;
@@ -120,21 +95,6 @@
  letter-spacing: 1px;
 }
 .live {
  color: $ui-black;
  background-color: $ui-white;
 }
 .due {
  color: $ui-black;
  background-color: $orange-500;
 }
 .done {
  color: $white-60;
  background-color: $white-7;
 }
 .runningTime {
  grid-area: running;
  font-size: 1.25rem;
@@ -25,7 +25,6 @@ interface OperatorEventProps {
  isLinkedToLoaded: boolean;
  isSelected: boolean;
  isPast: boolean;
  groupColour?: string;
  selectedRef?: RefObject<HTMLDivElement | null>;
  showStart: boolean;
  subscribed: Subscribed;
@@ -47,7 +46,6 @@ function OperatorEvent({
  isLinkedToLoaded,
  isSelected,
  isPast,
  groupColour,
  selectedRef,
  showStart,
  subscribed,
@@ -70,12 +68,7 @@ function OperatorEvent({
  const mouseHandlers = useLongPress(handleLongPress);
  const cueColours = colour && getAccessibleColour(colour);
-  const operatorClasses = cx([
+  const operatorClasses = cx([style.event, isSelected && style.running, isPast && style.past]);
    style.event,
    groupColour && style.grouped,
    isSelected && style.running,
    isPast && style.past,
  ]);
  const hasFields = subscribed.some((field) => field.value);
  const columnCount = subscribed.length ? Math.min(subscribed.length, 4) : 0;
@@ -92,10 +85,8 @@ function OperatorEvent({
      data-testid={cue}
      ref={selectedRef}
      onContextMenu={handleLongPress}
      style={groupColour ? ({ '--group-colour': groupColour } as CSSProperties) : undefined}
      {...mouseHandlers}
    >
      {groupColour && <div className={style.groupRail} />}
      <div className={style.binder} style={{ ...cueColours }}>
        <span className={style.cue}>{cue}</span>
      </div>
@@ -162,11 +153,11 @@ function OperatorEventSchedule({
  isLinkedToLoaded,
 }: OperatorEventScheduleProps) {
  if (isPast) {
-    return <span className={cx([style.timeUntil, style.done])}>DONE</span>;
+    return <span className={style.timeUntil}>DONE</span>;
  }
  if (isSelected) {
-    return <span className={cx([style.timeUntil, style.live])}>LIVE</span>;
+    return <span className={style.timeUntil}>LIVE</span>;
  }
  return (
@@ -195,7 +186,7 @@ function TimeUntil({ timeStart, delay, dayOffset, totalGap, isLinkedToLoaded }:
  const timeUntilString = isDue ? 'DUE' : `${formatDuration(Math.abs(timeUntil), timeUntil > 2 * MILLIS_PER_MINUTE)}`;
  return (
-    <span className={cx([style.timeUntil, isDue && style.due])} data-testid='time-until'>
+    <span className={style.timeUntil} data-testid='time-until'>
      {timeUntilString}
    </span>
  );
@@ -1,33 +1,13 @@
 .group {
  width: 100%;
-  min-height: 2.5rem;
+  padding: 0.25rem 0.5rem;
  padding: 0.4rem 0.75rem;
  border-left: 0.35rem solid var(--group-colour, $gray-500);
  background-color: $gray-1350;
  background: color-mix(in srgb, transparent 88%, var(--group-colour, $gray-500) 12%);
  font-size: 1.25rem;
  font-weight: 600;
  display: flex;
  align-items: center;
  gap: 1rem;
  letter-spacing: 0;
 }
-.title {
+// tablet
-  flex: 1 1 auto;
+@media (min-width: $min-tablet) {
-  min-width: 0;
+  .group {
-  overflow: hidden;
+    padding: 0.25rem 1rem;
-  text-overflow: ellipsis;
+  }
  white-space: nowrap;
 }
 .meta {
  display: flex;
  flex: 0 0 auto;
  align-items: center;
  gap: 0.5rem;
  color: color-mix(in srgb, currentColor 60%, transparent);
  font-size: 0.875rem;
  font-weight: 500;
 }
@@ -1,29 +1,12 @@
-import { CSSProperties, memo } from 'react';
+import { memo } from 'react';
 import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import { formatDuration } from '../../../common/utils/time';
 import style from './OperatorGroup.module.scss';
 interface OperatorGroup {
  title: string;
  colour: string;
  count: number;
  duration: number;
 }
 export default memo(OperatorGroup);
-function OperatorGroup({ title, colour, count, duration }: OperatorGroup) {
+function OperatorGroup({ title }: OperatorGroup) {
-  const groupColour = colour || '#929292';
+  return <div className={style.group}>{title}</div>;
  const groupColours = getAccessibleColour(groupColour);
  return (
    <div className={style.group} style={{ ...groupColours, '--group-colour': groupColour } as CSSProperties}>
      <span className={style.title}>{title}</span>
      <span className={style.meta}>
        <span>{`${count} ${count === 1 ? 'event' : 'events'}`}</span>
        <span>{formatDuration(duration)}</span>
      </span>
    </div>
  );
 }
@@ -105,29 +105,12 @@ export default function Rundown({ order, flatOrder, entries, id, rundownMetadata
    handleCollapseGroup,
  });
  // Jump to the current element on demand: the running event in Run mode, the edit cursor otherwise.
  // Scrolls only (no selection change) so jumping to the running event does not hijack the edit cursor.
  const jumpToCurrent = useCallback(() => {
    const targetId = editorMode === AppMode.Run ? featureData?.selectedEventId : cursor;
    if (!targetId) {
      return;
    }
    // Open parent group if the target is inside a collapsed group
    const entry = entries[targetId];
    if (entry && 'parent' in entry) {
      expandGroup(entry.parent);
    }
    scrollToEntry(targetId);
  }, [editorMode, featureData?.selectedEventId, cursor, entries, expandGroup, scrollToEntry]);
  // Keyboard shortcuts
  useRundownKeyboard({
    cursor,
    commands,
    clearSelectedEvents,
    setEntryCopyId,
    jumpToCurrent,
  });
  // DND handlers
@@ -339,9 +322,7 @@ export default function Rundown({ order, flatOrder, entries, id, rundownMetadata
            increaseViewportBy={{ top: 200, bottom: 400 }}
            style={{ height: '100%' }}
            components={{
-              Header: isEditMode
+              Header: isEditMode ? () => <QuickAddButtons previousEventId={null} parentGroup={null} /> : undefined,
                ? () => <QuickAddButtons previousEventId={null} nextEventId={order[0]} parentGroup={null} />
                : undefined,
              Footer: () => (
                <>
                  {isEditMode && (
@@ -3,94 +3,58 @@
  height: 100%;
  max-height: 100%;
  overflow-y: auto;
-  padding: 1rem 1.5rem;
+  padding: 0.5rem;
  display: flex;
  flex-direction: column;
  overflow-x: auto;
 }
 .shortcutSection {
  flex: 1;
-  width: min(100%, 48rem);
+  margin-top: 15vh;
  margin-top: clamp(1.5rem, 8vh, 5rem);
  margin-inline: auto;
  gap: 1rem;
 }
 .shortcuts {
-  display: grid;
+  font-size: calc(1rem - 3px);
-  gap: 0.875rem;
+  border-collapse: separate;
-  margin-top: 0.875rem;
+  border-spacing: 4rem 0;
 }
-.shortcutGroup {
+  tr {
-  h3 {
+    white-space: nowrap;
-    margin: 0 0 0.375rem;
+    td:nth-child(odd) {
-    color: $ui-white;
+      text-align: left;
-    font-size: calc(1rem - 3px);
+    }
-    font-weight: 600;
+    td:nth-child(even) {
-    text-transform: uppercase;
+      text-align: right;
    }
  }
 }
-.shortcutList {
+.spacer {
-  display: grid;
+  height: 1rem;
  gap: 0.25rem;
 }
 .shortcutRow {
  min-height: 1.625rem;
  display: grid;
  grid-template-columns: minmax(10rem, 1fr) minmax(0, auto);
  align-items: center;
  gap: 0.75rem;
  font-size: calc(1rem - 3px);
 }
 .shortcutLabel {
  min-width: 0;
  line-height: 1.2;
 }
 .shortcutKeys {
  display: inline-flex;
  align-items: center;
  flex-wrap: wrap;
  justify-content: flex-end;
  gap: 0.25rem 0.5rem;
  min-width: 0;
 }
 .keyCombo {
  display: inline-flex;
  align-items: center;
  flex-wrap: nowrap;
  gap: 0.25rem 0;
 }
 .separator {
  color: $gray-500;
  font-size: calc(1rem - 5px);
 }
 .prompt {
  margin-left: 4rem;
 }
 .divider {
  display: inline-block;
  text-align: center;
  width: 1em;
 }
 .kbd {
  font-family: monospace;
  white-space: nowrap;
  font-size: calc(1rem - 2px);
  padding: 0.125rem 0.5rem;
  background-color: $gray-1200;
  color: $ui-white;
-}
+  border-radius: 2px;
-
+  font-weight: 400;
-@media (max-width: 680px) {
+  box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.4);
  .entryEditor {
    padding: 0.75rem 1rem;
  }
  .shortcutSection {
    margin-top: 1rem;
  }
  .shortcutRow {
    grid-template-columns: 1fr;
    gap: 0.25rem;
  }
  .shortcutKeys {
    justify-content: flex-start;
  }
 }
@@ -1,7 +1,6 @@
 import { PropsWithChildren, memo } from 'react';
 import * as Editor from '../../../common/components/editor-utils/EditorUtils';
 import Kbd from '../../../common/components/kbd/Kbd';
 import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
 import style from './EventEditorEmpty.module.scss';
@@ -13,127 +12,216 @@ function EventEditorEmpty() {
    <div className={style.entryEditor} data-testid='editor-container'>
      <div className={style.shortcutSection}>
        <Editor.Title className={style.prompt}>Rundown shortcuts</Editor.Title>
-        <div className={style.shortcuts}>
+        <table className={style.shortcuts}>
-          <ShortcutGroup title='Search'>
+          <tbody>
-            <Shortcut label='Find in rundown'>
+            <tr>
-              <Combo keys={[deviceMod, 'F']} />
+              <td>Find in rundown</td>
-            </Shortcut>
+              <td>
-            <Shortcut label='Open settings'>
+                <Kbd>{deviceMod}</Kbd>
-              <Combo keys={[deviceMod, ',']} />
+                <AuxKey>+</AuxKey>
-            </Shortcut>
+                <Kbd>F</Kbd>
-          </ShortcutGroup>
+              </td>
-
+            </tr>
-          <ShortcutGroup title='Navigation'>
+            <tr>
-            <Shortcut label='Select entry'>
+              <td>Open Settings</td>
-              <Combo keys={[deviceAlt, '↑']} />
+              <td>
-              <Separator />
+                <Kbd>{deviceMod}</Kbd>
-              <Combo keys={[deviceAlt, '↓']} />
+                <AuxKey>+</AuxKey>
-            </Shortcut>
+                <Kbd>,</Kbd>
-            <Shortcut label='Select group'>
+              </td>
-              <Combo keys={[deviceAlt, 'Shift', '↑']} />
+            </tr>
-              <Separator />
+            <tr className={style.spacer} />
-              <Combo keys={[deviceAlt, 'Shift', '↓']} />
+            <tr>
-            </Shortcut>
+              <td>Select entry</td>
-            <Shortcut label='Jump to top / bottom'>
+              <td>
-              <Combo keys={['Home']} />
+                <Kbd>{deviceAlt}</Kbd>
-              <Separator />
+                <AuxKey>+</AuxKey>
-              <Combo keys={['End']} />
+                <Kbd>↑</Kbd>
-            </Shortcut>
+                <AuxKey>/</AuxKey>
-            <Shortcut label='Page up / down'>
+                <Kbd>↓</Kbd>
-              <Combo keys={['PgUp']} />
+              </td>
-              <Separator />
+            </tr>
-              <Combo keys={['PgDn']} />
+            <tr>
-            </Shortcut>
+              <td>Select group</td>
-            <Shortcut label='Jump to current entry'>
+              <td>
-              <Combo keys={[deviceAlt, 'L']} />
+                <Kbd>{deviceAlt}</Kbd>
-            </Shortcut>
+                <AuxKey>+</AuxKey>
-            <Shortcut label='Deselect entry'>
+                <Kbd>Shift</Kbd>
-              <Combo keys={['Esc']} />
+                <AuxKey>+</AuxKey>
-            </Shortcut>
+                <Kbd>↑</Kbd>
-          </ShortcutGroup>
+                <AuxKey>/</AuxKey>
-
+                <Kbd>↓</Kbd>
-          <ShortcutGroup title='Editing'>
+              </td>
-            <Shortcut label='Reorder selected entry'>
+            </tr>
-              <Combo keys={[deviceAlt, deviceMod, '↑']} />
+            <tr>
-              <Separator />
+              <td>Jump to top / bottom</td>
-              <Combo keys={[deviceAlt, deviceMod, '↓']} />
+              <td>
-            </Shortcut>
+                <Kbd>Home</Kbd>
-            <Shortcut label='Copy selected entry'>
+                <AuxKey>/</AuxKey>
-              <Combo keys={[deviceMod, 'C']} />
+                <Kbd>End</Kbd>
-            </Shortcut>
+              </td>
-            <Shortcut label='Cut selected entry'>
+            </tr>
-              <Combo keys={[deviceMod, 'X']} />
+            <tr>
-            </Shortcut>
+              <td>Page up / down</td>
-            <Shortcut label='Paste below'>
+              <td>
-              <Combo keys={[deviceMod, 'V']} />
+                <Kbd>PgUp</Kbd>
-            </Shortcut>
+                <AuxKey>/</AuxKey>
-            <Shortcut label='Paste above'>
+                <Kbd>PgDn</Kbd>
-              <Combo keys={[deviceMod, 'Shift', 'V']} />
+              </td>
-            </Shortcut>
+            </tr>
-            <Shortcut label='Clone selected entry'>
+            <tr>
-              <Combo keys={[deviceMod, 'D']} />
+              <td>Deselect entry</td>
-            </Shortcut>
+              <td>
-            <Shortcut label='Delete selected entry'>
+                <Kbd>Esc</Kbd>
-              <Combo keys={[deviceAlt, 'Backspace']} />
+              </td>
-            </Shortcut>
+            </tr>
-          </ShortcutGroup>
+            <tr className={style.spacer} />
-
+            <tr>
-          <ShortcutGroup title='Insert'>
+              <td>Reorder selected entry</td>
-            <Shortcut label='Add event below / above'>
+              <td>
-              <Combo keys={[deviceAlt, 'E']} />
+                <Kbd>{deviceAlt}</Kbd>
-              <Separator />
+                <AuxKey>+</AuxKey>
-              <Combo keys={[deviceAlt, 'Shift', 'E']} />
+                <Kbd>{deviceMod}</Kbd>
-            </Shortcut>
+                <AuxKey>+</AuxKey>
-            <Shortcut label='Add group below / above'>
+                <Kbd>↑</Kbd>
-              <Combo keys={[deviceAlt, 'G']} />
+                <AuxKey>/</AuxKey>
-              <Separator />
+                <Kbd>↓</Kbd>
-              <Combo keys={[deviceAlt, 'Shift', 'G']} />
+              </td>
-            </Shortcut>
+            </tr>
-            <Shortcut label='Add milestone below / above'>
+            <tr>
-              <Combo keys={[deviceAlt, 'M']} />
+              <td>Copy selected entry</td>
-              <Separator />
+              <td>
-              <Combo keys={[deviceAlt, 'Shift', 'M']} />
+                <Kbd>{deviceMod}</Kbd>
-            </Shortcut>
+                <AuxKey>+</AuxKey>
-            <Shortcut label='Add delay below / above'>
+                <Kbd>C</Kbd>
-              <Combo keys={[deviceAlt, 'D']} />
+              </td>
-              <Separator />
+            </tr>
-              <Combo keys={[deviceAlt, 'Shift', 'D']} />
+            <tr>
-            </Shortcut>
+              <td>Cut selected entry</td>
-          </ShortcutGroup>
+              <td>
-        </div>
+                <Kbd>{deviceMod}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>X</Kbd>
              </td>
            </tr>
            <tr>
              <td>Paste above</td>
              <td>
                <Kbd>{deviceMod}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Shift</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>V</Kbd>
              </td>
            </tr>
            <tr>
              <td>Paste below</td>
              <td>
                <Kbd>{deviceMod}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>V</Kbd>
              </td>
            </tr>
            <tr>
              <td>Clone selected entry</td>
              <td>
                <Kbd>{deviceMod}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>D</Kbd>
              </td>
            </tr>
            <tr>
              <td>Delete selected entry</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Backspace</Kbd>
              </td>
            </tr>
            <tr className={style.spacer} />
            <tr>
              <td>Add event below</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>E</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add event above</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Shift</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>E</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add group below</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>G</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add group above</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Shift</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>G</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add milestone below</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>M</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add milestone above</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Shift</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>M</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add delay below</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>D</Kbd>
              </td>
            </tr>
            <tr>
              <td>Add delay above</td>
              <td>
                <Kbd>{deviceAlt}</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>Shift</Kbd>
                <AuxKey>+</AuxKey>
                <Kbd>D</Kbd>
              </td>
            </tr>
          </tbody>
        </table>
      </div>
    </div>
  );
 }
-function ShortcutGroup({ title, children }: PropsWithChildren<{ title: string }>) {
+function AuxKey({ children }: PropsWithChildren) {
-  return (
+  return <span className={style.divider}>{children}</span>;
    <section className={style.shortcutGroup}>
      <h3>{title}</h3>
      <div className={style.shortcutList}>{children}</div>
    </section>
  );
 }
-function Shortcut({ label, children }: PropsWithChildren<{ label: string }>) {
+function Kbd({ children }: PropsWithChildren) {
-  return (
+  return <span className={style.kbd}>{children}</span>;
    <div className={style.shortcutRow}>
      <span className={style.shortcutLabel}>{label}</span>
      <span className={style.shortcutKeys}>{children}</span>
    </div>
  );
 }
 function Combo({ keys }: { keys: string[] }) {
  return (
    <span className={style.keyCombo}>
      {keys.map((key) => (
        <Kbd key={key}>{key}</Kbd>
      ))}
    </span>
  );
 }
 function Separator() {
  return <span className={style.separator}>/</span>;
 }
@@ -10,7 +10,7 @@ import Switch from '../../../../common/components/switch/Switch';
 import Tooltip from '../../../../common/components/tooltip/Tooltip';
 import { useEntryActionsContext } from '../../../../common/context/EntryActionsContext';
 import { millisToDelayString } from '../../../../common/utils/dateConfig';
-import { formatTime, normaliseWallClock } from '../../../../common/utils/time';
+import { formatTime } from '../../../../common/utils/time';
 import TimeInputFlow from '../../time-input-flow/TimeInputFlow';
 import style from '../EntryEditor.module.scss';
@@ -68,10 +68,8 @@ function EventEditorTimes({
  };
  const hasDelay = delay !== 0;
  const delayedStart = normaliseWallClock(timeStart + delay);
  const delayedEnd = normaliseWallClock(timeEnd + delay);
  const delayLabel = hasDelay
-    ? `Event is ${millisToDelayString(delay, 'expanded')}. New schedule ${formatTime(delayedStart)} → ${formatTime(delayedEnd)}`
+    ? `Event is ${millisToDelayString(delay, 'expanded')}. New schedule ${formatTime(timeStart + delay)} → ${formatTime(timeEnd + delay)}`
    : '';
  return (
@@ -88,6 +86,7 @@ function EventEditorTimes({
              timeStrategy={timeStrategy}
              linkStart={linkStart}
              delay={delay}
              countToEnd={countToEnd}
              showLabels
            />
          </div>
@@ -11,17 +11,13 @@ import style from './QuickAddButtons.module.scss';
 interface QuickAddButtonsProps {
  previousEventId: MaybeString;
  nextEventId?: MaybeString;
  parentGroup: MaybeString;
  backgroundColor?: string;
 }
 export default memo(QuickAddButtons);
-function QuickAddButtons({ previousEventId, nextEventId, parentGroup, backgroundColor }: QuickAddButtonsProps) {
+function QuickAddButtons({ previousEventId, parentGroup, backgroundColor }: QuickAddButtonsProps) {
  const { addEntry } = useEntryActionsContext();
  const appendOptions = previousEventId ? { after: previousEventId, lastEventId: previousEventId } : undefined;
  const prependOptions = nextEventId ? { before: nextEventId } : undefined;
  const insertionOptions = appendOptions ?? prependOptions;
  const addEvent = () => {
    addEntry(
@@ -29,23 +25,44 @@ function QuickAddButtons({ previousEventId, nextEventId, parentGroup, background
        type: SupportedEntry.Event,
        parent: parentGroup,
      },
-      insertionOptions,
+      {
        after: previousEventId,
        lastEventId: previousEventId,
      },
    );
  };
  const addDelay = () => {
-    addEntry({ type: SupportedEntry.Delay, parent: parentGroup }, insertionOptions);
+    addEntry(
      { type: SupportedEntry.Delay, parent: parentGroup },
      {
        lastEventId: previousEventId,
        after: previousEventId,
      },
    );
  };
  const addMilestone = () => {
-    addEntry({ type: SupportedEntry.Milestone, parent: parentGroup }, insertionOptions);
+    addEntry(
      { type: SupportedEntry.Milestone, parent: parentGroup },
      {
        lastEventId: previousEventId,
        after: previousEventId,
      },
    );
  };
  const addGroup = () => {
    if (parentGroup !== null) {
      return;
    }
-    addEntry({ type: SupportedEntry.Group }, insertionOptions);
+    addEntry(
      { type: SupportedEntry.Group },
      {
        lastEventId: previousEventId,
        after: previousEventId,
      },
    );
  };
  /**
@@ -96,7 +96,7 @@ export function useRundownCommands({
      addEntry(patch, {
        after: id && !above ? id : undefined,
        before: id && above ? id : undefined,
-        lastEventId: id && !above ? id : undefined,
+        lastEventId: !above && id ? id : undefined,
      });
    },
    [addEntry],
@@ -19,7 +19,6 @@ interface UseRundownKeyboardOptions {
  };
  clearSelectedEvents: () => void;
  setEntryCopyId: (id: EntryId | null, mode?: 'copy' | 'cut') => void;
  jumpToCurrent: () => void;
 }
 /**
@@ -41,7 +40,6 @@ export function useRundownKeyboard({
  commands,
  clearSelectedEvents,
  setEntryCopyId,
  jumpToCurrent,
 }: UseRundownKeyboardOptions) {
  const scrollToEntry = useEventSelection((state) => state.scrollToEntry);
@@ -129,8 +127,6 @@ export function useRundownKeyboard({
      { preventDefault: true, usePhysicalKeys: true },
    ],
    ['alt + L', () => jumpToCurrent(), { preventDefault: true, usePhysicalKeys: true }],
    [
      'alt + mod + ArrowDown',
      () => commands.moveEntry(cursor, 'down'),
@@ -7,7 +7,6 @@ $skip-opacity: 0.2;
  background-color: $block-bg;
  margin-block: 0.25rem;
  overflow: initial;
  position: relative;
  display: grid;
  grid-template-areas:
@@ -17,7 +16,7 @@ $skip-opacity: 0.2;
    'binder pb-actions estatus estatus'
    'binder ...        ...     ...';
-  grid-template-columns: $block-binder-width 3rem minmax(0, 1fr) 3rem;
+  grid-template-columns: $block-binder-width 3rem 1fr 3rem;
  grid-template-rows: 0.125rem 2rem 2rem auto 0.125rem;
  align-items: center;
  padding-right: $block-clearance;
@@ -137,7 +136,6 @@ $skip-opacity: 0.2;
  align-items: center;
  gap: $block-clearance;
  height: 100%;
  min-width: 0;
 }
 .eventTimers.editMode:hover {
@@ -157,7 +155,7 @@ $skip-opacity: 0.2;
  align-items: center;
  justify-content: space-between;
-  .warningMeta {
+  .nextTag {
    font-size: 1rem;
    color: $orange-500;
    letter-spacing: 0.03px;
@@ -233,10 +231,6 @@ $skip-opacity: 0.2;
    color: var(--status-color-active-override, $active-indicator);
  }
  .statusIcon.countToEndStatus {
    color: $orange-400;
  }
  .statusIcon.warning {
    color: $orange-500;
  }
@@ -18,7 +18,7 @@ import { TbFlagFilled, TbListNumbers } from 'react-icons/tb';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
-import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
+import { deviceMod } from '../../../common/utils/deviceUtils';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
 import { useRenumberCuesDialogStore } from '../renumber-cues-dialog/RenumberCuesDialog';
 import { useEventIdSwapping } from '../useEventIdSwapping';
@@ -156,7 +156,7 @@ export default function RundownEvent({
            type: 'item',
            label: 'Delete',
            icon: IoTrash,
-            shortcut: `${deviceAlt}+Backspace`,
+            shortcut: `${deviceMod}+Del`,
            onClick: () => {
              clearSelectedEvents();
              deleteEntry(Array.from(selectedEvents));
@@ -202,7 +202,7 @@ export default function RundownEvent({
            type: 'item',
            label: 'Delete',
            icon: IoTrash,
-            shortcut: `${deviceAlt}+Backspace`,
+            shortcut: `${deviceMod}+Del`,
            onClick: () => {
              deleteEntry([eventId]);
              unselect(eventId);
@@ -115,12 +115,12 @@ function RundownEventInner({
          delay={delay}
          timeStrategy={timeStrategy}
          linkStart={linkStart}
          countToEnd={countToEnd}
        />
      </div>
      <div className={style.titleSection}>
        <TitleEditor title={title} entryId={eventId} placeholder='Event title' className={style.eventTitle} />
-        {isNext && <span className={style.warningMeta}>UP NEXT</span>}
+        {isNext && <span className={style.nextTag}>UP NEXT</span>}
        {!isNext && countToEnd && <span className={style.warningMeta}>COUNT TO END</span>}
      </div>
      <EventBlockPlayback
        eventId={eventId}
@@ -157,13 +157,7 @@ function RundownEventInner({
            <EndActionIcon action={endAction} className={style.statusIcon} />
          </Tooltip>
          <Tooltip text={`${countToEnd ? 'Count to End' : 'Count duration'}`} render={<span />}>
-            <LuArrowDownToLine
+            <LuArrowDownToLine className={`${style.statusIcon} ${countToEnd ? style.active : style.disabled}`} />
              className={cx([
                style.statusIcon,
                countToEnd ? style.active : style.disabled,
                countToEnd && style.countToEndStatus,
              ])}
            />
          </Tooltip>
          <Tooltip text={automationTooltip} render={<span />}>
            <IoFlash className={automationIconClasses} />
@@ -1,33 +1,10 @@
 import { MILLIS_PER_HOUR, MILLIS_PER_MINUTE } from 'ontime-utils';
 import { formatDelay } from '../rundownEvent.utils';
 describe('formatDelay()', () => {
  it('adds a given delay to the start time', () => {
-    const timeStart = 1 * MILLIS_PER_MINUTE; // 00:01
+    const timeStart = 60000; // 1 min
-    const delay = 1 * MILLIS_PER_MINUTE; // 00:01
+    const delay = 60000; // 1 min
    const result = formatDelay(timeStart, delay);
    expect(result).toEqual('New start 00:02');
  });
  it('wraps negative delayed starts under midnight', () => {
    const timeStart = 1 * MILLIS_PER_MINUTE; // 00:01
    const delay = -2 * MILLIS_PER_MINUTE; // -00:02
    const result = formatDelay(timeStart, delay);
    expect(result).toEqual('New start 23:59');
  });
  it('wraps later-day negative delays using delay as the source of truth', () => {
    const timeStart = 1 * MILLIS_PER_HOUR; // 01:00
    const delay = -(1 * MILLIS_PER_HOUR + 30 * MILLIS_PER_MINUTE); // -01:30
    const result = formatDelay(timeStart, delay);
    expect(result).toEqual('New start 23:30');
  });
  it('displays positive delays as wall-clock time', () => {
    const timeStart = 1 * MILLIS_PER_HOUR; // 01:00
    const delay = 1 * MILLIS_PER_HOUR + 30 * MILLIS_PER_MINUTE; // 01:30
    const result = formatDelay(timeStart, delay);
    expect(result).toEqual('New start 02:30');
  });
 });
@@ -3,5 +3,7 @@
  width: 0;
  border-radius: 1px 0 0 1px;
  transition: 1s linear;
  transition-property: width;
  background-color: $gray-200;
 }
@@ -1,12 +1,12 @@
 import { useAnimatedProgress } from '../../../../common/hooks/useAnimatedProgress';
 import { useTimer } from '../../../../common/hooks/useSocket';
 import { getProgress } from '../../../../common/utils/getProgress';
 import style from './RundownEventProgressBar.module.scss';
 export default function RundownEventProgressBar() {
  const timer = useTimer();
-  const progress = useAnimatedProgress(timer.current, timer.duration);
+  const progress = getProgress(timer.current, timer.duration);
  return <div className={style.progressBar} style={{ width: `${progress}%` }} />;
 }
@@ -1,16 +1,15 @@
 import { millisToString, removeTrailingZero } from 'ontime-utils';
-import { formatDuration, normaliseWallClock } from '../../../common/utils/time';
+import { formatDuration } from '../../../common/utils/time';
 export function formatDelay(timeStart: number, delay: number): string | undefined {
  if (!delay) return;
-  const delayedStart = normaliseWallClock(timeStart + delay);
+  const delayedStart = Math.max(0, timeStart + delay);
  const timeTag = removeTrailingZero(millisToString(delayedStart));
  return `New start ${timeTag}`;
 }
 export function formatGap(gap: number, isNextDay: boolean) {
  if (gap === 0) {
    if (isNextDay) {
@@ -82,17 +82,6 @@
  margin-right: 0.25rem;
  color: $ui-white;
 }
 .duration {
  display: flex;
  align-items: center;
  gap: 0.25rem;
 }
 .lockIcon {
  opacity: 0.6;
 }
 .over {
  color: $playback-over;
  .strike {
@@ -8,7 +8,6 @@ import {
  IoChevronUp,
  IoDuplicateOutline,
  IoFolderOpenOutline,
  IoLockClosed,
  IoReorderTwo,
  IoTrash,
 } from 'react-icons/io5';
@@ -18,7 +17,7 @@ import Tag from '../../../common/components/tag/Tag';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
-import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
+import { deviceMod } from '../../../common/utils/deviceUtils';
 import { getOffsetState } from '../../../common/utils/offset';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
 import { formatDuration, formatTime } from '../../../common/utils/time';
@@ -66,7 +65,7 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
      type: 'item',
      label: 'Delete Group',
      icon: IoTrash,
-      shortcut: `${deviceAlt}+Backspace`,
+      shortcut: `${deviceMod}+Del`,
      onClick: () => deleteEntry([data.id]),
    },
  ]);
@@ -177,17 +176,14 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
          </div>
          <div className={style.metaEntry}>
            <div className={style.metaLabel}>Duration</div>
-            <div className={style.duration}>
+            {planOffset === null ? (
-              {planOffset === null ? (
+              <div>{formatDuration(data.duration)}</div>
-                formatDuration(data.duration)
+            ) : (
-              ) : (
+              <div className={cx([planOffsetLabel && style[planOffsetLabel]])}>
-                <span className={cx([planOffsetLabel && style[planOffsetLabel]])}>
+                <span className={style.strike}>{formatDuration(data.duration)}</span>
-                  <span className={style.strike}>{formatDuration(data.duration)}</span>
+                <Tag className={style.offsetLabel}>{planOffset}</Tag>
-                  <Tag className={style.offsetLabel}>{planOffset}</Tag>
+              </div>
-                </span>
+            )}
              )}
              {data.targetDuration !== null && <IoLockClosed className={style.lockIcon} />}
            </div>
          </div>
        </div>
      </div>
@@ -9,7 +9,7 @@ import useReactiveTextInput from '../../../common/components/input/text-input/us
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
-import { deviceAlt } from '../../../common/utils/deviceUtils';
+import { deviceMod } from '../../../common/utils/deviceUtils';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
 import { useEventSelection } from '../useEventSelection';
@@ -38,7 +38,7 @@ export default function RundownMilestone({ colour, cue, entryId, hasCursor, titl
      type: 'item',
      label: 'Delete',
      icon: IoTrash,
-      shortcut: `${deviceAlt}+Backspace`,
+      shortcut: `${deviceMod}+Del`,
      onClick: () => deleteEntry([entryId]),
    },
  ]);
@@ -4,15 +4,10 @@
 .timerNote {
  width: 1.25em;
  flex: 0 0 1.25em;
  color: $blue-500;
  font-size: 1.5em;
 }
 .timerNotePlaceholder {
  visibility: hidden;
 }
 .inactive {
  color: $muted-gray;
 }
@@ -14,6 +14,7 @@ import style from './TimeInputFlow.module.scss';
 interface TimeInputFlowProps {
  eventId: string;
  countToEnd: boolean;
  timeStart: number;
  timeEnd: number;
  duration: number;
@@ -21,12 +22,12 @@ interface TimeInputFlowProps {
  linkStart: boolean;
  delay: number;
  showLabels?: boolean;
  showWarnings?: boolean;
 }
 export default memo(TimeInputFlow);
 function TimeInputFlow({
  eventId,
  countToEnd,
  timeStart,
  timeEnd,
  duration,
@@ -34,7 +35,6 @@ function TimeInputFlow({
  linkStart,
  delay,
  showLabels,
  showWarnings = true,
 }: TimeInputFlowProps) {
  const { updateEntry, updateTimer } = useEntryActionsContext();
@@ -56,6 +56,10 @@ function TimeInputFlow({
    warnings.push('Over midnight');
  }
  if (countToEnd) {
    warnings.push('Count to End');
  }
  const hasDelay = delay !== 0;
  const isLockedEnd = timeStrategy === TimeStrategy.LockEnd;
  const isLockedDuration = timeStrategy === TimeStrategy.LockDuration;
@@ -132,19 +136,11 @@ function TimeInputFlow({
        </TimeInputGroup>
      </div>
-      {showWarnings &&
+      {warnings.length > 0 && (
-        (warnings.length > 0 ? (
+        <Tooltip text={warnings.join(' - ')} className={style.timerNote} data-testid='event-warning' render={<span />}>
-          <Tooltip
+          <IoAlertCircleOutline />
-            text={warnings.join(' - ')}
+        </Tooltip>
-            className={style.timerNote}
+      )}
            data-testid='event-warning'
            render={<span />}
          >
            <IoAlertCircleOutline />
          </Tooltip>
        ) : (
          <span className={`${style.timerNote} ${style.timerNotePlaceholder}`} aria-hidden='true' />
        ))}
    </>
  );
 }
@@ -3,7 +3,6 @@ import { useMemo } from 'react';
 import useInfo from '../../common/hooks-query/useInfo';
 import useUrlPresets from '../../common/hooks-query/useUrlPresets';
 import { hostToBaseUrl } from '../../common/utils/linkUtils';
 import GenerateLinkForm from './GenerateLinkForm';
 interface GenerateLinkFormExportProps {
@@ -22,7 +21,7 @@ export default function GenerateLinkFormExport({ lockedPath }: GenerateLinkFormE
   */
  const hostOptions = useMemo(() => {
    return infoData.networkInterfaces.map((nif) => ({
-      value: hostToBaseUrl(nif.address, infoData.serverPort),
+      value: `http://${nif.address}:${infoData.serverPort}`,
      label: `${nif.name} - ${nif.address}`,
    }));
  }, [infoData.networkInterfaces, infoData.serverPort]);
@@ -18,7 +18,6 @@ export const langDe: TranslationObject = {
  'common.no_data': 'Keine Daten',
  'countdown.ended': 'Veranstaltung endete um',
  'countdown.running': 'Veranstaltung läuft',
  'countdown.group_running': 'Veranstaltung in Gruppe läuft',
  'countdown.loaded': 'Veranstaltung geladen',
  'countdown.select_event': 'Wählen Sie eine Veranstaltung aus, um sie zu verfolgen',
  'countdown.to_start': 'Zeit bis zum Start',
@@ -18,7 +18,6 @@ export const langEs: TranslationObject = {
  'common.no_data': 'Sin datos',
  'countdown.ended': 'Evento finalizado a las',
  'countdown.running': 'Evento en curso',
  'countdown.group_running': 'Evento en grupo en curso',
  'countdown.loaded': 'Evento está cargado', //TODO: check translation
  'countdown.select_event': 'Seleccionar un evento para seguir',
  'countdown.to_start': 'Tiempo para comenzar',
@@ -18,7 +18,6 @@ export const langFr: TranslationObject = {
  'common.no_data': 'Aucune donnée',
  'countdown.ended': 'Évènement terminé à',
  'countdown.running': 'Évènement en cours',
  'countdown.group_running': 'Évènement du groupe en cours',
  'countdown.loaded': 'Évènement chargé',
  'countdown.select_event': 'Sélectionnez un évènement à suivre',
  'countdown.to_start': 'Évènement commence dans',
@@ -18,7 +18,6 @@ export const langIt: TranslationObject = {
  'common.no_data': 'Nessun dato disponibile',
  'countdown.ended': 'Evento finito alle',
  'countdown.running': 'Evento in corso',
  'countdown.group_running': 'Evento nel gruppo in corso',
  'countdown.loaded': 'Evento caricato', //TODO: check translation
  'countdown.select_event': 'Seleziona un evento da seguire',
  'countdown.to_start': 'Tempo alla partenza',
@@ -18,7 +18,6 @@ export const langPt: TranslationObject = {
  'common.no_data': 'Sem dados',
  'countdown.ended': 'Evento encerrado às',
  'countdown.running': 'Evento em andamento',
  'countdown.group_running': 'Evento em grupo em andamento',
  'countdown.loaded': 'Evento carregado', //TODO: check translation
  'countdown.select_event': 'Selecione um evento para acompanhar',
  'countdown.to_start': 'Tempo para iniciar',
@@ -7,7 +7,6 @@ import {
  useCallback,
  useEffect,
  useLayoutEffect,
  useMemo,
  useRef,
  useState,
 } from 'react';
@@ -141,23 +140,25 @@ export const ScheduleProvider = ({ children, selectedEventId }: PropsWithChildre
    return () => clearInterval(paginator.current);
  }, [cycleInterval, numPages, stopCycle, visiblePage]);
  let selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);
  // we want to show the event after the current
-  const viewEvents = useMemo(() => {
+  const viewEvents = events.slice(selectedEventIndex + 1);
-    const selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);
+  selectedEventIndex = 0;
    return (events as ExtendedEntry<OntimeEvent>[]).slice(selectedEventIndex + 1);
  }, [events, selectedEventId]);
-  const value = useMemo(() => {
+  return (
-    return {
+    <ScheduleContext
-      events: viewEvents,
+      value={{
-      selectedEventId,
+        events: viewEvents as ExtendedEntry<OntimeEvent>[],
-      numPages,
+        selectedEventId,
-      visiblePage,
+        numPages,
-      containerRef,
+        visiblePage,
-    };
+        containerRef,
-  }, [viewEvents, selectedEventId, numPages, visiblePage, containerRef]);
+      }}
-
+    >
-  return <ScheduleContext value={value}>{children}</ScheduleContext>;
+      {children}
    </ScheduleContext>
  );
 };
 export const useSchedule = () => {
@@ -59,7 +59,6 @@ $item-height: 3.5rem;
    right: $view-inline-padding;
    display: flex;
    align-items: center;
    justify-content: end;
    gap: 2rem;
@@ -73,27 +72,14 @@ $item-height: 3.5rem;
  }
  /* ========================= LIST ========================*/
-  .empty-state {
+  .empty-container {
    min-height: min(56vh, 36rem);
    padding-top: clamp(4rem, 14vh, 9rem);
    text-align: center;
    display: flex;
    flex-direction: column;
    align-items: center;
    button {
-      margin-top: 1.75rem;
+      margin-top: 2rem;
    }
  }
  .empty-state__content {
    max-width: none;
    span {
      max-width: none;
      white-space: nowrap;
      font-size: clamp(1.5rem, 4vw, 2.25rem);
      line-height: 1.1;
    }
  }
@@ -102,7 +88,7 @@ $item-height: 3.5rem;
    flex-direction: column;
    overflow-y: auto;
-    padding-bottom: max(8rem, calc(5rem + env(safe-area-inset-bottom)));
+    padding-bottom: 60vh;
  }
  /* ====================== LIST-ITEM ======================*/
@@ -118,7 +104,6 @@ $item-height: 3.5rem;
    column-gap: 1rem;
    background-color: var(--card-background-color-override, $viewer-card-bg-color);
    padding-right: 1rem;
    border: 1px solid transparent;
    border-radius: $element-border-radius;
    &:hover {
@@ -130,41 +115,18 @@ $item-height: 3.5rem;
  .sub--selected {
    background: $blue-700;
    box-shadow: inset 0 0 0 1px $blue-500;
  }
  .sub--live {
    background-color: $active-green;
    box-shadow: inset 0 0 0 1px color-mix(in srgb, $active-green 75%, $ui-white);
  }
  .sub--armed {
    background-color: $gray-1325;
  }
  .sub--in-group {
    position: relative;
    margin-left: 1rem;
    &::before {
      content: '';
      position: absolute;
      left: -0.5rem;
      top: -0.25rem;
      bottom: -0.25rem;
      width: 2px;
      border-radius: 1px;
      background: var(--group-color, transparent);
    }
    .sub__binder {
      box-shadow: inset 3px 0 0 var(--group-color, transparent);
    }
  }
  .sub__binder {
    background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
    border-radius: $element-border-radius 0 0 $element-border-radius;
    grid-area: binder;
  }
@@ -176,8 +138,6 @@ $item-height: 3.5rem;
    gap: 0.25em;
    font-size: $timer-label-size;
    color: var(--label-color-override, $viewer-label-color);
    white-space: nowrap;
    font-variant-numeric: tabular-nums;
  }
  .sub__schedule--delayed {
@@ -196,73 +156,22 @@ $item-height: 3.5rem;
    color: $playback-under;
  }
  .sub--group {
    box-shadow: inset 0 0 0 1px var(--user-color, $gray-1325);
    background:
      linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 18%, transparent), transparent 42%),
      var(--card-background-color-override, $viewer-card-bg-color);
    .sub__binder {
      background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
      box-shadow: none;
    }
    .sub__title {
      font-weight: 700;
    }
    .sub__schedule,
    .sub__status,
    .sub__label {
      color: var(--secondary-color-override, $viewer-secondary-color);
    }
  }
  .sub--group.sub--selected {
    box-shadow: inset 0 0 0 1px $blue-500;
    background:
      linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 22%, transparent), transparent 42%),
      $blue-700;
    .sub__schedule,
    .sub__status,
    .sub__label,
    .sub__eyebrow {
      color: $ui-white;
    }
  }
  .sub__title {
    grid-area: title;
    padding-bottom: 0.5rem;
    min-width: 0;
    font-size: $title-font-size;
    line-height: 1.1em;
    overflow-wrap: anywhere;
  }
  .sub__eyebrow {
    display: block;
    margin-bottom: 0.15rem;
    color: var(--secondary-color-override, $viewer-secondary-color);
    font-size: $timer-label-size;
    font-weight: 700;
    line-height: 1;
    text-transform: uppercase;
  }
  .sub__secondary {
    grid-area: secondary;
    padding-bottom: 0.5rem;
    min-width: 0;
    font-size: $base-font-size;
    line-height: 1.1em;
    color: var(--label-color-override, $viewer-label-color);
    // allow multi-line text but trim before
    white-space: pre-line;
    overflow-wrap: anywhere;
  }
  .sub__status {
@@ -272,7 +181,6 @@ $item-height: 3.5rem;
    font-size: $timer-label-size;
    text-align: right;
    text-transform: uppercase;
    white-space: nowrap;
  }
  .sub__label {
@@ -282,7 +190,6 @@ $item-height: 3.5rem;
    font-size: $timer-label-size;
    color: var(--label-color-override, $viewer-label-color);
    text-align: right;
    white-space: nowrap;
  }
  .sub__timer {
@@ -292,16 +199,6 @@ $item-height: 3.5rem;
    line-height: 1.1em;
    font-weight: 600;
    text-align: right;
    white-space: nowrap;
    font-variant-numeric: tabular-nums;
  }
  .selection-count {
    color: var(--label-color-override, $viewer-label-color);
    font-size: $timer-label-size;
    font-weight: 600;
    text-transform: uppercase;
    white-space: nowrap;
  }
  /* ====================== MODIFIERS ======================*/
@@ -1,14 +1,4 @@
-import {
+import { EntryId, OntimeEvent, OntimeView, PlayableEvent, isOntimeEvent, isPlayableEvent } from 'ontime-types';
  EntryId,
  OntimeEntry,
  OntimeEvent,
  OntimeGroup,
  OntimeView,
  PlayableEvent,
  isOntimeEvent,
  isOntimeGroup,
  isPlayableEvent,
 } from 'ontime-types';
 import { useMemo, useState } from 'react';
 import { IoAdd } from 'react-icons/io5';
@@ -25,7 +15,7 @@ import { useTranslation } from '../../translation/TranslationProvider';
 import Loader from '../common/loader/Loader';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getCountdownOptions, useCountdownOptions } from './countdown.options';
-import { getOrderedSubscriptions, resolveSubscriptionTarget } from './countdown.utils';
+import { getOrderedSubscriptions } from './countdown.utils';
 import CountdownSelect from './CountdownSelect';
 import CountdownSubscriptions from './CountdownSubscriptions';
 import SingleEventCountdown from './SingleEventCountdown';
@@ -55,19 +45,13 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
  const [editMode, setEditMode] = useState(false);
-  // gather subscribable items: playable events and groups that contain at least one playable child
+  // gather rundown data
-  const candidates = rundownData.filter((entry): entry is ExtendedEntry<PlayableEvent | OntimeGroup> => {
+  const playableEvents = rundownData.filter((entry): entry is ExtendedEntry<PlayableEvent> => {
-    if (isOntimeEvent(entry)) {
+    return isOntimeEvent(entry) && isPlayableEvent(entry);
      return isPlayableEvent(entry);
    }
    if (isOntimeGroup(entry)) {
      return rundownData.some((item) => isOntimeEvent(item) && isPlayableEvent(item) && item.parent === entry.id);
    }
    return false;
  });
  // gather presentation data
-  const hasEvents = candidates.length > 0;
+  const hasEvents = playableEvents.length > 0;
  // gather option data
  const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -85,20 +69,15 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
        <CountdownClock />
      </div>
-      {!hasEvents && (
+      {!hasEvents && <Empty text={getLocalizedString('common.no_data')} className='empty-container' />}
        <div className='empty-state'>
          <Empty text={getLocalizedString('common.no_data')} className='empty-state__content' />
        </div>
      )}
      {hasEvents && editMode && (
-        <CountdownSelect events={candidates} subscriptions={subscriptions} disableEdit={() => setEditMode(false)} />
+        <CountdownSelect events={playableEvents} subscriptions={subscriptions} disableEdit={() => setEditMode(false)} />
      )}
      {hasEvents && !editMode && (
        <CountdownContents
-          candidates={candidates}
+          playableEvents={playableEvents}
          rundownData={rundownData}
          subscriptions={subscriptions}
          goToEditMode={() => setEditMode(true)}
        />
@@ -108,20 +87,19 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
 }
 interface CountdownContentsProps {
-  candidates: ExtendedEntry<OntimeEvent | OntimeGroup>[];
+  playableEvents: ExtendedEntry<OntimeEvent>[];
  rundownData: ExtendedEntry<OntimeEntry>[];
  subscriptions: EntryId[];
  goToEditMode: () => void;
 }
-function CountdownContents({ candidates, rundownData, subscriptions, goToEditMode }: CountdownContentsProps) {
+function CountdownContents({ playableEvents, subscriptions, goToEditMode }: CountdownContentsProps) {
  const { getLocalizedString } = useTranslation();
  const { hidePast } = useCountdownOptions();
  if (subscriptions.length === 0) {
    return (
-      <div className='empty-state'>
+      <div className='empty-container'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.select_event')} className='empty-container' />
        <Button variant='primary' size='xlarge' onClick={goToEditMode}>
          <IoAdd /> Add
        </Button>
@@ -129,15 +107,13 @@ function CountdownContents({ candidates, rundownData, subscriptions, goToEditMod
    );
  }
-  const subscribedEvents = getOrderedSubscriptions(subscriptions, candidates)
+  const subscribedEvents = getOrderedSubscriptions(subscriptions, playableEvents);
    .map((entry) => resolveSubscriptionTarget(entry, rundownData))
    .filter((target): target is NonNullable<typeof target> => target !== null);
  const eventsToShow = !hidePast ? subscribedEvents : subscribedEvents.filter((event) => !event.isPast);
  if (subscribedEvents.length === 0) {
    return (
-      <div className='empty-state'>
+      <div className='empty-container'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.select_event')} className='empty-container' />
        <Button variant='primary' size='xlarge' onClick={goToEditMode}>
          <IoAdd /> Add
        </Button>
@@ -153,8 +129,8 @@ function CountdownContents({ candidates, rundownData, subscriptions, goToEditMod
  if (eventsToShow.length === 0) {
    return (
-      <div className='empty-state'>
+      <div className='empty-container'>
-        <Empty text={getLocalizedString('countdown.all_have_finished')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.all_have_finished')} className='empty-container' />
      </div>
    );
  }
@@ -1,4 +1,4 @@
-import { EntryId, OntimeEvent, OntimeGroup, isOntimeGroup } from 'ontime-types';
+import { EntryId, PlayableEvent } from 'ontime-types';
 import { useState } from 'react';
 import { IoArrowBack, IoClose, IoSaveOutline } from 'react-icons/io5';
 import { useNavigate } from 'react-router';
@@ -12,7 +12,7 @@ import { makeSubscriptionsUrl } from './countdown.utils';
 import './Countdown.scss';
 interface CountdownSelectProps {
-  events: ExtendedEntry<OntimeEvent | OntimeGroup>[];
+  events: ExtendedEntry<PlayableEvent>[];
  subscriptions: EntryId[];
  disableEdit: () => void;
 }
@@ -52,15 +52,13 @@ export default function CountdownSelect({ events, subscriptions, disableEdit }:
  return (
    <div className='list-container'>
-      {events.map((event) => {
+      {events.map((event, index) => {
        const title = event.title || '{no title}';
        const isSelected = selectedIds.has(event.id);
        const isGroup = isOntimeGroup(event);
        const isGroupedEvent = !isGroup && Boolean(event.parent);
        return (
          <div
-            key={event.id}
+            key={index}
            role='button'
            tabIndex={0}
            onClick={() => toggleSelect(event.id)}
@@ -70,33 +68,21 @@ export default function CountdownSelect({ events, subscriptions, disableEdit }:
                e.stopPropagation();
              }
            }}
-            className={cx([
+            className={cx(['sub', isSelected && 'sub--selected'])}
              'sub',
              isSelected && 'sub--selected',
              isGroup && 'sub--group',
              isGroupedEvent && 'sub--in-group',
            ])}
          >
-            <div
+            <div className='sub__binder' style={{ '--user-color': event?.colour ?? '' }} />
              className='sub__binder'
              style={{ '--user-color': event?.colour ?? '', '--group-color': event.groupColour ?? 'transparent' }}
            />
            <div className='sub__schedule'>
              <ClockTime value={event.timeStart} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />
              →
              <ClockTime value={event.timeEnd} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />
            </div>
            <div className='sub__label'>{isSelected ? 'Click to remove' : 'Click to add'}</div>
-            <div className='sub__title'>
+            <div className='sub__title'>{title}</div>
              {isGroup && <span className='sub__eyebrow'>Group</span>}
              {title}
            </div>
          </div>
        );
      })}
      <div className='fab-container'>
        <div className='selection-count'>{selected.length} selected</div>
        <Button variant='subtle' size='xlarge' onClick={disableEdit}>
          <IoArrowBack /> Go back
        </Button>
@@ -19,7 +19,6 @@ import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
 import {
  CountdownEvent,
  CountdownTarget,
  extendEventData,
  getIsLive,
  isOutsideRange,
@@ -31,7 +30,7 @@ import {
 import './Countdown.scss';
 interface CountdownSubscriptionsProps {
-  subscribedEvents: CountdownTarget[];
+  subscribedEvents: ExtendedEntry<OntimeEvent>[];
  goToEditMode: () => void;
 }
@@ -99,39 +98,22 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
  return (
    <div className='list-container' onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
      {subscribedEvents.map((event) => {
-        // while a group is live, surface the running event's title as the secondary line
+        const secondaryData = getPropertyValue(event, secondarySource);
-        const liveTitle = event.isGroup && event.liveEntry ? event.liveEntry.title : undefined;
+        const isLive = getIsLive(event.id, selectedEventId, playback);
-        const secondaryData = liveTitle ?? getPropertyValue(event, secondarySource);
+        const isArmed = !isLive && event.id === selectedEventId;
        const isGroupedEvent = !event.isGroup && Boolean(event.parent);
        const activeEntryId = event.isGroup ? (event.liveEntry?.id ?? event.targetId) : event.id;
        // a subscribed group is live when any of its children is the selected/running event
        const isLive = activeEntryId ? getIsLive(activeEntryId, selectedEventId, playback) : false;
        const isArmed = !isLive && activeEntryId === selectedEventId;
        const countdownEvent = extendEventData(event, currentDay, actualStart, plannedStart, offset, mode, reportData);
        const displayTitle = getPropertyValue(event, mainSource ?? 'title');
        return (
          <div
            key={event.id}
            ref={isLive ? selectedRef : undefined}
-            className={cx([
+            className={cx(['sub', isLive && 'sub--live', isArmed && 'sub--armed'])}
              'sub',
              isLive && 'sub--live',
              isArmed && 'sub--armed',
              event.isGroup && 'sub--group',
              isGroupedEvent && 'sub--in-group',
            ])}
            data-testid={event.cue}
          >
-            <div
+            <div className='sub__binder' style={{ '--user-color': event.colour }} />
              className='sub__binder'
              style={{ '--user-color': event.colour, '--group-color': event.groupColour ?? 'transparent' }}
            />
            <ScheduleTime event={countdownEvent} showExpected={showExpected} />
            <SubscriptionStatus event={countdownEvent} />
-            <div className={cx(['sub__title', !displayTitle && 'subdued'])}>
+            <div className={cx(['sub__title', !displayTitle && 'subdued'])}>{displayTitle}</div>
              {event.isGroup && <span className='sub__eyebrow'>Group</span>}
              {displayTitle}
            </div>
            {secondaryData && <div className='sub__secondary'>{secondaryData}</div>}
          </div>
        );
@@ -153,7 +135,7 @@ type ScheduleTimeProps = {
 //TODO: consider relative mode
 export function ScheduleTime(props: ScheduleTimeProps) {
  const { event, showExpected } = props;
-  const { timeStart, duration, delay, expectedStart, expectedEnd } = event;
+  const { timeStart, duration, delay, expectedStart, countToEnd } = event;
  const plannedStart = timeStart + delay + event.dayOffset * dayInMs;
@@ -164,6 +146,7 @@ export function ScheduleTime(props: ScheduleTimeProps) {
  const expectedStateClass = `sub__schedule--${getOffsetState(expectedStart - plannedStart)}`;
  const plannedEnd = plannedStart + duration + delay;
  const expectedEnd = countToEnd ? Math.max(expectedStart + duration, plannedEnd) : expectedStart + duration;
  const expectedEndClass = `sub__schedule--${getOffsetState(expectedEnd - plannedEnd)}`;
  return (
@@ -1,21 +1,23 @@
-import { getExpectedEnd, getExpectedStart } from 'ontime-utils';
+import { MaybeNumber, OntimeEvent } from 'ontime-types';
 import { getExpectedStart } from 'ontime-utils';
 import { IoPencil } from 'react-icons/io5';
 import Button from '../../common/components/buttons/Button';
 import useReport from '../../common/hooks-query/useReport';
 import { useFadeOutOnInactivity } from '../../common/hooks/useFadeOutOnInactivity';
 import { useExpectedStartData } from '../../common/hooks/useSocket';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
 import { cx } from '../../common/utils/styleUtils';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
-import { CountdownEvent, CountdownTarget, useSubscriptionDisplayData } from './countdown.utils';
+import { useSubscriptionDisplayData } from './countdown.utils';
 import { ScheduleTime } from './CountdownSubscriptions';
 import './SingleEventCountdown.scss';
 interface SingleEventCountdownProps {
-  subscribedEvent: CountdownTarget;
+  subscribedEvent: ExtendedEntry<OntimeEvent>;
  goToEditMode: () => void;
 }
@@ -36,15 +38,11 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
    mode,
  });
-  const expectedEnd = getExpectedEnd(subscribedEvent, expectedStart, currentDay);
+  const { endedAt } = reportData[subscribedEvent.id] ?? { endedAt: null };
-
+  const countdownEvent = { ...subscribedEvent, expectedStart, endedAt };
  const { endedAt } = reportData[subscribedEvent.reportId ?? subscribedEvent.id] ?? { endedAt: null };
  const countdownEvent = { ...subscribedEvent, expectedStart, endedAt, expectedEnd };
  const titleTmp = getPropertyValue(subscribedEvent, mainSource ?? 'title');
  const title = titleTmp?.length ? titleTmp : ' '; // insert utf-8 empty space to avoid the line collapsing;
-  // while a group is live, surface the running event's title as the secondary line
+  const secondaryData = getPropertyValue(subscribedEvent, secondarySource);
  const liveTitle = subscribedEvent.isGroup && subscribedEvent.liveEntry ? subscribedEvent.liveEntry.title : undefined;
  const secondaryData = liveTitle ?? getPropertyValue(subscribedEvent, secondarySource);
  return (
    <div className='single-container' data-testid='countdown-event'>
@@ -64,7 +62,7 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
 }
 interface SubscriptionStatusProps {
-  event: CountdownEvent;
+  event: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number };
 }
 function SubscriptionStatus({ event }: SubscriptionStatusProps) {
@@ -80,7 +80,7 @@ export const getCountdownOptions = (
        {
          id: 'sub',
          title: 'Event subscription',
-          description: 'The events and groups to follow',
+          description: 'The events to follow',
          values: persistedSubscriptions,
          type: 'persist',
        },
@@ -1,128 +0,0 @@
 import { OntimeEntry, OntimeEvent, OntimeGroup, SupportedEntry } from 'ontime-types';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
 import { resolveSubscriptionTarget } from './countdown.utils';
 /**
 * Minimal builders for the extended (metadata enriched) entries the countdown view consumes.
 * Only the fields exercised by resolveSubscriptionTarget are provided; the rest are cast away.
 */
 function makeEvent(patch: Partial<ExtendedEntry<OntimeEvent>>): ExtendedEntry<OntimeEvent> {
  return {
    id: 'event',
    type: SupportedEntry.Event,
    title: 'event title',
    cue: '1',
    colour: '',
    skip: false,
    parent: null,
    timeStart: 0,
    timeEnd: 0,
    duration: 0,
    delay: 0,
    dayOffset: 0,
    gap: 0,
    countToEnd: false,
    custom: {},
    note: '',
    // metadata
    totalGap: 0,
    isLinkedToLoaded: false,
    isLoaded: false,
    isPast: false,
    ...patch,
  } as ExtendedEntry<OntimeEvent>;
 }
 function makeGroup(patch: Partial<ExtendedEntry<OntimeGroup>>): ExtendedEntry<OntimeGroup> {
  return {
    id: 'group',
    type: SupportedEntry.Group,
    title: 'group title',
    colour: '#abcdef',
    note: 'group note',
    entries: [],
    duration: 0,
    custom: {},
    timeStart: 0,
    timeEnd: 0,
    isPast: false,
    isLoaded: false,
    ...patch,
  } as ExtendedEntry<OntimeGroup>;
 }
 describe('resolveSubscriptionTarget()', () => {
  it('returns events unchanged', () => {
    const event = makeEvent({ id: 'e1' });
    const result = resolveSubscriptionTarget(event, [event]);
    expect(result).toBe(event);
  });
  it('derives group timing from the first playable child while keeping the group identity', () => {
    const group = makeGroup({ id: 'g1', title: 'Session A', colour: '#123456', duration: 5000 });
    const child1 = makeEvent({ id: 'c1', parent: 'g1', timeStart: 1000, delay: 100, dayOffset: 0, title: 'Pres 1' });
    const child2 = makeEvent({ id: 'c2', parent: 'g1', timeStart: 3000, title: 'Pres 2' });
    const flat: ExtendedEntry<OntimeEntry>[] = [group, child1, child2];
    const result = resolveSubscriptionTarget(group, flat);
    expect(result).not.toBeNull();
    // group identity and display
    expect(result?.id).toBe('g1');
    expect(result?.title).toBe('Session A');
    expect(result?.colour).toBe('#123456');
    expect(result?.isGroup).toBe(true);
    // timing comes from the first child, duration from the group
    expect(result?.timeStart).toBe(1000);
    expect(result?.delay).toBe(100);
    expect(result?.duration).toBe(5000);
    expect(result?.countToEnd).toBe(false);
    // state checks target the first child before any child is loaded
    expect(result?.targetId).toBe('c1');
    // report lookup targets the last child (session end)
    expect(result?.reportId).toBe('c2');
  });
  it('returns null for a group with no playable children', () => {
    const group = makeGroup({ id: 'g1' });
    const result = resolveSubscriptionTarget(group, [group]);
    expect(result).toBeNull();
  });
  it('skips skipped children when picking the first child', () => {
    const group = makeGroup({ id: 'g1' });
    const skipped = {
      ...makeEvent({ id: 'c0', parent: 'g1', timeStart: 500 }),
      skip: true,
    } as ExtendedEntry<OntimeEntry>;
    const playable = makeEvent({ id: 'c1', parent: 'g1', timeStart: 1500 });
    const result = resolveSubscriptionTarget(group, [group, skipped, playable]);
    expect(result?.timeStart).toBe(1500);
    expect(result?.reportId).toBe('c1');
  });
  it('is live while any child is loaded and not past', () => {
    const group = makeGroup({ id: 'g1' });
    const child1 = makeEvent({ id: 'c1', parent: 'g1', isPast: true });
    const child2 = makeEvent({ id: 'c2', parent: 'g1', isLoaded: true });
    const child3 = makeEvent({ id: 'c3', parent: 'g1' });
    const result = resolveSubscriptionTarget(group, [group, child1, child2, child3]);
    expect(result?.isLoaded).toBe(true);
    expect(result?.isPast).toBe(false);
    expect(result?.liveEntry?.id).toBe('c2');
  });
  it('is past only once the last child is past and nothing is loaded', () => {
    const group = makeGroup({ id: 'g1' });
    const child1 = makeEvent({ id: 'c1', parent: 'g1', isPast: true });
    const child2 = makeEvent({ id: 'c2', parent: 'g1', isPast: true });
    const result = resolveSubscriptionTarget(group, [group, child1, child2]);
    expect(result?.isLoaded).toBe(false);
    expect(result?.isPast).toBe(true);
    expect(result?.targetId).toBe('c1');
    expect(result?.liveEntry).toBeNull();
  });
 });
@@ -1,18 +1,5 @@
-import {
+import { EntryId, MaybeNumber, OffsetMode, OntimeEntry, OntimeEvent, OntimeReport, Playback } from 'ontime-types';
-  EntryId,
+import { MILLIS_PER_MINUTE, getExpectedStart, millisToString, removeLeadingZero } from 'ontime-utils';
  MaybeNumber,
  OffsetMode,
  OntimeEntry,
  OntimeEvent,
  OntimeGroup,
  OntimeReport,
  Playback,
  PlayableEvent,
  isOntimeEvent,
  isOntimeGroup,
  isPlayableEvent,
 } from 'ontime-types';
 import { MILLIS_PER_MINUTE, getExpectedEnd, getExpectedStart, millisToString, removeLeadingZero } from 'ontime-utils';
 import { useCountdownSocket } from '../../common/hooks/useSocket';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
@@ -53,7 +40,7 @@ export const timerProgress: TimerMessage = {
 * Handles events in different days but disregards whether an event has actually played
 */
 export function useSubscriptionDisplayData(
-  subscribedEvent: CountdownTarget & { endedAt: MaybeNumber; expectedStart: number },
+  subscribedEvent: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number },
 ): { status: ProgressStatus; statusDisplay: string; timeDisplay: string } {
  const { playback, current, clock } = useCountdownSocket();
  const { getLocalizedString } = useTranslation();
@@ -80,11 +67,7 @@ export function useSubscriptionDisplayData(
    return {
      status: 'live',
-      statusDisplay: getLocalizedString(
+      statusDisplay: getLocalizedString(timerProgress['live']),
        subscribedEvent.parent || (subscribedEvent.isGroup && subscribedEvent.liveEntry)
          ? 'countdown.group_running'
          : timerProgress['live'],
      ),
      timeDisplay: bigDuration(current ?? 0),
    };
  }
@@ -185,75 +168,10 @@ export function isOutsideRange(a: number, b: number): boolean {
  return Math.abs(a - b) > MILLIS_PER_MINUTE;
 }
-/**
+export type CountdownEvent = ExtendedEntry<OntimeEvent> & { expectedStart: number; endedAt: MaybeNumber };
 * A subscription target normalised to the event-shaped object the countdown display consumes.
 * For events this is a pass-through; for groups it carries the group identity and display data
 * while deriving timing from the group's first playable child (see resolveSubscriptionTarget).
 */
 export type CountdownTarget = ExtendedEntry<OntimeEvent> & {
  isGroup?: boolean;
  targetId?: EntryId; // child entry used for countdown/live/armed state checks
  reportId?: EntryId; // entry used for the report lookup (e.g. last child of a group)
  liveEntry?: ExtendedEntry<OntimeEvent> | null; // the running child while a group is live
 };
 export type CountdownEvent = CountdownTarget & { expectedStart: number; endedAt: MaybeNumber; expectedEnd: number };
 /**
 * Resolves a subscription (event or group) into an event-shaped countdown target.
 * - Events are returned unchanged.
 * - Groups count down to their first playable child while displaying the group identity.
 *   Status is group-aware: live while any child is loaded, past only once the whole group has finished.
 * Returns null when a group has no playable children (nothing to count down to).
 */
 export function resolveSubscriptionTarget(
  entry: ExtendedEntry<OntimeEvent | OntimeGroup>,
  flatRundown: ExtendedEntry<OntimeEntry>[],
 ): CountdownTarget | null {
  if (!isOntimeGroup(entry)) {
    return entry;
  }
  const children = flatRundown.filter(
    (item): item is ExtendedEntry<PlayableEvent> =>
      isOntimeEvent(item) && isPlayableEvent(item) && item.parent === entry.id,
  );
  if (children.length === 0) {
    return null;
  }
  const firstChild = children[0];
  const lastChild = children[children.length - 1];
  const liveEntry = children.find((child) => child.isLoaded) ?? null;
  const isLoaded = liveEntry !== null;
  const isPast = !isLoaded && lastChild.isPast;
  return {
    // timing derives from the first playable child
    ...firstChild,
    // group identity and display data
    id: entry.id,
    parent: null,
    title: entry.title,
    colour: entry.colour,
    note: entry.note,
    custom: entry.custom,
    duration: entry.duration,
    countToEnd: false,
    // group-aware status
    isLoaded,
    isPast,
    // group markers
    isGroup: true,
    targetId: firstChild.id,
    reportId: lastChild.id,
    liveEntry,
  };
 }
 export function extendEventData(
-  event: CountdownTarget,
+  event: ExtendedEntry<OntimeEvent>,
  currentDay: number,
  actualStart: MaybeNumber,
  plannedStart: MaybeNumber,
@@ -271,7 +189,6 @@ export function extendEventData(
    offset,
    mode,
  });
-  const expectedEnd = getExpectedEnd(event, expectedStart, currentDay);
+  const { endedAt } = reportData[event.id] ?? { endedAt: null };
-  const { endedAt } = reportData[event.reportId ?? event.id] ?? { endedAt: null };
+  return { ...event, expectedStart, endedAt };
  return { ...event, expectedStart, endedAt, expectedEnd };
 }
@@ -0,0 +1,32 @@
 import { parseField } from '../cuesheet.utils';
 describe('parseField()', () => {
  it('returns a string from given millis on timeStart, TimeEnd and duration', () => {
    const testData1 = 1000;
    const testData2 = 60000;
    const testData3 = 600000;
    expect(parseField('timeStart', testData1)).toBe('00:00:01');
    expect(parseField('timeEnd', testData2)).toBe('00:01:00');
    expect(parseField('duration', testData3)).toBe('00:10:00');
  });
  it('returns an empty string on undefined fields', () => {
    // @ts-expect-error -- testing user data with missing fields
    expect(parseField('title')).toBe('');
  });
  describe('simply returns any other value in any other field', () => {
    const testFields = [
      { field: 'nothing', value: '123' },
      { field: 'title', value: 'test' },
      { field: 'note', value: 'test' },
      { field: 'colour', value: 'test' },
    ];
    testFields.forEach((testCase) => {
      test(`${testCase.field}:${testCase.value}`, () => {
        expect(parseField(testCase.field, testCase.value)).toBe(testCase.value);
      });
    });
  });
 });
@@ -0,0 +1,23 @@
 import { CustomFields, MaybeNumber, OntimeEntryCommonKeys } from 'ontime-types';
 import { millisToString } from 'ontime-utils';
 type CsvHeaderKey = OntimeEntryCommonKeys | keyof CustomFields;
 /**
 * @description parses a field for export
 * @param {string} field
 * @param {*} data
 * @return {string}
 */
 export const parseField = (field: CsvHeaderKey, data: unknown): string => {
  if (field === 'timeStart' || field === 'timeEnd' || field === 'duration') {
    return millisToString(data as MaybeNumber, { fallback: '' });
  }
  if (field === 'skip') {
    return data ? 'x' : '';
  }
  return String(data ?? '');
 };
@@ -15,7 +15,7 @@ function EditorLayoutOptions() {
      {
        type: 'item',
        label: 'Planning',
-        description: 'Edit focused list with planning stats',
+        description: 'Edit-focused list with planning stats',
        icon: layoutMode === EditorLayoutMode.PLANNING ? IoCheckmark : undefined,
        onClick: () => setLayoutMode(EditorLayoutMode.PLANNING),
      },
@@ -54,51 +54,17 @@
 }
 .footer {
  width: 100%;
  display: flex;
  align-items: flex-end;
  justify-content: space-between;
  gap: 1rem;
  font-size: calc(1rem - 2px);
  color: $label-gray;
 }
 .filterHint {
  text-align: right;
 }
 .em {
  color: $ui-white;
  margin-inline: 0.25rem;
 }
 .hints {
  display: flex;
  flex-wrap: wrap;
  gap: 0.5rem 1rem;
  color: $label-gray;
  font-size: calc(1rem - 3px);
 }
 .hintItem {
  display: inline-flex;
  align-items: center;
  gap: 0.25rem;
 }
 .scrollContainer {
  max-height: 70vh;
  overflow: auto;
  padding-top: 1rem;
 }
@media (max-width: 680px) {
  .footer {
    align-items: flex-start;
    flex-direction: column;
  }
  .filterHint {
    text-align: left;
  }
 }
@@ -3,7 +3,6 @@ import { SupportedEntry } from 'ontime-types';
 import { KeyboardEvent, useState } from 'react';
 import Input from '../../../common/components/input/input/Input';
 import Kbd from '../../../common/components/kbd/Kbd';
 import Modal from '../../../common/components/modal/Modal';
 import useFinder from './useFinder';
@@ -97,25 +96,8 @@ export default function Finder({ isOpen, onClose }: FinderProps) {
      }
      footerElements={
        <div className={style.footer}>
-          <div className={style.hints}>
+          Use the keywords <span className={style.em}>cue</span>, <span className={style.em}>index</span> or
-            <span className={style.hintItem}>
+          <span className={style.em}>title</span> to filter search.
              <Kbd>↑</Kbd>
              <Kbd>↓</Kbd>
              Navigate
            </span>
            <span className={style.hintItem}>
              <Kbd>Enter</Kbd>
              Go
            </span>
            <span className={style.hintItem}>
              <Kbd>Esc</Kbd>
              Close
            </span>
          </div>
          <div className={style.filterHint}>
            Filter by <span className={style.em}>cue</span>, <span className={style.em}>index</span>, or
            <span className={style.em}>title</span>
          </div>
        </div>
      }
    />
@@ -28,9 +28,9 @@
  .timer-container {
    flex: 1;
-    display: flex;
+    align-content: center;
-    flex-direction: column;
+    justify-self: center;
-    justify-content: center;
+    align-self: center;
    width: 100%;
    overflow: hidden;
@@ -1,8 +1,8 @@
 import { Day } from 'ontime-types';
 import { CSSProperties, RefObject } from 'react';
 import { useAnimatedProgress } from '../../common/hooks/useAnimatedProgress';
 import { useExpectedStartData, useTimer } from '../../common/hooks/useSocket';
 import { getProgress } from '../../common/utils/getProgress';
 import { alpha, cx } from '../../common/utils/styleUtils';
 import { formatDuration, formatTime, getExpectedTimesFromExtendedEvent } from '../../common/utils/time';
 import { useTranslation } from '../../translation/TranslationProvider';
@@ -169,7 +169,7 @@ function TimelineEntryStatus({
 /** Generates a block level progress bar */
 function ActiveBlock() {
  const { current, duration } = useTimer();
-  const progress = useAnimatedProgress(current, duration);
+  const progress = getProgress(current, duration);
  return (
    <div data-status='live' className={style.timelineBlock} style={{ '--progress': `${progress}%` } as CSSProperties} />
  );
@@ -82,9 +82,9 @@
  .timer-container {
    flex: 1;
-    display: flex;
+    align-content: center;
-    flex-direction: column;
+    justify-self: center;
-    justify-content: center;
+    align-self: center;
    width: 100%;
    overflow: hidden;
@@ -71,11 +71,6 @@ export default defineConfig({
        changeOrigin: true,
        configure: logProxyRequests,
      },
      '^/mcp': {
        target: 'http://localhost:4001/',
        changeOrigin: true,
        configure: logProxyRequests,
      },
      '^/ws*': {
        target: 'http://localhost:4001/',
        changeOrigin: true,
@@ -1,6 +1,6 @@
 {
  "name": "ontime-electron",
-  "version": "4.11.0",
+  "version": "4.10.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -125,13 +125,6 @@
          "**/*",
          "*{.ts}"
        ]
      },
      {
        "from": "../server/src/html/",
        "to": "extraResources/html/",
        "filter": [
          "**/*"
        ]
      }
    ]
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Claude	fe96941737	refactor: limit runtimeState core exports to consumed seams Only the cores exercised by tests remain exported (startCore, addTimeCore, updateCore, getExpectedTimesCore, loadGroupFlagAndEndCore). The rest stay parameterized but module private until a consumer needs them. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-04 14:54:56 +00:00
Claude	ee9ac492c3	test: cover hot reload and add direct calculation tests for runtimeState cores - characterisation scenarios for the hot-reload path (updateAll and updateLoaded), which was previously untested: editing the running event, removing the running event, and re-arming the loaded event - direct tests for the parameterized cores against plain state objects with no module mocks: the update tick arithmetic and finish trigger window, added-time edge cases, and a documented matrix of the expected-times projection (offset sign, gap absorption, linked events, relative mode, delays and day offsets) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-04 14:53:01 +00:00
Claude	4a0a174eb9	refactor: extract broadcast diffing into a testable function The state diffing and gating logic moves verbatim from the broadcastResult decorator into collectRuntimeStateChanges in runtime.utils.ts. The decorator becomes a thin shell: snapshot, diff, batch the changed keys, save the restore point, send. The entire gating matrix is now unit tested against plain state objects (see runtime.utils.test.ts), including the characterised entry-diffing short-circuit, without sockets or module mocking. The broadcast-contract tests remain the end-to-end lock and are unchanged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-04 10:01:02 +00:00
Claude	56257adcbd	perf: hoist update() inner functions out of the tick path updateIfIdle and updateIfWaitingToRoll were declared inside update(), allocating two closures on every 32ms tick. They are now module-level functions receiving the state explicitly. Behaviour is unchanged, as proven by the characterisation suite. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-04 09:57:06 +00:00
Claude	b10c38514f	refactor: parameterize runtimeState mutators on an explicit state Every mutator in runtimeState.ts now has a *Core function that receives the state it operates on and touches nothing else. The module keeps the singleton and exports thin wrappers with the existing names and signatures, so all call sites (EventTimer, runtime service, rundown service) are unchanged and the hot path gains no allocations. This also removes the partial-injection hazards of the previous seams: start(state) wrote timer.phase, offset and expected times to the module singleton rather than the received state, and stop(state) cleared the singleton. Production behaviour is identical since production always operated on the singleton; the characterisation harness and snapshots are untouched and prove it. The cores can now be unit tested against a plain state object without the singleton, module resets or the rundown cache. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-04 09:55:56 +00:00
Claude	80cb1f96e7	test: add characterisation harness for the runtimeState machinery Locks down the current behaviour of the runtime state hot path before any refactoring work: - scenario driver and fixtures that script playback sequences against the real runtimeState singleton with fake timers, mirroring the EventTimer tick loop - characterisation catalogue covering absolute/relative offsets, expected group/flag/rundown times, gap compensation, delays, countToEnd, addTime edge cases, pause accounting, roll modes and playback across midnight - broadcast-contract tests locking which top-level store keys are emitted per action and tick, including the per-second gating and integration throttling - unit tests for the previously untested change-detection predicates in runtime.utils.ts The tests characterise current behaviour, including quirks (documented inline): the entry diffing short-circuit that drips changed entries one per broadcast, the sticky forceFinish flag after negative addTime, and roll-continuation overwriting actualStart. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PVTnCfesGNGwPQJwJ9FwoD	2026-07-03 17:05:30 +00:00