refactor:shedule time

apps/client/src/common/components/kbd/Kbd.module.scss

@@ -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;
-}

apps/client/src/common/components/kbd/Kbd.tsx

@@ -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>;
-}

apps/client/src/common/components/multi-part-progress-bar/MultiPartProgressBar.scss

@@ -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;

apps/client/src/common/components/multi-part-progress-bar/MultiPartProgressBar.tsx

@@ -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;

apps/client/src/common/components/navigation-menu/ViewNavigationMenu.tsx

@@ -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} />}
     </>

apps/client/src/common/components/navigation-menu/client-link/ClientLink.module.scss

@@ -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;
-  }
-}

apps/client/src/common/components/navigation-menu/client-link/ClientLink.tsx

@@ -1,16 +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 NavigationMenuItem from '../navigation-menu-item/NavigationMenuItem';
 
 import style from './ClientLink.module.scss';
@@ -23,100 +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' />
-          <IconButton
-            variant='ghosted-white'
-            size='small'
-            className={style.clear}
-            aria-label='Clear saved view settings'
-            title='Clear saved view settings'
-            onClick={clearViewSettings}
-          >
-            <IoCloseOutline />
-          </IconButton>
-        </span>
-      )}
     </NavigationMenuItem>
   );
 }

apps/client/src/common/components/navigation-menu/floating-navigation/FloatingNavigation.module.scss

@@ -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;
-}

apps/client/src/common/components/navigation-menu/floating-navigation/FloatingNavigation.tsx

@@ -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

apps/client/src/common/components/progress-bar/ProgressBar.scss

@@ -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;
 }

apps/client/src/common/components/progress-bar/ProgressBar.tsx

@@ -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}`}>

apps/client/src/common/components/schedule-time/ScheduleTime.scss

@@ -0,0 +1,26 @@
+@use '@/theme/viewerDefs' as *;
+
+.schedule__ {
+  padding-top: 0.5rem;
+  display: flex;
+  gap: 0.25em;
+  font-size: $timer-label-size;
+  color: var(--label-color-override, $timer-color);
+}
+
+.schedule__delayed {
+  color: $ontime-delay-text;
+}
+
+.schedule__strike {
+  text-decoration: line-through;
+  color: var(--label-color-override, $viewer-label-color);
+}
+
+.schedule__over {
+  color: $playback-over;
+}
+
+.schedule__under {
+  color: $playback-under;
+}

apps/client/src/common/components/schedule-time/ScheduleTime.tsx

@@ -0,0 +1,88 @@
+import { OntimeEvent } from 'ontime-types';
+import { dayInMs, MILLIS_PER_MINUTE } from 'ontime-utils';
+
+import ClockTime from '../../../views/common/clock-time/ClockTime';
+import { getOffsetState } from '../../utils/offset';
+import { ExtendedEntry } from '../../utils/rundownMetadata';
+
+import './ScheduleTime.scss';
+import { cx } from '../../utils/styleUtils';
+
+type ScheduleTimeProps = {
+  event: ExtendedEntry<OntimeEvent>;
+  showExpected: boolean;
+  className?: string;
+  preferredFormat12?: string;
+  preferredFormat24?: string;
+  expectedStart: number;
+};
+
+//TODO: consider relative mode
+export default function ScheduleTime(props: ScheduleTimeProps) {
+  const {
+    event,
+    showExpected,
+    className,
+    preferredFormat12 = 'h:mm a',
+    preferredFormat24 = 'HH:mm',
+    expectedStart,
+  } = props;
+  const { timeStart, duration, delay, countToEnd } = event;
+
+  const plannedStart = timeStart + delay + event.dayOffset * dayInMs;
+
+  // only show new expected value if outside  range of the planned value
+  const isExpectedValueShow = showExpected && isOutsideRange(plannedStart, expectedStart);
+
+  const plannedStateClass = isExpectedValueShow ? 'schedule__strike' : delay !== 0 ? 'schedule__delayed' : '';
+
+  const expectedOffsetState = getOffsetState(expectedStart - plannedStart);
+  const expectedStateClass = expectedOffsetState ? `schedule__${expectedOffsetState}` : '';
+  const plannedEnd = plannedStart + duration;
+  const expectedEnd = countToEnd ? Math.max(expectedStart + duration, plannedEnd) : expectedStart + duration;
+  const expectedEndOffsetState = getOffsetState(expectedEnd - plannedEnd);
+  const expectedEndClass = expectedEndOffsetState ? `schedule__${expectedEndOffsetState}` : '';
+
+  return (
+    <div className={cx(['schedule__', className])}>
+      <ClockTime
+        value={plannedStart}
+        preferredFormat12={preferredFormat12}
+        preferredFormat24={preferredFormat24}
+        className={plannedStateClass}
+      />
+      {!isExpectedValueShow && (
+        <>
+          →
+          <ClockTime
+            value={plannedEnd}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+            className={plannedStateClass}
+          />
+        </>
+      )}
+      {isExpectedValueShow && (
+        <>
+          <ClockTime
+            value={expectedStart}
+            className={expectedStateClass}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+          />
+          →
+          <ClockTime
+            value={expectedEnd}
+            className={expectedEndClass}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+          />
+        </>
+      )}
+    </div>
+  );
+}
+
+function isOutsideRange(a: number, b: number): boolean {
+  return Math.abs(a - b) > MILLIS_PER_MINUTE;
+}

apps/client/src/common/components/state/Empty.module.scss

@@ -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;
   }
 }

apps/client/src/common/hooks/useAnimatedProgress.ts

@@ -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);
-}

apps/client/src/common/hooks/useSocket.ts

@@ -26,7 +26,6 @@ export const useTimerViewControl = createSelector((state: RuntimeStore) => ({
   blackout: state.message.timer.blackout,
   blink: state.message.timer.blink,
   secondarySource: state.message.timer.secondarySource,
-  secondaryPlacement: state.message.timer.secondaryPlacement,
 }));
 
 export const useTimerMessageInput = createSelector((state: RuntimeStore) => ({
@@ -44,7 +43,6 @@ export const useMessagePreview = createSelector((state: RuntimeStore) => ({
   blackout: state.message.timer.blackout,
   phase: state.timer.phase,
   secondarySource: state.message.timer.secondarySource,
-  secondaryPlacement: state.message.timer.secondaryPlacement,
   showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
   timerType: state.eventNow?.timerType ?? null,
   countToEnd: state.eventNow?.countToEnd ?? false,
@@ -58,8 +56,6 @@ export const setMessage = {
   timerBlackout: (payload: boolean) => sendSocket('message', { timer: { blackout: payload } }),
   timerSecondarySource: (payload: TimerMessage['secondarySource']) =>
     sendSocket('message', { timer: { secondarySource: payload } }),
-  timerSecondaryPlacement: (payload: TimerMessage['secondaryPlacement']) =>
-    sendSocket('message', { timer: { secondaryPlacement: payload } }),
 };
 
 export const usePlaybackControl = createSelector((state: RuntimeStore) => ({
@@ -231,9 +227,9 @@ export const useTimerSocket = createSelector((state: RuntimeStore) => ({
   timerTypeNow: state.eventNow?.timerType ?? TimerType.CountDown,
   countToEndNow: state.eventNow?.countToEnd ?? false,
   auxTimer: {
-    aux1: { current: state.auxtimer1.current, direction: state.auxtimer1.direction },
+    aux1: state.auxtimer1.current,
-    aux2: { current: state.auxtimer2.current, direction: state.auxtimer2.direction },
+    aux2: state.auxtimer2.current,
-    aux3: { current: state.auxtimer3.current, direction: state.auxtimer3.direction },
+    aux3: state.auxtimer3.current,
   },
 }));
 

apps/client/src/common/stores/__tests__/savedViewParams.test.ts

@@ -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);
-  });
-});

apps/client/src/common/stores/savedViewParams.ts

@@ -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;
-}

apps/client/src/common/utils/__tests__/linkUtils.test.ts

@@ -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');
-  });
-});

apps/client/src/common/utils/linkUtils.ts

@@ -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}`;
-}

apps/client/src/features/app-settings/panel-utils/PanelUtils.module.scss

@@ -38,7 +38,7 @@ $inner-padding: 1rem;
 .section {
   position: relative;
   margin-top: 2rem;
-  max-width: 1024px;
+  max-width: 850px;
 }
 
 .indent {

apps/client/src/features/app-settings/panel/settings-panel/McpSection.tsx

@@ -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>
   );

apps/client/src/features/control/message/TimerPreview.module.scss

@@ -25,15 +25,6 @@
 
 .secondaryContent {
   border-top: 1px solid $white-7;
-  // when the event timer is demoted here (secondary swapped to main) it keeps its colour treatment
-  color: var(--override-colour, inherit);
-
-  &[data-phase='pending'] {
-    color: $ontime-roll;
-  }
-  &[data-phase='overtime'] {
-    color: $playback-negative;
-  }
 }
 
 .blackout {

apps/client/src/features/control/message/TimerPreview.tsx

@@ -1,5 +1,5 @@
 import { TimerPhase, TimerType } from 'ontime-types';
-import { IoArrowDown, IoArrowUp, IoBan, IoSwapVertical, IoTime } from 'react-icons/io5';
+import { IoArrowDown, IoArrowUp, IoBan, IoTime } from 'react-icons/io5';
 import { LuArrowDownToLine } from 'react-icons/lu';
 
 import { CornerWithPip } from '../../../common/components/editor-utils/EditorUtils';
@@ -20,11 +20,10 @@ const secondarySourceLabels: Record<string, string> = {
 };
 
 export default function TimerPreview() {
-  const { blink, blackout, countToEnd, phase, secondarySource, secondaryPlacement, showTimerMessage, timerType } =
+  const { blink, blackout, countToEnd, phase, secondarySource, showTimerMessage, timerType } = useMessagePreview();
-    useMessagePreview();
   const { data } = useViewSettings();
 
-  const eventLabel = (() => {
+  const main = (() => {
     if (showTimerMessage) return 'Message';
     if (timerType === TimerType.None) return timerPlaceholder;
     if (phase === TimerPhase.Pending) return 'Standby to start';
@@ -34,7 +33,7 @@ export default function TimerPreview() {
     return 'Timer';
   })();
 
-  const secondaryLabel = (() => {
+  const secondary = (() => {
     // message is a fullscreen overlay or secondary is not active
     if (showTimerMessage || !secondarySource) return null;
 
@@ -42,11 +41,6 @@ export default function TimerPreview() {
     return secondarySourceLabels[secondarySource];
   })();
 
-  // when the secondary is promoted to the main slot the two labels swap; the event timer is demoted
-  const isSwapped = secondaryPlacement === 'main' && secondaryLabel !== null && !showTimerMessage;
-  const mainDisplay = isSwapped ? secondaryLabel : eventLabel;
-  const secondaryDisplay = isSwapped ? eventLabel : secondaryLabel;
-
   const overrideColour = (() => {
     // override fallback colours from starter project
     if (phase === TimerPhase.Warning) return data.warningColor ?? '#ffa528';
@@ -54,9 +48,7 @@ export default function TimerPreview() {
     return data.normalColor ?? '#FFFC';
   })();
 
-  // the event timer keeps its colour treatment in whichever slot it now occupies
+  const showColourOverride = main == 'Timer';
-  const eventInMain = !isSwapped;
-  const showColourOverride = eventLabel == 'Timer';
   const contentClasses = cx([blink && style.blink, blackout && style.blackout]);
 
   return (
@@ -65,20 +57,12 @@ export default function TimerPreview() {
       <div className={contentClasses}>
         <div
           className={style.mainContent}
-          data-phase={eventInMain && showColourOverride && phase}
+          data-phase={showColourOverride && phase}
-          style={eventInMain && showColourOverride ? { '--override-colour': overrideColour } : {}}
+          style={showColourOverride ? { '--override-colour': overrideColour } : {}}
         >
-          {mainDisplay}
+          {main}
         </div>
-        {secondaryDisplay !== null && (
+        {secondary !== null && <div className={style.secondaryContent}>{secondary}</div>}
-          <div
-            className={style.secondaryContent}
-            data-phase={!eventInMain && showColourOverride && phase}
-            style={!eventInMain && showColourOverride ? { '--override-colour': overrideColour } : {}}
-          >
-            {secondaryDisplay}
-          </div>
-        )}
       </div>
       <div className={style.eventStatus}>
         <Tooltip
@@ -121,14 +105,6 @@ export default function TimerPreview() {
         >
           <LuArrowDownToLine />
         </Tooltip>
-        <Tooltip
-          text='Secondary swapped into main slot'
-          render={<span />}
-          className={style.statusIcon}
-          data-active={isSwapped}
-        >
-          <IoSwapVertical />
-        </Tooltip>
       </div>
     </div>
   );

apps/client/src/features/control/message/TimerViewControl.tsx

@@ -1,9 +1,8 @@
-import { SecondaryPlacement, SecondarySource } from 'ontime-types';
+import { SecondarySource } from 'ontime-types';
 import { useEffect, useState } from 'react';
 
 import Button from '../../../common/components/buttons/Button';
 import * as Editor from '../../../common/components/editor-utils/EditorUtils';
-import RadioGroup from '../../../common/components/radio-group/RadioGroup';
 import Select from '../../../common/components/select/Select';
 import { setMessage, useTimerViewControl } from '../../../common/hooks/useSocket';
 import TimerPreview from './TimerPreview';
@@ -43,7 +42,7 @@ export default function TimerControlsPreview() {
 }
 
 function SecondarySourceControl() {
-  const { secondarySource, secondaryPlacement } = useTimerViewControl();
+  const { secondarySource } = useTimerViewControl();
   const [value, setValue] = useState<SecondarySource>('aux1');
 
   // sync secondary source with external changes
@@ -53,8 +52,6 @@ function SecondarySourceControl() {
     }
   }, [secondarySource]);
 
-  const isActive = secondarySource !== null;
-
   const toggleSecondary = () => {
     if (secondarySource === value) {
       setMessage.timerSecondarySource(null);
@@ -82,19 +79,12 @@ function SecondarySourceControl() {
           setValue(value);
         }}
       />
-      <Editor.Label htmlFor='secondary-placement'>Placement</Editor.Label>
+      <Button
-      <RadioGroup<SecondaryPlacement>
+        variant={secondarySource !== null ? 'primary' : 'subtle'}
-        id='secondary-placement'
+        fluid
-        orientation='horizontal'
+        onClick={toggleSecondary}
-        value={secondaryPlacement}
+        data-testid='toggle secondary'
-        disabled={!isActive}
+      >
-        onValueChange={(placement) => setMessage.timerSecondaryPlacement(placement)}
-        items={[
-          { value: 'below', label: 'Below timer' },
-          { value: 'main', label: 'Swap with timer' },
-        ]}
-      />
-      <Button variant={isActive ? 'primary' : 'subtle'} fluid onClick={toggleSecondary} data-testid='toggle secondary'>
         Show secondary
       </Button>
     </>

apps/client/src/features/operator/Operator.tsx

@@ -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}

apps/client/src/features/operator/operator-event/OperatorEvent.module.scss

@@ -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;

apps/client/src/features/operator/operator-event/OperatorEvent.tsx

@@ -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>
   );

apps/client/src/features/operator/operator-group/OperatorGroup.module.scss

@@ -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;
 }

apps/client/src/features/operator/operator-group/OperatorGroup.tsx

@@ -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>
-  );
 }

apps/client/src/features/rundown/entry-editor/EventEditorEmpty.module.scss

@@ -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;
-  }
 }

apps/client/src/features/rundown/entry-editor/EventEditorEmpty.tsx

@@ -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,124 +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='Deselect entry'>
+              <td>
-              <Combo keys={['Esc']} />
+                <Kbd>{deviceAlt}</Kbd>
-            </Shortcut>
+                <AuxKey>+</AuxKey>
-          </ShortcutGroup>
+                <Kbd>Shift</Kbd>
-
+                <AuxKey>+</AuxKey>
-          <ShortcutGroup title='Editing'>
+                <Kbd>↑</Kbd>
-            <Shortcut label='Reorder selected entry'>
+                <AuxKey>/</AuxKey>
-              <Combo keys={[deviceAlt, deviceMod, '↑']} />
+                <Kbd>↓</Kbd>
-              <Separator />
+              </td>
-              <Combo keys={[deviceAlt, deviceMod, '↓']} />
+            </tr>
-            </Shortcut>
+            <tr>
-            <Shortcut label='Copy selected entry'>
+              <td>Jump to top / bottom</td>
-              <Combo keys={[deviceMod, 'C']} />
+              <td>
-            </Shortcut>
+                <Kbd>Home</Kbd>
-            <Shortcut label='Cut selected entry'>
+                <AuxKey>/</AuxKey>
-              <Combo keys={[deviceMod, 'X']} />
+                <Kbd>End</Kbd>
-            </Shortcut>
+              </td>
-            <Shortcut label='Paste below'>
+            </tr>
-              <Combo keys={[deviceMod, 'V']} />
+            <tr>
-            </Shortcut>
+              <td>Page up / down</td>
-            <Shortcut label='Paste above'>
+              <td>
-              <Combo keys={[deviceMod, 'Shift', 'V']} />
+                <Kbd>PgUp</Kbd>
-            </Shortcut>
+                <AuxKey>/</AuxKey>
-            <Shortcut label='Clone selected entry'>
+                <Kbd>PgDn</Kbd>
-              <Combo keys={[deviceMod, 'D']} />
+              </td>
-            </Shortcut>
+            </tr>
-            <Shortcut label='Delete selected entry'>
+            <tr>
-              <Combo keys={[deviceAlt, 'Backspace']} />
+              <td>Deselect entry</td>
-            </Shortcut>
+              <td>
-          </ShortcutGroup>
+                <Kbd>Esc</Kbd>
-
+              </td>
-          <ShortcutGroup title='Insert'>
+            </tr>
-            <Shortcut label='Add event below / above'>
+            <tr className={style.spacer} />
-              <Combo keys={[deviceAlt, 'E']} />
+            <tr>
-              <Separator />
+              <td>Reorder selected entry</td>
-              <Combo keys={[deviceAlt, 'Shift', 'E']} />
+              <td>
-            </Shortcut>
+                <Kbd>{deviceAlt}</Kbd>
-            <Shortcut label='Add group below / above'>
+                <AuxKey>+</AuxKey>
-              <Combo keys={[deviceAlt, 'G']} />
+                <Kbd>{deviceMod}</Kbd>
-              <Separator />
+                <AuxKey>+</AuxKey>
-              <Combo keys={[deviceAlt, 'Shift', 'G']} />
+                <Kbd>↑</Kbd>
-            </Shortcut>
+                <AuxKey>/</AuxKey>
-            <Shortcut label='Add milestone below / above'>
+                <Kbd>↓</Kbd>
-              <Combo keys={[deviceAlt, 'M']} />
+              </td>
-              <Separator />
+            </tr>
-              <Combo keys={[deviceAlt, 'Shift', 'M']} />
+            <tr>
-            </Shortcut>
+              <td>Copy selected entry</td>
-            <Shortcut label='Add delay below / above'>
+              <td>
-              <Combo keys={[deviceAlt, 'D']} />
+                <Kbd>{deviceMod}</Kbd>
-              <Separator />
+                <AuxKey>+</AuxKey>
-              <Combo keys={[deviceAlt, 'Shift', 'D']} />
+                <Kbd>C</Kbd>
-            </Shortcut>
+              </td>
-          </ShortcutGroup>
+            </tr>
-        </div>
+            <tr>
+              <td>Cut selected entry</td>
+              <td>
+                <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>;
 }

apps/client/src/features/rundown/rundown-event/RundownEvent.tsx

@@ -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);

apps/client/src/features/rundown/rundown-event/composite/RundownEventProgressBar.module.scss

@@ -3,5 +3,7 @@
   width: 0;
   border-radius: 1px 0 0 1px;
 
+  transition: 1s linear;
+  transition-property: width;
   background-color: $gray-200;
 }

apps/client/src/features/rundown/rundown-event/composite/RundownEventProgressBar.tsx

@@ -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}%` }} />;
 }

apps/client/src/features/rundown/rundown-group/RundownGroup.module.scss

@@ -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 {

apps/client/src/features/rundown/rundown-group/RundownGroup.tsx

@@ -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>

apps/client/src/features/rundown/rundown-milestone/RundownMilestone.tsx

@@ -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]),
     },
   ]);

apps/client/src/features/sharing/GenerateLinkFormExport.tsx

@@ -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]);

apps/client/src/translation/languages/de.ts

@@ -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',

apps/client/src/translation/languages/es.ts

@@ -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',

apps/client/src/translation/languages/fr.ts

@@ -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',

apps/client/src/translation/languages/it.ts

@@ -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',

apps/client/src/translation/languages/pt.ts

@@ -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',

apps/client/src/views/common/schedule/ScheduleContext.tsx

@@ -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 = () => {

apps/client/src/views/countdown/Countdown.scss

@@ -1,4 +1,5 @@
 @use '@/theme/viewerDefs' as *;
+@use 'sass:color';
 
 $item-height: 3.5rem;
 
@@ -59,7 +60,6 @@ $item-height: 3.5rem;
     right: $view-inline-padding;
 
     display: flex;
-    align-items: center;
     justify-content: end;
     gap: 2rem;
 
@@ -73,27 +73,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 +89,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 +105,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,139 +116,52 @@ $item-height: 3.5rem;
 
   .sub--selected {
     background: $blue-700;
-    box-shadow: inset 0 0 0 1px $blue-500;
   }
 
   .sub--live {
-    background-color: $active-green;
+    // we need to dim this if the schedule times are ahead of schedule they will be green and diaper in a full green background
-    box-shadow: inset 0 0 0 1px color-mix(in srgb, $active-green 75%, $ui-white);
+    background-color: color.adjust($active-green, $lightness: -10%);
   }
 
   .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;
   }
 
   .sub__schedule {
     grid-area: schedule;
+  }
+
+  .sub__schedule-inline {
+    grid-area: schedule;
     padding-top: 0.5rem;
 
     display: flex;
     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 {
-    color: $ontime-delay-text;
-  }
-
-  .sub__schedule--strike {
-    text-decoration: line-through;
-  }
-
-  .sub__schedule--over {
-    color: $playback-over;
-  }
-
-  .sub__schedule--under {
-    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 +171,6 @@ $item-height: 3.5rem;
     font-size: $timer-label-size;
     text-align: right;
     text-transform: uppercase;
-    white-space: nowrap;
   }
 
   .sub__label {
@@ -282,7 +180,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 +189,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 ======================*/

apps/client/src/views/countdown/Countdown.tsx

@@ -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>
     );
   }

apps/client/src/views/countdown/CountdownSelect.tsx

@@ -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'
+            <div className='sub__schedule-inline'>
-              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>

apps/client/src/views/countdown/CountdownSubscriptions.tsx

@@ -1,41 +1,32 @@
 import { MaybeNumber, OntimeEvent } from 'ontime-types';
-import { dayInMs } from 'ontime-utils';
+import { getExpectedStart } from 'ontime-utils';
 import { useEffect, useRef, useState } from 'react';
 import { IoPencil } from 'react-icons/io5';
 
 import Button from '../../common/components/buttons/Button';
+import ScheduleTime from '../../common/components/schedule-time/ScheduleTime';
 import useReport from '../../common/hooks-query/useReport';
 import { useFadeOutOnInactivity } from '../../common/hooks/useFadeOutOnInactivity';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useExpectedStartData, usePlayback, useSelectedEventId } from '../../common/hooks/useSocket';
-import { getOffsetState } from '../../common/utils/offset';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
 import { cx } from '../../common/utils/styleUtils';
 import { throttle } from '../../common/utils/throttle';
 import FollowButton from '../../features/operator/follow-button/FollowButton';
-import ClockTime from '../common/clock-time/ClockTime';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
-import {
-  CountdownEvent,
-  CountdownTarget,
-  extendEventData,
-  getIsLive,
-  isOutsideRange,
-  preferredFormat12,
-  preferredFormat24,
-  useSubscriptionDisplayData,
-} from './countdown.utils';
 
 import './Countdown.scss';
+import { getIsLive, useSubscriptionDisplayData } from './countdown.utils';
 
 interface CountdownSubscriptionsProps {
-  subscribedEvents: CountdownTarget[];
+  subscribedEvents: ExtendedEntry<OntimeEvent>[];
   goToEditMode: () => void;
 }
 
 export default function CountdownSubscriptions({ subscribedEvents, goToEditMode }: CountdownSubscriptionsProps) {
+  'use memo';
   const { mainSource, secondarySource, showExpected } = useCountdownOptions();
   const playback = usePlayback();
   const selectedEventId = useSelectedEventId();
@@ -99,39 +90,37 @@ 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 { totalGap, isLinkedToLoaded } = event;
-        const activeEntryId = event.isGroup ? (event.liveEntry?.id ?? event.targetId) : event.id;
+        const expectedStart = getExpectedStart(event, {
-        // a subscribed group is live when any of its children is the selected/running event
+          currentDay,
-        const isLive = activeEntryId ? getIsLive(activeEntryId, selectedEventId, playback) : false;
+          totalGap,
-        const isArmed = !isLive && activeEntryId === selectedEventId;
+          actualStart,
-        const countdownEvent = extendEventData(event, currentDay, actualStart, plannedStart, offset, mode, reportData);
+          plannedStart,
+          isLinkedToLoaded,
+          offset,
+          mode,
+        });
+        const { endedAt } = reportData[event.id] ?? { endedAt: null };
         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'
+            <ScheduleTime
-              style={{ '--user-color': event.colour, '--group-color': event.groupColour ?? 'transparent' }}
+              event={event}
+              expectedStart={expectedStart}
+              showExpected={showExpected}
+              className='sub__schedule'
             />
-            <ScheduleTime event={countdownEvent} showExpected={showExpected} />
+            <SubscriptionStatus event={event} expectedStart={expectedStart} endedAt={endedAt} />
-            <SubscriptionStatus event={countdownEvent} />
+            <div className={cx(['sub__title', !displayTitle && 'subdued'])}>{displayTitle}</div>
-            <div className={cx(['sub__title', !displayTitle && 'subdued'])}>
-              {event.isGroup && <span className='sub__eyebrow'>Group</span>}
-              {displayTitle}
-            </div>
             {secondaryData && <div className='sub__secondary'>{secondaryData}</div>}
           </div>
         );
@@ -146,73 +135,15 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
   );
 }
 
-type ScheduleTimeProps = {
-  event: CountdownEvent;
-  showExpected: boolean;
-};
-//TODO: consider relative mode
-export function ScheduleTime(props: ScheduleTimeProps) {
-  const { event, showExpected } = props;
-  const { timeStart, duration, delay, expectedStart, countToEnd } = event;
-
-  const plannedStart = timeStart + delay + event.dayOffset * dayInMs;
-
-  // only show new exacted value if outside  range of the planned value
-  const isExpectedValueShow = showExpected && isOutsideRange(plannedStart, expectedStart);
-
-  const plannedStateClass = isExpectedValueShow ? 'sub__schedule--strike' : delay !== 0 ? 'sub__schedule--delayed' : '';
-
-  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 (
-    <div className='sub__schedule'>
-      <ClockTime
-        value={plannedStart}
-        preferredFormat12={preferredFormat12}
-        preferredFormat24={preferredFormat24}
-        className={plannedStateClass}
-      />
-      {!isExpectedValueShow && (
-        <>
-          →
-          <ClockTime
-            value={plannedEnd}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-            className={plannedStateClass}
-          />
-        </>
-      )}
-      {isExpectedValueShow && (
-        <>
-          <ClockTime
-            value={expectedStart}
-            className={expectedStateClass}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-          />
-          →
-          <ClockTime
-            value={expectedEnd}
-            className={expectedEndClass}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-          />
-        </>
-      )}
-    </div>
-  );
-}
-
 interface SubscriptionStatusProps {
-  event: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number };
+  event: ExtendedEntry<OntimeEvent>;
+  endedAt: MaybeNumber;
+  expectedStart: number;
 }
 
-function SubscriptionStatus({ event }: SubscriptionStatusProps) {
+function SubscriptionStatus({ event, endedAt, expectedStart }: SubscriptionStatusProps) {
-  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event);
+  'use memo';
+  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event, endedAt, expectedStart);
 
   return (
     <>

apps/client/src/views/countdown/SingleEventCountdown.scss

@@ -7,27 +7,6 @@
   gap: 5rem;
 }
 
-.event__title {
-  background-color: var(--card-background-color-override, $viewer-card-bg-color);
-  padding: $view-card-padding;
-  border-radius: $element-border-radius;
-  font-size: clamp(40px, 4.5vw, 80px);
-  line-height: 1.1;
-  text-align: center;
-  border-left: 0.25em solid;
-  border-color: var(--card-background-color-override, $viewer-card-bg-color);
-
-  .secondary {
-    text-align: left;
-    font-size: $title-font-size;
-  }
-
-  .sub__schedule {
-    color: inherit;
-    font-size: $base-font-size;
-  }
-}
-
 .event__status {
   color: var(--secondary-color-override, $viewer-secondary-color);
   font-size: $header-font-size;

apps/client/src/views/countdown/SingleEventCountdown.tsx

@@ -3,6 +3,7 @@ import { getExpectedStart } from 'ontime-utils';
 import { IoPencil } from 'react-icons/io5';
 
 import Button from '../../common/components/buttons/Button';
+import TitleCard from '../../common/components/title-card/TitleCard';
 import useReport from '../../common/hooks-query/useReport';
 import { useFadeOutOnInactivity } from '../../common/hooks/useFadeOutOnInactivity';
 import { useExpectedStartData } from '../../common/hooks/useSocket';
@@ -11,13 +12,12 @@ import { cx } from '../../common/utils/styleUtils';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
-import { CountdownTarget, useSubscriptionDisplayData } from './countdown.utils';
-import { ScheduleTime } from './CountdownSubscriptions';
 
 import './SingleEventCountdown.scss';
+import { useSubscriptionDisplayData } from './countdown.utils';
 
 interface SingleEventCountdownProps {
-  subscribedEvent: CountdownTarget;
+  subscribedEvent: ExtendedEntry<OntimeEvent>;
   goToEditMode: () => void;
 }
 
@@ -38,22 +38,23 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
     mode,
   });
 
-  const { endedAt } = reportData[subscribedEvent.reportId ?? subscribedEvent.id] ?? { endedAt: null };
+  const { endedAt } = reportData[subscribedEvent.id] ?? { endedAt: null };
-  const countdownEvent = { ...subscribedEvent, expectedStart, endedAt };
+  const title = getPropertyValue(subscribedEvent, mainSource ?? 'title');
-  const titleTmp = getPropertyValue(subscribedEvent, mainSource ?? 'title');
+  const secondaryData = getPropertyValue(subscribedEvent, secondarySource);
-  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 liveTitle = subscribedEvent.isGroup && subscribedEvent.liveEntry ? subscribedEvent.liveEntry.title : undefined;
-  const secondaryData = liveTitle ?? getPropertyValue(subscribedEvent, secondarySource);
 
   return (
     <div className='single-container' data-testid='countdown-event'>
-      <SubscriptionStatus event={countdownEvent} />
+      <SubscriptionStatus event={subscribedEvent} expectedStart={expectedStart} endedAt={endedAt} />
-      <div className='event__title' style={{ borderColor: countdownEvent.colour }}>
+      <TitleCard
-        <ScheduleTime event={countdownEvent} showExpected={showExpected} />
+        title={title}
-        {title}
+        secondary={secondaryData}
-        {secondaryData && <div className='secondary'>{secondaryData}</div>}
+        colour={subscribedEvent.colour}
-      </div>
+        textAlign='center'
+        size='lg'
+        event={subscribedEvent}
+        showExpected={showExpected}
+        expectedStart={expectedStart}
+      />
       <div className={cx(['fab-container', !showFab && 'fab-container--hidden'])}>
         <Button variant='primary' size='xlarge' onClick={goToEditMode}>
           <IoPencil /> Edit
@@ -64,11 +65,13 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
 }
 
 interface SubscriptionStatusProps {
-  event: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number };
+  event: ExtendedEntry<OntimeEvent>;
+  endedAt: MaybeNumber;
+  expectedStart: number;
 }
 
-function SubscriptionStatus({ event }: SubscriptionStatusProps) {
+function SubscriptionStatus({ event, endedAt, expectedStart }: SubscriptionStatusProps) {
-  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event);
+  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event, endedAt, expectedStart);
 
   return (
     <>

apps/client/src/views/countdown/countdown.options.ts

@@ -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',
         },

apps/client/src/views/countdown/countdown.utils.test.ts

@@ -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();
-  });
-});

apps/client/src/views/countdown/countdown.utils.ts

@@ -1,18 +1,5 @@
-import {
+import { EntryId, MaybeNumber, OntimeEntry, OntimeEvent, Playback } from 'ontime-types';
-  EntryId,
+import { MILLIS_PER_MINUTE, millisToString, removeLeadingZero } from 'ontime-utils';
-  MaybeNumber,
-  OffsetMode,
-  OntimeEntry,
-  OntimeEvent,
-  OntimeGroup,
-  OntimeReport,
-  Playback,
-  PlayableEvent,
-  isOntimeEvent,
-  isOntimeGroup,
-  isPlayableEvent,
-} from 'ontime-types';
-import { MILLIS_PER_MINUTE, getExpectedStart, millisToString, removeLeadingZero } from 'ontime-utils';
 
 import { useCountdownSocket } from '../../common/hooks/useSocket';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
@@ -26,9 +13,6 @@ export function sanitiseTitle(title: string | null) {
   return title ?? '{no title}';
 }
 
-export const preferredFormat12 = 'h:mm a';
-export const preferredFormat24 = 'HH:mm';
-
 /**
  * Whether the current event is live
  */
@@ -53,7 +37,9 @@ 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 +66,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),
     };
   }
@@ -101,11 +83,11 @@ export function useSubscriptionDisplayData(
     return {
       status: 'done',
       statusDisplay: getLocalizedString(timerProgress['done']),
-      timeDisplay: formatTime(subscribedEvent.endedAt, { format12: preferredFormat12, format24: preferredFormat24 }),
+      timeDisplay: formatTime(endedAt, { format12: 'h:mm a', format24: 'HH:mm' }),
     };
   }
 
-  if (subscribedEvent.expectedStart - clock <= 0) {
+  if (expectedStart - clock <= 0) {
     return {
       status: 'due',
       statusDisplay: getLocalizedString(timerProgress['future']), // We use future here on purpose for the look of it
@@ -116,7 +98,7 @@ export function useSubscriptionDisplayData(
   return {
     status: 'future',
     statusDisplay: getLocalizedString(timerProgress['future']),
-    timeDisplay: bigDuration(subscribedEvent.expectedStart - clock),
+    timeDisplay: bigDuration(expectedStart - clock),
   };
 }
 
@@ -180,97 +162,3 @@ export function isLinkedToLoadedEvent(events: OntimeEvent[], loadedId: EntryId |
 
   return true;
 }
-
-export function isOutsideRange(a: number, b: number): boolean {
-  return Math.abs(a - b) > MILLIS_PER_MINUTE;
-}
-
-/**
- * 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 };
-
-/**
- * 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,
-  currentDay: number,
-  actualStart: MaybeNumber,
-  plannedStart: MaybeNumber,
-  offset: number,
-  mode: OffsetMode,
-  reportData: OntimeReport,
-): CountdownEvent {
-  const { totalGap, isLinkedToLoaded } = event;
-  const expectedStart = getExpectedStart(event, {
-    currentDay,
-    totalGap,
-    actualStart,
-    plannedStart,
-    isLinkedToLoaded,
-    offset,
-    mode,
-  });
-  const { endedAt } = reportData[event.reportId ?? event.id] ?? { endedAt: null };
-  return { ...event, expectedStart, endedAt };
-}

apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts

@@ -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);
+      });
+    });
+  });
+});

apps/client/src/views/cuesheet/cuesheet.utils.ts

@@ -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 ?? '');
+};

apps/client/src/views/editor/finder/Finder.module.scss

@@ -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;
-  }
-}

apps/client/src/views/editor/finder/Finder.tsx

@@ -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>
       }
     />

apps/client/src/views/timeline/TimelineEntry.tsx

@@ -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} />
   );

apps/client/src/views/timer/Timer.scss

@@ -154,28 +154,6 @@
       opacity: 0;
       height: 0;
     }
-
-    // when the event timer is demoted into the secondary slot it keeps its (phase-aware) colour
-    &--as-timer {
-      color: var(--timer-colour, var(--timer-color-override, $ui-white));
-      border-top-color: color-mix(in srgb, var(--timer-colour, $external-color) 10%, transparent);
-
-      &.secondary--paused {
-        opacity: $viewer-opacity-disabled;
-        transition: $viewer-transition-time;
-      }
-
-      &.secondary--finished {
-        color: var(--timer-overtime-color-override, $timer-finished-color);
-      }
-
-      &[data-phase='warning'] {
-        color: var(--timer-colour, var(--timer-warning-color-override));
-      }
-      &[data-phase='danger'] {
-        color: var(--timer-colour, var(--timer-danger-color-override));
-      }
-    }
   }
 
   .progress-container {

apps/client/src/views/timer/Timer.tsx

@@ -27,7 +27,6 @@ import {
   getShowMessage,
   getShowModifiers,
   getShowProgressBar,
-  getTimerSlots,
   getTotalTime,
 } from './timer.utils';
 import { TimerData, useTimerData } from './useTimerData';
@@ -133,25 +132,15 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
     hideSecondary,
   );
 
-  // when the operator promotes the secondary source to the main slot, swap the two so the event
-  // timer is demoted (never removed). Frozen overtime end-messages keep the event timer prominent.
-  const isSwapped = message.timer.secondaryPlacement === 'main' && Boolean(secondaryContent) && !showEndMessage;
-  const { main: mainSlot, secondary: secondarySlot } = getTimerSlots(
-    isSwapped,
-    { content: display, timerType: viewTimerType, phase: time.phase },
-    secondaryContent,
-  );
-
   // gather presentation styles
   const resolvedTimerColour = getTimerColour(viewSettings, timerColour, showWarning, showDanger);
-  const timerFontSize = getEstimatedFontSize(mainSlot.content ?? display, secondarySlot.content);
+  const timerFontSize = getEstimatedFontSize(display, secondaryContent);
   const subduePaused = !isPlaying && viewTimerType !== TimerType.Clock;
   const userStyles = {
     ...(keyColour && { '--timer-bg': keyColour }),
+    ...(resolvedTimerColour && { '--timer-colour': resolvedTimerColour }),
     ...(font && { '--timer-font': font }),
   };
-  // the event timer keeps its (phase-aware) colour in whichever slot it occupies
-  const eventTimerColour = resolvedTimerColour ? { '--timer-colour': resolvedTimerColour } : undefined;
 
   // gather option data
   const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -186,32 +175,17 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
           </FitText>
         ) : (
           <div
-            className={cx([
+            className={cx(['timer', subduePaused && 'timer--paused', showFinished && 'timer--finished'])}
-              'timer',
+            style={{ fontSize: `${timerFontSize}vw` }}
-              mainSlot.isEventTimer && subduePaused && 'timer--paused',
+            data-type={viewTimerType}
-              mainSlot.isEventTimer && showFinished && 'timer--finished',
+            data-phase={time.phase}
-            ])}
-            style={{ fontSize: `${timerFontSize}vw`, ...(mainSlot.isEventTimer ? eventTimerColour : {}) }}
-            data-type={mainSlot.timerType}
-            data-phase={mainSlot.phase}
           >
-            {mainSlot.content}
+            {display}
           </div>
         )}
-        <div
+        <div className={cx(['secondary', !secondaryContent && 'secondary--hidden'])}>
-          className={cx([
-            'secondary',
-            !secondarySlot.content && 'secondary--hidden',
-            secondarySlot.isEventTimer && 'secondary--as-timer',
-            secondarySlot.isEventTimer && subduePaused && 'secondary--paused',
-            secondarySlot.isEventTimer && showFinished && 'secondary--finished',
-          ])}
-          style={secondarySlot.isEventTimer ? eventTimerColour : undefined}
-          data-type={secondarySlot.timerType}
-          data-phase={secondarySlot.phase}
-        >
           <FitText mode='multi' min={64} max={256}>
-            {secondarySlot.content}
+            {secondaryContent}
           </FitText>
         </div>
       </div>

apps/client/src/views/timer/timer.utils.test.ts

@@ -1,89 +0,0 @@
-import { MessageState, SimpleDirection, TimerPhase, TimerType } from 'ontime-types';
-
-import { getSecondaryDisplay, getTimerSlots } from './timer.utils';
-
-function makeMessage(partial: Partial<MessageState['timer']> = {}, secondary = ''): MessageState {
-  return {
-    timer: {
-      text: '',
-      visible: false,
-      blink: false,
-      blackout: false,
-      secondarySource: null,
-      secondaryPlacement: 'below',
-      ...partial,
-    },
-    secondary,
-  };
-}
-
-const eventTimer = { content: '00:10:00', timerType: TimerType.CountDown, phase: TimerPhase.Warning };
-
-describe('getTimerSlots()', () => {
-  it('keeps the event timer in the main slot when not swapped', () => {
-    const { main, secondary } = getTimerSlots(false, eventTimer, 'AUX');
-
-    expect(main).toMatchObject({ content: '00:10:00', phase: TimerPhase.Warning, isEventTimer: true });
-    expect(secondary).toMatchObject({ content: 'AUX', phase: undefined, isEventTimer: false });
-  });
-
-  it('swaps the secondary into the main slot and demotes the event timer', () => {
-    const { main, secondary } = getTimerSlots(true, eventTimer, 'AUX');
-
-    expect(main).toMatchObject({ content: 'AUX', isEventTimer: false, phase: undefined });
-    // the event timer is never removed, only demoted, and keeps its phase
-    expect(secondary).toMatchObject({ content: '00:10:00', isEventTimer: true, phase: TimerPhase.Warning });
-  });
-
-  it('does not swap when there is no secondary content to promote', () => {
-    const { main, secondary } = getTimerSlots(true, eventTimer, undefined);
-
-    expect(main.isEventTimer).toBe(true);
-    expect(secondary.isEventTimer).toBe(false);
-  });
-});
-
-describe('getSecondaryDisplay()', () => {
-  it('returns nothing when the secondary is hidden', () => {
-    const message = makeMessage({ secondarySource: 'aux1' });
-    expect(
-      getSecondaryDisplay(message, { current: 5000, direction: SimpleDirection.CountDown }, 'min', false, false, true),
-    ).toBeUndefined();
-  });
-
-  it('returns the secondary message text for the secondary source', () => {
-    const message = makeMessage({ secondarySource: 'secondary' }, 'hello');
-    expect(getSecondaryDisplay(message, null, 'min', false, false, false)).toBe('hello');
-  });
-
-  it('formats an aux source as a timer honouring its direction', () => {
-    const message = makeMessage({ secondarySource: 'aux1' });
-
-    // a running count-up aux shows elapsed time without a negative sign
-    const countUp = getSecondaryDisplay(
-      message,
-      { current: 5000, direction: SimpleDirection.CountUp },
-      'min',
-      false,
-      false,
-      false,
-    );
-    expect(countUp).toBe('00:00:05');
-
-    // a count-down aux past zero shows overtime as a negative value
-    const countDown = getSecondaryDisplay(
-      message,
-      { current: -5000, direction: SimpleDirection.CountDown },
-      'min',
-      false,
-      false,
-      false,
-    );
-    expect(countDown).toBe('-00:00:05');
-  });
-
-  it('returns nothing when no secondary source is selected', () => {
-    const message = makeMessage({ secondarySource: null });
-    expect(getSecondaryDisplay(message, null, 'min', false, false, false)).toBeUndefined();
-  });
-});

apps/client/src/views/timer/timer.utils.ts

@@ -4,7 +4,6 @@ import {
   OntimeEvent,
   Playback,
   RundownEntries,
-  SimpleDirection,
   TimerMessage,
   TimerPhase,
   TimerType,
@@ -13,11 +12,6 @@ import { isPlaybackActive } from 'ontime-utils';
 
 import { getFormattedTimer, getPropertyValue } from '../common/viewUtils';
 
-/**
- * The current value and direction of the aux timer feeding the secondary slot
- */
-export type AuxTimerValue = { current: MaybeNumber; direction: SimpleDirection };
-
 /**
  * Whether a message should be shown
  */
@@ -125,7 +119,7 @@ export function getShowModifiers(
  */
 export function getSecondaryDisplay(
   message: MessageState,
-  currentAux: AuxTimerValue | null,
+  currentAux: MaybeNumber,
   localisedMinutes: string,
   removeSeconds: boolean,
   removeLeadingZero: boolean,
@@ -139,9 +133,7 @@ export function getSecondaryDisplay(
     message.timer.secondarySource === 'aux2' ||
     message.timer.secondarySource === 'aux3'
   ) {
-    // honour the aux timer's own direction so a promoted aux reads correctly
+    return getFormattedTimer(currentAux, TimerType.CountDown, localisedMinutes, {
-    const timerType = currentAux?.direction === SimpleDirection.CountUp ? TimerType.CountUp : TimerType.CountDown;
-    return getFormattedTimer(currentAux?.current ?? null, timerType, localisedMinutes, {
       removeSeconds,
       removeLeadingZero,
     });
@@ -152,45 +144,6 @@ export function getSecondaryDisplay(
   return;
 }
 
-/**
- * Describes what a timer slot (main or secondary) renders and how it should be styled
- */
-export type TimerSlot = {
-  content: string | undefined;
-  timerType: TimerType | undefined;
-  phase: TimerPhase | undefined;
-  isEventTimer: boolean;
-};
-
-/**
- * Assigns the event timer and the secondary content to the main (large) and secondary (small) slots.
- * When the operator promotes the secondary source to the main slot, the two are swapped so the event
- * timer is never removed from screen — it is only demoted to the smaller slot.
- */
-export function getTimerSlots(
-  isSwapped: boolean,
-  eventTimer: { content: string; timerType: TimerType; phase: TimerPhase },
-  secondaryContent: string | undefined,
-): { main: TimerSlot; secondary: TimerSlot } {
-  const eventSlot: TimerSlot = {
-    content: eventTimer.content,
-    timerType: eventTimer.timerType,
-    phase: eventTimer.phase,
-    isEventTimer: true,
-  };
-  const secondarySlot: TimerSlot = {
-    content: secondaryContent,
-    timerType: undefined,
-    phase: undefined,
-    isEventTimer: false,
-  };
-
-  if (isSwapped && secondaryContent) {
-    return { main: secondarySlot, secondary: eventSlot };
-  }
-  return { main: eventSlot, secondary: secondarySlot };
-}
-
 /**
  * What should we be showing in the cards?
  */

apps/client/vite.config.js

@@ -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,

apps/resolver/package.json

@@ -20,7 +20,7 @@
   "license": "AGPL-3.0-only",
   "devDependencies": {
     "ontime-types": "workspace:^4.2.1",
-    "tsdown": "^0.22.4",
+    "tsdown": "^0.21.5",
     "typescript": "catalog:"
   },
   "files": [

apps/resolver/tsconfig.dts.json

@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "isolatedDeclarations": true,
+    "ignoreDeprecations": "6.0"
-    "allowJs": false
   }
 }

apps/server/src/api-mcp/__tests__/mcp.service.test.ts

@@ -6,13 +6,11 @@ const editEntryMock = vi.hoisted(() => vi.fn());
 const groupEntriesMock = vi.hoisted(() => vi.fn());
 const ungroupEntriesMock = vi.hoisted(() => vi.fn());
 const getCurrentRundownMock = vi.hoisted(() => vi.fn());
-const getProjectCustomFieldsMock = vi.hoisted(() => vi.fn());
-const createCustomFieldMock = vi.hoisted(() => vi.fn());
 
 vi.mock('../../api-data/rundown/rundown.dao.js', () => ({
   getCurrentRundown: getCurrentRundownMock,
   getCurrentRundownId: vi.fn(() => 'loaded-rundown'),
-  getProjectCustomFields: getProjectCustomFieldsMock,
+  getProjectCustomFields: vi.fn(() => ({})),
 }));
 
 vi.mock('../../classes/data-provider/DataProvider.js', () => ({
@@ -22,7 +20,6 @@ vi.mock('../../classes/data-provider/DataProvider.js', () => ({
 vi.mock('../../api-data/rundown/rundown.service.js', () => ({
   addEntry: addEntryMock,
   batchEditEntries: vi.fn(),
-  createCustomField: createCustomFieldMock,
   deleteEntries: vi.fn(),
   editEntry: editEntryMock,
   groupEntries: groupEntriesMock,
@@ -30,8 +27,7 @@ vi.mock('../../api-data/rundown/rundown.service.js', () => ({
   ungroupEntries: ungroupEntriesMock,
 }));
 
-const { batchCreateEntriesForMcp, createCustomFieldForMcp, createEntryForMcp, groupEntriesForMcp, ungroupEntryForMcp } =
+const { batchCreateEntriesForMcp, groupEntriesForMcp, ungroupEntryForMcp } = await import('../mcp.service.js');
-  await import('../mcp.service.js');
 
 function makeRundown(entries: Rundown['entries'], order: string[] = Object.keys(entries)): Rundown {
   return {
@@ -48,7 +44,6 @@ describe('mcp.service', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     getCurrentRundownMock.mockReturnValue(makeRundown({}));
-    getProjectCustomFieldsMock.mockReturnValue({});
 
     let id = 0;
     addEntryMock.mockImplementation(async (_rundownId: string, payload: EventPostPayload) => {
@@ -257,42 +252,4 @@ describe('mcp.service', () => {
     expect(ungroupEntriesMock).toHaveBeenCalledWith('loaded-rundown', 'group');
     expect(result).toMatchObject({ ungrouped: 'group', order: ['entry-1'] });
   });
-
-  describe('createCustomFieldForMcp', () => {
-    it('creates a field and returns the derived key', async () => {
-      createCustomFieldMock.mockResolvedValue({
-        Camera_Angle: { label: 'Camera Angle', type: 'text', colour: '#3E75E8' },
-      });
-
-      const result = await createCustomFieldForMcp({ label: 'Camera Angle', type: 'text', colour: '#3E75E8' });
-
-      expect(createCustomFieldMock).toHaveBeenCalledWith({ label: 'Camera Angle', type: 'text', colour: '#3E75E8' });
-      expect(result.key).toBe('Camera_Angle');
-    });
-
-    it('rejects labels the editor UI would not accept', async () => {
-      await expect(createCustomFieldForMcp({ label: 'Camera/GFX', type: 'text', colour: '#000000' })).rejects.toThrow(
-        'Invalid label',
-      );
-      expect(createCustomFieldMock).not.toHaveBeenCalled();
-    });
-
-    it('rejects case-insensitive duplicates and points at the existing key', async () => {
-      getProjectCustomFieldsMock.mockReturnValue({ Camera: { label: 'Camera', type: 'text', colour: '' } });
-
-      await expect(createCustomFieldForMcp({ label: 'camera', type: 'text', colour: '#000000' })).rejects.toThrow(
-        'A custom field with key "Camera" (label "Camera") already exists.',
-      );
-      expect(createCustomFieldMock).not.toHaveBeenCalled();
-    });
-  });
-
-  it('suggests the correctly cased key when custom values use the wrong casing', async () => {
-    getProjectCustomFieldsMock.mockReturnValue({ Camera: { label: 'Camera', type: 'text', colour: '' } });
-
-    await expect(createEntryForMcp({ title: 'Talk', custom: { camera: 'CAM 2' } })).rejects.toThrow(
-      'Keys are case-sensitive — did you mean: "camera" → "Camera"?',
-    );
-    expect(addEntryMock).not.toHaveBeenCalled();
-  });
 });

apps/server/src/api-mcp/__tests__/mcp.wiring.test.ts

@@ -1,56 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-
-vi.mock('../../api-data/project-data/projectData.dao.js', () => ({
-  getProjectData: vi.fn(() => ({ title: 'Test project' })),
-}));
-
-vi.mock('../../api-data/rundown/rundown.dao.js', () => ({
-  getCurrentRundown: vi.fn(() => ({
-    id: 'rundown-1',
-    title: 'Test',
-    order: [],
-    flatOrder: [],
-    entries: {},
-    revision: 0,
-  })),
-  getProjectCustomFields: vi.fn(() => ({})),
-}));
-
-vi.mock('../../classes/data-provider/DataProvider.js', () => ({
-  getDataProvider: vi.fn(() => ({ getProjectRundowns: () => ({}) })),
-}));
-
-const { PROMPT_DEFINITIONS, handleGetPrompt } = await import('../mcp.prompts.js');
-const { RESOURCE_DEFINITIONS, handleReadResource } = await import('../mcp.resources.js');
-
-describe('MCP resource wiring', () => {
-  it('serves non-empty content for every listed resource', () => {
-    for (const resource of RESOURCE_DEFINITIONS) {
-      const result = handleReadResource(resource.uri);
-      expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].uri).toBe(resource.uri);
-      expect(result.contents[0].mimeType).toBe(resource.mimeType);
-      expect((result.contents[0].text as string).length).toBeGreaterThan(0);
-    }
-  });
-
-  it('rejects unknown resource URIs', () => {
-    expect(() => handleReadResource('ontime://nope')).toThrow('Unknown resource URI: ontime://nope');
-  });
-});
-
-describe('MCP prompt wiring', () => {
-  it('resolves every listed prompt', () => {
-    for (const prompt of PROMPT_DEFINITIONS) {
-      const args = Object.fromEntries((prompt.arguments ?? []).map((arg) => [arg.name, 'test value']));
-      const result = handleGetPrompt(prompt.name, args);
-      expect(result.messages.length).toBeGreaterThan(0);
-      const content = result.messages[0].content;
-      expect(content.type).toBe('text');
-    }
-  });
-
-  it('rejects unknown prompts', () => {
-    expect(() => handleGetPrompt('nope', {})).toThrow('Unknown prompt: nope');
-  });
-});

apps/server/src/api-mcp/mcp.guides.ts

@@ -1,103 +0,0 @@
-/**
- * Agent-facing Ontime guidance documents.
- *
- * These markdown resources teach agents rundown craft (ontime://style-guide)
- * and Ontime's view ecosystem (ontime://views). Guidance should be concise and
- * clear — verbosity distracts agents and users alike. Keep each document short.
- */
-
-// The palette mirrors the editor colour picker swatches in
-// apps/client/src/common/components/input/colour-input/SwatchSelect.tsx — keep in sync.
-export const ONTIME_STYLE_GUIDE_MARKDOWN = `# Ontime rundown style guide
-
-Conventions for tidy, scannable rundowns. Read before creating or restyling a rundown. Follow the user's own conventions when they have them; otherwise prefer these. When communicating with the user, be concise — short proposals beat long explanations.
-
-## Structure
-
-- Group events into blocks matching the show's segments; 10+ ungrouped events is a wall — propose groups.
-- Set \`targetDuration\` on groups so operators can track time to block completion.
-- Use \`milestone\` for non-timed markers (doors open, broadcast start), not zero-duration events.
-- Use \`delay\` only to model schedule drift, never as padding.
-- Schedule changeovers and buffers as real events (grey; orange when technical), not invisible gaps — 5–10 min between major segments stops one overrun cascading through the day.
-- Model contingency segments as \`skip: true\` events: visible in the rundown, excluded from playback, one edit to activate.
-- Before show day, duplicate the rundown for rehearsal so the show copy stays clean.
-
-## Colours
-
-Prefer Ontime's default palette — the editor's swatches — so colours look native. Each hue has a dark/light tone pair:
-
-| Hue | Dark | Light | Use |
-| --- | --- | --- | --- |
-| Red | \`#ED3333\` | \`#FF7878\` | attention: curfews, hard deadlines, broadcast-critical |
-| Orange | \`#FFAB33\` | \`#FFCC78\` | technical changeovers, resets |
-| Green | \`#339E4E\` | \`#77C785\` | normal show content |
-| Blue | \`#3E75E8\` | \`#779BE7\` | normal show content |
-| Violet | \`#8064E1\` | \`#A790F5\` | normal show content |
-| Grey | \`#9d9d9d\` | \`#ececec\` | breaks, housekeeping |
-
-- Normal segments use the calm hues (green, blue, violet). Reserve red for what genuinely needs attention and orange for changeovers.
-- Use tones for hierarchy: dark tone on a group, the light tone of the same hue on its child events.
-- One convention per project, applied consistently.
-
-## Cues and titles
-
-- Cues follow ONE convention per rundown: numeric (\`1, 2, 3\` or \`10, 20, 30\`, leaving room for insertions), semantic (\`Preset\`, \`Key 1\`, \`Lunch\`), or a deliberate mix. Dense technical shows often prefix by department (\`LX1\`, \`SND2\`, \`VID3\`). Match what the rundown already uses; ask if nothing is established.
-- Cues are automation handles — external systems (Companion, OSC/HTTP) trigger events by cue name. Keep them unique and stable; warn before renaming cues on an existing show.
-- Title = what happens on stage, under ~50 characters. Department/tech data goes in custom fields; \`note\` is for free-text human context.
-
-## Custom fields
-
-- Structured per-department data (camera, graphics, audio, speaker) belongs in custom fields — one per department, coloured to match. This powers the cuesheet and operator views.
-- Reuse existing fields; never create near-duplicates (\`Cam\`, \`camera\`, \`Cameras\`).
-- Data repeated in titles or notes ("CAM 2") is a sign it belongs in a custom field.
-- Write values to be scannable mid-show: "CAM 2 close-up", not sentences.
-
-## Timing
-
-- \`linkStart\` events inside a block so schedule edits propagate.
-- \`flag\` sparingly — it marks critical moments and dilutes with overuse.
-- Set \`timeWarning\` where a moderator would signal the speaker to wrap (commonly 5 min); \`timeDanger\` for the final push (e.g. 1 min). Scale both down for short items.
-- Hard out? Backtime: build the closing items from the end with \`timeEnd\` + \`duration\` (Ontime calculates \`timeStart\`), protect their ends with \`timeStrategy: lock-end\`, and use \`countToEnd\` for true curfew items.
-
-After tidying, read \`ontime://views\` and suggest views that use the new structure.
-`;
-
-export const ONTIME_VIEWS_MARKDOWN = `# Ontime views and sharing guide
-
-Ontime renders the rundown into role-specific views at \`http://<host>:<port>/<view>\`. Recommend the right view when the user mentions a role, device, or sharing need. Prefer sharing live view links over exporting static documents — everyone sees the current version, ending the conflicting-copies problem of circulated spreadsheets. The agent cannot create views or presets — give exact URLs and point to the editor settings.
-
-| View | Path | For |
-| --- | --- | --- |
-| Timer | \`/timer\` | speakers/presenters on stage |
-| Backstage | \`/backstage\` | crew following schedule + notes |
-| Operator | \`/op\` | department operators on phone/tablet |
-| Cuesheet | \`/cuesheet\` | cross-department table editing |
-| Timeline | \`/timeline\` | producers, whole-show overview |
-| Countdown | \`/countdown\` | following selected events or a group |
-| Studio clock | \`/studio\` | on-air studio environments |
-| Project info | \`/info\` | sharing event logistics widely |
-
-Most views are configured via URL parameters (editor and cuesheet in-app); the view's cog icon exposes the options and encodes them into the URL.
-
-## Operator view parameters
-
-- \`main\` / \`secondary-src\`: the two text lines — \`title\`, \`note\`, or \`custom-<fieldKey>\`.
-- \`subscribe=<fieldKey>\`: highlight a custom field (repeatable).
-- \`shouldEdit=true\`: long-press editing of the highlighted field.
-- \`hidePast=true\`, \`showStart=true\`: trim and annotate the list.
-
-Example for a camera operator:
-\`/op?main=title&secondary-src=custom-Camera&subscribe=Camera&hidePast=true\`
-
-Offer a link like this after creating a department custom field.
-
-## URL presets
-
-Presets bundle a configured view under a short alias (e.g. \`/camera-op\`), optionally shown in the nav menu. Managed in **Editor → Settings → URL presets**. When recommending a configured view, spell out the view and query string and suggest saving it as a preset.
-Docs: https://docs.getontime.no/features/url-presets/
-
-## Custom views
-
-For branding or layouts beyond the built-in options: files in Ontime's \`external\` folder are served at \`/external/…\` and can use Ontime's APIs for live data. Recommend for sponsor branding, unusual layouts, or LED wall graphics.
-Docs: https://docs.getontime.no/features/custom-views/
-`;

apps/server/src/api-mcp/mcp.prompts.ts

@@ -33,18 +33,6 @@ export const PROMPT_DEFINITIONS: ListPromptsResult['prompts'] = [
       },
     ],
   },
-  {
-    name: 'tidy_rundown',
-    description:
-      'Audit the rundown for readability (colours, grouping, cue naming, custom field usage) and propose improvements',
-    arguments: [
-      {
-        name: 'focus',
-        description: 'Optional area to focus on, e.g. "colours only" or "grouping"',
-        required: false,
-      },
-    ],
-  },
   {
     name: 'manage_custom_fields',
     description: 'List, create, rename, recolour, or delete project-level custom field definitions',
@@ -117,17 +105,15 @@ Flags (flag):
 - Set \`flag: true\` on events that are critical operational markers (keynote starts, broadcast moments, VIP arrivals).
 - The operator view shows a countdown to the next flagged event — use sparingly for maximum impact.
 
-Structure and colours:
+Colours:
-- Read the ontime://style-guide resource before deciding on structure or colours.
+- Ask the user what colour convention they use before applying any colours.
-- Propose a group per agenda section (morning block, keynotes, breaks) rather than a flat list — in ontime_batch_create_entries this is just a group entry with \`children\`.
+- Common pattern: one colour per event type (keynotes, panels, breaks, meals).
-- Ask the user what colour convention they use; if they have none, propose one from the default Ontime palette in the style guide: calm hues for normal content, red only for attention items, orange for changeovers, dark tone on a group with the light tone of the same hue on its children. Colours are hex strings: \`#RRGGBB\`.
+- Colours are hex strings: \`#RRGGBB\`.
 
 Custom fields (custom):
 - Call ontime_get_custom_fields for the project's field keys (cuesheet-style columns such as camera, graphics, speaker).
-- Store values per entry at \`custom: { <fieldKey>: <value> }\` — keys are case-sensitive.
+- Store values per entry at \`custom: { <fieldKey>: <value> }\` — only use keys that exist in the project.
-- Reuse an existing field when it covers the concept (avoid duplicates such as \`Cam\`, \`camera\`, \`Cameras\`); when the agenda carries structured data with no matching field (speakers, locations), create it with ontime_create_custom_field and use the returned key — no confirmation needed.
+- If the user's requested field is ambiguous, show the existing field list before choosing a key, so you avoid duplicate concepts such as \`Cam\`, \`camera\`, and \`Cameras\`.
-
-After creating the rundown, read ontime://views and suggest how the team can follow it — e.g. a timer view for speakers, a backstage view for crew, or an operator view subscribed to a department custom field.
 
 Agenda:
 ${args.agenda}`,
@@ -176,7 +162,6 @@ Schedule integrity:
 - Events with \`duration\` of 0 or negative
 - Events with \`gap < 0\`: overlaps the previous timed event and is a conflict
 - Large unexplained positive gaps between consecutive timed events (> 30 min): check whether these are intentional
-- Long segments scheduled back-to-back with no changeover or buffer between them: one overrun will cascade — suggest a buffer event
 - Events where \`timeEnd < timeStart\`: these cross midnight; confirm this is intentional
 - Events whose \`timeStart\` is the same as or earlier than the previous playable event's \`timeStart\`: Ontime schedules these on the next day; confirm this is intentional
 
@@ -196,13 +181,6 @@ Skipped events:
 Totals:
 - Total rundown duration and whether it matches the user's expected show length (ask if unknown)
 
-Readability (report at INFO level; see ontime://style-guide for the conventions):
-- Colour usage without a consistent convention, or key segments left uncoloured
-- Long runs of related ungrouped events that would read better as groups
-- Duplicate cues (cues are automation handles and should be unique) or mixed cue naming conventions
-- Structured department data in titles/notes that belongs in custom fields
-- If several readability issues surface, suggest running the tidy_rundown prompt to fix them systematically
-
 Present issues grouped by severity: ERROR (breaks playback), WARNING (likely mistake), INFO (worth confirming).`,
     );
   }
@@ -237,34 +215,6 @@ Efficiency tip: plan moves in the direction of the target position to minimise r
     );
   }
 
-  if (name === 'tidy_rundown') {
-    const focus = args.focus ? `\nFocus specifically on: "${args.focus}".` : '';
-    return userPrompt(
-      'Audit and improve rundown readability',
-      `Audit the current Ontime rundown for readability and tidiness, then propose improvements.${focus}
-
-Steps:
-1. Read the ontime://style-guide resource — it defines the conventions to audit against, including the standard colour palette.
-2. Call ontime_list_rundowns and identify the target rundown. If the user wants a background rundown, pass its \`rundownId\` in all entry read/write calls instead of loading it.
-3. Call ontime_get_rundown with the chosen \`rundownId\`, and ontime_get_custom_fields for the project field definitions.
-4. Call ontime_get_timer_state. If playback is not \`stop\` and the target is the loaded rundown, explain that MCP edits affect the live rundown and ask the user to confirm before changing it.
-
-Audit for:
-- Colour consistency: entries coloured outside a discernible convention, missing colours on key segments, red/orange used for normal content (the style guide reserves them for attention items and changeovers), or group/children colours that ignore the dark/light tone pairing. Prefer the default Ontime palette.
-- Grouping: long runs (roughly 4+) of related consecutive top-level events that would read better as a named group; groups missing \`targetDuration\`.
-- Buffers: long segments back-to-back with no changeover event between them; propose short buffer events so one overrun cannot cascade.
-- Cue naming: mixed conventions (numeric vs semantic) without apparent intent, duplicate cues, or gaps that suggest mistakes. Remember cues are automation handles — renaming them can break external triggers, so flag renames explicitly.
-- Data in the wrong place: structured department data buried in titles or notes (e.g. "CAM 2", "GFX: lower third") that belongs in a custom field; overlong titles (over ~50 chars).
-- Entry types: zero-duration events that should be milestones; milestones that carry timing expectations and should be events.
-- Flags: \`flag: true\` on many events dilutes its meaning — critical markers only.
-
-Then:
-5. Present the findings as a short, scannable proposal (what changes, on which entries, and why) and WAIT for the user to approve before mutating anything. Be concise — a tight list beats prose.
-6. Apply approved changes with the cheapest calls: ontime_group_entries to group existing entries, ontime_batch_update_entries when several entries get the same values (e.g. recolouring), ontime_update_entry for per-entry changes, ontime_create_custom_field when moving data into a new field.
-7. Finish by reading ontime://views and suggesting views that put the improved structure to work — e.g. an operator view subscribed to a department custom field, or a cuesheet for cross-department editing.`,
-    );
-  }
-
   if (name === 'manage_custom_fields') {
     return userPrompt(
       'List, create, rename, recolour, or delete custom field definitions',
@@ -273,14 +223,14 @@ Then:
 Custom fields are project-scoped. They appear as columns in the cuesheet and can be set on any event, milestone, or group. Changes apply to all rundowns in the project.
 
 Steps:
-1. Call ontime_get_custom_fields to see what fields already exist. Reuse an existing field when it covers the concept — avoid duplicates such as "Cam", "camera", and "Cameras".
+1. Call ontime_get_custom_fields to see what fields already exist. This is mandatory before creating — to avoid duplicates such as "Cam", "camera", and "Cameras".
-2. Carry out the instruction using the tools below. Creating a field is non-destructive — do it directly. Confirm destructive changes (rename, delete) with the user before calling.
+2. Carry out the instruction using the tools below. Confirm destructive changes (rename, delete) with the user before calling.
 
 Creating a field:
 - Call ontime_create_custom_field with { label, type, colour }.
-- label: human-readable name (letters, numbers and spaces). The key is auto-derived: spaces → underscores (e.g. "Camera Angle" → "Camera_Angle").
+- label: human-readable name (alphanumeric with spaces). The key is auto-derived: spaces → underscores (e.g. "Camera Angle" → "Camera_Angle"). Confirm the derived key with the user before creating.
 - type: "text" for short string values, "image" for image URLs. Cannot be changed after creation.
-- colour: hex colour (#RRGGBB) used to visually identify this column in the cuesheet. If unspecified, pick one from the default Ontime palette matching the department.
+- colour: hex colour (#RRGGBB) used to visually identify this column in the cuesheet. Ask the user what colour to use if not specified.
 - Returns: { key, customFields } — use the returned key when setting values on entries.
 
 Renaming or recolouring a field:
@@ -292,9 +242,7 @@ Deleting a field:
 - Call ontime_delete_custom_field with { key }.
 - Warning: this permanently removes the field definition and its values from every entry in all rundowns. Confirm with the user before deleting.
 
-After any mutation, call ontime_get_custom_fields again to confirm the result and show the user the updated field list with their keys.
+After any mutation, call ontime_get_custom_fields again to confirm the result and show the user the updated field list with their keys.`,
-
-When a field was created for a department (camera, graphics, audio…), read ontime://views and offer the views that surface it: the cuesheet shows the field as a column for cross-department editing, and the operator view can display or highlight it for that department, e.g. /op?main=title&secondary-src=custom-<key>&subscribe=<key>.`,
     );
   }
 

apps/server/src/api-mcp/mcp.resources.ts

@@ -4,7 +4,6 @@ import { getProjectData } from '../api-data/project-data/projectData.dao.js';
 import { getCurrentRundown, getProjectCustomFields } from '../api-data/rundown/rundown.dao.js';
 import { normalisedToRundownArray } from '../api-data/rundown/rundown.utils.js';
 import { getDataProvider } from '../classes/data-provider/DataProvider.js';
-import { ONTIME_STYLE_GUIDE_MARKDOWN, ONTIME_VIEWS_MARKDOWN } from './mcp.guides.js';
 import { ONTIME_DOCS_MARKDOWN, ONTIME_SCHEMA_MARKDOWN } from './mcp.schema.js';
 
 export const RESOURCE_DEFINITIONS: ListResourcesResult['resources'] = [
@@ -46,22 +45,6 @@ export const RESOURCE_DEFINITIONS: ListResourcesResult['resources'] = [
       'Map of custom field keys to their label, type, and colour. Events reference these keys in their `custom` object.',
     mimeType: 'application/json',
   },
-  {
-    uri: 'ontime://style-guide',
-    name: 'ontime-style-guide',
-    title: 'Rundown style guide',
-    description:
-      'Best practices for tidy, easy-to-read rundowns: grouping, colour conventions and the default Ontime palette, cue naming, custom fields vs notes, timing hygiene. Read before creating or restyling a rundown.',
-    mimeType: 'text/markdown',
-  },
-  {
-    uri: 'ontime://views',
-    name: 'ontime-views',
-    title: 'Views and sharing guide',
-    description:
-      'What each Ontime view (timer, backstage, operator, cuesheet, timeline, countdown, studio clock, project info) is for, key URL parameters, URL presets, and custom views. Read when recommending how a team member should follow or edit the show.',
-    mimeType: 'text/markdown',
-  },
   {
     uri: 'ontime://docs',
     name: 'ontime-docs',
@@ -74,8 +57,6 @@ export const RESOURCE_DEFINITIONS: ListResourcesResult['resources'] = [
 
 const RESOURCE_READERS: Record<string, { mimeType: string; read: () => string }> = {
   'ontime://schema': { mimeType: 'text/markdown', read: () => ONTIME_SCHEMA_MARKDOWN },
-  'ontime://style-guide': { mimeType: 'text/markdown', read: () => ONTIME_STYLE_GUIDE_MARKDOWN },
-  'ontime://views': { mimeType: 'text/markdown', read: () => ONTIME_VIEWS_MARKDOWN },
   'ontime://docs': { mimeType: 'text/markdown', read: () => ONTIME_DOCS_MARKDOWN },
   'ontime://rundown/current': {
     mimeType: 'application/json',

apps/server/src/api-mcp/mcp.schema.ts

@@ -49,8 +49,7 @@ export const EVENT_WRITABLE_FIELDS = {
   note: { type: 'string', description: 'Free-text note for production notes or references' },
   colour: {
     type: 'string',
-    description:
+    description: 'Hex colour (#RRGGBB) for visual grouping — ask the user what colour convention they use',
-      'Hex colour (#RRGGBB) for visual grouping — ask the user what colour convention they use, and prefer the default Ontime palette from ontime://style-guide so colours match the editor swatches',
   },
   skip: { type: 'boolean', description: 'If true, event is skipped during playback' },
   flag: {
@@ -61,7 +60,7 @@ export const EVENT_WRITABLE_FIELDS = {
     type: 'object',
     additionalProperties: { type: 'string' },
     description:
-      'Custom field values keyed by project field key, e.g. { "Camera": "CAM 2" }. Keys are case-sensitive — get them with ontime_get_custom_fields, and create missing fields with ontime_create_custom_field.',
+      'Custom field values keyed by existing project field key, e.g. { "camera": "CAM 2" }. Get available keys with ontime_get_custom_fields. Adding new custom field definitions is a separate project-level operation.',
   },
   ...EVENT_TIMER_FIELDS,
 } as const;
@@ -181,11 +180,12 @@ Events, milestones and groups store values at \`entry.custom[fieldKey]\`.
 
 Managing field definitions:
 - Read: \`ontime_get_custom_fields\` — returns \`{ [key]: { label, type, colour } }\`
-- Create: \`ontime_create_custom_field { label, type, colour }\` — key is auto-derived from label (spaces → underscores). Returns \`{ key, customFields }\`.
+- Create: \`ontime_create_custom_field { label, type, colour }\` — key is auto-derived from label (spaces → underscores). Confirm the derived key before creating. Returns \`{ key, customFields }\`.
 - Rename/recolour: \`ontime_update_custom_field { key, label?, colour? }\` — renaming the label changes the derived key and cascades to all entry references across all rundowns. Type cannot be changed.
 - Delete: \`ontime_delete_custom_field { key }\` — removes the field definition and its values from every entry in all rundowns. Destructive, confirm first.
 
-Keys are case-sensitive. When setting \`custom\` values, reuse an existing field when it covers the concept; otherwise create the missing field — creation is non-destructive and needs no confirmation. Rename and delete are the destructive operations: confirm those with the user.
+When setting \`custom\` values on entries, only use existing field keys. If a key does not exist, create it with \`ontime_create_custom_field\` first.
+Show the existing field list before creating to avoid duplicates such as \`Cam\`, \`camera\`, and \`Cameras\`.
 
 ## Targeting rundowns
 Entry read/write tools accept an optional \`rundownId\`.
@@ -199,8 +199,6 @@ When playback is not \`stop\`, mutations to the loaded rundown affect the live r
 
 ## Available resources
 - \`ontime://schema\` — this document
-- \`ontime://style-guide\` — rundown design best practices: grouping, colour palette, cue naming, custom field usage. Read before creating or restyling a rundown.
-- \`ontime://views\` — Ontime's role-specific views, URL parameters, URL presets, and custom views. Read when recommending how a team member should follow or edit the show.
 - \`ontime://rundown/current\` — the currently loaded rundown (JSON)
 - \`ontime://rundowns\` — all rundowns in the project (JSON)
 - \`ontime://project/info\` — project metadata (JSON)
@@ -236,16 +234,6 @@ Main site: https://docs.getontime.no
 - OSC Integration: https://docs.getontime.no/api/osc/
 - Make custom views: https://docs.getontime.no/features/custom-views/
 
-## Views
-- Configuring views: https://docs.getontime.no/quick-tips/configuring-views/
-- Operator view: https://docs.getontime.no/interface/production/operator/
-- Cuesheet: https://docs.getontime.no/interface/production/cuesheet/
-- Render views in third-party apps: https://docs.getontime.no/quick-tips/render-elsewhere/
-
-## Quick tips
-- Managing delays: https://docs.getontime.no/quick-tips/managing-delays/
-- Smart time entry: https://docs.getontime.no/quick-tips/smart-time-entry/
-
 ## Helpful references
 - Ontime Cloud: https://docs.getontime.no/ontime-cloud/
 - Connect to companion module: https://docs.getontime.no/additional-notes/companion-module/

apps/server/src/api-mcp/mcp.service.ts

@@ -12,7 +12,6 @@ import {
   Rundown,
   SupportedEntry,
 } from 'ontime-types';
-import { checkRegex, customFieldLabelToKey } from 'ontime-utils';
 
 import { getCurrentRundown, getCurrentRundownId, getProjectCustomFields } from '../api-data/rundown/rundown.dao.js';
 import {
@@ -111,21 +110,11 @@ export function assertKnownCustomFields(...customValues: Array<EntryFieldArgs['c
     const available = Object.keys(customFields);
     const hint =
       available.length > 0 ? `Available keys: ${available.join(', ')}.` : 'No custom fields are defined yet.';
-
-    // keys are case-sensitive; a near-miss on casing is the most common mistake
-    const suggestions = [...unknownKeys]
-      .map((key) => {
-        const match = available.find((existing) => existing.toLowerCase() === key.toLowerCase());
-        return match ? `"${key}" → "${match}"` : null;
-      })
-      .filter(Boolean);
-    const caseHint =
-      suggestions.length > 0 ? ` Keys are case-sensitive — did you mean: ${suggestions.join(', ')}?` : '';
-
     throw new Error(
-      `Unknown custom field key(s): ${missing}. ${hint}${caseHint} ` +
+      `Unknown custom field key(s): ${missing}. ${hint} ` +
         `Call ontime_create_custom_field with { label, type, colour } to create a missing field — ` +
-        `the key is auto-derived from the label (spaces → underscores, e.g. label "Mix Output" → key "Mix_Output").`,
+        `the key is auto-derived from the label (spaces → underscores, e.g. label "Camera" → key "Camera"). ` +
+        `Call ontime_get_custom_fields to list existing keys.`,
     );
   }
 }
@@ -344,23 +333,8 @@ export async function batchUpdateEntriesForMcp(args: TargetRundownArgs & { ids:
 }
 
 export async function createCustomFieldForMcp(args: { label: string; type: 'text' | 'image'; colour: string }) {
-  const label = args.label?.trim();
+  const updated = await createCustomField({ label: args.label, type: args.type, colour: args.colour });
-  // same constraint the HTTP route enforces in customFields.validation.ts
+  const key = Object.keys(updated).find((k) => updated[k].label === args.label) ?? args.label;
-  if (!label || !checkRegex.isAlphanumericWithSpace(label)) {
-    throw new Error('Invalid label: use letters, numbers and spaces only, e.g. "Camera Angle".');
-  }
-
-  const key = customFieldLabelToKey(label);
-  const existingFields = getProjectCustomFields();
-  const clash = Object.keys(existingFields).find((existing) => existing.toLowerCase() === key.toLowerCase());
-  if (clash) {
-    throw new Error(
-      `A custom field with key "${clash}" (label "${existingFields[clash].label}") already exists. ` +
-        `Reuse it in entry.custom["${clash}"] instead of creating a duplicate, or pick a clearly different label.`,
-    );
-  }
-
-  const updated = await createCustomField({ label, type: args.type, colour: args.colour });
   return { key, customFields: updated };
 }
 

apps/server/src/api-mcp/mcp.tools.ts

@@ -186,11 +186,7 @@ export const TOOL_DEFINITIONS = [
         ids: { type: 'array', items: { type: 'string' }, description: 'Existing top-level entry IDs to group' },
         title: { type: 'string', description: 'Group title shown in the rundown and views' },
         note: { type: 'string', description: 'Free-text group note for production notes or references' },
-        colour: {
+        colour: { type: 'string', description: 'Hex colour (#RRGGBB) for the group' },
-          type: 'string',
-          description:
-            'Hex colour (#RRGGBB) for the group — prefer the default Ontime palette from ontime://style-guide',
-        },
         custom: {
           type: 'object',
           additionalProperties: { type: 'string' },
@@ -381,7 +377,7 @@ export const TOOL_DEFINITIONS = [
   {
     name: 'ontime_create_custom_field',
     description:
-      'Create a new project-level custom field definition. Custom fields add typed columns to every entry in all rundowns. The key is auto-derived from the label (spaces → underscores, e.g. "Camera Angle" → "Camera_Angle"). Creation is non-destructive — check ontime_get_custom_fields for an existing field covering the concept, and if none exists create directly without asking the user. After creation, use the returned key in entry.custom.',
+      'Create a new project-level custom field definition. Custom fields add typed columns to every entry in all rundowns. The key is auto-derived from the label (spaces → underscores, e.g. "Camera Angle" → "Camera_Angle"). After creation, use the key in entry.custom when creating or updating entries.',
     inputSchema: {
       type: 'object',
       required: ['label', 'type', 'colour'],
@@ -389,7 +385,7 @@ export const TOOL_DEFINITIONS = [
         label: {
           type: 'string',
           description:
-            'Human-readable label (letters, numbers and spaces, e.g. "Camera"). Determines the key. Reuse an existing field over creating near-duplicates like "Cam", "camera", "Cameras".',
+            'Human-readable label (alphanumeric with spaces, e.g. "Camera"). Determines the key — ask the user to confirm before creating to avoid duplicates like "Cam", "camera", "Cameras".',
         },
         type: {
           type: 'string',
@@ -399,8 +395,7 @@ export const TOOL_DEFINITIONS = [
         },
         colour: {
           type: 'string',
-          description:
+          description: 'Hex colour (#RRGGBB) used to visually identify this column in the cuesheet.',
-            'Hex colour (#RRGGBB) used to visually identify this column in the cuesheet — for department fields, match the department colour convention (see ontime://style-guide).',
         },
       },
     },

apps/server/src/services/__tests__/timerUtils.test.ts

@@ -5,7 +5,6 @@ import type { RuntimeState } from '../../stores/runtimeState.js';
 import {
   findDayOffset,
   getCurrent,
-  getElapsed,
   getExpectedFinish,
   getRuntimeOffset,
   getTimerPhase,
@@ -16,56 +15,6 @@ import {
 
 const asTimeOfDay = (value: number): RuntimeState['clock'] => value as RuntimeState['clock'];
 
-describe('getElapsed()', () => {
-  it('returns active elapsed time from startedAt without add-time adjustments', () => {
-    const state = {
-      clock: 5 * MILLIS_PER_MINUTE,
-      timer: {
-        addedTime: -10 * MILLIS_PER_MINUTE,
-        current: 15 * MILLIS_PER_MINUTE,
-        duration: 20 * MILLIS_PER_MINUTE,
-        startedAt: 2 * MILLIS_PER_MINUTE,
-      },
-      _timer: {
-        pausedAt: null,
-        pausedDuration: 0,
-      },
-    } as RuntimeState;
-
-    expect(getElapsed(state)).toBe(3 * MILLIS_PER_MINUTE);
-  });
-
-  it('subtracts accumulated pause time', () => {
-    const state = {
-      clock: 10 * MILLIS_PER_MINUTE,
-      timer: {
-        startedAt: 2 * MILLIS_PER_MINUTE,
-      },
-      _timer: {
-        pausedAt: null,
-        pausedDuration: 5 * MILLIS_PER_MINUTE,
-      },
-    } as RuntimeState;
-
-    expect(getElapsed(state)).toBe(3 * MILLIS_PER_MINUTE);
-  });
-
-  it('uses the current pause start while paused', () => {
-    const state = {
-      clock: 10 * MILLIS_PER_MINUTE,
-      timer: {
-        startedAt: 2 * MILLIS_PER_MINUTE,
-      },
-      _timer: {
-        pausedAt: 7 * MILLIS_PER_MINUTE,
-        pausedDuration: 1 * MILLIS_PER_MINUTE,
-      },
-    } as RuntimeState;
-
-    expect(getElapsed(state)).toBe(4 * MILLIS_PER_MINUTE);
-  });
-});
-
 describe('getExpectedFinish()', () => {
   it('is null if we havent started', () => {
     const state = {

apps/server/src/services/message-service/__tests__/message.utils.test.ts

@@ -33,11 +33,4 @@ describe('validateTimerMessage()', () => {
 
     expect(validateTimerMessage(payload)).toStrictEqual(expected);
   });
-  it('coerces the secondary placement to a permitted value', () => {
-    expect(validateTimerMessage({ secondaryPlacement: 'main' })).toStrictEqual({ secondaryPlacement: 'main' });
-    expect(validateTimerMessage({ secondaryPlacement: 'below' })).toStrictEqual({ secondaryPlacement: 'below' });
-  });
-  it('falls back to below for an invalid placement', () => {
-    expect(validateTimerMessage({ secondaryPlacement: 'nonsense' })).toStrictEqual({ secondaryPlacement: 'below' });
-  });
 });

apps/server/src/services/message-service/message.utils.ts

@@ -25,7 +25,6 @@ export function validateTimerMessage(message: unknown): Partial<TimerMessage> {
   if ('blink' in message) result.blink = coerceBoolean(message.blink);
   if ('blackout' in message) result.blackout = coerceBoolean(message.blackout);
   if ('secondarySource' in message) result.secondarySource = coerceSecondary(message.secondarySource);
-  if ('secondaryPlacement' in message) result.secondaryPlacement = coercePlacement(message.secondaryPlacement);
 
   return result;
 }
@@ -46,20 +45,3 @@ function coerceSecondary(source: unknown): TimerMessage['secondarySource'] {
   }
   return source;
 }
-
-/**
- * Asserts that the placement value is one of the permitted values
- */
-function assertPlacement(placement: unknown): placement is TimerMessage['secondaryPlacement'] {
-  return placement === 'below' || placement === 'main';
-}
-
-/**
- * Ensures that the placement value is one of the permitted values
- */
-function coercePlacement(placement: unknown): TimerMessage['secondaryPlacement'] {
-  if (!assertPlacement(placement)) {
-    return 'below';
-  }
-  return placement;
-}

apps/server/src/services/restore-service/__tests__/restore.parser.test.ts

@@ -47,23 +47,6 @@ describe('isRestorePoint()', () => {
     expect(isRestorePoint(restorePoint)).toBe(true);
   });
 
-  it('accepts optional paused duration', () => {
-    const restorePoint: RestorePoint = {
-      playback: Playback.Roll,
-      selectedEventId: '123',
-      startedAt: 1,
-      addedTime: 2,
-      pausedAt: null,
-      pausedDuration: 3000,
-      firstStart: 1,
-      startEpoch: asInstant(1),
-      currentDay: 0,
-    };
-
-    expect(isRestorePoint(restorePoint)).toBe(true);
-    expect(isRestorePoint({ ...restorePoint, pausedDuration: '3000' })).toBe(false);
-  });
-
   describe('rejects a badly formatted file', () => {
     it('with invalid playback value', () => {
       const restorePoint = {

apps/server/src/services/restore-service/restore.parser.ts

@@ -46,10 +46,6 @@ export function isRestorePoint(restorePoint: unknown): restorePoint is RestorePo
     return false;
   }
 
-  if ('pausedDuration' in restorePoint && !is.number(restorePoint.pausedDuration)) {
-    return false;
-  }
-
   if (!is.number(restorePoint.firstStart) && restorePoint.firstStart !== null) {
     return false;
   }

apps/server/src/services/restore-service/restore.type.ts

@@ -6,7 +6,6 @@ export type RestorePoint = {
   startedAt: MaybeNumber;
   addedTime: number;
   pausedAt: MaybeNumber;
-  pausedDuration?: number;
   firstStart: MaybeNumber;
   startEpoch: Maybe<Instant>;
   currentDay: MaybeNumber;

apps/server/src/services/runtime-service/runtime.service.ts

@@ -760,7 +760,6 @@ function broadcastResult(_target: any, _propertyKey: string, descriptor: Propert
           startedAt: state.timer.startedAt,
           addedTime: state.timer.addedTime,
           pausedAt: state._timer.pausedAt,
-          pausedDuration: state._timer.pausedDuration,
           firstStart: state.rundown.actualStart,
           startEpoch: state._startEpoch,
           currentDay: state.rundown.currentDay,

apps/server/src/services/runtime-service/runtime.utils.ts

@@ -33,8 +33,7 @@ export function getShouldClockUpdate(previousUpdate: number, now: number): boole
  * Checks whether we should update the timer values
  * - `current` and `secondaryTimer` trigger on seconds roll over
  * - the rest trigger on any change
- * - `elapsed` changes alongside `current`
+ * - `elapsed` and `expectedFinish` is not checked
- * - `expectedFinish` is not checked
  */
 export function getShouldTimerUpdate(previousValue: TimerState | undefined, currentValue: TimerState): boolean {
   if (previousValue === undefined) return true;
@@ -49,7 +48,7 @@ export function getShouldTimerUpdate(previousValue: TimerState | undefined, curr
     previousValue.phase !== currentValue.phase ||
     previousValue.playback !== currentValue.playback ||
     previousValue.startedAt !== currentValue.startedAt
-    // elapsed - this is derived from current / duration / addedTime, so the fields above cover it
+    // elapsed - this would be the direct invert of current value so no need to check
     // expectedFinish - this will be moved out by the current value going into over time, no need to check
   );
 }

apps/server/src/services/timerUtils.ts

@@ -92,33 +92,6 @@ export function getCurrent(state: RuntimeState): number {
   return startedAt + duration + addedTime - clock - correctDay;
 }
 
-/**
- * Calculates active time elapsed since the timer started.
- */
-export function getElapsed(state: RuntimeState): MaybeNumber {
-  const { clock } = state;
-  const { startedAt } = state.timer;
-  const { pausedAt, pausedDuration } = state._timer;
-
-  if (startedAt === null) {
-    return null;
-  }
-
-  const referenceClock = pausedAt ?? clock;
-  const elapsedSinceStart = getTimeSinceStart(referenceClock, startedAt);
-  const activeElapsed = elapsedSinceStart - pausedDuration;
-
-  return Math.max(0, activeElapsed);
-}
-
-function getTimeSinceStart(clock: TimeOfDay, startedAt: number): number {
-  if (clock < startedAt) {
-    return clock + dayInMs - startedAt;
-  }
-
-  return clock - startedAt;
-}
-
 /**
  * Checks whether we have skipped out of the event
  * @param {RuntimeState} state runtime state

apps/server/src/stores/__mocks__/runtimeState.mocks.ts

@@ -40,7 +40,6 @@ const baseState: RuntimeState = {
   _timer: {
     forceFinish: null,
     pausedAt: null,
-    pausedDuration: 0,
     secondaryTarget: null,
     hasFinished: false,
   },

apps/server/src/stores/__tests__/runtimeState.test.ts

@@ -61,13 +61,6 @@ vi.mock('../../classes/data-provider/DataProvider.js', () => {
       return {
         setCustomFields: vi.fn().mockImplementation((newData) => newData),
         setRundown: vi.fn().mockImplementation((newData) => newData),
-        getAutomation: vi.fn().mockReturnValue({
-          enabledAutomations: false,
-          enabledOscIn: false,
-          oscPortIn: 0,
-          triggers: [],
-          automations: {},
-        }),
       };
     }),
   };
@@ -175,79 +168,6 @@ describe('mutation on runtimeState', () => {
       });
       expect(newState.rundown.actualStart).toBeNull();
     });
-
-    test('elapsed remains active time when adding and removing time', async () => {
-      clearState();
-      const event = {
-        ...mockEvent,
-        id: 'elapsed-add-time',
-        timeStart: 0,
-        timeEnd: 10 * MILLIS_PER_MINUTE,
-        duration: 10 * MILLIS_PER_MINUTE,
-      };
-      const mockRundown = makeRundown({
-        entries: { [event.id]: event },
-        order: [event.id],
-      });
-
-      await initRundown(mockRundown, {});
-      vi.runAllTimers();
-
-      const { metadata, rundown } = rundownCache.get();
-      vi.setSystemTime('jan 1 00:00');
-      load(event, rundown, metadata);
-      start();
-
-      vi.setSystemTime('jan 1 00:02');
-      update();
-
-      addTime(5 * MILLIS_PER_MINUTE);
-      let state = getState();
-      expect(state.timer.elapsed).toBe(2 * MILLIS_PER_MINUTE);
-      expect(state.timer.duration! - state.timer.current!).toBe(-3 * MILLIS_PER_MINUTE);
-
-      addTime(-8 * MILLIS_PER_MINUTE);
-      state = getState();
-      expect(state.timer.elapsed).toBe(2 * MILLIS_PER_MINUTE);
-      expect(state.timer.duration! - state.timer.current!).toBe(5 * MILLIS_PER_MINUTE);
-    });
-
-    test('elapsed excludes time spent paused after resume', async () => {
-      clearState();
-      const event = {
-        ...mockEvent,
-        id: 'elapsed-pause',
-        timeStart: 0,
-        timeEnd: 10 * MILLIS_PER_MINUTE,
-        duration: 10 * MILLIS_PER_MINUTE,
-      };
-      const mockRundown = makeRundown({
-        entries: { [event.id]: event },
-        order: [event.id],
-      });
-
-      await initRundown(mockRundown, {});
-      vi.runAllTimers();
-
-      const { metadata, rundown } = rundownCache.get();
-      vi.setSystemTime('jan 1 00:00');
-      load(event, rundown, metadata);
-      start();
-
-      vi.setSystemTime('jan 1 00:02');
-      update();
-      pause();
-
-      vi.setSystemTime('jan 1 00:07');
-      start();
-      let state = getState();
-      expect(state.timer.elapsed).toBe(2 * MILLIS_PER_MINUTE);
-
-      vi.setSystemTime('jan 1 00:08');
-      update();
-      state = getState();
-      expect(state.timer.elapsed).toBe(3 * MILLIS_PER_MINUTE);
-    });
   });
 
   test('runtime offset', async () => {

apps/server/src/stores/runtimeState.ts

@@ -36,7 +36,6 @@ import { loadRoll, normaliseRollStart } from '../services/rollUtils.js';
 import {
   findDayOffset,
   getCurrent,
-  getElapsed,
   getExpectedFinish,
   getRuntimeOffset,
   getTimerPhase,
@@ -63,7 +62,6 @@ export type RuntimeState = {
   _timer: {
     forceFinish: Maybe<TimeOfDay>; // whether we should declare an event as finished, will contain the finish time
     pausedAt: Maybe<TimeOfDay>;
-    pausedDuration: number;
     secondaryTarget: Maybe<TimeOfDay>;
     hasFinished: boolean;
   };
@@ -89,7 +87,6 @@ const runtimeState: RuntimeState = {
   _timer: {
     forceFinish: null,
     pausedAt: null,
-    pausedDuration: 0,
     secondaryTarget: null,
     hasFinished: false,
   },
@@ -141,7 +138,6 @@ export function clearEventData() {
   // when clearing, we maintain the total delay from the rundown
   runtimeState._timer.forceFinish = null;
   runtimeState._timer.pausedAt = null;
-  runtimeState._timer.pausedDuration = 0;
   runtimeState._timer.secondaryTarget = null;
   runtimeState._timer.hasFinished = false;
 }
@@ -174,7 +170,6 @@ export function clearState() {
   // when clearing, we maintain the total delay from the rundown
   runtimeState._timer.forceFinish = null;
   runtimeState._timer.pausedAt = null;
-  runtimeState._timer.pausedDuration = 0;
   runtimeState._timer.secondaryTarget = null;
   runtimeState._timer.hasFinished = false;
 
@@ -431,7 +426,6 @@ export function start(state: RuntimeState = runtimeState): boolean {
   if (state._timer.pausedAt) {
     const timeToAdd = state.clock - state._timer.pausedAt;
     state.timer.addedTime += timeToAdd;
-    state._timer.pausedDuration += timeToAdd;
     state._timer.pausedAt = null;
   }
 
@@ -441,7 +435,7 @@ export function start(state: RuntimeState = runtimeState): boolean {
 
   state.timer.playback = Playback.Play;
   state.timer.expectedFinish = getExpectedFinish(state);
-  state.timer.elapsed = getElapsed(state);
+  state.timer.elapsed = 0;
 
   if (state.rundown.actualStart === null) {
     state._startDayOffset = (findDayOffset(state.eventNow.timeStart, state.clock) + state.eventNow.dayOffset) as Day;
@@ -526,7 +520,6 @@ export function addTime(amount: number) {
   // we can update the state after handling the side effects
   runtimeState.timer.addedTime += amount;
   runtimeState.timer.current += amount;
-  runtimeState.timer.elapsed = getElapsed(runtimeState);
 
   // update runtime delays: over - under
   const { absolute, relative } = getRuntimeOffset(runtimeState);
@@ -582,7 +575,7 @@ export function update(): UpdateResult {
   runtimeState.timer.current = getCurrent(runtimeState);
   runtimeState.timer.expectedFinish = getExpectedFinish(runtimeState);
   runtimeState.timer.phase = getTimerPhase(runtimeState);
-  runtimeState.timer.elapsed = getElapsed(runtimeState);
+  runtimeState.timer.elapsed = runtimeState.timer.duration - runtimeState.timer.current;
 
   // update runtime, needs up-to-date timer state
   const { absolute, relative } = getRuntimeOffset(runtimeState);

packages/types/src/definitions/core/Automation.type.ts

@@ -83,7 +83,7 @@ export type OntimeActionKey =
   | OntimeMessageSet
   | OntimeMessageSecondary;
 
-export const ontimeActionKeyValues: string[] = [
+export const ontimeActionKeyValues = [
   ...ontimeAuxTriggerAction,
   ...ontimePlaybackAction,
   ...ontimeAuxSetAction,

packages/types/src/definitions/core/TimerLifecycle.type.ts

@@ -12,4 +12,4 @@ export enum TimerLifeCycle {
 
 export type TimerLifeCycleKey = keyof typeof TimerLifeCycle;
 
-export const timerLifecycleValues: string[] = Object.keys(TimerLifeCycle);
+export const timerLifecycleValues = Object.keys(TimerLifeCycle);

packages/types/src/definitions/runtime/MessageControl.type.ts

@@ -1,19 +1,11 @@
 export type SecondarySource = 'aux1' | 'aux2' | 'aux3' | 'secondary' | null;
 
-/**
- * Where the selected secondary source is displayed in the timer view
- * - below: shown as a smaller timer under the main timer (default)
- * - main: swapped into the main slot, demoting the event timer to the secondary slot
- */
-export type SecondaryPlacement = 'below' | 'main';
-
 export type TimerMessage = {
   text: string;
   visible: boolean;
   blink: boolean;
   blackout: boolean;
   secondarySource: SecondarySource;
-  secondaryPlacement: SecondaryPlacement;
 };
 
 export type MessageState = {

packages/types/src/definitions/runtime/RuntimeStore.ts

@@ -10,7 +10,7 @@ export const runtimeStorePlaceholder: Readonly<RuntimeStore> = {
     addedTime: 0,
     current: null, // changes on every update
     duration: null, // only changes if event changes
-    elapsed: null, // active time from start, changes on every update
+    elapsed: null, // changes on every update
     expectedFinish: null, // change can only be initiated by user, can roll over midnight
     phase: TimerPhase.None, // can change on update or user action
     playback: Playback.Stop, // change initiated by user
@@ -24,7 +24,6 @@ export const runtimeStorePlaceholder: Readonly<RuntimeStore> = {
       blink: false,
       blackout: false,
       secondarySource: null,
-      secondaryPlacement: 'below',
     },
     secondary: '',
   },

packages/types/src/definitions/runtime/TimerState.type.ts

@@ -21,7 +21,7 @@ export type TimerState = {
   current: MaybeNumber;
   /** Total duration of the running event */
   duration: MaybeNumber;
-  /** Active time elapsed since the timer started */
+  /** Time elapsed since the timer started */
   elapsed: MaybeNumber;
   /** Timestamp of the expected finish time */
   expectedFinish: MaybeNumber;

packages/types/src/index.ts

@@ -108,12 +108,7 @@ export type { ApiAction, ApiActionTag, ApiResponse } from './api/websocket/api.t
 export { type Log, LogLevel, type LogMessage, LogOrigin } from './definitions/runtime/Logger.type.js';
 export { Playback } from './definitions/runtime/Playback.type.js';
 export { TimerLifeCycle, timerLifecycleValues } from './definitions/core/TimerLifecycle.type.js';
-export type {
+export type { TimerMessage, MessageState, SecondarySource } from './definitions/runtime/MessageControl.type.js';
-  TimerMessage,
-  MessageState,
-  SecondarySource,
-  SecondaryPlacement,
-} from './definitions/runtime/MessageControl.type.js';
 
 export type { RundownState } from './definitions/runtime/RundownState.type.js';
 export type { Offset } from './definitions/runtime/Offset.type.js';

packages/types/src/translations/index.ts

@@ -16,7 +16,6 @@ export const langEn = {
   'common.no_data': 'No data',
   'countdown.ended': 'Event ended at',
   'countdown.running': 'Event running',
-  'countdown.group_running': 'Event in group running',
   'countdown.loaded': 'Event loaded',
   'countdown.select_event': 'Select an event to follow',
   'countdown.to_start': 'Time to start',

pnpm-workspace.yaml

@@ -6,7 +6,7 @@ catalog:
   '@types/node': 22.19.11
   rimraf: 6.0.1
   ts-essentials: 10.1.1
-  typescript: 7.0.2
+  typescript: 6.0.2
   vitest: 4.0.17
 
 allowBuilds: