feat(server): introduce Zod request validation, starting with MCP tools

Adds Zod as the validation library for apps/server (in place of express-validator), scoped here to a low-risk slice rather than a full migration: - MCP tool-call arguments (apps/server/src/api-mcp) are now validated end to end. Every tool's inputSchema is generated from its Zod schema via z.toJSONSchema() instead of hand-maintained JSON Schema literals, and every handler now parses its arguments before use — previously every handler did an unchecked `args as SomeType` cast with no runtime validation at all. - A new validate.ts middleware (validateBody/validateParams) replaces the express-validator chokepoint for two reference routers, session and url-presets, demonstrating the pattern the remaining ~11 routers will follow in later PRs. - An oxlint no-restricted-imports guardrail keeps zod importable only from apps/server, so it can never leak into the apps/client bundle. The bulk of the REST router migration (automation, rundown, and the rest of api-data) is intentionally left for follow-up PRs to keep this change reviewable.
feat(navigation): persist view params customisation
2026-07-26 10:38:55 +00:00 · 2026-07-18 13:34:07 +00:00 · 2026-07-13 18:44:38 +02:00 · 2026-07-13 17:34:11 +02:00 · 2026-07-13 17:29:56 +02:00 · 2026-07-13 15:34:31 +02:00
123 changed files with 5798 additions and 1212 deletions
@@ -54,3 +54,6 @@ ontime-data/

 # temporary write files
 **.tmp
+
+# Claude Code metadata
+.claude/
@@ -1 +1 @@
-v22.22.2
+v22.22.3
@@ -23,7 +23,7 @@
    "no-restricted-imports": [
      "error",
      {
-        "patterns": ["ontime-types/src/*", "ontime-utils/src/*"]
+        "patterns": ["ontime-types/src/*", "ontime-utils/src/*", "zod"]
      }
    ]
  },
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/cli",
-  "version": "4.9.0",
+  "version": "4.10.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -1,10 +1,10 @@
 {
  "name": "ontime-ui",
-  "version": "4.9.0",
+  "version": "4.10.0",
  "private": true,
  "type": "module",
  "dependencies": {
-    "@base-ui/react": "1.3.0",
+    "@base-ui/react": "1.6.0",
    "@codemirror/commands": "^6.0.0",
    "@codemirror/lang-css": "^6.0.0",
    "@codemirror/state": "^6.0.0",
@@ -12,27 +12,27 @@
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
-    "@fontsource/open-sans": "^5.2.6",
+    "@fontsource/open-sans": "^5.2.7",
    "@mantine/hooks": "^8.3.7",
-    "@sentry/react": "^10.2.0",
+    "@sentry/react": "^10.59.0",
    "@table-nav/react": "^0.0.7",
-    "@tanstack/react-query": "^5.85.9",
-    "@tanstack/react-query-devtools": "^5.85.9",
+    "@tanstack/react-query": "^5.101.0",
+    "@tanstack/react-query-devtools": "^5.101.0",
    "@tanstack/react-table": "^8.21.3",
-    "@uiw/codemirror-theme-vscode": "^4.25.9",
+    "@uiw/codemirror-theme-vscode": "^4.25.10",
    "autosize": "^6.0.1",
-    "axios": "^1.12.2",
+    "axios": "^1.18.0",
    "csv-stringify": "^6.6.0",
    "qrcode": "^1.5.4",
-    "react": "^19.2.3",
-    "react-colorful": "^5.6.1",
-    "react-dom": "^19.2.3",
+    "react": "^19.2.7",
+    "react-colorful": "^5.7.0",
+    "react-dom": "^19.2.7",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.72.0",
-    "react-icons": "5.5.0",
-    "react-router": "^7.11.0",
-    "react-virtuoso": "^4.17.0",
-    "zustand": "^5.0.9"
+    "react-hook-form": "^7.80.0",
+    "react-icons": "5.6.0",
+    "react-router": "^8.0.1",
+    "react-virtuoso": "^4.18.7",
+    "zustand": "^5.0.14"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -8,6 +8,7 @@ import { useLocation } from 'react-router';
 import { isLocalhost, supportsFullscreen } from '../../../externals';
 import { canUseWakeLock, useKeepAwakeOptions } from '../../../features/keep-awake/useWakeLock';
 import { navigatorConstants } from '../../../viewerConfig';
+import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
@@ -105,6 +106,8 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
                {route.label}
              </ClientLink>
            ))}
+
+            <PresetNavigation isSmallScreen={isSmallScreen} onClose={onClose} />
          </div>

          {isLocalhost && (
@@ -117,3 +120,27 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
    </Dialog.Root>
  );
 }
+
+function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean; onClose: () => void }) {
+  const location = useLocation();
+  const { data: urlPresets } = useUrlPresets();
+  const navPresets = urlPresets.filter((preset) => preset.enabled && preset.displayInNav);
+
+  if (navPresets.length === 0) return null;
+
+  return (
+    <>
+      <hr className={style.separator} />
+      {navPresets.map((preset) => (
+        <ClientLink
+          key={preset.alias}
+          to={`preset/${preset.alias}`}
+          current={location.pathname === `/preset/${preset.alias}`}
+          postAction={isSmallScreen ? onClose : undefined}
+        >
+          {preset.alias}
+        </ClientLink>
+      ))}
+    </>
+  );
+}
@@ -1,6 +1,8 @@
 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';
@@ -17,6 +19,9 @@ 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([
    [
@@ -46,6 +51,7 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
      <FloatingNavigation
        toggleMenu={isNavigationLocked ? undefined : menuHandler.toggle}
        toggleSettings={suppressSettings ? undefined : showEditFormDrawer}
+        hasSavedChanges={hasSavedChanges}
      />
      {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />}
    </>
@@ -1,4 +1,29 @@
-.linkIcon {
+.trailing {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
  margin-left: auto;
+}
+
+.linkIcon {
  @include rotate-fourty-five;
 }
+
+.indicator {
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 50%;
+  background-color: $active-indicator;
+  pointer-events: none;
+  flex-shrink: 0;
+}
+
+.clear {
+  opacity: 0.6;
+  transition: opacity $transition-time-action;
+
+  &:hover,
+  &:focus-visible {
+    opacity: 1;
+  }
+}
@@ -1,9 +1,16 @@
-import { PropsWithChildren } from 'react';
-import { IoArrowUp } from 'react-icons/io5';
-import { useNavigate } from 'react-router';
+import { MouseEvent, PropsWithChildren } from 'react';
+import { IoArrowUp, IoCloseOutline } from 'react-icons/io5';
+import { useLocation, useNavigate, useSearchParams } 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';
@@ -16,32 +23,100 @@ interface ClientLinkProps {

 export default function ClientLink({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
  const { isElectron } = useElectronEvent();
-  const navigate = useNavigate();

  if (isElectron) {
    return (
-      <NavigationMenuItem
-        active={current}
-        onClick={() => {
-          handleLinks(to);
-          postAction?.();
-        }}
-      >
+      <ElectronNavigationItem current={current} to={to} postAction={postAction}>
        {children}
-        <IoArrowUp className={style.linkIcon} />
-      </NavigationMenuItem>
+      </ElectronNavigationItem>
    );
  }

  return (
-    <NavigationMenuItem
-      active={current}
-      onClick={() => {
-        navigate(`/${to}`);
-        postAction?.();
-      }}
-    >
+    <BrowserNavigationItem current={current} to={to} postAction={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>
  );
 }
@@ -22,3 +22,19 @@
  top: 0;
  z-index: $zindex-nav;
 }
+
+.buttonWithIndicator {
+  position: relative;
+  display: inline-flex;
+}
+
+.indicator {
+  position: absolute;
+  top: -0.15rem;
+  right: -0.15rem;
+  width: 0.6rem;
+  height: 0.6rem;
+  border-radius: 50%;
+  background-color: $active-indicator;
+  pointer-events: none;
+}
@@ -9,9 +9,10 @@ import style from './FloatingNavigation.module.scss';
 interface FloatingNavigationProps {
  toggleMenu?: () => void;
  toggleSettings?: () => void;
+  hasSavedChanges?: boolean;
 }

-export default function FloatingNavigation({ toggleMenu, toggleSettings }: FloatingNavigationProps) {
+export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSavedChanges }: FloatingNavigationProps) {
  const isButtonShown = useFadeOutOnInactivity(true);

  return (
@@ -20,15 +21,18 @@ export default function FloatingNavigation({ toggleMenu, toggleSettings }: Float
      className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}
    >
      {toggleMenu && (
-        <IconButton
-          variant='subtle-white'
-          size='xlarge'
-          onClick={toggleMenu}
-          aria-label='toggle menu'
-          data-testid='navigation__toggle-menu'
-        >
-          <IoApps />
-        </IconButton>
+        <div className={style.buttonWithIndicator}>
+          <IconButton
+            variant='subtle-white'
+            size='xlarge'
+            onClick={toggleMenu}
+            aria-label='toggle menu'
+            data-testid='navigation__toggle-menu'
+          >
+            <IoApps />
+          </IconButton>
+          {hasSavedChanges && <span className={style.indicator} data-testid='navigation__saved-indicator' />}
+        </div>
      )}
      {toggleSettings && (
        <IconButton
@@ -4,7 +4,9 @@
  color: $white-10;

  .empty {
-    width: 100%;
+    display: block;
+    width: min(100%, 24rem);
+    margin-inline: auto;
    opacity: 0.8;
  }

@@ -13,6 +15,6 @@
    margin-inline: auto;
    font-weight: 600;
    font-size: 2em;
-    max-width: 600px;
+    max-width: min(100%, 600px);
  }
 }
@@ -8,9 +8,12 @@
    padding-top: 10vh;
  }

-  .empty {
-    width: 100%;
-    opacity: 0.8;
+  .inline {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 1rem;
+    margin-top: 1em;
  }

  .text {
@@ -1,18 +1,33 @@
-import EmptyImage from '../../../assets/images/empty.svg?react';
+import { SupportedEntry } from 'ontime-types';
+import { IoAdd } from 'react-icons/io5';
+
+import { useTranslation } from '../../../translation/TranslationProvider';
+import Button from '../buttons/Button';
+import Empty from './Empty';

 import style from './EmptyTableBody.module.scss';

 interface EmptyTableBodyProps {
-  text: string;
+  handleAddNew?: (type: SupportedEntry) => void;
 }

-export default function EmptyTableBody({ text }: EmptyTableBodyProps) {
+export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
+  const { getLocalizedString } = useTranslation();
+  const text = getLocalizedString('common.no_data');
  return (
    <tbody className={style.emptyContainer}>
      <tr>
        <td colSpan={99} className={style.emptyCell}>
-          <EmptyImage className={style.empty} />
-          {text && <span className={style.text}>{text}</span>}
+          <Empty injectedStyles={{ marginTop: '5vh' }} />
+          <span className={style.text}>{text}</span>
+          {handleAddNew && (
+            <div className={style.inline}>
+              <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>
+                <IoAdd />
+                Create Event
+              </Button>
+            </div>
+          )}
        </td>
      </tr>
    </tbody>
@@ -16,6 +16,7 @@ import {
  TimeStrategy,
  isOntimeEvent,
  isOntimeGroup,
+  isOntimeMilestone,
 } from 'ontime-types';
 import {
  MILLIS_PER_SECOND,
@@ -82,6 +83,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
+    inheritGroupColour,
  } = useEditorSettings();

  const resolveCurrentRundownQueryKey = useCallback(() => {
@@ -239,6 +241,14 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        }
      }

+      if (inheritGroupColour && (isOntimeEvent(newEntry) || isOntimeMilestone(newEntry)) && !newEntry.colour) {
+        const parentId = resolveInsertParent(rundownData, newEntry);
+        const maybeParent = parentId ? rundownData.entries[parentId] : null;
+        if (maybeParent && isOntimeGroup(maybeParent)) {
+          newEntry.colour = maybeParent.colour;
+        }
+      }
+
      try {
        await addEntryMutation([rundownId, newEntry]);
      } catch (error) {
@@ -254,6 +264,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      defaultTimerType,
      defaultEndAction,
      defaultTimeStrategy,
+      inheritGroupColour,
      addEntryMutation,
    ],
  );
@@ -0,0 +1,87 @@
+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);
+  });
+});
@@ -12,8 +12,10 @@ type EditorSettingsStore = {
  defaultDangerTime: string;
  defaultTimerType: TimerType;
  defaultEndAction: EndAction;
+  inheritGroupColour: boolean;
  setDefaultDuration: (defaultDuration: string) => void;
  setLinkPrevious: (linkPrevious: boolean) => void;
+  setInheritGroupColour: (inheritGroupColour: boolean) => void;
  setTimeStrategy: (timeStrategy: TimeStrategy) => void;
  setWarnTime: (warnTime: string) => void;
  setDangerTime: (dangerTime: string) => void;
@@ -29,6 +31,7 @@ export const editorSettingsDefaults = {
  dangerTime: '00:01:00', // 60000 same as backend
  timerType: TimerType.CountDown,
  endAction: EndAction.None,
+  inheritGroupColour: false,
 };

 enum EditorSettingsKeys {
@@ -39,6 +42,7 @@ enum EditorSettingsKeys {
  DefaultDangerTime = 'ontime-default-danger-time',
  DefaultTimerType = 'ontime-default-timer-type',
  DefaultEndAction = 'ontime-default-end-action',
+  InheritGroupColour = 'ontime-inherit-group-colour',
 }

 export const useEditorSettings = create<EditorSettingsStore>((set) => {
@@ -59,6 +63,10 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
      localStorage.getItem(EditorSettingsKeys.DefaultEndAction),
      editorSettingsDefaults.endAction,
    ),
+    inheritGroupColour: booleanFromLocalStorage(
+      EditorSettingsKeys.InheritGroupColour,
+      editorSettingsDefaults.inheritGroupColour,
+    ),

    setDefaultDuration: (defaultDuration) =>
      set(() => {
@@ -97,5 +105,10 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
        localStorage.setItem(EditorSettingsKeys.DefaultEndAction, String(defaultEndAction));
        return { defaultEndAction };
      }),
+    setInheritGroupColour: (inheritGroupColour) =>
+      set(() => {
+        localStorage.setItem(EditorSettingsKeys.InheritGroupColour, String(inheritGroupColour));
+        return { inheritGroupColour };
+      }),
  };
 });
@@ -0,0 +1,62 @@
+import { create } from 'zustand';
+
+// params that are auth/preset markers, not user view customisation (see common/utils/urlPresets.ts)
+export const reservedParams = new Set(['token', 'n', 'alias']);
+
+interface SavedViewParamsStore {
+  params: Record<string, string>; // view key (e.g. "timer") -> search string without leading "?"
+  save: (view: string, search: string) => void;
+  clear: (view: string) => void;
+  clearAll: () => void;
+}
+
+/**
+ * Remembers the last view parameters used for each view so they can be
+ * restored when the user navigates back to that view through the menu.
+ * In-memory only: persists across SPA navigation, resets on a full page reload.
+ */
+export const useSavedViewParams = create<SavedViewParamsStore>((set) => ({
+  params: {},
+  save: (view, search) =>
+    set((state) => {
+      // ignore empty view keys and do not store empty entries, so the
+      // "saved changes" indicator only reflects genuine customisation
+      if (!view) return state;
+      const params = { ...state.params };
+      if (search) {
+        params[view] = search;
+      } else {
+        delete params[view];
+      }
+      return { params };
+    }),
+  clear: (view) =>
+    set((state) => {
+      if (!state.params[view]) return state;
+      const params = { ...state.params };
+      delete params[view];
+      return { params };
+    }),
+  clearAll: () => set({ params: {} }),
+}));
+
+/**
+ * Removes reserved (auth/preset) params from a search string, keeping only
+ * genuine view customisation.
+ */
+export function stripReservedParams(search: string): string {
+  const sp = new URLSearchParams(search);
+  reservedParams.forEach((key) => sp.delete(key));
+  return sp.toString();
+}
+
+/**
+ * Whether the search params contain any genuine view customisation,
+ * ignoring reserved params.
+ */
+export function hasCustomParams(searchParams: URLSearchParams): boolean {
+  for (const key of searchParams.keys()) {
+    if (!reservedParams.has(key)) return true;
+  }
+  return false;
+}
@@ -1,4 +1,4 @@
-import { linkToOtherHost } from '../linkUtils';
+import { hostToBaseUrl, linkToOtherHost } from '../linkUtils';

 describe('linkToOTherHost', () => {
  it('should handle electron links', () => {
@@ -22,3 +22,18 @@ 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');
+  });
+});
@@ -37,6 +37,16 @@ describe('getRouteFromPreset()', () => {
      alias: 'demopage',
      target: OntimeView.Timer,
      search: 'user=guest',
+      displayInNav: false,
+      options: {},
+    },
+  ];
+  const disabledPresets: URLPreset[] = [
+    {
+      enabled: false,
+      alias: 'demopage',
+      target: OntimeView.Timer,
+      search: 'user=guest',
      options: {},
    },
  ];
@@ -47,6 +57,16 @@ describe('getRouteFromPreset()', () => {
    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
  });

+  it('checks if the current location matches an enabled preset target', () => {
+    const location = resolvePath('/timer');
+    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
+  });
+
+  it('does not redirect disabled presets', () => {
+    const location = resolvePath('/demopage');
+    expect(getRouteFromPreset(location, disabledPresets)).toBeNull();
+  });
+
  it('returns null when already on a preset path', () => {
    const location = resolvePath('/preset/demopage');
    expect(getRouteFromPreset(location, presets)).toBeNull();
@@ -86,6 +106,11 @@ describe('getRouteFromPreset()', () => {
      const location = resolvePath('/demopage?n=1&token=123');
      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
    });
+
+    it('redirects stale unwrapped params back to the saved preset params while preserving feature params', () => {
+      const location = resolvePath('/timer?user=admin&alias=demopage&n=1&token=123');
+      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
+    });
  });

  describe('cuesheet presets', () => {
@@ -95,6 +120,7 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-4685d6',
        target: OntimeView.Cuesheet,
        search: '',
+        displayInNav: false,
        options: {
          read: 'full',
          write: '-',
@@ -107,6 +133,7 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-basic',
        target: OntimeView.Cuesheet,
        search: '',
+        displayInNav: false,
      },
    ];
    const cuesheetPresetWithNavLock: URLPreset[] = [
@@ -115,6 +142,7 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-locked',
        target: OntimeView.Cuesheet,
        search: 'n=1',
+        displayInNav: false,
      },
    ];

@@ -196,6 +224,7 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
+        displayInNav: false,
      },
    ],
    [
@@ -207,6 +236,7 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
+        displayInNav: false,
      },
    ],
    [
@@ -218,6 +248,7 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
+        displayInNav: false,
      },
    ],
    [
@@ -229,6 +260,7 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
+        displayInNav: false,
      },
    ],
  ])('should generate URL preset options for %s', (_description, alias, url, expected) => {
@@ -37,7 +37,12 @@ export function handleLinks(
  event?.preventDefault();

  const destination = new URL(externalServerUrl);
-  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
+  // split off any query string so it is not encoded into the pathname
+  const [pathname, search] = location.split('?');
+  destination.pathname = externalBaseURI ? `${externalBaseURI}/${pathname}` : pathname;
+  if (search) {
+    destination.search = search;
+  }
  openLink(destination.toString());
 }

@@ -54,3 +59,17 @@ 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}`;
+}
@@ -194,6 +194,7 @@ export function generateUrlPresetOptions(alias: string, userUrl: string): URLPre
    target: path,
    search: url.searchParams.toString(),
    enabled: true,
+    displayInNav: false,
  };
 }

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

 .indent {
@@ -1,7 +1,8 @@
-import { URLPreset } from 'ontime-types';
+import { OntimeView, URLPreset } from 'ontime-types';
 import { useState } from 'react';
 import { IoAdd, IoOpenOutline, IoPencil, IoTrash } from 'react-icons/io5';

+import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
@@ -22,13 +23,23 @@ const urlPresetsDocs = 'https://docs.getontime.no/features/url-presets/';

 export default function URLPresets() {
  const [formState, setFormState] = useState<FormState>({ isOpen: false, preset: undefined });
+  const [actionError, setActionError] = useState<string | null>(null);
  const { data, status } = useUrlPresets();
-  const { deletePreset, isMutating } = useUpdateUrlPreset();
+  const { updatePreset, deletePreset, isMutating } = useUpdateUrlPreset();

  const openNewForm = () => setFormState({ isOpen: true });
  const openEditForm = (preset: URLPreset) => setFormState({ isOpen: true, preset });
  const closeForm = () => setFormState({ isOpen: false, preset: undefined });

+  const persistPreset = async (preset: URLPreset) => {
+    setActionError(null);
+    try {
+      await updatePreset(preset.alias, preset);
+    } catch (error) {
+      setActionError(maybeAxiosError(error));
+    }
+  };
+
  return (
    <Panel.Section>
      <Panel.Card>
@@ -53,10 +64,12 @@ export default function URLPresets() {
        <Panel.Section>
          <Panel.Loader isLoading={status === 'pending'} />
          {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
+          {actionError && <Panel.Error>{actionError}</Panel.Error>}
          <Panel.Table>
            <thead>
              <tr>
                <th>Enabled</th>
+                <th>Show in nav</th>
                <th>Target view</th>
                <th>Alias</th>
                <th />
@@ -65,10 +78,23 @@ export default function URLPresets() {
            <tbody>
              {data.length === 0 && <Panel.TableEmpty handleClick={openNewForm} />}
              {data.map((preset, index) => {
+                const isCuesheet = preset.target === OntimeView.Cuesheet;
                return (
                  <tr key={preset.alias}>
                    <td>
-                      <Switch defaultChecked={preset.enabled} onCheckedChange={() => {}} />
+                      <Switch
+                        checked={preset.enabled}
+                        onCheckedChange={(enabled) => persistPreset({ ...preset, enabled })}
+                        disabled={isMutating}
+                        aria-label='Toggle preset enabled'
+                      />
+                    </td>
+                    <td>
+                      <Switch
+                        checked={preset.displayInNav}
+                        onCheckedChange={(checked) => persistPreset({ ...preset, displayInNav: checked })}
+                        disabled={isMutating || isCuesheet}
+                      />
                    </td>
                    <td>
                      <Tag>{preset.target}</Tag>
@@ -1,5 +1,5 @@
 import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types';
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';

 import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils';
@@ -12,6 +12,7 @@ import { preventEscape } from '../../../../../common/utils/keyEvent';
 import { isUrlSafe } from '../../../../../common/utils/regex';
 import { enDash } from '../../../../../common/utils/styleUtils';
 import { generateUrlPresetOptions } from '../../../../../common/utils/urlPresets';
+import CuesheetLinkOptions, { CuesheetPermissionValues } from '../../../../sharing/composite/CuesheetLinkOptions';
 import * as Panel from '../../../panel-utils/PanelUtils';

 import style from './URLPresetForm.module.scss';
@@ -32,6 +33,7 @@ const defaultValues: URLPreset = {
  target: OntimeView.Timer,
  search: '',
  enabled: true,
+  displayInNav: false,
 };

 interface URLPresetFormProps {
@@ -61,12 +63,42 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
  });
  const urlRef = useRef<HTMLInputElement>(null);

+  // Cuesheet read/write permissions live outside react-hook-form
+  const initialPermissions = useRef<CuesheetPermissionValues>({
+    read: urlPreset?.options?.read ?? 'full',
+    write: urlPreset?.options?.write ?? 'full',
+  });
+  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>(initialPermissions.current);
+
+  // update initial permissions on mount
+  useEffect(() => {
+    initialPermissions.current = {
+      read: urlPreset?.options?.read ?? 'full',
+      write: urlPreset?.options?.write ?? 'full',
+    };
+    setCuesheetPermissions(initialPermissions.current);
+    // oxlint-disable-next-line eslint-plugin-react-hooks/exhaustive-deps -- run on mount
+  }, []);
+
+  const isEditingCuesheet = urlPreset && urlPreset.target === OntimeView.Cuesheet;
+  const isCuesheet = watch('target') === OntimeView.Cuesheet;
+  const permissionsDirty =
+    isCuesheet &&
+    (cuesheetPermissions.read !== initialPermissions.current.read ||
+      cuesheetPermissions.write !== initialPermissions.current.write);
+  const noReadAccess = isCuesheet && cuesheetPermissions.read === '-';
+
  const setupSubmit = async (data: URLPreset) => {
    try {
+      // Preserve / apply cuesheet permissions, which are not part of the form fields
+      const payload: URLPreset =
+        data.target === OntimeView.Cuesheet
+          ? { ...data, target: OntimeView.Cuesheet, options: cuesheetPermissions }
+          : data;
      if (urlPreset) {
-        await updatePreset(urlPreset.alias, data);
+        await updatePreset(urlPreset.alias, payload);
      } else {
-        await addPreset(data);
+        await addPreset(payload);
      }
      onClose();
    } catch (error) {
@@ -74,6 +106,7 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
    }
  };

+  // focus on alias when the form opens
  useEffect(() => {
    setFocus('alias');
  }, [setFocus]);
@@ -126,44 +159,66 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
        <div className={style.expand}>
          <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
          <Panel.InlineElements>
-            <Input placeholder='Paste URL' fluid ref={urlRef} />
-            <Button onClick={generateOptions}>Generate</Button>
+            <Input placeholder='Paste URL' fluid ref={urlRef} disabled={isEditingCuesheet} />
+            <Button onClick={generateOptions} disabled={isEditingCuesheet}>
+              Generate
+            </Button>
          </Panel.InlineElements>
        </div>
      </Panel.InlineElements>
      {errors.alias?.message && <Panel.Error>{errors.alias.message}</Panel.Error>}
-      <div>
-        {enDash} or {enDash}
-      </div>
-      <div>2. Choose a view and its parameters</div>
-      <div>
-        <Panel.Description>Target</Panel.Description>
-        <Select
-          options={targetOptions}
-          {...register('target', { required: 'Target is required' })}
-          value={watch('target')}
-          onValueChange={(value: OntimeViewPresettable | null) => {
-            if (value === null) return;
-            setValue('target', value, { shouldDirty: true });
-          }}
-        />
-      </div>
-      <div>
-        <Panel.Description>Parameters</Panel.Description>
-        <Textarea
-          fluid
-          rows={3}
-          {...register('search', {
-            validate: validateParams,
-          })}
-        />
-        <Panel.Error>{errors.search?.message}</Panel.Error>
-      </div>
+      {!isEditingCuesheet && (
+        <>
+          <div>
+            {enDash} or {enDash}
+          </div>
+          <div>2. Choose a view and its parameters</div>
+          <div>
+            <Panel.Description>Target</Panel.Description>
+            <Select
+              options={targetOptions}
+              {...register('target', { required: 'Target is required' })}
+              value={watch('target')}
+              onValueChange={(value: OntimeViewPresettable | null) => {
+                if (value === null) return;
+                setValue('target', value, { shouldDirty: true });
+              }}
+            />
+          </div>
+          <div>
+            <Panel.Description>Parameters</Panel.Description>
+            <Textarea
+              fluid
+              rows={3}
+              {...register('search', {
+                validate: validateParams,
+              })}
+            />
+            <Panel.Error>{errors.search?.message}</Panel.Error>
+          </div>
+        </>
+      )}
+
+      {isCuesheet && (
+        <div>
+          <Panel.Description>Permissions</Panel.Description>
+          <CuesheetLinkOptions
+            initialRead={initialPermissions.current.read}
+            initialWrite={initialPermissions.current.write}
+            onChange={setCuesheetPermissions}
+          />
+        </div>
+      )}
      <div>
        <Panel.Error>{errors.root?.message}</Panel.Error>
        <Panel.InlineElements align='end'>
          <Button onClick={onClose}>Cancel</Button>
-          <Button variant='primary' type='submit' disabled={!isValid || !isDirty} loading={isSubmitting || isMutating}>
+          <Button
+            variant='primary'
+            type='submit'
+            disabled={!isValid || (!isDirty && !permissionsDirty) || noReadAccess}
+            loading={isSubmitting || isMutating}
+          >
            Save
          </Button>
        </Panel.InlineElements>
@@ -157,7 +157,7 @@ export default function ManageRundowns() {
                      </td>
                      <td>
                        <DropdownMenu
-                          render={<IconButton variant='ghosted-white' />}
+                          render={<IconButton variant='ghosted-white' data-testId='rundown_menu' />}
                          items={[
                            {
                              type: 'item',
@@ -16,6 +16,7 @@ export default function RundownDefaultSettings() {
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
+    inheritGroupColour,
    setDefaultDuration,
    setLinkPrevious,
    setTimeStrategy,
@@ -23,6 +24,7 @@ export default function RundownDefaultSettings() {
    setDangerTime,
    setDefaultTimerType,
    setDefaultEndAction,
+    setInheritGroupColour,
  } = useEditorSettings((state) => state);

  const durationInMs = parseUserTime(defaultDuration);
@@ -44,6 +46,13 @@ export default function RundownDefaultSettings() {
              />
              <Switch size='large' checked={linkPrevious} onCheckedChange={setLinkPrevious} />
            </Panel.ListItem>
+            <Panel.ListItem>
+              <Panel.Field
+                title='Inherit group colour'
+                description='Whether new events and milestones inherit the colour of their parent group'
+              />
+              <Switch size='large' checked={inheritGroupColour} onCheckedChange={setInheritGroupColour} />
+            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field
                title='Timer strategy'
@@ -0,0 +1,49 @@
+import { useEffect, useState } from 'react';
+
+import { generateUrl } from '../../../../common/api/session';
+import CopyTag from '../../../../common/components/copy-tag/CopyTag';
+import { serverURL } from '../../../../externals';
+import * as Panel from '../../panel-utils/PanelUtils';
+
+export default function McpSection() {
+  const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
+
+  // generate url
+  useEffect(() => {
+    // the page origin is reachable wherever the user is browsing from,
+    // and follows the deployment (cloud, reverse proxy, port mappings)
+    // we are reusing the endpoint, so locking config and nav have no effect
+    generateUrl({ baseUrl: serverURL, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
+      .then(setMcpEndpointUrl)
+      .catch(() => {
+        setMcpEndpointUrl('');
+      });
+  }, []);
+
+  const mcpClientConfig = mcpEndpointUrl
+    ? JSON.stringify({ mcpServers: { ontime: { url: mcpEndpointUrl } } }, null, 2)
+    : '';
+
+  return (
+    <Panel.Section>
+      <Panel.Card>
+        <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.ListItem>
+            <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
+            {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
+          </Panel.ListItem>
+          <Panel.ListItem>
+            <Panel.Field
+              title='Client configuration snippet'
+              description='Paste this into your AI agent settings under "mcpServers"'
+            />
+            {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
+          </Panel.ListItem>
+        </Panel.ListGroup>
+      </Panel.Card>
+    </Panel.Section>
+  );
+}
@@ -4,6 +4,7 @@ import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import CustomViews from '../manage-panel/CustomViews';
 import GeneralSettings from './GeneralSettings';
+import McpSection from './McpSection';
 import ProjectData from './ProjectData';
 import ServerPortSettings from './ServerPortSettings';
 import ViewSettings from './ViewSettings';
@@ -13,6 +14,7 @@ export default function SettingsPanel({ location }: PanelBaseProps) {
  const generalRef = useScrollIntoView<HTMLDivElement>('general', location);
  const viewRef = useScrollIntoView<HTMLDivElement>('view', location);
  const customViewsRef = useScrollIntoView<HTMLDivElement>('custom-views', location);
+  const mcpRef = useScrollIntoView<HTMLDivElement>('mcp', location);
  const portRef = useScrollIntoView<HTMLDivElement>('port', location);

  return (
@@ -30,6 +32,9 @@ export default function SettingsPanel({ location }: PanelBaseProps) {
      <div ref={customViewsRef}>
        <CustomViews />
      </div>
+      <div ref={mcpRef}>
+        <McpSection />
+      </div>
      {!isDocker && (
        <div ref={portRef}>
          <ServerPortSettings />
@@ -0,0 +1,3 @@
+.footer {
+  width: 100%;
+}
@@ -1,5 +1,5 @@
 import { TranslationObject, langEn } from 'ontime-types';
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';

 import { maybeAxiosError } from '../../../../../common/api/utils';
@@ -10,6 +10,8 @@ import Modal from '../../../../../common/components/modal/Modal';
 import { useTranslation } from '../../../../../translation/TranslationProvider';
 import * as Panel from '../../../panel-utils/PanelUtils';

+import style from './CustomTranslationModal.module.scss';
+
 interface CustomTranslationModalProps {
  isOpen: boolean;
  onClose: () => void;
@@ -17,14 +19,7 @@ interface CustomTranslationModalProps {

 export default function CustomTranslationModal({ isOpen, onClose }: CustomTranslationModalProps) {
  const { userTranslation, postUserTranslation } = useTranslation();
-
-  const defaultValues = useMemo(() => {
-    const values: Record<string, string> = {};
-    Object.keys(langEn).forEach((key) => {
-      values[toFormKey(key)] = userTranslation[key as keyof TranslationObject] || '';
-    });
-    return values;
-  }, [userTranslation]);
+  const customTranslationFormValues = useMemo(() => toFormValues(userTranslation), [userTranslation]);

  const {
    handleSubmit,
@@ -33,13 +28,17 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
    formState: { isSubmitting, isDirty, errors, isValid },
    setError,
  } = useForm({
-    defaultValues,
-    resetOptions: {
-      keepDirtyValues: true,
-    },
+    defaultValues: customTranslationFormValues,
    mode: 'onChange',
  });

+  // keep data up to date
+  useEffect(() => {
+    if (isOpen) {
+      reset(customTranslationFormValues);
+    }
+  }, [customTranslationFormValues, isOpen, reset]);
+
  const onSubmit = async (formData: Record<string, string>) => {
    try {
      const translationData: Record<string, string> = {};
@@ -54,6 +53,10 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
    }
  };

+  const resetToEnglish = () => {
+    reset(toFormValues(langEn), { keepDefaultValues: true });
+  };
+
  return (
    <Modal
      title='Edit custom translations'
@@ -84,9 +87,12 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
        </Panel.Section>
      }
      footerElements={
-        <div>
+        <div className={style.footer}>
          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Panel.InlineElements align='apart'>
+            <Button variant='ghosted' size='large' onClick={resetToEnglish} disabled={isSubmitting}>
+              Reset to English
+            </Button>
            <Panel.InlineElements>
              <Button size='large' onClick={onClose}>
                Cancel
@@ -109,6 +115,14 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
  );
 }

+function toFormValues(translation: Partial<TranslationObject>) {
+  const values: Record<string, string> = {};
+  Object.keys(langEn).forEach((key) => {
+    values[toFormKey(key)] = translation[key as keyof TranslationObject] || '';
+  });
+  return values;
+}
+
 function toFormKey(key: string) {
  return key.replace('.', '_');
 }
@@ -19,7 +19,8 @@ const staticOptions = [
      { id: 'settings__general', label: 'General settings' },
      { id: 'settings__view', label: 'View settings' },
      { id: 'settings__custom-views', label: 'Custom views' },
-      { id: 'settings__port', label: 'Server port' },
+      { id: 'settings__mcp', label: 'MCP Server' },
+      ...(isDocker ? [] : [{ id: 'settings__port', label: 'Server port' }]),
    ],
  },
  {
@@ -96,18 +97,12 @@ export function useAppSettingsMenu() {

  const options: Readonly<SettingsOption[]> = useMemo(
    () =>
-      staticOptions.map((option) => ({
-        ...option,
-        // if we are in docker don't show the port option
-        secondary:
-          'secondary' in option
-            ? isDocker && option.id === 'settings'
-              ? [...option.secondary.filter(({ id }) => id !== 'settings__port')]
-              : [...option.secondary]
-            : undefined,
+      staticOptions.map((option) =>
        // if there is an update then highlight the about setting
-        highlight: option.id === 'about' && data.hasUpdates ? 'New version available' : undefined,
-      })),
+        option.id === 'about' && data.hasUpdates
+          ? Object.assign({}, option, { highlight: 'New version available' })
+          : option,
+      ),
    [data],
  );

@@ -82,6 +82,17 @@
  margin-right: 0.25rem;
  color: $ui-white;
 }
+
+.duration {
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.lockIcon {
+  opacity: 0.6;
+}
+
 .over {
  color: $playback-over;
  .strike {
@@ -8,6 +8,7 @@ import {
  IoChevronUp,
  IoDuplicateOutline,
  IoFolderOpenOutline,
+  IoLockClosed,
  IoReorderTwo,
  IoTrash,
 } from 'react-icons/io5';
@@ -176,14 +177,17 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
          </div>
          <div className={style.metaEntry}>
            <div className={style.metaLabel}>Duration</div>
-            {planOffset === null ? (
-              <div>{formatDuration(data.duration)}</div>
-            ) : (
-              <div className={cx([planOffsetLabel && style[planOffsetLabel]])}>
-                <span className={style.strike}>{formatDuration(data.duration)}</span>
-                <Tag className={style.offsetLabel}>{planOffset}</Tag>
-              </div>
-            )}
+            <div className={style.duration}>
+              {planOffset === null ? (
+                formatDuration(data.duration)
+              ) : (
+                <span className={cx([planOffsetLabel && style[planOffsetLabel]])}>
+                  <span className={style.strike}>{formatDuration(data.duration)}</span>
+                  <Tag className={style.offsetLabel}>{planOffset}</Tag>
+                </span>
+              )}
+              {data.targetDuration !== null && <IoLockClosed className={style.lockIcon} />}
+            </div>
          </div>
        </div>
      </div>
@@ -1,6 +1,6 @@
 import { OntimeView, URLPreset } from 'ontime-types';
 import { generateId } from 'ontime-utils';
-import { useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { FieldErrors, useForm } from 'react-hook-form';

 import { generateUrl } from '../../common/api/session';
@@ -18,7 +18,7 @@ import { preventEscape } from '../../common/utils/keyEvent';
 import { isUrlSafe } from '../../common/utils/regex';
 import { isOntimeCloud, serverURL } from '../../externals';
 import * as Panel from '../app-settings/panel-utils/PanelUtils';
-import CuesheetLinkOptions from './composite/CuesheetLinkOptions';
+import CuesheetLinkOptions, { CuesheetPermissionValues } from './composite/CuesheetLinkOptions';

 import style from './GenerateLinkForm.module.scss';

@@ -53,12 +53,26 @@ type GenerateLinkState = 'pending' | 'loading' | 'success' | 'error';

 export default function GenerateLinkForm({ hostOptions, pathOptions, presets, isLockedToView }: GenerateLinkFormProps) {
  const [formState, setFormState] = useState<GenerateLinkState>('pending');
-  const [url, setUrl] = useState(serverURL);
-  const cuesheetReadRef = useRef<HTMLInputElement>(null);
-  const cuesheetWriteRef = useRef<HTMLInputElement>(null);
+  const [url, setUrl] = useState('');
+  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>({
+    read: 'full',
+    write: 'full',
+  });
  const generatedAlias = useRef<string>(`cuesheet-${generateId()}`);

-  const { addPreset } = useUpdateUrlPreset();
+  const { addPreset, updatePreset } = useUpdateUrlPreset();
+  // Tracks the alias we already created this session so re-generating updates rather than duplicates it
+  const createdAlias = useRef<string | null>(null);
+
+  /**
+   * Permissions live outside react-hook-form, so we reset a successful state manually
+   * whenever they change - this re-arms the "Create share link" button as the previous
+   * link no longer reflects the selected permissions.
+   */
+  const handlePermissionsChange = useCallback((permissions: CuesheetPermissionValues) => {
+    setCuesheetPermissions(permissions);
+    setFormState((current) => (current === 'success' ? 'pending' : current));
+  }, []);

  const {
    handleSubmit,
@@ -90,16 +104,20 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
    if (options.read === '-') {
      throw new Error('Cannot create a share with no read permissions');
    }
-    const presets = await addPreset({
+    const payload = {
      target: OntimeView.Cuesheet,
      enabled: true,
      alias,
      search: '',
+      displayInNav: false,
      options: {
        read: options.read,
        write: options.write,
      },
-    });
+    } as const;
+    // Re-generating with the same name updates the existing preset instead of failing on a duplicate alias
+    const presets = createdAlias.current === alias ? await updatePreset(alias, payload) : await addPreset(payload);
+    createdAlias.current = alias;
    return presets.find((preset) => preset.alias === alias);
  };

@@ -108,8 +126,8 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
      setFormState('loading');
      if (options.path === OntimeView.Cuesheet) {
        const urlPreset = await createPresetFromOptions((options as CuesheetLinkOptions).alias, {
-          read: cuesheetReadRef.current?.value ?? 'full',
-          write: cuesheetWriteRef.current?.value ?? 'full',
+          read: cuesheetPermissions.read,
+          write: cuesheetPermissions.write,
        });

        if (!urlPreset) {
@@ -157,6 +175,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
    }
  };

+  const noReadAccess = watch('path') === OntimeView.Cuesheet && cuesheetPermissions.read === '-';
  const canSubmit = isDirty || formState !== 'success';

  return (
@@ -220,7 +239,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
                    })}
                  />
                </Panel.ListItem>
-                <CuesheetLinkOptions readRef={cuesheetReadRef} writeRef={cuesheetWriteRef} />
+                <CuesheetLinkOptions onChange={handlePermissionsChange} />
              </>
            )}

@@ -268,18 +287,29 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
          </Panel.ListGroup>
          <Panel.Error>{errors.root?.message}</Panel.Error>
          <Panel.InlineElements align='end' className={style.end}>
-            <Button type='submit' variant={canSubmit ? 'primary' : 'subtle'} loading={formState === 'loading'}>
+            <Button
+              type='submit'
+              variant={canSubmit ? 'primary' : 'subtle'}
+              loading={formState === 'loading'}
+              disabled={noReadAccess}
+            >
              {canSubmit ? 'Create share link' : 'Link copied to clipboard!'}
            </Button>
          </Panel.InlineElements>
        </div>
        <Panel.Section className={style.column}>
          <Panel.Description>Share this link</Panel.Description>
-          <QRCode size={172} value={url} />
-          <div className={style.copiableLink} data-testid='copy-link'>
-            {url}
-          </div>
-          <CopyTag copyValue={url}>Copy link</CopyTag>
+          {url ? (
+            <>
+              <QRCode size={172} value={url} />
+              <div className={style.copiableLink} data-testid='copy-link'>
+                {url}
+              </div>
+              <CopyTag copyValue={url}>Copy link</CopyTag>
+            </>
+          ) : (
+            <Panel.Description>Your link will appear here once you create it.</Panel.Description>
+          )}
        </Panel.Section>
      </div>
    </form>
@@ -3,6 +3,7 @@ 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 {
@@ -21,7 +22,7 @@ export default function GenerateLinkFormExport({ lockedPath }: GenerateLinkFormE
   */
  const hostOptions = useMemo(() => {
    return infoData.networkInterfaces.map((nif) => ({
-      value: `http://${nif.address}:${infoData.serverPort}`,
+      value: hostToBaseUrl(nif.address, infoData.serverPort),
      label: `${nif.name} - ${nif.address}`,
    }));
  }, [infoData.networkInterfaces, infoData.serverPort]);
@@ -1,4 +1,4 @@
-import { Fragment, RefObject, useMemo, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';

 import RadioGroup from '../../../common/components/radio-group/RadioGroup';
 import Switch from '../../../common/components/switch/Switch';
@@ -10,118 +10,141 @@ import style from './CuesheetLinkOptions.module.scss';

 type AccessMode = 'full' | 'custom';

-interface CuesheetLinkOptionsProps {
-  readRef?: RefObject<HTMLInputElement | null>;
-  writeRef?: RefObject<HTMLInputElement | null>;
+export interface CuesheetPermissionValues {
+  read: string;
+  write: string;
 }

-export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkOptionsProps) {
+interface CuesheetLinkOptionsProps {
+  /** Existing read permission to seed the form with ('full' | '-' | comma separated keys) */
+  initialRead?: string;
+  /** Existing write permission to seed the form with ('full' | '-' | comma separated keys) */
+  initialWrite?: string;
+  /** Notifies the parent whenever the resolved read/write permissions change */
+  onChange: (permissions: CuesheetPermissionValues) => void;
+}
+
+/** A null result means "full or unset" - there is no explicit per-column selection to seed */
+function parseKeys(permission: string | undefined): Set<string> | null {
+  if (permission == null || permission === 'full') {
+    return null;
+  }
+  if (permission === '-') {
+    return new Set();
+  }
+  return new Set(permission.split(','));
+}
+
+function modeFromPermission(permission: string | undefined): AccessMode {
+  return permission == null || permission === 'full' ? 'full' : 'custom';
+}
+
+export default function CuesheetLinkOptions({ initialRead, initialWrite, onChange }: CuesheetLinkOptionsProps) {
  const { data } = useCustomFields();
  const customFieldColumns = useMemo(() => makeCuesheetCustomColumns(data), [data]);
+  const allColumns = useMemo(() => [...cuesheetDefaultColumns, ...customFieldColumns], [customFieldColumns]);

-  const [readPermissions, setReadPermissions] = useState<AccessMode>('full');
-  const [writePermissions, setWritePermissions] = useState<AccessMode>('full');
+  // Parsed seed values - stable for the lifetime of a given preset
+  const initialReadKeys = useMemo(() => parseKeys(initialRead), [initialRead]);
+  const initialWriteKeys = useMemo(() => parseKeys(initialWrite), [initialWrite]);

-  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>(() => {
-    const initialState: Record<string, boolean> = {};
-    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
-      initialState[column.value] = true;
+  const [readPermissions, setReadPermissions] = useState<AccessMode>(() => modeFromPermission(initialRead));
+  const [writePermissions, setWritePermissions] = useState<AccessMode>(() => modeFromPermission(initialWrite));
+
+  // Default for a column we have not seen yet: honour the seed in custom mode, otherwise grant access
+  const defaultRead = useCallback(
+    (key: string) => (initialReadKeys ? initialReadKeys.has(key) : true),
+    [initialReadKeys],
+  );
+  const defaultWrite = useCallback(
+    (key: string) => (initialWriteKeys ? initialWriteKeys.has(key) : true),
+    [initialWriteKeys],
+  );
+
+  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>({});
+  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>({});
+
+  // Custom fields load asynchronously, so reconcile the switch maps whenever the column list grows.
+  // Newly seen columns are seeded from the initial values (or default to on for a fresh link).
+  useEffect(() => {
+    setReadSwitches((prev) => {
+      const next = { ...prev };
+      for (const column of allColumns) {
+        if (!(column.value in next)) next[column.value] = defaultRead(column.value);
+      }
+      return next;
    });
-    return initialState;
-  });
-
-  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>(() => {
-    const initialState: Record<string, boolean> = {};
-    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
-      initialState[column.value] = true;
+    setWriteSwitches((prev) => {
+      const next = { ...prev };
+      for (const column of allColumns) {
+        if (!(column.value in next)) next[column.value] = defaultWrite(column.value);
+      }
+      return next;
    });
-    return initialState;
-  });
+  }, [allColumns, defaultRead, defaultWrite]);
+
+  const isReadOn = (key: string) => readSwitches[key] ?? defaultRead(key);
+  const isWriteOn = (key: string) => writeSwitches[key] ?? defaultWrite(key);

  const handleReadModeChange = (value: AccessMode) => {
    setReadPermissions(value);
-
-    setReadSwitches((prevReadSwitches) => {
-      const updatedReadSwitches = { ...prevReadSwitches };
-      Object.keys(updatedReadSwitches).forEach((key) => {
-        updatedReadSwitches[key] = true;
-      });
-      return updatedReadSwitches;
-    });
  };

  const handleWriteModeChange = (value: AccessMode) => {
+    setWritePermissions(value);
+    // Full write implies full read
    if (value === 'full') {
      setReadPermissions('full');
    }
-    setWritePermissions(value);
-
-    setReadSwitches((prevReadSwitches) => {
-      const updatedReadSwitches = { ...prevReadSwitches };
-      setWriteSwitches((prevWriteSwitches) => {
-        const updatedWriteSwitches = { ...prevWriteSwitches };
-        [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
-          updatedReadSwitches[column.value] = true;
-          updatedWriteSwitches[column.value] = true;
-        });
-        return updatedWriteSwitches;
-      });
-      return updatedReadSwitches;
-    });
  };

-  const handleSwitchChange = (key: string, type: 'read' | 'write', value: boolean) => {
-    if (type === 'read') {
-      setReadSwitches((prevReadSwitches) => {
-        const updatedReadSwitches = { ...prevReadSwitches, [key]: value };
-        return updatedReadSwitches;
-      });
-    } else {
-      setWriteSwitches((prevWriteSwitches) => {
-        const updatedWriteSwitches = { ...prevWriteSwitches, [key]: value };
-        return updatedWriteSwitches;
-      });
+  const handleReadSwitch = (key: string, value: boolean) => {
+    setReadSwitches((prev) => ({ ...prev, [key]: value }));
+    // A column the recipient cannot read cannot be written either
+    if (!value) {
+      setWriteSwitches((prev) => ({ ...prev, [key]: false }));
    }
  };

-  const getReadPermissions = () => {
+  const handleWriteSwitch = (key: string, value: boolean) => {
+    setWriteSwitches((prev) => ({ ...prev, [key]: value }));
+    // Granting write access requires read access
+    if (value) {
+      setReadSwitches((prev) => ({ ...prev, [key]: true }));
+    }
+  };
+
+  const resolvedRead = useMemo(() => {
    if (readPermissions === 'full' || writePermissions === 'full') {
      return 'full';
    }
+    const keys = allColumns.filter((column) => isReadOn(column.value)).map((column) => column.value);
+    return keys.length ? keys.join(',') : '-';
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [readPermissions, writePermissions, readSwitches, allColumns]);

-    return Object.entries(readSwitches)
-      .filter(([_, value]) => value)
-      .map(([key]) => key)
-      .join(',');
-  };
-
-  const getWritePermissions = () => {
+  const resolvedWrite = useMemo(() => {
    if (writePermissions === 'full') {
      return 'full';
    }
+    const keys = allColumns.filter((column) => isWriteOn(column.value)).map((column) => column.value);
+    return keys.length ? keys.join(',') : '-';
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [writePermissions, writeSwitches, allColumns]);

-    return Object.entries(writeSwitches)
-      .filter(([_, value]) => value)
-      .map(([key]) => key)
-      .join(',');
-  };
+  // Notify the parent of the resolved permissions. onChange is expected to be stable.
+  useEffect(() => {
+    onChange({ read: resolvedRead, write: resolvedWrite });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [resolvedRead, resolvedWrite]);
+
+  const noReadAccess = resolvedRead === '-';

  return (
    <Panel.Indent>
-      <input name='read' hidden readOnly ref={readRef} value={getReadPermissions() || '-'} />
-      <input name='write' hidden readOnly ref={writeRef} value={getWritePermissions() || '-'} />
      <div>
-        <Panel.Field title='Access mode' description='Which parts of the data will the link give access to' />
+        <Panel.Field title='Access mode' description='Which parts of the data the link gives access to' />
        <div>
-          <RadioGroup
-            value={writePermissions}
-            onValueChange={handleWriteModeChange}
-            orientation='horizontal'
-            items={[
-              { value: 'full', label: 'Full write (edit all existing and future columns)' },
-              { value: 'custom', label: 'Custom write' },
-            ]}
-          />
          <RadioGroup
            value={readPermissions}
            onValueChange={handleReadModeChange}
@@ -132,8 +155,18 @@ export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkO
              { value: 'custom', label: 'Custom read' },
            ]}
          />
+          <RadioGroup
+            value={writePermissions}
+            onValueChange={handleWriteModeChange}
+            orientation='horizontal'
+            items={[
+              { value: 'full', label: 'Full write (edit all existing and future columns)' },
+              { value: 'custom', label: 'Custom write' },
+            ]}
+          />
        </div>
      </div>
+      {noReadAccess && <Panel.Error>Links must contain at least one readable column.</Panel.Error>}
      <div className={style.twoCols}>
        <div className={style.grid}>
          <Panel.Description>Ontime columns</Panel.Description>
@@ -143,14 +176,14 @@ export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkO
            <Fragment key={column.value}>
              <div>{column.label}</div>
              <Switch
-                checked={Boolean(readSwitches[column.value])}
-                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
+                checked={isReadOn(column.value)}
+                onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
                disabled={readPermissions === 'full' || writePermissions === 'full'}
                data-testid={`read-${column.value}`}
              />
              <Switch
-                checked={Boolean(writeSwitches[column.value])}
-                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
+                checked={isWriteOn(column.value)}
+                onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
                disabled={writePermissions === 'full'}
                data-testid={`write-${column.value}`}
              />
@@ -164,16 +197,16 @@ export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkO
            <Panel.Description>Write</Panel.Description>
            {customFieldColumns.map((column) => (
              <Fragment key={column.value}>
-                {column.label}
+                <div>{column.label}</div>
                <Switch
-                  checked={Boolean(readSwitches[column.value])}
-                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
+                  checked={isReadOn(column.value)}
+                  onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
                  disabled={readPermissions === 'full' || writePermissions === 'full'}
                  data-testid={`read-${column.value}`}
                />
                <Switch
-                  checked={Boolean(writeSwitches[column.value])}
-                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
+                  checked={isWriteOn(column.value)}
+                  onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
                  disabled={writePermissions === 'full'}
                  data-testid={`write-${column.value}`}
                />
@@ -82,5 +82,5 @@ export const initializeSentry = () => {
    },
  });

-  return Sentry.withSentryReactRouterV6Routing(Routes);
+  return Sentry.withSentryReactRouterV7Routing(Routes);
 };
@@ -18,6 +18,7 @@ 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',
@@ -28,6 +29,7 @@ export const langDe: TranslationObject = {
  'timeline.done': 'Beendet',
  'timeline.due': 'fällig',
  'timeline.followedby': 'Gefolgt von',
+  'timeline.standby': 'Bereitschaft',
  'project.title': 'Titel',
  'project.description': 'Beschreibung',
  'project.info': 'Projektinfo',
@@ -18,6 +18,7 @@ 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',
@@ -28,6 +29,7 @@ export const langEs: TranslationObject = {
  'timeline.done': 'Terminado',
  'timeline.due': 'pendiente',
  'timeline.followedby': 'Seguido por',
+  'timeline.standby': 'En espera',
  'project.title': 'Título',
  'project.description': 'Descripción',
  'project.info': 'Información del proyecto',
@@ -18,6 +18,7 @@ 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',
@@ -28,6 +29,7 @@ export const langFr: TranslationObject = {
  'timeline.done': 'Terminé',
  'timeline.due': 'dû',
  'timeline.followedby': 'Suivi de',
+  'timeline.standby': 'En attente',
  'project.title': 'Titre',
  'project.description': 'Description',
  'project.info': 'Informations du projet',
@@ -18,6 +18,7 @@ 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',
@@ -28,6 +29,7 @@ export const langIt: TranslationObject = {
  'timeline.done': 'Terminato',
  'timeline.due': 'previsto',
  'timeline.followedby': 'Seguito da',
+  'timeline.standby': 'In attesa',
  'project.title': 'Titolo',
  'project.description': 'Descrizione',
  'project.info': 'Informazioni sul progetto',
@@ -18,6 +18,7 @@ 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',
@@ -28,6 +29,7 @@ export const langPt: TranslationObject = {
  'timeline.done': 'Concluído',
  'timeline.due': 'Pendente',
  'timeline.followedby': 'Seguido por',
+  'timeline.standby': 'Em espera',
  'project.title': 'Título',
  'project.description': 'Descrição',
  'project.info': 'Informações do projeto',
@@ -7,6 +7,7 @@ import {
  useCallback,
  useEffect,
  useLayoutEffect,
+  useMemo,
  useRef,
  useState,
 } from 'react';
@@ -140,25 +141,23 @@ 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 = events.slice(selectedEventIndex + 1);
-  selectedEventIndex = 0;
+  const viewEvents = useMemo(() => {
+    const selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);
+    return (events as ExtendedEntry<OntimeEvent>[]).slice(selectedEventIndex + 1);
+  }, [events, selectedEventId]);

-  return (
-    <ScheduleContext
-      value={{
-        events: viewEvents as ExtendedEntry<OntimeEvent>[],
-        selectedEventId,
-        numPages,
-        visiblePage,
-        containerRef,
-      }}
-    >
-      {children}
-    </ScheduleContext>
-  );
+  const value = useMemo(() => {
+    return {
+      events: viewEvents,
+      selectedEventId,
+      numPages,
+      visiblePage,
+      containerRef,
+    };
+  }, [viewEvents, selectedEventId, numPages, visiblePage, containerRef]);
+
+  return <ScheduleContext value={value}>{children}</ScheduleContext>;
 };

 export const useSchedule = () => {
@@ -59,6 +59,7 @@ $item-height: 3.5rem;
    right: $view-inline-padding;

    display: flex;
+    align-items: center;
    justify-content: end;
    gap: 2rem;

@@ -72,14 +73,27 @@ $item-height: 3.5rem;
  }

  /* ========================= LIST ========================*/
-  .empty-container {
+  .empty-state {
+    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: 2rem;
+      margin-top: 1.75rem;
+    }
+  }
+
+  .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;
    }
  }

@@ -88,7 +102,7 @@ $item-height: 3.5rem;
    flex-direction: column;
    overflow-y: auto;

-    padding-bottom: 60vh;
+    padding-bottom: max(8rem, calc(5rem + env(safe-area-inset-bottom)));
  }

  /* ====================== LIST-ITEM ======================*/
@@ -104,6 +118,7 @@ $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 {
@@ -115,18 +130,41 @@ $item-height: 3.5rem;

  .sub--selected {
    background: $blue-700;
+    box-shadow: inset 0 0 0 1px $blue-500;
  }

  .sub--live {
    background-color: $active-green;
+    box-shadow: inset 0 0 0 1px color-mix(in srgb, $active-green 75%, $ui-white);
  }

  .sub--armed {
    background-color: $gray-1325;
  }

+  .sub--in-group {
+    position: relative;
+    margin-left: 1rem;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: -0.5rem;
+      top: -0.25rem;
+      bottom: -0.25rem;
+      width: 2px;
+      border-radius: 1px;
+      background: var(--group-color, transparent);
+    }
+
+    .sub__binder {
+      box-shadow: inset 3px 0 0 var(--group-color, transparent);
+    }
+  }
+
  .sub__binder {
    background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
+    border-radius: $element-border-radius 0 0 $element-border-radius;
    grid-area: binder;
  }

@@ -138,6 +176,8 @@ $item-height: 3.5rem;
    gap: 0.25em;
    font-size: $timer-label-size;
    color: var(--label-color-override, $viewer-label-color);
+    white-space: nowrap;
+    font-variant-numeric: tabular-nums;
  }

  .sub__schedule--delayed {
@@ -156,22 +196,73 @@ $item-height: 3.5rem;
    color: $playback-under;
  }

+  .sub--group {
+    box-shadow: inset 0 0 0 1px var(--user-color, $gray-1325);
+    background:
+      linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 18%, transparent), transparent 42%),
+      var(--card-background-color-override, $viewer-card-bg-color);
+
+    .sub__binder {
+      background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
+      box-shadow: none;
+    }
+
+    .sub__title {
+      font-weight: 700;
+    }
+
+    .sub__schedule,
+    .sub__status,
+    .sub__label {
+      color: var(--secondary-color-override, $viewer-secondary-color);
+    }
+  }
+
+  .sub--group.sub--selected {
+    box-shadow: inset 0 0 0 1px $blue-500;
+    background:
+      linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 22%, transparent), transparent 42%),
+      $blue-700;
+
+    .sub__schedule,
+    .sub__status,
+    .sub__label,
+    .sub__eyebrow {
+      color: $ui-white;
+    }
+  }
+
  .sub__title {
    grid-area: title;
    padding-bottom: 0.5rem;
+    min-width: 0;

    font-size: $title-font-size;
    line-height: 1.1em;
+    overflow-wrap: anywhere;
+  }
+
+  .sub__eyebrow {
+    display: block;
+    margin-bottom: 0.15rem;
+    color: var(--secondary-color-override, $viewer-secondary-color);
+    font-size: $timer-label-size;
+    font-weight: 700;
+    line-height: 1;
+    text-transform: uppercase;
  }

  .sub__secondary {
    grid-area: secondary;
    padding-bottom: 0.5rem;
+    min-width: 0;

    font-size: $base-font-size;
    line-height: 1.1em;
+    color: var(--label-color-override, $viewer-label-color);
    // allow multi-line text but trim before
    white-space: pre-line;
+    overflow-wrap: anywhere;
  }

  .sub__status {
@@ -181,6 +272,7 @@ $item-height: 3.5rem;
    font-size: $timer-label-size;
    text-align: right;
    text-transform: uppercase;
+    white-space: nowrap;
  }

  .sub__label {
@@ -190,6 +282,7 @@ $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 {
@@ -199,6 +292,16 @@ $item-height: 3.5rem;
    line-height: 1.1em;
    font-weight: 600;
    text-align: right;
+    white-space: nowrap;
+    font-variant-numeric: tabular-nums;
+  }
+
+  .selection-count {
+    color: var(--label-color-override, $viewer-label-color);
+    font-size: $timer-label-size;
+    font-weight: 600;
+    text-transform: uppercase;
+    white-space: nowrap;
  }

  /* ====================== MODIFIERS ======================*/
@@ -1,4 +1,14 @@
-import { EntryId, OntimeEvent, OntimeView, PlayableEvent, isOntimeEvent, isPlayableEvent } from 'ontime-types';
+import {
+  EntryId,
+  OntimeEntry,
+  OntimeEvent,
+  OntimeGroup,
+  OntimeView,
+  PlayableEvent,
+  isOntimeEvent,
+  isOntimeGroup,
+  isPlayableEvent,
+} from 'ontime-types';
 import { useMemo, useState } from 'react';
 import { IoAdd } from 'react-icons/io5';

@@ -15,7 +25,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 } from './countdown.utils';
+import { getOrderedSubscriptions, resolveSubscriptionTarget } from './countdown.utils';
 import CountdownSelect from './CountdownSelect';
 import CountdownSubscriptions from './CountdownSubscriptions';
 import SingleEventCountdown from './SingleEventCountdown';
@@ -45,13 +55,19 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting

  const [editMode, setEditMode] = useState(false);

-  // gather rundown data
-  const playableEvents = rundownData.filter((entry): entry is ExtendedEntry<PlayableEvent> => {
-    return isOntimeEvent(entry) && isPlayableEvent(entry);
+  // gather subscribable items: playable events and groups that contain at least one playable child
+  const candidates = rundownData.filter((entry): entry is ExtendedEntry<PlayableEvent | OntimeGroup> => {
+    if (isOntimeEvent(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 = playableEvents.length > 0;
+  const hasEvents = candidates.length > 0;

  // gather option data
  const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -69,15 +85,20 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
        <CountdownClock />
      </div>

-      {!hasEvents && <Empty text={getLocalizedString('common.no_data')} className='empty-container' />}
+      {!hasEvents && (
+        <div className='empty-state'>
+          <Empty text={getLocalizedString('common.no_data')} className='empty-state__content' />
+        </div>
+      )}

      {hasEvents && editMode && (
-        <CountdownSelect events={playableEvents} subscriptions={subscriptions} disableEdit={() => setEditMode(false)} />
+        <CountdownSelect events={candidates} subscriptions={subscriptions} disableEdit={() => setEditMode(false)} />
      )}

      {hasEvents && !editMode && (
        <CountdownContents
-          playableEvents={playableEvents}
+          candidates={candidates}
+          rundownData={rundownData}
          subscriptions={subscriptions}
          goToEditMode={() => setEditMode(true)}
        />
@@ -87,19 +108,20 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
 }

 interface CountdownContentsProps {
-  playableEvents: ExtendedEntry<OntimeEvent>[];
+  candidates: ExtendedEntry<OntimeEvent | OntimeGroup>[];
+  rundownData: ExtendedEntry<OntimeEntry>[];
  subscriptions: EntryId[];
  goToEditMode: () => void;
 }

-function CountdownContents({ playableEvents, subscriptions, goToEditMode }: CountdownContentsProps) {
+function CountdownContents({ candidates, rundownData, subscriptions, goToEditMode }: CountdownContentsProps) {
  const { getLocalizedString } = useTranslation();
  const { hidePast } = useCountdownOptions();

  if (subscriptions.length === 0) {
    return (
-      <div className='empty-container'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-container' />
+      <div className='empty-state'>
+        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
        <Button variant='primary' size='xlarge' onClick={goToEditMode}>
          <IoAdd /> Add
        </Button>
@@ -107,13 +129,15 @@ function CountdownContents({ playableEvents, subscriptions, goToEditMode }: Coun
    );
  }

-  const subscribedEvents = getOrderedSubscriptions(subscriptions, playableEvents);
+  const subscribedEvents = getOrderedSubscriptions(subscriptions, candidates)
+    .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-container'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-container' />
+      <div className='empty-state'>
+        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
        <Button variant='primary' size='xlarge' onClick={goToEditMode}>
          <IoAdd /> Add
        </Button>
@@ -129,8 +153,8 @@ function CountdownContents({ playableEvents, subscriptions, goToEditMode }: Coun

  if (eventsToShow.length === 0) {
    return (
-      <div className='empty-container'>
-        <Empty text={getLocalizedString('countdown.all_have_finished')} className='empty-container' />
+      <div className='empty-state'>
+        <Empty text={getLocalizedString('countdown.all_have_finished')} className='empty-state__content' />
      </div>
    );
  }
@@ -1,4 +1,4 @@
-import { EntryId, PlayableEvent } from 'ontime-types';
+import { EntryId, OntimeEvent, OntimeGroup, isOntimeGroup } 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<PlayableEvent>[];
+  events: ExtendedEntry<OntimeEvent | OntimeGroup>[];
  subscriptions: EntryId[];
  disableEdit: () => void;
 }
@@ -52,13 +52,15 @@ export default function CountdownSelect({ events, subscriptions, disableEdit }:

  return (
    <div className='list-container'>
-      {events.map((event, index) => {
+      {events.map((event) => {
        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={index}
+            key={event.id}
            role='button'
            tabIndex={0}
            onClick={() => toggleSelect(event.id)}
@@ -68,21 +70,33 @@ export default function CountdownSelect({ events, subscriptions, disableEdit }:
                e.stopPropagation();
              }
            }}
-            className={cx(['sub', isSelected && 'sub--selected'])}
+            className={cx([
+              'sub',
+              isSelected && 'sub--selected',
+              isGroup && 'sub--group',
+              isGroupedEvent && 'sub--in-group',
+            ])}
          >
-            <div className='sub__binder' style={{ '--user-color': event?.colour ?? '' }} />
+            <div
+              className='sub__binder'
+              style={{ '--user-color': event?.colour ?? '', '--group-color': event.groupColour ?? 'transparent' }}
+            />
            <div className='sub__schedule'>
              <ClockTime value={event.timeStart} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />
              →
              <ClockTime value={event.timeEnd} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />
            </div>
            <div className='sub__label'>{isSelected ? 'Click to remove' : 'Click to add'}</div>
-            <div className='sub__title'>{title}</div>
+            <div className='sub__title'>
+              {isGroup && <span className='sub__eyebrow'>Group</span>}
+              {title}
+            </div>
          </div>
        );
      })}

      <div className='fab-container'>
+        <div className='selection-count'>{selected.length} selected</div>
        <Button variant='subtle' size='xlarge' onClick={disableEdit}>
          <IoArrowBack /> Go back
        </Button>
@@ -19,6 +19,7 @@ import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
 import {
  CountdownEvent,
+  CountdownTarget,
  extendEventData,
  getIsLive,
  isOutsideRange,
@@ -30,7 +31,7 @@ import {
 import './Countdown.scss';

 interface CountdownSubscriptionsProps {
-  subscribedEvents: ExtendedEntry<OntimeEvent>[];
+  subscribedEvents: CountdownTarget[];
  goToEditMode: () => void;
 }

@@ -98,22 +99,39 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
  return (
    <div className='list-container' onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
      {subscribedEvents.map((event) => {
-        const secondaryData = getPropertyValue(event, secondarySource);
-        const isLive = getIsLive(event.id, selectedEventId, playback);
-        const isArmed = !isLive && event.id === selectedEventId;
+        // while a group is live, surface the running event's title as the secondary line
+        const liveTitle = event.isGroup && event.liveEntry ? event.liveEntry.title : undefined;
+        const secondaryData = liveTitle ?? getPropertyValue(event, secondarySource);
+        const isGroupedEvent = !event.isGroup && Boolean(event.parent);
+        const activeEntryId = event.isGroup ? (event.liveEntry?.id ?? event.targetId) : event.id;
+        // a subscribed group is live when any of its children is the selected/running event
+        const isLive = activeEntryId ? getIsLive(activeEntryId, selectedEventId, playback) : false;
+        const isArmed = !isLive && activeEntryId === selectedEventId;
        const countdownEvent = extendEventData(event, currentDay, actualStart, plannedStart, offset, mode, reportData);
        const displayTitle = getPropertyValue(event, mainSource ?? 'title');
        return (
          <div
            key={event.id}
            ref={isLive ? selectedRef : undefined}
-            className={cx(['sub', isLive && 'sub--live', isArmed && 'sub--armed'])}
+            className={cx([
+              'sub',
+              isLive && 'sub--live',
+              isArmed && 'sub--armed',
+              event.isGroup && 'sub--group',
+              isGroupedEvent && 'sub--in-group',
+            ])}
            data-testid={event.cue}
          >
-            <div className='sub__binder' style={{ '--user-color': event.colour }} />
+            <div
+              className='sub__binder'
+              style={{ '--user-color': event.colour, '--group-color': event.groupColour ?? 'transparent' }}
+            />
            <ScheduleTime event={countdownEvent} showExpected={showExpected} />
            <SubscriptionStatus event={countdownEvent} />
-            <div className={cx(['sub__title', !displayTitle && 'subdued'])}>{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>
        );
@@ -11,13 +11,13 @@ import { cx } from '../../common/utils/styleUtils';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
-import { useSubscriptionDisplayData } from './countdown.utils';
+import { CountdownTarget, useSubscriptionDisplayData } from './countdown.utils';
 import { ScheduleTime } from './CountdownSubscriptions';

 import './SingleEventCountdown.scss';

 interface SingleEventCountdownProps {
-  subscribedEvent: ExtendedEntry<OntimeEvent>;
+  subscribedEvent: CountdownTarget;
  goToEditMode: () => void;
 }

@@ -38,11 +38,13 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
    mode,
  });

-  const { endedAt } = reportData[subscribedEvent.id] ?? { endedAt: null };
+  const { endedAt } = reportData[subscribedEvent.reportId ?? subscribedEvent.id] ?? { endedAt: null };
  const countdownEvent = { ...subscribedEvent, expectedStart, endedAt };
  const titleTmp = getPropertyValue(subscribedEvent, mainSource ?? 'title');
  const title = titleTmp?.length ? titleTmp : ' '; // insert utf-8 empty space to avoid the line collapsing;
-  const secondaryData = getPropertyValue(subscribedEvent, secondarySource);
+  // 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'>
@@ -80,7 +80,7 @@ export const getCountdownOptions = (
        {
          id: 'sub',
          title: 'Event subscription',
-          description: 'The events to follow',
+          description: 'The events and groups to follow',
          values: persistedSubscriptions,
          type: 'persist',
        },
@@ -0,0 +1,128 @@
+import { OntimeEntry, OntimeEvent, OntimeGroup, SupportedEntry } from 'ontime-types';
+
+import { ExtendedEntry } from '../../common/utils/rundownMetadata';
+import { resolveSubscriptionTarget } from './countdown.utils';
+
+/**
+ * Minimal builders for the extended (metadata enriched) entries the countdown view consumes.
+ * Only the fields exercised by resolveSubscriptionTarget are provided; the rest are cast away.
+ */
+function makeEvent(patch: Partial<ExtendedEntry<OntimeEvent>>): ExtendedEntry<OntimeEvent> {
+  return {
+    id: 'event',
+    type: SupportedEntry.Event,
+    title: 'event title',
+    cue: '1',
+    colour: '',
+    skip: false,
+    parent: null,
+    timeStart: 0,
+    timeEnd: 0,
+    duration: 0,
+    delay: 0,
+    dayOffset: 0,
+    gap: 0,
+    countToEnd: false,
+    custom: {},
+    note: '',
+    // metadata
+    totalGap: 0,
+    isLinkedToLoaded: false,
+    isLoaded: false,
+    isPast: false,
+    ...patch,
+  } as ExtendedEntry<OntimeEvent>;
+}
+
+function makeGroup(patch: Partial<ExtendedEntry<OntimeGroup>>): ExtendedEntry<OntimeGroup> {
+  return {
+    id: 'group',
+    type: SupportedEntry.Group,
+    title: 'group title',
+    colour: '#abcdef',
+    note: 'group note',
+    entries: [],
+    duration: 0,
+    custom: {},
+    timeStart: 0,
+    timeEnd: 0,
+    isPast: false,
+    isLoaded: false,
+    ...patch,
+  } as ExtendedEntry<OntimeGroup>;
+}
+
+describe('resolveSubscriptionTarget()', () => {
+  it('returns events unchanged', () => {
+    const event = makeEvent({ id: 'e1' });
+    const result = resolveSubscriptionTarget(event, [event]);
+    expect(result).toBe(event);
+  });
+
+  it('derives group timing from the first playable child while keeping the group identity', () => {
+    const group = makeGroup({ id: 'g1', title: 'Session A', colour: '#123456', duration: 5000 });
+    const child1 = makeEvent({ id: 'c1', parent: 'g1', timeStart: 1000, delay: 100, dayOffset: 0, title: 'Pres 1' });
+    const child2 = makeEvent({ id: 'c2', parent: 'g1', timeStart: 3000, title: 'Pres 2' });
+    const flat: ExtendedEntry<OntimeEntry>[] = [group, child1, child2];
+
+    const result = resolveSubscriptionTarget(group, flat);
+
+    expect(result).not.toBeNull();
+    // group identity and display
+    expect(result?.id).toBe('g1');
+    expect(result?.title).toBe('Session A');
+    expect(result?.colour).toBe('#123456');
+    expect(result?.isGroup).toBe(true);
+    // timing comes from the first child, duration from the group
+    expect(result?.timeStart).toBe(1000);
+    expect(result?.delay).toBe(100);
+    expect(result?.duration).toBe(5000);
+    expect(result?.countToEnd).toBe(false);
+    // state checks target the first child before any child is loaded
+    expect(result?.targetId).toBe('c1');
+    // report lookup targets the last child (session end)
+    expect(result?.reportId).toBe('c2');
+  });
+
+  it('returns null for a group with no playable children', () => {
+    const group = makeGroup({ id: 'g1' });
+    const result = resolveSubscriptionTarget(group, [group]);
+    expect(result).toBeNull();
+  });
+
+  it('skips skipped children when picking the first child', () => {
+    const group = makeGroup({ id: 'g1' });
+    const skipped = {
+      ...makeEvent({ id: 'c0', parent: 'g1', timeStart: 500 }),
+      skip: true,
+    } as ExtendedEntry<OntimeEntry>;
+    const playable = makeEvent({ id: 'c1', parent: 'g1', timeStart: 1500 });
+    const result = resolveSubscriptionTarget(group, [group, skipped, playable]);
+    expect(result?.timeStart).toBe(1500);
+    expect(result?.reportId).toBe('c1');
+  });
+
+  it('is live while any child is loaded and not past', () => {
+    const group = makeGroup({ id: 'g1' });
+    const child1 = makeEvent({ id: 'c1', parent: 'g1', isPast: true });
+    const child2 = makeEvent({ id: 'c2', parent: 'g1', isLoaded: true });
+    const child3 = makeEvent({ id: 'c3', parent: 'g1' });
+    const result = resolveSubscriptionTarget(group, [group, child1, child2, child3]);
+
+    expect(result?.isLoaded).toBe(true);
+    expect(result?.isPast).toBe(false);
+    expect(result?.liveEntry?.id).toBe('c2');
+  });
+
+  it('is past only once the last child is past and nothing is loaded', () => {
+    const group = makeGroup({ id: 'g1' });
+    const child1 = makeEvent({ id: 'c1', parent: 'g1', isPast: true });
+    const child2 = makeEvent({ id: 'c2', parent: 'g1', isPast: true });
+    const result = resolveSubscriptionTarget(group, [group, child1, child2]);
+
+    expect(result?.isLoaded).toBe(false);
+    expect(result?.isPast).toBe(true);
+    expect(result?.targetId).toBe('c1');
+    expect(result?.liveEntry).toBeNull();
+  });
+});
@@ -1,4 +1,17 @@
-import { EntryId, MaybeNumber, OffsetMode, OntimeEntry, OntimeEvent, OntimeReport, Playback } from 'ontime-types';
+import {
+  EntryId,
+  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';
@@ -40,7 +53,7 @@ export const timerProgress: TimerMessage = {
 * Handles events in different days but disregards whether an event has actually played
 */
 export function useSubscriptionDisplayData(
-  subscribedEvent: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number },
+  subscribedEvent: CountdownTarget & { endedAt: MaybeNumber; expectedStart: number },
 ): { status: ProgressStatus; statusDisplay: string; timeDisplay: string } {
  const { playback, current, clock } = useCountdownSocket();
  const { getLocalizedString } = useTranslation();
@@ -67,7 +80,11 @@ export function useSubscriptionDisplayData(

    return {
      status: 'live',
-      statusDisplay: getLocalizedString(timerProgress['live']),
+      statusDisplay: getLocalizedString(
+        subscribedEvent.parent || (subscribedEvent.isGroup && subscribedEvent.liveEntry)
+          ? 'countdown.group_running'
+          : timerProgress['live'],
+      ),
      timeDisplay: bigDuration(current ?? 0),
    };
  }
@@ -168,10 +185,75 @@ export function isOutsideRange(a: number, b: number): boolean {
  return Math.abs(a - b) > MILLIS_PER_MINUTE;
 }

-export type CountdownEvent = ExtendedEntry<OntimeEvent> & { expectedStart: number; endedAt: MaybeNumber };
+/**
+ * A subscription target normalised to the event-shaped object the countdown display consumes.
+ * For events this is a pass-through; for groups it carries the group identity and display data
+ * while deriving timing from the group's first playable child (see resolveSubscriptionTarget).
+ */
+export type CountdownTarget = ExtendedEntry<OntimeEvent> & {
+  isGroup?: boolean;
+  targetId?: EntryId; // child entry used for countdown/live/armed state checks
+  reportId?: EntryId; // entry used for the report lookup (e.g. last child of a group)
+  liveEntry?: ExtendedEntry<OntimeEvent> | null; // the running child while a group is live
+};
+
+export type CountdownEvent = CountdownTarget & { expectedStart: number; endedAt: MaybeNumber };
+
+/**
+ * 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: ExtendedEntry<OntimeEvent>,
+  event: CountdownTarget,
  currentDay: number,
  actualStart: MaybeNumber,
  plannedStart: MaybeNumber,
@@ -189,6 +271,6 @@ export function extendEventData(
    offset,
    mode,
  });
-  const { endedAt } = reportData[event.id] ?? { endedAt: null };
+  const { endedAt } = reportData[event.reportId ?? event.id] ?? { endedAt: null };
  return { ...event, expectedStart, endedAt };
 }
@@ -20,6 +20,7 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-read-only',
      target: OntimeView.Cuesheet,
      search: '',
+      displayInNav: false,
      options: {
        read: 'full',
        write: '-',
@@ -41,6 +42,7 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-flag',
      target: OntimeView.Cuesheet,
      search: '',
+      displayInNav: false,
      options: {
        read: 'full',
        write: 'flag',
@@ -62,6 +64,7 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-default',
      target: OntimeView.Cuesheet,
      search: '',
+      displayInNav: false,
    };

    const policy = getCuesheetColumnAccessPolicy(preset, AppMode.Edit);
@@ -76,6 +79,7 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-granular',
      target: OntimeView.Cuesheet,
      search: '',
+      displayInNav: false,
      options: {
        read: 'cue,title',
        write: 'title',
@@ -1,32 +0,0 @@
-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);
-      });
-    });
-  });
-});
@@ -1,6 +1,6 @@
 import { useTableNav } from '@table-nav/react';
 import { ColumnDef, Table, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import { OntimeEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { OntimeEntry, SupportedEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { ComponentProps, ReactNode, memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import {
  ContextProp,
@@ -20,6 +20,7 @@ import { usePersistedRundownOptions } from '../../../features/rundown/rundown.op
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
 import { AppMode } from '../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../cuesheet.options';
+import { useCuesheetPermissions } from '../useTablePermissions';
 import { CuesheetHeader, SortableCuesheetHeader } from './cuesheet-table-elements/CuesheetHeader';
 import DelayRow from './cuesheet-table-elements/DelayRow';
 import EventRow from './cuesheet-table-elements/EventRow';
@@ -62,7 +63,8 @@ export default function CuesheetTable({
  insertElement,
 }: CuesheetTableProps) {
  const { flatRundown, status, selectedEventId } = source;
-  const { updateEntry, updateTimer } = useEntryActionsContext();
+  const { updateEntry, updateTimer, addEntry } = useEntryActionsContext();
+  const canCreateEntries = useCuesheetPermissions((state) => state.canCreateEntries) && cuesheetMode === AppMode.Edit;

  const useOptions = tableRoot === 'editor' ? usePersistedRundownOptions : usePersistedCuesheetOptions;
  const optionsStore = useOptions();
@@ -202,8 +204,9 @@ export default function CuesheetTable({
      listeners,
      rows,
      table,
+      handleAddNew: canCreateEntries ? (type: SupportedEntry) => addEntry({ type }) : undefined,
    }),
-    [columnSizeVars, cursor, listeners, rows, table],
+    [columnSizeVars, cursor, listeners, rows, table, addEntry, canCreateEntries],
  );

  const computeItemKey = useCallback((_: number, item: ExtendedEntry) => item.id, []);
@@ -273,10 +276,13 @@ interface CuesheetVirtuosoContext {
  listeners: ReturnType<typeof useTableNav>['listeners'];
  rows: ReturnType<Table<ExtendedEntry>['getRowModel']>['rows'];
  table: Table<ExtendedEntry>;
+  handleAddNew?: (type: SupportedEntry) => void;
 }

-const EmptyPlaceholder = memo(function EmptyPlaceholder() {
-  return <EmptyTableBody text='No data in rundown' />;
+const EmptyPlaceholder = memo(function EmptyPlaceholder({
+  context,
+}: TableProps & ContextProp<CuesheetVirtuosoContext>) {
+  return <EmptyTableBody handleAddNew={context.handleAddNew} />;
 });

 const CuesheetTableElement = memo(function CuesheetTableElement({
@@ -1,23 +0,0 @@
-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 ?? '');
-};
@@ -1,6 +1,8 @@
@use '@/theme/viewerDefs' as *;

 $timeline-height: 1rem;
+$group-band-height: 0.5rem;
+$group-band-gap: 0.25rem;
 $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-override, $viewer-background-color));

 .timelineContainer {
@@ -17,7 +19,21 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
  position: relative;
  font-weight: 600;
  height: 100%;
-  box-shadow: inset 0 1rem 0 0 var(--card-background-color-override, $viewer-card-bg-color);
+  // reserve the top region (progress bar + gap + group band) with the card background
+  box-shadow: inset 0 calc(#{$timeline-height} + #{$group-band-gap} + #{$group-band-height}) 0 0
+    var(--card-background-color-override, $viewer-card-bg-color);
+}
+
+.groupBand {
+  height: $group-band-height;
+  margin-top: $group-band-gap;
+  width: 100%;
+  background: var(--group-colour, transparent);
+  display: flex;
+  align-items: center;
+  position: relative;
+  z-index: 2;
+  overflow: visible;
 }

 .column {
@@ -92,7 +108,6 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
  border-top: 2px solid var(--background-color-override, $viewer-background-color);
  box-shadow: 0 0.25rem 0 0 var(--color, $gray-300);

-  text-transform: capitalize;
  white-space: normal;

  &[data-status='done'] {
@@ -119,6 +134,7 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over

  .status {
    width: fit-content;
+    text-transform: uppercase;
  }

  .status.due {
@@ -55,10 +55,6 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
    return calculateTimelineLayout(playableEvents, scheduleStart, scheduleEnd, screenWidth, !fixedSize);
  }, [rundown, scheduleStart, scheduleEnd, screenWidth, fixedSize]);

-  if (totalDuration === 0) {
-    return null;
-  }
-
  // Pre-calculate event statuses
  let currentStatus: ProgressStatus = selectedEventId ? 'done' : 'future';
  const statusMap: Record<string, ProgressStatus> = {};
@@ -105,6 +101,7 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
              title={displayTitle}
              cue={event.cue}
              width={position.width}
+              groupColour={event.groupColour}
            />
          );
        })}
@@ -26,6 +26,7 @@ interface TimelineEntryProps {
  title: string;
  width: number;
  cue: string;
+  groupColour?: string;
  ref?: RefObject<HTMLDivElement | null>;
 }

@@ -48,6 +49,7 @@ export function TimelineEntry({
  title,
  width,
  cue,
+  groupColour,
  ref,
 }: TimelineEntryProps) {
  const formattedStartTime = formatTime(start, formatOptions);
@@ -67,6 +69,7 @@ export function TimelineEntry({
        {
          '--color': colour,
          '--lighter': lighterColour ?? '',
+          '--group-colour': groupColour ?? 'transparent',
          left: `${left}px`,
          width: `${width}px`,
        } as CSSProperties
@@ -74,6 +77,7 @@ export function TimelineEntry({
      data-testid={cue}
    >
      {status === 'live' ? <ActiveBlock /> : <div data-status={status} className={style.timelineBlock} />}
+      <div className={style.groupBand} />
      <div
        className={cx([style.content, width < 20 && style.hide, !hasLink && style.separeLeft])}
        data-status={status}
@@ -153,6 +157,8 @@ function TimelineEntryStatus({
    statusText = getLocalizedString('timeline.live');
  } else if (statusText === 'pending') {
    statusText = getLocalizedString('timeline.due');
+  } else if (statusText === 'done') {
+    statusText = getLocalizedString('timeline.done');
  }

  const isDue = status === 'future' && timeToStart <= 0;
@@ -38,6 +38,8 @@ export default function TimelinePageLoader() {
 function TimelinePage({ events, customFields, projectData, settings }: TimelineData) {
  const selectedEventId = useSelectedEventId();
  const { mainSource, timeformat } = useTimelineOptions();
+  const { getLocalizedString } = useTranslation();
+
  // holds copy of the rundown with only relevant events
  const { scopedRundown, firstStart, totalDuration } = useScopedRundown(events, selectedEventId);

@@ -50,6 +52,8 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD
  const defaultFormat = getDefaultFormat(settings?.timeFormat);
  const progressOptions = useMemo(() => getTimelineOptions(defaultFormat, customFields), [defaultFormat, customFields]);

+  const hasContent = totalDuration > 0;
+
  return (
    <div className='timeline' data-testid='timeline-view'>
      <ViewParamsEditor target={OntimeView.Timeline} viewOptions={progressOptions} />
@@ -61,12 +65,16 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD

      <TimelineSections now={now} next={next} followedBy={followedBy} mainSource={mainSource} />

-      <Timeline
-        firstStart={firstStart}
-        rundown={scopedRundown}
-        selectedEventId={selectedEventId}
-        totalDuration={totalDuration}
-      />
+      {hasContent ? (
+        <Timeline
+          firstStart={firstStart}
+          rundown={scopedRundown}
+          selectedEventId={selectedEventId}
+          totalDuration={totalDuration}
+        />
+      ) : (
+        <EmptyPage text={getLocalizedString('common.no_data')} />
+      )}
    </div>
  );
 }
@@ -20,7 +20,7 @@ export default function TimelineSections({ now, next, followedBy, mainSource }:
  const state = useExpectedStartData();

  // gather card data
-  const titleNow = getPropertyValue(now, mainSource ?? 'title') ?? '-';
+  const titleNow = now ? (getPropertyValue(now, mainSource ?? 'title') ?? '-') : getLocalizedString('timeline.standby');
  const dueText = getLocalizedString('timeline.due').toUpperCase();
  const nextText = getPropertyValue(next, mainSource ?? 'title') ?? '-';
  const followedByText = getPropertyValue(followedBy, mainSource ?? 'title') ?? '-';
@@ -96,63 +96,77 @@ export function useScopedRundown(
 ): ScopedRundownData {
  const { hidePast } = useTimelineOptions();

-  const data = useMemo(() => {
-    if (rundown.length === 0) {
-      return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
-    }
-
-    const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
-    let selectedIndex = selectedEventId ? Infinity : -1;
-    let firstStart = null;
-    let totalDuration = 0;
-    let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
-
-    for (let i = 0; i < rundown.length; i++) {
-      const currentEntry = rundown[i];
-      // we only deal with playableEvents
-      if (isOntimeEvent(currentEntry) && isPlayableEvent(currentEntry)) {
-        if (currentEntry.id === selectedEventId) {
-          selectedIndex = i;
-        }
-
-        // maybe filter past
-        if (hidePast && i < selectedIndex) {
-          continue;
-        }
-
-        // add to scopedRundown
-        scopedRundown.push(currentEntry);
-
-        /**
-         * Derive timers
-         * This logic is partially from rundownCache.generate
-         * With the addition of deriving the current day offset
-         */
-        if (firstStart === null) {
-          firstStart = currentEntry.timeStart;
-        }
-
-        const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
-
-        if (timeFromPrevious === 0) {
-          totalDuration += currentEntry.duration;
-        } else if (timeFromPrevious > 0) {
-          totalDuration += timeFromPrevious + currentEntry.duration;
-        } else if (timeFromPrevious < 0) {
-          totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
-        }
-        if (isNewLatest(currentEntry, lastEntry)) {
-          lastEntry = currentEntry;
-        }
-      }
-    }
-
-    return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
-  }, [hidePast, rundown, selectedEventId]);
+  const data = useMemo(
+    () => computeScopedRundown(rundown, selectedEventId, hidePast),
+    [hidePast, rundown, selectedEventId],
+  );

  return data;
 }

+/**
+ * Pure computation behind useScopedRundown: filters to playable events and derives timers
+ */
+export function computeScopedRundown(
+  rundown: ExtendedEntry<OntimeEntry>[],
+  selectedEventId: MaybeString,
+  hidePast: boolean,
+): ScopedRundownData {
+  if (rundown.length === 0) {
+    return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
+  }
+
+  const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
+  let selectedIndex = selectedEventId ? Infinity : -1;
+  let firstStart: number | null = null;
+  let totalDuration = 0;
+  let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
+
+  for (let i = 0; i < rundown.length; i++) {
+    // we only deal with playableEvents
+    const currentEntry = rundown[i];
+    if (!isOntimeEvent(currentEntry) || !isPlayableEvent(currentEntry)) {
+      continue;
+    }
+
+    if (currentEntry.id === selectedEventId) {
+      selectedIndex = i;
+    }
+
+    // maybe filter past
+    if (hidePast && i < selectedIndex) {
+      continue;
+    }
+
+    // add to scopedRundown
+    scopedRundown.push(currentEntry);
+
+    /**
+     * Derive timers
+     * This logic is partially from rundownCache.generate
+     * With the addition of deriving the current day offset
+     */
+    if (firstStart === null) {
+      firstStart = currentEntry.timeStart;
+    }
+
+    const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
+
+    if (timeFromPrevious === 0) {
+      totalDuration += currentEntry.duration;
+    } else if (timeFromPrevious > 0) {
+      totalDuration += timeFromPrevious + currentEntry.duration;
+    } else if (timeFromPrevious < 0) {
+      totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
+    }
+    if (isNewLatest(currentEntry, lastEntry)) {
+      lastEntry = currentEntry;
+    }
+  }
+
+  return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
+}
+
 type UpcomingEvents = {
  now: ExtendedEntry<OntimeEvent> | null;
  next: ExtendedEntry<OntimeEvent> | null;
@@ -71,6 +71,11 @@ export default defineConfig({
        changeOrigin: true,
        configure: logProxyRequests,
      },
+      '^/mcp': {
+        target: 'http://localhost:4001/',
+        changeOrigin: true,
+        configure: logProxyRequests,
+      },
      '^/ws*': {
        target: 'http://localhost:4001/',
        changeOrigin: true,
@@ -1,6 +1,6 @@
 {
  "name": "ontime-electron",
-  "version": "4.9.0",
+  "version": "4.10.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/resolver",
-  "version": "4.9.0",
+  "version": "4.10.0",
  "type": "module",
  "repository": "https://github.com/cpvalente/ontime",
  "types": "./dist/main.d.ts",
@@ -20,7 +20,7 @@
  "license": "AGPL-3.0-only",
  "devDependencies": {
    "ontime-types": "workspace:^4.2.1",
-    "tsdown": "^0.21.5",
+    "tsdown": "^0.22.4",
    "typescript": "catalog:"
  },
  "files": [
@@ -1,6 +1,7 @@
 {
  "extends": "./tsconfig.json",
  "compilerOptions": {
-    "ignoreDeprecations": "6.0"
+    "isolatedDeclarations": true,
+    "allowJs": false
  }
 }
@@ -1,5 +1,13 @@
 {
  "$schema": "../../node_modules/oxlint/configuration_schema.json",
  "extends": ["../../.oxlintrc.json"],
-  "plugins": ["unicorn", "typescript", "oxc", "vitest", "node", "promise"]
+  "plugins": ["unicorn", "typescript", "oxc", "vitest", "node", "promise"],
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": ["ontime-types/src/*", "ontime-utils/src/*"]
+      }
+    ]
+  }
 }
@@ -2,31 +2,33 @@
  "name": "ontime-server",
  "type": "module",
  "main": "src/index.ts",
-  "version": "4.9.0",
+  "version": "4.10.0",
  "exports": "./src/index.js",
  "dependencies": {
    "@googleapis/sheets": "^5.0.5",
+    "@modelcontextprotocol/sdk": "^1.15.0",
    "cookie": "1.0.2",
    "cookie-parser": "1.4.7",
-    "cors": "2.8.5",
+    "cors": "2.8.6",
    "dotenv": "^16.0.1",
-    "express": "5.1.0",
-    "express-static-gzip": "3.0.0",
-    "express-validator": "7.2.1",
-    "fast-equals": "^5.0.1",
+    "express": "5.2.1",
+    "express-static-gzip": "3.0.1",
+    "express-validator": "7.3.2",
+    "fast-equals": "^6.0.0",
    "google-auth-library": "^9.4.2",
    "lowdb": "^7.0.1",
-    "multer": "2.1.0",
+    "multer": "2.2.0",
    "ontime-utils": "workspace:*",
    "osc-min": "2.1.2",
    "sanitize-filename": "^1.6.3",
    "ws": "^8.18.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "zod": "catalog:"
  },
  "devDependencies": {
-    "@types/cookie-parser": "1.4.9",
+    "@types/cookie-parser": "1.4.10",
    "@types/cors": "2.8.19",
-    "@types/express": "5.0.3",
+    "@types/express": "5.0.6",
    "@types/multer": "2.1.0",
    "@types/node": "catalog:",
    "@types/ws": "^8.5.10",
@@ -110,14 +110,13 @@ type old_URLPreset = {
 /**
 * migrates a url presets from v3 to v4
 * - pathAndParams split into a target and search
- *
 */
 export function migrateURLPresets(jsonData: object): URLPreset[] | undefined {
  if (is.objectWithKeys(jsonData, ['urlPresets']) && is.array(jsonData.urlPresets)) {
    const oldURLPresets = structuredClone(jsonData.urlPresets) as old_URLPreset;
    const newURLPreset: URLPreset[] = oldURLPresets.map(({ enabled, alias, pathAndParams }) => {
      const [target, search] = pathAndParams.split('?');
-      return { enabled, alias, target, search, options: {} } as URLPreset;
+      return { enabled, alias, target, search, displayInNav: false, options: {} } as URLPreset;
    });
    return newURLPreset;
  }
@@ -208,6 +208,7 @@ describe('v3 to v4', () => {
        target: OntimeView.Timer,
        search:
          'showLeadingZeros=true&timerType=clock&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
+        displayInNav: false,
        options: {},
      },
      {
@@ -216,6 +217,7 @@ describe('v3 to v4', () => {
        target: OntimeView.Timer,
        search:
          'showLeadingZeros=true&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
+        displayInNav: false,
        options: {},
      },
    ];
@@ -2,13 +2,11 @@ import { EndAction, OntimeEvent, TimeStrategy, TimerType } from 'ontime-types';
 import { MILLIS_PER_HOUR, createEvent } from 'ontime-utils';
 import { assertType } from 'vitest';

-import { demoDb } from '../../../models/demoProject.js';
 import { makeOntimeEvent, makeOntimeGroup, makeRundown } from '../__mocks__/rundown.mocks.js';
 import {
  calculateDayOffset,
  deleteById,
  doesInvalidateMetadata,
-  duplicateRundown,
  getIntegerAndFraction,
  hasChanges,
  makeDeepClone,
@@ -223,25 +221,6 @@ describe('calculateDayOffset()', () => {
  });
 });

-describe('duplicateRundown', () => {
-  it('duplicates a given rundown', () => {
-    const demoRundown = demoDb.rundowns['default'];
-    const title = 'Duplicated Rundown';
-    const duplicatedRundown = duplicateRundown(demoRundown, title);
-
-    expect(duplicatedRundown).toMatchObject({
-      title: title,
-      entries: expect.any(Object),
-      order: expect.any(Array),
-      flatOrder: expect.any(Array),
-    });
-    expect(demoRundown.id).not.toEqual(duplicatedRundown.id);
-    expect(duplicatedRundown.order.length).toEqual(demoRundown.order.length);
-    expect(duplicatedRundown.flatOrder.length).toEqual(demoRundown.flatOrder.length);
-    expect(Object.keys(duplicatedRundown.entries).length).toEqual(Object.keys(demoRundown.entries).length);
-  });
-});
-
 describe('makeDeepClone()', () => {
  it('deep clones a group along with its nested entries', () => {
    const group1 = makeOntimeGroup({ id: 'group1', title: 'Group 1', entries: ['event1', 'event2'] });
@@ -15,16 +15,18 @@ import {
  createNewRundown,
  deleteAllEntries,
  deleteEntries,
+  deleteRundown,
+  duplicateExistingRundown,
  editEntry,
  groupEntries,
-  initRundown,
  loadRundown,
+  renameRundown,
  renumberEntries,
  reorderEntry,
  swapEvents,
  ungroupEntries,
 } from './rundown.service.js';
-import { duplicateRundown, normalisedToRundownArray } from './rundown.utils.js';
+import { normalisedToRundownArray } from './rundown.utils.js';
 import {
  clonePostValidator,
  entryBatchPutValidator,
@@ -34,6 +36,7 @@ import {
  entryReorderValidator,
  entrySwapValidator,
  rundownArrayOfIds,
+  rundownPatchValidator,
  rundownPostValidator,
 } from './rundown.validation.js';

@@ -44,7 +47,7 @@ export const router: Router = express.Router();
 /**
 * Returns all rundowns in the project
 */
-router.get('/', async (_req: Request, res: Response<ProjectRundownsList>) => {
+router.get('/', (_req: Request, res: Response<ProjectRundownsList>) => {
  const projectRundowns = getDataProvider().getProjectRundowns();
  res.json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
 });
@@ -52,7 +55,7 @@ router.get('/', async (_req: Request, res: Response<ProjectRundownsList>) => {
 /**
 * Returns the current rundown
 */
-router.get('/current', async (_req: Request, res: Response<Rundown>) => {
+router.get('/current', (_req: Request, res: Response<Rundown>) => {
  const rundown = getCurrentRundown();
  res.json(rundown);
 });
@@ -60,7 +63,7 @@ router.get('/current', async (_req: Request, res: Response<Rundown>) => {
 /**
 * Returns a given rundown in its normalised client shape
 */
-router.get('/:id', paramsWithId, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+router.get('/:id', paramsWithId, (req: Request, res: Response<Rundown | ErrorResponse>) => {
  try {
    const rundown = getProcessedRundown(req.params.id);
    res.json(rundown);
@@ -104,13 +107,7 @@ router.post(
  paramsWithId,
  async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
    try {
-      const dataProvider = getDataProvider();
-      const rundown = dataProvider.getRundown(req.params.id);
-
-      const duplicatedRundown: Rundown = duplicateRundown(rundown, `Copy of ${rundown.title}`);
-      await dataProvider.setRundown(duplicatedRundown.id, duplicatedRundown);
-
-      const projectRundowns = getDataProvider().getProjectRundowns();
+      const projectRundowns = await duplicateExistingRundown(req.params.id);
      res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
    } catch (error) {
      const message = getErrorMessage(error);
@@ -123,54 +120,26 @@ router.post(
 * Patches the data of an existing rundown
 * Currently only the title can be changed
 */
-router.patch('/:id', paramsWithId, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
-  try {
-    const dataProvider = getDataProvider();
-    const rundown = dataProvider.getRundown(req.params.id);
-    if (!rundown) throw new Error(`Rundown with ID ${req.params.id} not found`);
-    if (!req.body.title) throw new Error('No title provided');
-
-    await dataProvider.setRundown(rundown.id, { ...rundown, title: req.body.title });
-
-    /**
-     * If loaded we re-init the rundown
-     * This is likely over-kill but the simplest way to ensure state consistency
-     */
-    if (req.params.id === getCurrentRundown().id) {
-      const rundown = dataProvider.getRundown(req.params.id);
-      const customField = dataProvider.getCustomFields();
-      await initRundown(rundown, customField);
+router.patch(
+  '/:id',
+  rundownPatchValidator,
+  async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
+    try {
+      const projectRundowns = await renameRundown(req.params.id, req.body.title);
+      res.status(200).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
    }
-
-    const projectRundowns = getDataProvider().getProjectRundowns();
-    res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+  },
+);

 /**
 * Deletes a rundown if not loaded
 */
 router.delete('/:id', paramsWithId, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
  try {
-    if (req.params.id === getCurrentRundown().id) {
-      res.status(400).send({ message: 'Cannot delete loaded rundown' });
-      return;
-    }
-
-    const dataProvider = getDataProvider();
-    const projectRundowns = dataProvider.getProjectRundowns();
-
-    if (Object.keys(projectRundowns).length <= 1) {
-      // might never hit this as it is likely covered by the case of trying to delete the loaded rundown
-      res.status(400).send({ message: 'Cannot delete the last rundown' });
-      return;
-    }
-
-    await dataProvider.deleteRundown(req.params.id);
-    const newProjectRundowns = getDataProvider().getProjectRundowns();
+    const newProjectRundowns = await deleteRundown(req.params.id);
    res.status(200).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(newProjectRundowns) });
  } catch (error) {
    const message = getErrorMessage(error);
@@ -16,7 +16,7 @@ import {
  isOntimeEvent,
  isOntimeGroup,
 } from 'ontime-types';
-import { customFieldLabelToKey, getInsertAfterId, resolveInsertParent } from 'ontime-utils';
+import { customFieldLabelToKey, generateId, getInsertAfterId, resolveInsertParent } from 'ontime-utils';

 import { sendRefetch } from '../../adapters/WebsocketAdapter.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
@@ -692,3 +692,76 @@ export async function createNewRundown(title: string) {

  return projectRundowns;
 }
+
+/**
+ * Renames an existing rundown
+ * @throws if the provided id does not exist
+ */
+export async function renameRundown(id: string, title: string) {
+  const dataProvider = getDataProvider();
+  const rundown = dataProvider.getRundown(id);
+
+  await dataProvider.setRundown(id, { ...rundown, title });
+
+  /**
+   * If we are modifying the loaded rundown we re-init it
+   * This is likely over-kill but the simplest way to ensure state consistency
+   */
+  if (isCurrentRundown(id)) {
+    const rundown = dataProvider.getRundown(id);
+    const customField = dataProvider.getCustomFields();
+    // init rundown does its own refetch
+    await initRundown(rundown, customField);
+  } else {
+    setImmediate(() => {
+      sendRefetch(RefetchKey.ProjectRundowns);
+    });
+  }
+
+  return dataProvider.getProjectRundowns();
+}
+
+/**
+ * Duplicates an existing rundown without making it the loaded one
+ * @throws if the provided id does not exist
+ */
+export async function duplicateExistingRundown(id: string) {
+  const dataProvider = getDataProvider();
+  const rundown = dataProvider.getRundown(id);
+
+  const duplicatedRundown: Rundown = structuredClone(rundown);
+  duplicatedRundown.id = generateId();
+  duplicatedRundown.title = `Copy of ${rundown.title}`;
+  duplicatedRundown.revision = 0;
+
+  await dataProvider.setRundown(duplicatedRundown.id, duplicatedRundown);
+
+  setImmediate(() => {
+    sendRefetch(RefetchKey.ProjectRundowns);
+  });
+
+  return dataProvider.getProjectRundowns();
+}
+
+/**
+ * Deletes a rundown
+ * @throws if attempting to delete the loaded rundown or the last rundown in the project
+ */
+export async function deleteRundown(id: string) {
+  if (isCurrentRundown(id)) {
+    throw new Error('Cannot delete loaded rundown');
+  }
+
+  const dataProvider = getDataProvider();
+  if (Object.keys(dataProvider.getProjectRundowns()).length <= 1) {
+    throw new Error('Cannot delete the last rundown');
+  }
+
+  const projectRundowns = await dataProvider.deleteRundown(id);
+
+  setImmediate(() => {
+    sendRefetch(RefetchKey.ProjectRundowns);
+  });
+
+  return projectRundowns;
+}
@@ -34,43 +34,34 @@ import {

 import { RundownMetadata } from './rundown.types.js';

-type CompleteEntry<T> =
-  T extends Partial<OntimeEvent>
-    ? OntimeEvent
-    : T extends Partial<OntimeDelay>
-      ? OntimeDelay
-      : T extends Partial<OntimeGroup>
-        ? OntimeGroup
-        : T extends Partial<OntimeMilestone>
-          ? OntimeMilestone
-          : never;
-
 /**
 * Generates a fully formed RundownEntry of the patch type
 */
-export function generateEvent<
-  T extends Partial<OntimeEvent> | Partial<OntimeDelay> | Partial<OntimeGroup> | Partial<OntimeMilestone>,
->(rundown: Rundown, eventData: T, afterId: EntryId | null, parent?: EntryId): CompleteEntry<T> {
+export function generateEvent(
+  rundown: Rundown,
+  eventData: Partial<OntimeEvent> | Partial<OntimeDelay> | Partial<OntimeGroup> | Partial<OntimeMilestone>,
+  afterId: EntryId | null,
+  parent?: EntryId,
+): OntimeEntry {
  if (isOntimeEvent(eventData)) {
-    return createEvent(
-      eventData,
-      getCueCandidate(rundown.entries, rundown.flatOrder, afterId, parent),
-    ) as CompleteEntry<T>;
+    const event = createEvent(eventData, getCueCandidate(rundown.entries, rundown.flatOrder, afterId, parent));
+    if (!event) throw new Error('Invalid event type');
+    return event;
  }

  const id = eventData.id || getUniqueId(rundown);

  if (isOntimeDelay(eventData)) {
-    return createDelay({ duration: eventData.duration ?? 0, id }) as CompleteEntry<T>;
+    return createDelay({ duration: eventData.duration ?? 0, id });
  }

  // TODO(v4): allow user to provide a larger patch of the group entry
  if (isOntimeGroup(eventData)) {
-    return createGroup({ id, title: eventData.title ?? '' }) as CompleteEntry<T>;
+    return createGroup({ id, title: eventData.title ?? '' });
  }

  if (isOntimeMilestone(eventData)) {
-    return createMilestone({ ...eventData, id }) as CompleteEntry<T>;
+    return createMilestone({ ...eventData, id });
  }

  throw new Error('Invalid event type');
@@ -460,20 +451,6 @@ export function normalisedToRundownArray(rundowns: ProjectRundowns): ProjectRund
  });
 }

-/**
- * Duplicates an existing rundown ensuring all IDs are unique
- */
-export function duplicateRundown(rundown: Rundown, newTitle: string): Rundown {
-  const newRundownId = generateId();
-
-  const newRundown = structuredClone(rundown);
-  newRundown.id = newRundownId;
-  newRundown.title = newTitle;
-  newRundown.revision = 0;
-
-  return newRundown;
-}
-
 export type IncrementNumber = {
  integer: number;
  faction: number;
@@ -5,6 +5,11 @@ import { requestValidationFunction } from '../validation-utils/validationFunctio
 // #region operations on project rundowns =========================

 export const rundownPostValidator = [body('title').isString().trim().notEmpty(), requestValidationFunction];
+export const rundownPatchValidator = [
+  param('id').isString().trim().notEmpty(),
+  body('title').isString().trim().notEmpty().withMessage('No title provided'),
+  requestValidationFunction,
+];

 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================
@@ -0,0 +1,57 @@
+import { describe, expect, it } from 'vitest';
+
+import { runMiddleware } from '../../validation-utils/__tests__/testMiddleware.js';
+import { validateGenerateUrl } from '../session.validation.js';
+
+describe('validateGenerateUrl', () => {
+  it('accepts a valid payload and normalises req.body', () => {
+    const { nextCalled, req } = runMiddleware(validateGenerateUrl, {
+      body: {
+        baseUrl: 'https://ontime.example',
+        path: '/timer',
+        authenticate: true,
+        lockConfig: false,
+        lockNav: false,
+      },
+    });
+    expect(nextCalled).toBe(true);
+    expect(req.body).toMatchObject({ baseUrl: 'https://ontime.example', path: '/timer' });
+  });
+
+  it('accepts an optional preset field', () => {
+    const { nextCalled, req } = runMiddleware(validateGenerateUrl, {
+      body: {
+        baseUrl: 'https://ontime.example',
+        path: '/timer',
+        authenticate: true,
+        lockConfig: false,
+        lockNav: false,
+        preset: 'my-preset',
+      },
+    });
+    expect(nextCalled).toBe(true);
+    expect(req.body.preset).toBe('my-preset');
+  });
+
+  it('rejects a missing required field with a 422', () => {
+    const { nextCalled, statusCode } = runMiddleware(validateGenerateUrl, {
+      body: { path: '/timer', authenticate: true, lockConfig: false, lockNav: false },
+    });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+
+  it('rejects a wrong-typed field', () => {
+    const { nextCalled, statusCode } = runMiddleware(validateGenerateUrl, {
+      body: {
+        baseUrl: 'https://ontime.example',
+        path: '/timer',
+        authenticate: 'yes', // should be boolean
+        lockConfig: false,
+        lockNav: false,
+      },
+    });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+});
@@ -4,6 +4,7 @@ import type { ErrorResponse, GetInfo, GetUrl, SessionStats } from 'ontime-types'
 import { getErrorMessage } from 'ontime-utils';

 import * as sessionService from './session.service.js';
+import type { GenerateUrlInput } from './session.validation.js';
 import { validateGenerateUrl } from './session.validation.js';

 export const router: Router = express.Router();
@@ -28,17 +29,21 @@ router.get('/info', (_req: Request, res: Response<GetInfo | ErrorResponse>) => {
  }
 });

-router.post('/url', validateGenerateUrl, (req: Request, res: Response<GetUrl | ErrorResponse>) => {
-  try {
-    const url = sessionService.generateShareUrl(req.body.baseUrl, req.body.path, {
-      authenticate: req.body.authenticate,
-      lockConfig: req.body.lockConfig,
-      lockNav: req.body.lockNav,
-      preset: req.body.preset,
-    });
-    res.status(200).send({ url: url.toString() });
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(500).send({ message });
-  }
-});
+router.post(
+  '/url',
+  validateGenerateUrl,
+  (req: Request<unknown, GetUrl | ErrorResponse, GenerateUrlInput>, res: Response<GetUrl | ErrorResponse>) => {
+    try {
+      const url = sessionService.generateShareUrl(req.body.baseUrl, req.body.path, {
+        authenticate: req.body.authenticate,
+        lockConfig: req.body.lockConfig,
+        lockNav: req.body.lockNav,
+        preset: req.body.preset,
+      });
+      res.status(200).send({ url: url.toString() });
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(500).send({ message });
+    }
+  },
+);
@@ -1,15 +1,14 @@
-import { body } from 'express-validator';
+import { z } from 'zod';

-import { requestValidationFunction } from '../validation-utils/validationFunction.js';
+import { validateBody } from '../validation-utils/validate.js';

-export const validateGenerateUrl = [
-  body('baseUrl').isString().trim().notEmpty(),
-  body('path').isString().trim().notEmpty(),
-
-  body('authenticate').isBoolean(),
-  body('lockConfig').isBoolean(),
-  body('lockNav').isBoolean(),
-  body('preset').optional().isString().trim().notEmpty(),
-
-  requestValidationFunction,
-];
+const generateUrlSchema = z.object({
+  baseUrl: z.string().trim().min(1),
+  path: z.string().trim().min(1),
+  authenticate: z.boolean(),
+  lockConfig: z.boolean(),
+  lockNav: z.boolean(),
+  preset: z.string().trim().min(1).optional(),
+});
+export type GenerateUrlInput = z.infer<typeof generateUrlSchema>;
+export const validateGenerateUrl = validateBody(generateUrlSchema);
@@ -12,7 +12,9 @@ describe('parseUrlPresets()', () => {

  it('parses data, skipping invalid results', () => {
    const errorEmitter = vi.fn();
-    const urlPresets = [{ enabled: true, alias: 'alias', target: 'timer', search: 'ss' }] as URLPreset[];
+    const urlPresets = [
+      { enabled: true, alias: 'alias', target: 'timer', search: 'ss', displayInNav: false },
+    ] as URLPreset[];
    const result = parseUrlPresets({ urlPresets }, errorEmitter);
    expect(result.length).toEqual(1);
    expect(result.at(0)).toMatchObject({
@@ -36,6 +38,7 @@ describe('parseUrlPresets()', () => {
          alias: 'testalias',
          target: 'timer',
          search: 'testpathAndParams',
+          displayInNav: false,
        },
      ],
    } as unknown as DatabaseModel;
@@ -0,0 +1,64 @@
+import { OntimeView } from 'ontime-types';
+import { describe, expect, it } from 'vitest';
+
+import { runMiddleware } from '../../validation-utils/__tests__/testMiddleware.js';
+import { validateNewPreset, validatePresetParam } from '../urlPresets.validation.js';
+
+const validPreset = {
+  enabled: true,
+  alias: 'my-preset',
+  target: OntimeView.Cuesheet,
+  search: '',
+  displayInNav: true,
+};
+
+describe('validateNewPreset', () => {
+  it('accepts a valid preset', () => {
+    const { nextCalled } = runMiddleware(validateNewPreset, { body: validPreset });
+    expect(nextCalled).toBe(true);
+  });
+
+  it('accepts optional cuesheet options', () => {
+    const { nextCalled, req } = runMiddleware(validateNewPreset, {
+      body: { ...validPreset, options: { read: 'a', write: 'b' } },
+    });
+    expect(nextCalled).toBe(true);
+    expect(req.body.options).toEqual({ read: 'a', write: 'b' });
+  });
+
+  it('rejects a missing required field', () => {
+    const { alias: _alias, ...withoutAlias } = validPreset;
+    const { nextCalled, statusCode } = runMiddleware(validateNewPreset, { body: withoutAlias });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+
+  it('rejects "editor" as a target — URL presets cannot point at the editor view', () => {
+    const { nextCalled, statusCode } = runMiddleware(validateNewPreset, {
+      body: { ...validPreset, target: OntimeView.Editor },
+    });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+
+  it('rejects an unknown target value', () => {
+    const { nextCalled, statusCode } = runMiddleware(validateNewPreset, {
+      body: { ...validPreset, target: 'not-a-real-view' },
+    });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+});
+
+describe('validatePresetParam', () => {
+  it('accepts a non-empty alias param', () => {
+    const { nextCalled } = runMiddleware(validatePresetParam, { params: { alias: 'my-preset' } });
+    expect(nextCalled).toBe(true);
+  });
+
+  it('rejects an empty alias param', () => {
+    const { nextCalled, statusCode } = runMiddleware(validatePresetParam, { params: { alias: '' } });
+    expect(nextCalled).toBe(false);
+    expect(statusCode).toBe(422);
+  });
+});
@@ -26,6 +26,7 @@ export function parseUrlPresets(data: Partial<DatabaseModel>, emitError?: ErrorE
      alias: preset.alias,
      target: preset.target,
      search: preset.search ?? '',
+      displayInNav: preset.displayInNav ?? false,
      options: preset?.options,
    };
    newPresets.push(newPreset);
@@ -5,6 +5,7 @@ import { getErrorMessage } from 'ontime-utils';

 import { sendRefetch } from '../../adapters/WebsocketAdapter.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
+import type { NewPresetInput, PresetAliasParam, UpdatePresetInput } from './urlPresets.validation.js';
 import { validateNewPreset, validatePresetParam, validateUpdatePreset } from './urlPresets.validation.js';

 export const router: Router = express.Router();
@@ -14,78 +15,98 @@ router.get('/', (_req: Request, res: Response<URLPreset[]>) => {
  res.status(200).send(presets as URLPreset[]);
 });

-router.post('/', validateNewPreset, async (req: Request, res: Response<URLPreset[] | ErrorResponse>) => {
-  try {
-    const newPreset: URLPreset = {
-      enabled: req.body.enabled,
-      alias: req.body.alias,
-      target: req.body.target,
-      search: req.body.search,
-      options: req.body.options,
-    };
+router.post(
+  '/',
+  validateNewPreset,
+  async (
+    req: Request<unknown, URLPreset[] | ErrorResponse, NewPresetInput>,
+    res: Response<URLPreset[] | ErrorResponse>,
+  ) => {
+    try {
+      const newPreset: URLPreset = {
+        enabled: req.body.enabled,
+        alias: req.body.alias,
+        target: req.body.target,
+        search: req.body.search,
+        displayInNav: req.body.displayInNav,
+        options: req.body.options,
+      };

-    const currentPresets = getDataProvider().getUrlPresets();
-    if (currentPresets.some((preset) => preset.alias === newPreset.alias)) {
-      throw new Error(`Preset with alias ${newPreset.alias} already exists.`);
+      const currentPresets = getDataProvider().getUrlPresets();
+      if (currentPresets.some((preset) => preset.alias === newPreset.alias)) {
+        throw new Error(`Preset with alias ${newPreset.alias} already exists.`);
+      }
+
+      const newPresets = [...currentPresets, newPreset];
+
+      // Update the URL presets in the data provider
+      await getDataProvider().setUrlPresets(newPresets);
+      sendRefetch(RefetchKey.UrlPresets);
+      res.status(201).send(newPresets);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
    }
+  },
+);

-    const newPresets = [...currentPresets, newPreset];
+router.put(
+  '/:alias',
+  validateUpdatePreset,
+  async (
+    req: Request<PresetAliasParam, URLPreset[] | ErrorResponse, UpdatePresetInput>,
+    res: Response<URLPreset[] | ErrorResponse>,
+  ) => {
+    try {
+      const alias = req.params.alias;
+      const currentPresets = getDataProvider().getUrlPresets();
+      const existingPreset = currentPresets.find((preset) => preset.alias === alias);
+      if (!existingPreset) {
+        throw new Error(`Preset with alias ${alias} does not exist.`);
+      }

-    // Update the URL presets in the data provider
-    await getDataProvider().setUrlPresets(newPresets);
-    sendRefetch(RefetchKey.UrlPresets);
-    res.status(201).send(newPresets);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+      const updatedPreset: URLPreset = {
+        enabled: req.body.enabled,
+        alias: req.body.alias,
+        target: req.body.target,
+        search: req.body.search,
+        displayInNav: req.body.displayInNav,
+        options: req.body.options ?? existingPreset.options,
+      };

-router.put('/:alias', validateUpdatePreset, async (req: Request, res: Response<URLPreset[] | ErrorResponse>) => {
-  try {
-    const alias = req.params.alias;
-    const currentPresets = getDataProvider().getUrlPresets();
-    const existingPreset = currentPresets.find((preset) => preset.alias === alias);
-    if (!existingPreset) {
-      throw new Error(`Preset with alias ${alias} does not exist.`);
+      if (alias !== updatedPreset.alias) {
+        throw new Error('Changing alias is not permitted');
+      }
+
+      const newPresets = currentPresets.map((preset) => (preset.alias === alias ? updatedPreset : preset));
+
+      // Update the URL presets in the data provider
+      await getDataProvider().setUrlPresets(newPresets);
+      sendRefetch(RefetchKey.UrlPresets);
+      res.status(200).send(newPresets);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
    }
+  },
+);

-    const updatedPreset: URLPreset = {
-      enabled: req.body.enabled,
-      alias: req.body.alias,
-      target: req.body.target,
-      search: req.body.search,
-      options: req.body.options ?? existingPreset.options,
-    };
+router.delete(
+  '/:alias',
+  validatePresetParam,
+  async (req: Request<PresetAliasParam>, res: Response<URLPreset[] | ErrorResponse>) => {
+    try {
+      const alias = req.params.alias;
+      const currentPresets = getDataProvider().getUrlPresets();
+      const newPresets = currentPresets.filter((preset) => preset.alias !== alias);

-    if (alias !== updatedPreset.alias) {
-      throw new Error('Changing alias is not permitted');
+      // Update the URL presets in the data provider
+      await getDataProvider().setUrlPresets(newPresets);
+      sendRefetch(RefetchKey.UrlPresets);
+      res.status(200).send(newPresets);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
    }
-
-    const newPresets = currentPresets.map((preset) => (preset.alias === alias ? updatedPreset : preset));
-
-    // Update the URL presets in the data provider
-    await getDataProvider().setUrlPresets(newPresets);
-    sendRefetch(RefetchKey.UrlPresets);
-    res.status(200).send(newPresets);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
-
-router.delete('/:alias', validatePresetParam, async (req: Request, res: Response<URLPreset[] | ErrorResponse>) => {
-  try {
-    const alias = req.params.alias;
-    const currentPresets = getDataProvider().getUrlPresets();
-    const newPresets = currentPresets.filter((preset) => preset.alias !== alias);
-
-    // Update the URL presets in the data provider
-    await getDataProvider().setUrlPresets(newPresets);
-    sendRefetch(RefetchKey.UrlPresets);
-    res.status(200).send(newPresets);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+  },
+);
@@ -1,38 +1,36 @@
-import { body, param } from 'express-validator';
-import { OntimeView } from 'ontime-types';
+import { OntimeView, type OntimeViewPresettable } from 'ontime-types';
+import { z } from 'zod';

-import { requestValidationFunction } from '../validation-utils/validationFunction.js';
+import { validateBody, validateParams } from '../validation-utils/validate.js';
+
+// URL presets cannot target the editor (see OntimeViewPresettable) — the previous
+// express-validator check allowed any OntimeView value including 'editor', which URLPreset's
+// own type never permitted; narrowed here now that the field is properly typed end to end.
+const presettableViews = Object.values(OntimeView).filter(
+  (view): view is OntimeViewPresettable => view !== OntimeView.Editor,
+);
+
+const presetOptionsSchema = z.record(z.string(), z.string()).optional();

 /**
 * validate array of URL preset objects
 */
-export const validateNewPreset = [
-  body().isObject().withMessage('No data found in request'),
-  body('enabled').isBoolean(),
-  body('alias').isString().trim().notEmpty(),
-  body('target').isString().trim().notEmpty().isIn(Object.values(OntimeView)),
-  body('search').isString().trim(),
-
+const newPresetSchema = z.object({
+  enabled: z.boolean(),
+  alias: z.string().trim().min(1),
+  target: z.enum(presettableViews),
+  search: z.string().trim(),
+  displayInNav: z.boolean(),
  // options are currently only provided for cuesheet presets
-  body('options').optional().isObject(),
-  body('options.*').isString().trim(),
+  options: presetOptionsSchema,
+});
+export type NewPresetInput = z.infer<typeof newPresetSchema>;
+export const validateNewPreset = validateBody(newPresetSchema);

-  requestValidationFunction,
-];
+const presetAliasParamSchema = z.object({ alias: z.string().trim().min(1) });
+export type PresetAliasParam = z.infer<typeof presetAliasParamSchema>;
+export const validatePresetParam = validateParams(presetAliasParamSchema);

-export const validateUpdatePreset = [
-  param('alias').isString().trim().notEmpty(),
-  body().isObject().withMessage('No data found in request'),
-  body('enabled').isBoolean(),
-  body('alias').isString().trim().notEmpty(),
-  body('target').isString().trim().notEmpty().isIn(Object.values(OntimeView)),
-  body('search').isString().trim(),
-
-  // options are currently only provided for cuesheet presets
-  body('options').optional().isObject(),
-  body('options.*').isString().trim(),
-
-  requestValidationFunction,
-];
-
-export const validatePresetParam = [param('alias').isString().trim().notEmpty(), requestValidationFunction];
+// update reuses the same body shape as create, plus the alias param check
+export type UpdatePresetInput = NewPresetInput;
+export const validateUpdatePreset = [validateParams(presetAliasParamSchema), validateBody(newPresetSchema)];
@@ -0,0 +1,30 @@
+import type { NextFunction, Request, Response } from 'express';
+
+/**
+ * Exercises a single Express middleware (e.g. validateBody(schema)) against a minimal
+ * fake req/res, without standing up supertest or a running app — matches this codebase's
+ * convention of testing validation logic directly rather than through an HTTP layer.
+ */
+export function runMiddleware(
+  middleware: (req: Request, res: Response, next: NextFunction) => void,
+  req: Partial<Request>,
+) {
+  let statusCode: number | undefined;
+  let payload: unknown;
+  const res = {
+    status(code: number) {
+      statusCode = code;
+      return this;
+    },
+    json(data: unknown) {
+      payload = data;
+    },
+  } as Response;
+
+  let nextCalled = false;
+  middleware(req as Request, res, () => {
+    nextCalled = true;
+  });
+
+  return { nextCalled, statusCode, payload, req: req as Request };
+}
@@ -0,0 +1,47 @@
+import type { NextFunction, Request, Response } from 'express';
+import { z, type ZodType } from 'zod';
+
+type Target = 'body' | 'params';
+
+/**
+ * Builds an Express middleware that safe-parses req[target] against `schema`.
+ * - Uses safeParse: no throw/catch on the hot invalid-input path.
+ * - On success, replaces req[target] with the parsed value (defaults filled,
+ *   unknown keys stripped, .trim()/.transform() applied) and calls next().
+ * - On failure, responds 422 with { errors: [...] }.
+ */
+function validate<T extends ZodType>(target: Target, schema: T) {
+  return (req: Request, res: Response, next: NextFunction) => {
+    const result = schema.safeParse(req[target]);
+    if (!result.success) {
+      const errors = result.error.issues.map((issue) => ({
+        location: target,
+        path: issue.path.join('.'),
+        message: issue.message,
+      }));
+      res.status(422).json({ errors });
+      return;
+    }
+    req[target] = result.data;
+    next();
+  };
+}
+
+export const validateBody = <T extends ZodType>(schema: T) => validate('body', schema);
+export const validateParams = <T extends ZodType>(schema: T) => validate('params', schema);
+
+/** Direct replacement for the old paramsWithId */
+export const idParamSchema = z.object({ id: z.string().trim().min(1) });
+export const validateIdParam = validateParams(idParamSchema);
+
+/**
+ * Direct replacement for requestValidationFunctionWithFile — unrelated to Zod (it's a
+ * check on multer's req.file, not on body/params shape), kept as its own middleware.
+ */
+export function requireUploadedFile(req: Request & { file?: unknown }, res: Response, next: NextFunction) {
+  if (!req.file) {
+    res.status(422).json({ errors: 'File not found' });
+    return;
+  }
+  next();
+}
@@ -0,0 +1,298 @@
+import { SupportedEntry, type EventPostPayload, type OntimeEntry, type PatchWithId, type Rundown } from 'ontime-types';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const addEntryMock = vi.hoisted(() => vi.fn());
+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,
+}));
+
+vi.mock('../../classes/data-provider/DataProvider.js', () => ({
+  getDataProvider: vi.fn(),
+}));
+
+vi.mock('../../api-data/rundown/rundown.service.js', () => ({
+  addEntry: addEntryMock,
+  batchEditEntries: vi.fn(),
+  createCustomField: createCustomFieldMock,
+  deleteEntries: vi.fn(),
+  editEntry: editEntryMock,
+  groupEntries: groupEntriesMock,
+  reorderEntry: vi.fn(),
+  ungroupEntries: ungroupEntriesMock,
+}));
+
+const { batchCreateEntriesForMcp, createCustomFieldForMcp, createEntryForMcp, groupEntriesForMcp, ungroupEntryForMcp } =
+  await import('../mcp.service.js');
+
+function makeRundown(entries: Rundown['entries'], order: string[] = Object.keys(entries)): Rundown {
+  return {
+    id: 'loaded-rundown',
+    title: 'Loaded',
+    order,
+    flatOrder: order,
+    entries,
+    revision: 0,
+  };
+}
+
+describe('mcp.service', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    getCurrentRundownMock.mockReturnValue(makeRundown({}));
+    getProjectCustomFieldsMock.mockReturnValue({});
+
+    let id = 0;
+    addEntryMock.mockImplementation(async (_rundownId: string, payload: EventPostPayload) => {
+      id += 1;
+      const entryId = `entry-${id}`;
+
+      if (payload.type === SupportedEntry.Group) {
+        return {
+          id: entryId,
+          type: SupportedEntry.Group,
+          title: payload.title ?? '',
+          note: '',
+          colour: '',
+          custom: {},
+          targetDuration: null,
+          entries: [],
+          revision: 0,
+          timeStart: null,
+          timeEnd: null,
+          duration: 0,
+          isFirstLinked: false,
+        };
+      }
+
+      return {
+        id: entryId,
+        type: payload.type ?? SupportedEntry.Event,
+        title: payload.title ?? '',
+        parent: 'parent' in payload ? payload.parent : null,
+      } as OntimeEntry;
+    });
+
+    editEntryMock.mockImplementation(async (_rundownId: string, patch: PatchWithId) => ({
+      id: patch.id,
+      type: SupportedEntry.Group,
+      title: 'Session block',
+      note: patch.note ?? '',
+      colour: patch.colour ?? '',
+      custom: patch.custom ?? {},
+      targetDuration: patch.targetDuration ?? null,
+      entries: [],
+      revision: 1,
+      timeStart: null,
+      timeEnd: null,
+      duration: 0,
+      isFirstLinked: false,
+    }));
+  });
+
+  it('creates grouped batch entries with group metadata and child parent references', async () => {
+    const result = await batchCreateEntriesForMcp({
+      entries: [
+        {
+          type: SupportedEntry.Group,
+          title: 'Session block',
+          note: 'Main room',
+          colour: '#123456',
+          targetDuration: 3_600_000,
+          children: [
+            { type: SupportedEntry.Event, title: 'Talk', timeStart: 36_000_000, duration: 1_800_000 },
+            { type: SupportedEntry.Milestone, title: 'Reset stage' },
+          ],
+        },
+        { type: SupportedEntry.Event, title: 'After block', timeStart: 39_600_000, duration: 900_000 },
+      ],
+    });
+
+    expect(addEntryMock).toHaveBeenNthCalledWith(
+      1,
+      'loaded-rundown',
+      expect.objectContaining({ type: SupportedEntry.Group, title: 'Session block' }),
+    );
+    expect(editEntryMock).toHaveBeenCalledWith(
+      'loaded-rundown',
+      expect.objectContaining({
+        id: 'entry-1',
+        note: 'Main room',
+        colour: '#123456',
+        targetDuration: 3_600_000,
+      }),
+    );
+    expect(addEntryMock).toHaveBeenNthCalledWith(
+      2,
+      'loaded-rundown',
+      expect.objectContaining({ type: SupportedEntry.Event, title: 'Talk', parent: 'entry-1' }),
+    );
+    expect(addEntryMock).toHaveBeenNthCalledWith(
+      3,
+      'loaded-rundown',
+      expect.objectContaining({
+        type: SupportedEntry.Milestone,
+        title: 'Reset stage',
+        parent: 'entry-1',
+        after: 'entry-2',
+      }),
+    );
+    expect(addEntryMock).toHaveBeenNthCalledWith(
+      4,
+      'loaded-rundown',
+      expect.objectContaining({ type: SupportedEntry.Event, title: 'After block', after: 'entry-1' }),
+    );
+    expect(result.created.map((entry) => entry.id)).toEqual(['entry-1', 'entry-2', 'entry-3', 'entry-4']);
+  });
+
+  it('rejects nested groups before creating entries', async () => {
+    await expect(
+      batchCreateEntriesForMcp({
+        entries: [
+          {
+            type: SupportedEntry.Group,
+            title: 'Outer',
+            children: [{ type: SupportedEntry.Group, title: 'Inner' }],
+          },
+        ],
+      }),
+    ).rejects.toThrow('Cannot create a group inside another group.');
+
+    expect(addEntryMock).not.toHaveBeenCalled();
+    expect(editEntryMock).not.toHaveBeenCalled();
+  });
+
+  it('groups existing top-level entries and applies group metadata', async () => {
+    const sourceRundown = makeRundown(
+      {
+        'entry-1': { id: 'entry-1', type: SupportedEntry.Event, title: 'One', parent: null } as OntimeEntry,
+        'entry-2': { id: 'entry-2', type: SupportedEntry.Event, title: 'Two', parent: null } as OntimeEntry,
+      },
+      ['entry-1', 'entry-2'],
+    );
+    const groupedRundown = makeRundown(
+      {
+        group: {
+          id: 'group',
+          type: SupportedEntry.Group,
+          title: '',
+          note: '',
+          colour: '',
+          custom: {},
+          targetDuration: null,
+          entries: ['entry-1', 'entry-2'],
+          revision: 0,
+          timeStart: null,
+          timeEnd: null,
+          duration: 0,
+          isFirstLinked: false,
+        },
+        'entry-1': { id: 'entry-1', type: SupportedEntry.Event, title: 'One', parent: 'group' } as OntimeEntry,
+        'entry-2': { id: 'entry-2', type: SupportedEntry.Event, title: 'Two', parent: 'group' } as OntimeEntry,
+      },
+      ['group'],
+    );
+
+    getCurrentRundownMock.mockReturnValue(sourceRundown);
+    groupEntriesMock.mockResolvedValue(groupedRundown);
+
+    const result = await groupEntriesForMcp({
+      ids: ['entry-1', 'entry-2'],
+      title: 'Block',
+      colour: '#abcdef',
+      targetDuration: 1_200_000,
+    });
+
+    expect(groupEntriesMock).toHaveBeenCalledWith('loaded-rundown', ['entry-1', 'entry-2']);
+    expect(editEntryMock).toHaveBeenCalledWith(
+      'loaded-rundown',
+      expect.objectContaining({ id: 'group', colour: '#abcdef', targetDuration: 1_200_000 }),
+    );
+    expect(result.entry.id).toBe('group');
+    expect(result.order).toEqual(['group']);
+  });
+
+  it('rejects grouping nested entries before mutating', async () => {
+    getCurrentRundownMock.mockReturnValue(
+      makeRundown({
+        group: { id: 'group', type: SupportedEntry.Group, entries: ['entry-1'] } as OntimeEntry,
+        'entry-1': { id: 'entry-1', type: SupportedEntry.Event, title: 'One', parent: 'group' } as OntimeEntry,
+      }),
+    );
+
+    await expect(groupEntriesForMcp({ ids: ['entry-1'] })).rejects.toThrow(
+      'Cannot group nested entry entry-1. Move it out of its group first.',
+    );
+
+    expect(groupEntriesMock).not.toHaveBeenCalled();
+    expect(editEntryMock).not.toHaveBeenCalled();
+  });
+
+  it('ungroups an existing group entry', async () => {
+    getCurrentRundownMock.mockReturnValue(
+      makeRundown({
+        group: { id: 'group', type: SupportedEntry.Group, entries: ['entry-1'] } as OntimeEntry,
+        'entry-1': { id: 'entry-1', type: SupportedEntry.Event, title: 'One', parent: 'group' } as OntimeEntry,
+      }),
+    );
+    ungroupEntriesMock.mockResolvedValue(
+      makeRundown(
+        {
+          'entry-1': { id: 'entry-1', type: SupportedEntry.Event, title: 'One', parent: null } as OntimeEntry,
+        },
+        ['entry-1'],
+      ),
+    );
+
+    const result = await ungroupEntryForMcp({ id: 'group' });
+
+    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();
+  });
+});
@@ -0,0 +1,103 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('../../api-data/project-data/projectData.dao.js', () => ({
+  editCurrentProjectData: vi.fn(),
+  getProjectData: vi.fn(() => ({ title: 'Test project' })),
+}));
+
+vi.mock('../../api-data/rundown/rundown.dao.js', () => ({
+  getProjectCustomFields: vi.fn(() => ({})),
+  getRundownMetadata: vi.fn(() => ({})),
+}));
+
+vi.mock('../../api-data/rundown/rundown.service.js', () => ({
+  createNewRundown: vi.fn(),
+  deleteRundown: vi.fn(),
+  duplicateExistingRundown: vi.fn(),
+  loadRundown: vi.fn(),
+  renameRundown: vi.fn(),
+}));
+
+vi.mock('../../classes/data-provider/DataProvider.js', () => ({
+  getDataProvider: vi.fn(() => ({ getProjectRundowns: () => ({}) })),
+}));
+
+vi.mock('../../models/dataModel.js', () => ({
+  makeNewProject: vi.fn(() => ({ project: {} })),
+}));
+
+vi.mock('../../services/project-service/ProjectService.js', () => ({
+  createProjectWithPatch: vi.fn(),
+  deleteProjectFile: vi.fn(),
+  duplicateProjectFile: vi.fn(),
+  getProjectList: vi.fn(),
+  loadProjectFile: vi.fn(),
+  renameProjectFile: vi.fn(),
+}));
+
+vi.mock('../../stores/runtimeState.js', () => ({
+  getState: vi.fn(() => ({})),
+}));
+
+vi.mock('../mcp.service.js', () => ({
+  batchCreateEntriesForMcp: vi.fn(),
+  batchUpdateEntriesForMcp: vi.fn(),
+  createCustomFieldForMcp: vi.fn(),
+  createEntryForMcp: vi.fn(),
+  deleteCustomFieldForMcp: vi.fn(),
+  deleteEntriesForMcp: vi.fn(),
+  findEntry: vi.fn(),
+  getRundownById: vi.fn(() => ({ id: 'r1', order: [], entries: {} })),
+  groupEntriesForMcp: vi.fn(),
+  reorderEntryForMcp: vi.fn(),
+  toRundownList: vi.fn(),
+  ungroupEntryForMcp: vi.fn(),
+  updateCustomFieldForMcp: vi.fn(),
+  updateEntryForMcp: vi.fn(),
+}));
+
+const { TOOL_DEFINITIONS, handleToolCall } = await import('../mcp.tools.js');
+
+describe('MCP tool schema generation', () => {
+  it('generates a well-formed JSON Schema inputSchema for every tool', () => {
+    expect(TOOL_DEFINITIONS.length).toBeGreaterThan(0);
+    for (const tool of TOOL_DEFINITIONS) {
+      expect(tool.inputSchema).toMatchObject({ type: 'object' });
+      expect(typeof tool.inputSchema.properties).toBe('object');
+    }
+  });
+});
+
+describe('MCP tool-call argument validation', () => {
+  it('rejects a required field missing entirely (previously silently miscast)', async () => {
+    const result = await handleToolCall('ontime_create_rundown', {});
+    expect(result.isError).toBe(true);
+  });
+
+  it('rejects a field with the wrong primitive type', async () => {
+    const result = await handleToolCall('ontime_reorder_entry', {
+      entryId: 'a',
+      destinationId: 'b',
+      order: 'sideways', // not one of before/after/insert
+    });
+    expect(result.isError).toBe(true);
+  });
+
+  it('rejects an unknown enum value on a nested field', async () => {
+    const result = await handleToolCall('ontime_create_entry', {
+      type: 'not-a-real-type',
+    });
+    expect(result.isError).toBe(true);
+  });
+
+  it('accepts a minimal valid payload for a tool with no required fields', async () => {
+    const result = await handleToolCall('ontime_get_rundown', {});
+    expect(result.isError).toBeFalsy();
+  });
+
+  it('reports unknown tool names distinctly from validation failures', async () => {
+    const result = await handleToolCall('ontime_does_not_exist', {});
+    expect(result.isError).toBe(true);
+    expect(result.content[0]).toMatchObject({ type: 'text' });
+  });
+});
@@ -0,0 +1,56 @@
+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');
+  });
+});
@@ -0,0 +1,21 @@
+import type { NextFunction, Request, RequestHandler, Response } from 'express';
+
+import { hasPassword, hashedPassword } from '../api-data/session/session.service.js';
+
+/**
+ * Wraps the app authenticate middleware with support for the Authorization header.
+ * MCP clients conventionally authenticate with `Authorization: Bearer <token>`
+ * rather than cookies or query params; any other request falls through to the
+ * app middleware, keeping the behaviour of the shared middleware untouched.
+ */
+export function makeMcpAuthenticate(fallback: RequestHandler): RequestHandler {
+  return function mcpAuthenticate(req: Request, res: Response, next: NextFunction) {
+    if (hasPassword) {
+      const authHeader = req.headers.authorization;
+      if (authHeader?.startsWith('Bearer ') && authHeader.slice(7) === hashedPassword) {
+        return next();
+      }
+    }
+    return fallback(req, res, next);
+  };
+}
@@ -0,0 +1,103 @@
+/**
+ * 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/
+`;
@@ -0,0 +1,302 @@
+import type { GetPromptResult, ListPromptsResult } from '@modelcontextprotocol/sdk/types.js';
+
+export const PROMPT_DEFINITIONS: ListPromptsResult['prompts'] = [
+  {
+    name: 'create_rundown_from_agenda',
+    description: 'Convert a plain-text agenda into an Ontime rundown using ontime_batch_create_entries',
+    arguments: [{ name: 'agenda', description: 'Plain-text agenda to convert', required: true }],
+  },
+  {
+    name: 'bulk_edit_rundown',
+    description: 'Apply a bulk change across the rundown (recolour, reschedule, skip events, etc.)',
+    arguments: [
+      {
+        name: 'instruction',
+        description: 'What to change, e.g. "colour all keynotes blue"',
+        required: true,
+      },
+    ],
+  },
+  {
+    name: 'validate_rundown',
+    description: 'Check the current rundown for common issues: missing cues, overlaps, gaps, zero-duration events',
+    arguments: [],
+  },
+  {
+    name: 'restructure_rundown',
+    description: 'Reorder events in the rundown according to an instruction',
+    arguments: [
+      {
+        name: 'instruction',
+        description: 'How to restructure, e.g. "move all breaks to after keynotes"',
+        required: true,
+      },
+    ],
+  },
+  {
+    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',
+    arguments: [
+      {
+        name: 'instruction',
+        description: 'What to do, e.g. "add a Speaker field" or "delete the Camera field"',
+        required: true,
+      },
+    ],
+  },
+];
+
+function userPrompt(description: string, text: string): GetPromptResult {
+  return { description, messages: [{ role: 'user', content: { type: 'text', text } }] };
+}
+
+export function handleGetPrompt(name: string, args: Record<string, string>): GetPromptResult {
+  if (name === 'create_rundown_from_agenda') {
+    return userPrompt(
+      'Build an Ontime rundown from a plain-text agenda',
+      `Convert the following agenda into an Ontime rundown.
+Read the ontime://schema resource if you need a data model reference.
+
+Steps:
+1. 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.
+2. Call ontime_get_rundown with the chosen \`rundownId\` to see current state and identify an \`after\` anchor if appending.
+3. 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. If the target is a background rundown, it can be edited without interrupting playback.
+4. Build an array of entries in order and call ontime_batch_create_entries ONCE with all of them. This is much faster than calling ontime_create_entry per item.
+5. If the rundown already has events, pass \`after: <last event id>\` on the batch call so new events chain from the end.
+
+Entry type guidance:
+- Use \`event\` for anything with a scheduled time and duration (talks, panels, breaks, meals).
+- Use \`milestone\` for non-timed markers that don't advance playback (e.g. "Doors open", "Broadcast start").
+- Use \`delay\` only when the user explicitly wants to model schedule drift that shifts all following events.
+- Use \`group\` to collect related events into a named block. In ontime_batch_create_entries, put grouped items in the group's \`children\` array. A group may include \`title\`, \`colour\`, \`note\`, \`custom\`, and \`targetDuration\`; groups cannot be nested.
+
+Event timing:
+- Provide a title plus enough timing data for Ontime to infer a timing strategy.
+- \`timeStart\` + \`duration\`: keeps duration fixed and calculates \`timeEnd\`.
+- \`timeStart\` + \`timeEnd\`: keeps end time fixed and calculates \`duration\`.
+- \`timeEnd\` + \`duration\`: calculates \`timeStart\`.
+- Avoid sending \`timeStart\`, \`timeEnd\`, and \`duration\` together unless you intentionally want Ontime to prioritise duration and recalculate \`timeEnd\`.
+
+Timer type (timerType):
+- \`count-down\` (default): counts down from duration. Use for most timed sessions.
+- \`count-up\`: counts elapsed time. Use for open-ended items like Q&A or audience discussion.
+- \`clock\`: shows wall-clock time. Use for broadcast-start or house-open markers.
+- \`none\`: no timer shown. Use for purely informational or non-timed items.
+
+Count to end (countToEnd):
+- This is an advanced countdown behaviour, not a timer type.
+- When \`countToEnd: true\`, the timer counts to the scheduled \`timeEnd\` instead of counting down the event duration.
+- This can surprise operators if an event starts late or the schedule shifts, because the displayed time may be shorter or longer than the nominal duration.
+- Do not set \`countToEnd: true\` unless the user explicitly asks for "count to end", "count to scheduled end", or confirms after you explain this behaviour.
+
+End action (endAction):
+- Controls what happens when the event's timer reaches zero and can have surprising effect. Use only if the user explicitly asks for it.
+- \`none\` (default): stops at end; operator must manually start the next event.
+- \`load-next\`: pre-arms the next event; operator triggers start. Use when a human handoff is needed.
+- \`play-next\`: automatically starts the next event. Use for seamless back-to-back segments with no gap.
+
+Linking (linkStart):
+- \`linkStart\` controls schedule-change propagation through the rundown.
+- When an event is linked, it inherits the end time of the previous playable event as its start time.
+- The event's \`timeStrategy\` decides how it adapts to the inherited start: lock duration updates the end time; lock end updates the duration.
+- Ideal for segments within a block where only the anchor start time and individual durations are managed directly.
+
+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:
+- Read the ontime://style-guide resource before deciding on structure or 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\`.
+- 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\`.
+
+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.
+- 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.
+
+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}`,
+    );
+  }
+
+  if (name === 'bulk_edit_rundown') {
+    return userPrompt(
+      'Apply a bulk change across the rundown',
+      `Apply the following bulk edit to the current Ontime rundown: "${args.instruction}"
+
+Strategy:
+1. 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.
+2. Call ontime_get_rundown with the chosen \`rundownId\` to see the current events, their IDs, and field values.
+3. 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. If the target is a background rundown, it can be edited without interrupting playback.
+4. Determine which event IDs are affected by the instruction.
+5. If the user asks to group existing top-level entries: call ontime_group_entries once with { ids, title/note/colour/custom/targetDuration as needed, rundownId }.
+6. If the user asks to dissolve a group: call ontime_ungroup_entry with the group id and rundownId.
+7. If every affected entry receives the SAME field values (e.g. "colour all keynotes purple", "skip all breaks"): call ontime_batch_update_entries once with { ids, data, rundownId }.
+8. If each event needs DIFFERENT field values (e.g. "shift everything 30 minutes later"): check first if events use linkStart. If they do, changing the anchor event's timeStart or duration can cascade to linked followers — you may only need to update one event. Otherwise, compute the new values per event and call ontime_update_entry for each.
+
+Time shift mechanics:
+- All time fields are milliseconds from midnight; compute arithmetic before calling the tools.
+- timeEnd - timeStart = duration. When shifting times, decide whether to keep duration fixed (timeEnd moves with timeStart) or keep timeEnd fixed (duration shrinks). Provide only the fields you intend to change — the server infers the strategy from which fields are present.
+- For "shift everything N minutes later": update timeStart and timeEnd per event (or just timeStart on the anchor event of a linkStart chain). Do not use ontime_batch_update_entries for this unless every target event should receive the exact same timeStart/timeEnd values.
+
+Automation risks:
+- Setting \`endAction: 'play-next'\` on multiple events creates an automatic playback chain that removes operator control between those events. Confirm with the user before applying.
+- Bulk-setting \`skip: true\` will hide events from playback. Confirm before applying to many events.`,
+    );
+  }
+
+  if (name === 'validate_rundown') {
+    return userPrompt(
+      'Check the current rundown for common issues',
+      `Validate the currently loaded Ontime rundown and report issues.
+
+Steps:
+1. Call ontime_get_rundown to read all events and their fields.
+2. Call ontime_get_rundown_metadata for totals (totalDuration, totalDelay, totalDays, firstStart, lastEnd, flags).
+
+Check and report:
+
+Schedule integrity:
+- Events with missing \`cue\` or \`title\`: these are usually worth checking, but not necessarily errors
+- 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
+
+Timing and linking:
+- \`metadata.totalDays > 0\`: show spans midnight — confirm this is intentional
+- \`metadata.totalDelay !== 0\`: active delay entries are shifting the schedule by this many ms; report the net shift
+- Events with \`linkStart: true\` that are first in the rundown (no predecessor to link to)
+- Events with \`countToEnd: true\`: confirm the operator expects countdowns to target scheduled end time instead of event duration, especially if starts can drift.
+
+Automation:
+- Events with \`endAction: 'play-next'\`: these form automatic playback chains. List each chain so the user can confirm the automation is intentional.
+- Events with \`flag: true\`: these are the operator's critical markers. List them so the user can verify they are correct and complete.
+
+Skipped events:
+- Events with \`skip: true\` — confirm with the user these are intentional
+
+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).`,
+    );
+  }
+
+  if (name === 'restructure_rundown') {
+    return userPrompt(
+      'Reorder events in the rundown',
+      `Restructure the current Ontime rundown: "${args.instruction}"
+
+Steps:
+1. 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.
+2. Call ontime_get_rundown with the chosen \`rundownId\` to see the current order, groups, and event fields.
+3. Call ontime_get_timer_state. If playback is not \`stop\` and the target is the loaded rundown, explain that MCP reorders the live rundown and ask the user to confirm before changing it. If the target is a background rundown, it can be edited without interrupting playback.
+4. Note which events are inside groups (check each group's \`entries\` array vs the top-level \`order\` array).
+5. If the instruction groups existing top-level entries into a new group, call ontime_group_entries with the selected IDs and any group metadata.
+6. If the instruction dissolves a group, call ontime_ungroup_entry with that group ID.
+7. Otherwise compute the target arrangement as a sequence of moves.
+8. For each event that needs to move, call ontime_reorder_entry:
+   - \`order: 'before'\` or \`'after'\` — places the event as a sibling next to destinationId
+   - \`order: 'insert'\` — places the event inside a group (destinationId must be the group's ID)
+9. Call ontime_get_rundown again to confirm the new order.
+
+Group awareness:
+- Events inside a group appear in the group's \`entries\` array, not in the top-level \`order\`.
+- To create a group from existing top-level entries, prefer ontime_group_entries over creating an empty group and moving items one by one.
+- To dissolve a group, use ontime_ungroup_entry.
+- To move an event out of a group, reorder it before/after a top-level entry.
+- To move an event into a group, use \`order: 'insert'\` with the group as destinationId.
+- A group's \`targetDuration\` is a planning hint only — moving events in or out does not break anything.
+
+Efficiency tip: plan moves in the direction of the target position to minimise reorder calls. Avoid moving the same event twice — compute the full target sequence before issuing any calls.`,
+    );
+  }
+
+  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',
+      `Manage the project-level custom field definitions for this Ontime project: "${args.instruction}"
+
+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".
+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.
+
+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").
+- 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.
+- Returns: { key, customFields } — use the returned key when setting values on entries.
+
+Renaming or recolouring a field:
+- Call ontime_update_custom_field with { key, label?, colour? }.
+- Warning: changing the label changes the derived key and cascades to all entry references in all rundowns. Confirm with the user before renaming.
+- The field type cannot be changed.
+
+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.
+
+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>.`,
+    );
+  }
+
+  throw new Error(`Unknown prompt: ${name}`);
+}
@@ -0,0 +1,106 @@
+import type { ListResourcesResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
+
+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'] = [
+  {
+    uri: 'ontime://schema',
+    name: 'ontime-schema',
+    title: 'Ontime data model reference',
+    description:
+      'Markdown reference for rundown structure, event fields, time format, and entry types. Read once per session to ground tool calls in the correct data model.',
+    mimeType: 'text/markdown',
+  },
+  {
+    uri: 'ontime://rundown/current',
+    name: 'current-rundown',
+    title: 'Currently loaded rundown',
+    description:
+      'The rundown currently active in Ontime, with its full entries map and order. Re-read after any mutating call to see updated state.',
+    mimeType: 'application/json',
+  },
+  {
+    uri: 'ontime://rundowns',
+    name: 'project-rundowns',
+    title: 'All rundowns in the project',
+    description: 'List of every rundown stored in the current project file, plus the ID of the one currently loaded.',
+    mimeType: 'application/json',
+  },
+  {
+    uri: 'ontime://project/info',
+    name: 'project-info',
+    title: 'Project metadata',
+    description: 'Project title, description, URL, info, logo, and custom header fields.',
+    mimeType: 'application/json',
+  },
+  {
+    uri: 'ontime://project/custom-fields',
+    name: 'project-custom-fields',
+    title: 'Custom field definitions',
+    description:
+      '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',
+    title: 'Ontime documentation index',
+    description:
+      'Curated index of Ontime documentation topics with direct links to https://docs.getontime.no. Read this when you need to understand a concept in more depth or want to point the user to official documentation.',
+    mimeType: 'text/markdown',
+  },
+];
+
+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',
+    read: () => JSON.stringify(getCurrentRundown()),
+  },
+  'ontime://rundowns': {
+    mimeType: 'application/json',
+    read: () => {
+      const rundowns = normalisedToRundownArray(getDataProvider().getProjectRundowns());
+      const loaded = getCurrentRundown().id;
+      return JSON.stringify({ loaded, rundowns });
+    },
+  },
+  'ontime://project/info': {
+    mimeType: 'application/json',
+    read: () => JSON.stringify(getProjectData()),
+  },
+  'ontime://project/custom-fields': {
+    mimeType: 'application/json',
+    read: () => JSON.stringify(getProjectCustomFields()),
+  },
+};
+
+export function handleReadResource(uri: string): ReadResourceResult {
+  const reader = RESOURCE_READERS[uri];
+  if (!reader) throw new Error(`Unknown resource URI: ${uri}`);
+  return { contents: [{ uri, mimeType: reader.mimeType, text: reader.read() }] };
+}
@@ -0,0 +1,53 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import express from 'express';
+import type { Request, Response, Router } from 'express';
+import { LogOrigin } from 'ontime-types';
+
+import { logger } from '../classes/Logger.js';
+import { createMcpServer } from './mcp.server.js';
+
+export const mcpRouter: Router = express.Router();
+
+mcpRouter.post('/', async (req, res) => {
+  // A new Server instance is created per request — required for stateless mode where
+  // each POST is independent and concurrent requests must not share transport state.
+  const transport = new StreamableHTTPServerTransport({
+    sessionIdGenerator: undefined, // stateless: no session tracking
+    enableJsonResponse: true,
+  });
+  const server = createMcpServer();
+
+  let cleanedUp = false;
+  const cleanup = async () => {
+    if (cleanedUp) return;
+    cleanedUp = true;
+    transport.close();
+    await server.close?.();
+  };
+
+  res.on('close', () => void cleanup());
+  res.on('finish', () => void cleanup());
+
+  try {
+    await server.connect(transport);
+    await transport.handleRequest(req as IncomingMessage, res as ServerResponse, req.body);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    logger.error(LogOrigin.Server, `MCP request failed: ${message}`);
+    if (!res.headersSent) {
+      res.status(500).json({ jsonrpc: '2.0', error: { code: -32603, message }, id: req.body?.id ?? null });
+    }
+  } finally {
+    await cleanup();
+  }
+});
+
+// Stateless mode: GET (SSE) and DELETE (session teardown) are not applicable.
+// All MCP interactions happen via POST in a single request/response cycle.
+const methodNotAllowed = (_req: Request, res: Response) =>
+  void res.status(405).json({ jsonrpc: '2.0', error: { code: -32000, message: 'Method not allowed.' }, id: null });
+
+mcpRouter.get('/', methodNotAllowed);
+mcpRouter.delete('/', methodNotAllowed);
@@ -0,0 +1,260 @@
+import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
+import { z } from 'zod';
+
+/**
+ * Agent-facing Ontime MCP documentation.
+ *
+ * Tool field schemas (EVENT_TIMER_FIELDS, EVENT_WRITABLE_FIELDS) and the schema resource
+ * (ONTIME_SCHEMA_MARKDOWN) are maintained here so tool descriptions, prompt guidance,
+ * and the agent-readable reference document use the same wording.
+ *
+ * Canonical type definitions live in packages/types/src/definitions/core/OntimeEntry.ts.
+ * Keep this file concise and update it when MCP-exposed fields change.
+ */
+
+// ---- Shared event field schemas ----
+// Zod shape fragments, spread into z.object({...}) calls in mcp.tools.schema.ts.
+// Field descriptions carry through into the generated inputSchema (z.toJSONSchema) and
+// are what the MCP client/LLM actually reads — keep them in sync with reality.
+
+export const EVENT_TIMER_FIELDS = {
+  timerType: z
+    .enum(TimerType)
+    .optional()
+    .describe('count-down: countdown from duration; count-up: elapsed time; clock: wall clock; none: no timer shown'),
+  endAction: z
+    .enum(EndAction)
+    .optional()
+    .describe('Action when event ends: none = stop, load-next = cue next event, play-next = auto-start next event'),
+  linkStart: z
+    .boolean()
+    .optional()
+    .describe(
+      "Link this event's start time to the previous playable event's end time. Linked events allow time changes to propagate through the rundown. Unlinking would prevent propagation and lock this event's start time to the schedule",
+    ),
+  countToEnd: z
+    .boolean()
+    .optional()
+    .describe(
+      'Advanced timing mode: countdown targets the scheduled timeEnd instead of the event duration. This can surprise operators when an event starts late or the schedule shifts; only set true after explaining the behaviour and confirming the user wants it. This can be useful for a deadline, where an event always needs to end at the schedule time, ie: a curfew or a broadcast window.',
+    ),
+  timeStrategy: z
+    .enum(TimeStrategy)
+    .optional()
+    .describe(
+      'How linked events adapt to an inherited start: lock-duration recalculates end, lock-end recalculates duration',
+    ),
+  timeWarning: z.number().optional().describe('ms before timeEnd to enter warning state (e.g. 300000 = 5 min)'),
+  timeDanger: z.number().optional().describe('ms before timeEnd to enter danger state (e.g. 60000 = 1 min)'),
+};
+
+export const EVENT_WRITABLE_FIELDS = {
+  cue: z.string().optional().describe('Short free-form cue label — ask the user what naming convention they prefer'),
+  title: z.string().optional().describe('Event title shown in the rundown and views'),
+  note: z.string().optional().describe('Free-text note for production notes or references'),
+  colour: z
+    .string()
+    .optional()
+    .describe(
+      '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: z.boolean().optional().describe('If true, event is skipped during playback'),
+  flag: z
+    .boolean()
+    .optional()
+    .describe('Mark the event as a critical operational marker — use sparingly for maximum impact'),
+  custom: z
+    .record(z.string(), z.string())
+    .optional()
+    .describe(
+      '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.',
+    ),
+  ...EVENT_TIMER_FIELDS,
+};
+
+export const RUNDOWN_TARGET_FIELD = {
+  rundownId: z
+    .string()
+    .optional()
+    .describe(
+      'Optional target rundown ID. Omit to target the currently loaded live rundown; provide an ID from ontime_list_rundowns to edit a background rundown without loading it.',
+    ),
+};
+
+// ---- Agent-readable schema document ----
+// Served at ontime://schema. Agents read this once per session to orient themselves
+// before issuing tool calls.
+
+export const ONTIME_SCHEMA_MARKDOWN = `# Ontime data model
+
+A concise reference for how Ontime structures rundowns, events, and related data.
+
+## Rundown
+
+A rundown is an ordered list of entries rendered as a show schedule. A project can contain multiple rundowns; one is "loaded" at a time.
+
+\`\`\`
+Rundown {
+  id: string
+  title: string
+  order: EntryId[]       // top-level entry order
+  flatOrder: EntryId[]   // includes entries nested in groups
+  entries: { [id: EntryId]: OntimeEntry }
+  revision: number
+}
+\`\`\`
+
+## Entries
+
+There are four entry types discriminated by \`type\`:
+
+### \`event\` — OntimeEvent (a timed show item)
+\`\`\`
+{
+  type: 'event'
+  id: EntryId
+  cue: string                // human-facing cue label
+  title: string
+  note: string
+  colour: string             // hex, e.g. "#4A90D9"
+  timeStart: number          // ms from midnight (09:00 = 32400000)
+  timeEnd: number            // ms from midnight
+  duration: number           // ms (= timeEnd - timeStart)
+  delay: number              // delay accumulated from rundown delay entries
+  dayOffset: number          // runtime calculated day offset from the rundown start schedule, increments when the rundown crosses midnight
+  gap: number                // schedule gap between sequential playable events; negative gap means overlap
+  timerType: 'count-down' | 'count-up' | 'clock' | 'none'
+  endAction: 'none' | 'load-next' | 'play-next'
+  linkStart: boolean         // chain start to previous event's end
+  countToEnd: boolean        // advanced mode: counts to scheduled timeEnd instead of duration; confirm before enabling
+  skip: boolean              // event is skipped during playback
+  flag: boolean              // critical operational marker, highlighted to operators
+  timeStrategy: 'lock-duration' | 'lock-end'
+  timeWarning: number        // ms before end to trigger 'warning' state
+  timeDanger: number         // ms before end to trigger 'danger' state
+  custom: { [key: string]: string }   // custom field values
+  triggers: Trigger[]        // automation trigger references
+  parent: EntryId | null     // parent group, when nested
+  revision: number           // entry revision
+}
+\`\`\`
+
+### \`delay\` — OntimeDelay (schedule shift applied to following events)
+\`\`\`
+{ type: 'delay', id, duration: number, parent: EntryId | null }
+\`\`\`
+
+### \`group\` — OntimeGroup (nested container of entries)
+\`\`\`
+{
+  type: 'group'
+  id: EntryId
+  title: string
+  colour: string
+  note: string
+  entries: EntryId[]
+  targetDuration: number | null
+  custom: { [key: string]: string }
+  timeStart: number | null     // calculated from nested entries (runtime)
+  timeEnd: number | null       // calculated from nested entries (runtime)
+  duration: number             // calculated from nested entries (runtime)
+  isFirstLinked: boolean       // whether the first nested event is linked (runtime)
+  revision: number
+}
+\`\`\`
+MCP entry creation accepts title plus optional colour, note, custom values and targetDuration for groups. In batch creation, a group may also include \`children\` to create child events, milestones or delays inside the group. Groups cannot be nested.
+
+For existing entries, use \`ontime_group_entries\` to create a group from top-level non-group entries, and \`ontime_ungroup_entry\` to dissolve a group back into top-level entries. Use \`ontime_reorder_entry\` only for targeted moves into, out of, or around an existing group.
+
+### \`milestone\` — OntimeMilestone (marker with no timer)
+\`\`\`
+{ type: 'milestone', id, cue, title, note, colour, custom, parent: EntryId | null }
+\`\`\`
+
+## Time format
+Ontime stores time values as **milliseconds from midnight (local)**. Convert user-facing times before calling tools: \`10:30\` means \`37800000\`, and a duration like \`45 min\` means \`2700000\`.
+
+\`timeEnd\` may be lower than \`timeStart\` when an event crosses midnight; duration is calculated across the day boundary.
+
+Examples:
+- 09:00:00 = 32400000
+- 09:30:00 = 34200000
+- 14:15:00 = 51300000
+- Duration of 45 min = 2700000
+
+## Custom fields
+Custom fields are project-scoped definitions. Get definitions at \`ontime://project/custom-fields\` or with \`ontime_get_custom_fields\`.
+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 }\`.
+- 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.
+
+## Targeting rundowns
+Entry read/write tools accept an optional \`rundownId\`.
+- Omit \`rundownId\` to target the currently loaded live rundown.
+- Pass a rundown ID from \`ontime_list_rundowns\` to edit a background rundown without loading it.
+- Loading a rundown with \`ontime_load_rundown\` switches the live rundown and resets runtime state; do not load a rundown just to edit it in the background.
+
+## Playback states (runtime only)
+\`'stop' | 'play' | 'pause' | 'armed' | 'roll'\`
+When playback is not \`stop\`, mutations to the loaded rundown affect the live rundown immediately, so confirm with the user before editing. Mutations to a background rundown using \`rundownId\` do not interrupt playback.
+
+## 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)
+- \`ontime://project/custom-fields\` — custom field definitions (JSON)
+- \`ontime://docs\` — index of Ontime documentation topics with URLs
+
+## Further reading
+Full Ontime documentation: **https://docs.getontime.no**
+`;
+
+// ---- Documentation index ----
+// Served at ontime://docs. Agents read this when they need to point users to official docs.
+
+export const ONTIME_DOCS_MARKDOWN = `# Ontime Documentation Index
+
+Main site: https://docs.getontime.no
+
+## Getting started
+- Installation & setup: https://docs.getontime.no/installation/
+
+## Core concepts
+- Rundown: https://docs.getontime.no/concepts/rundown/
+- Timer types (count-down, count-up, clock, none): https://docs.getontime.no/concepts/timer/
+- Time entry format: https://docs.getontime.no/concepts/time-entry/
+- Event actions (end action, link start): https://docs.getontime.no/concepts/event-actions/
+- Delays and blocks: https://docs.getontime.no/concepts/delays-and-blocks/
+
+## Features
+- Custom fields: https://docs.getontime.no/features/custom-fields/
+- Automations (triggers, filters, outputs): https://docs.getontime.no/features/automations/
+- URL presets / shared views: https://docs.getontime.no/features/url-presets/
+- HTTP Integration: https://docs.getontime.no/api/http/
+- 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/
+- Import data from spreadsheets: https://docs.getontime.no/features/import-spreadsheet/
+`;
@@ -0,0 +1,47 @@
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import {
+  CallToolRequestSchema,
+  GetPromptRequestSchema,
+  ListPromptsRequestSchema,
+  ListResourcesRequestSchema,
+  ListToolsRequestSchema,
+  ReadResourceRequestSchema,
+  type CallToolResult,
+  type ListToolsResult,
+} from '@modelcontextprotocol/sdk/types.js';
+
+import { PROMPT_DEFINITIONS, handleGetPrompt } from './mcp.prompts.js';
+import { RESOURCE_DEFINITIONS, handleReadResource } from './mcp.resources.js';
+import { TOOL_DEFINITIONS, handleToolCall } from './mcp.tools.js';
+
+export function createMcpServer(): Server {
+  const server = new Server(
+    { name: 'ontime-mcp-server', version: '1.0.0' },
+    { capabilities: { tools: {}, prompts: {}, resources: {} } },
+  );
+
+  server.setRequestHandler(
+    ListToolsRequestSchema,
+    async (): Promise<ListToolsResult> => ({
+      tools: TOOL_DEFINITIONS as unknown as ListToolsResult['tools'],
+    }),
+  );
+
+  server.setRequestHandler(CallToolRequestSchema, async (request): Promise<CallToolResult> => {
+    const { name, arguments: args = {} } = request.params;
+    return handleToolCall(name, args as Record<string, unknown>);
+  });
+
+  server.setRequestHandler(ListPromptsRequestSchema, async () => ({ prompts: PROMPT_DEFINITIONS }));
+
+  server.setRequestHandler(GetPromptRequestSchema, async (request) => {
+    const { name, arguments: args = {} } = request.params;
+    return handleGetPrompt(name, args as Record<string, string>);
+  });
+
+  server.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: RESOURCE_DEFINITIONS }));
+
+  server.setRequestHandler(ReadResourceRequestSchema, async (request) => handleReadResource(request.params.uri));
+
+  return server;
+}
@@ -0,0 +1,354 @@
+import {
+  EntryId,
+  EventPostPayload,
+  OntimeEntry,
+  OntimeGroup,
+  PatchWithId,
+  ProjectRundowns,
+  Rundown,
+  SupportedEntry,
+} from 'ontime-types';
+import { checkRegex, customFieldLabelToKey } from 'ontime-utils';
+
+import { getCurrentRundown, getCurrentRundownId, getProjectCustomFields } from '../api-data/rundown/rundown.dao.js';
+import {
+  addEntry,
+  batchEditEntries,
+  createCustomField,
+  deleteCustomField,
+  deleteEntries,
+  editCustomField,
+  editEntry,
+  groupEntries,
+  reorderEntry,
+  ungroupEntries,
+} from '../api-data/rundown/rundown.service.js';
+import { normalisedToRundownArray } from '../api-data/rundown/rundown.utils.js';
+import { getDataProvider } from '../classes/data-provider/DataProvider.js';
+// *Args types are now derived from the Zod schemas in mcp.tools.schema.ts — that file is
+// the single source of truth for MCP tool input shape, validation, and typing.
+import type {
+  BatchCreateEntriesArgs,
+  BatchCreateEntryArgs,
+  BatchUpdateEntriesArgs,
+  CreateCustomFieldArgs,
+  CreateEntryArgs,
+  DeleteCustomFieldArgs,
+  DeleteEntriesArgs,
+  EntryFieldArgs,
+  GetEntryArgs,
+  GroupEntriesArgs,
+  ReorderEntryArgs,
+  TargetRundownArgs,
+  UngroupEntryArgs,
+  UpdateCustomFieldArgs,
+  UpdateEntryArgs,
+} from './mcp.tools.schema.js';
+
+export function resolveTargetRundownId(args: TargetRundownArgs): string {
+  return args.rundownId ?? getCurrentRundownId();
+}
+
+function getTargetMeta(rundownId: string) {
+  const loaded = rundownId === getCurrentRundownId();
+  return { rundownId, loaded };
+}
+
+export function getRundownById(rundownId?: string): Readonly<Rundown> {
+  const targetId = rundownId ?? getCurrentRundownId();
+  return targetId === getCurrentRundownId() ? getCurrentRundown() : getDataProvider().getRundown(targetId);
+}
+
+export function findEntry(args: GetEntryArgs): OntimeEntry | undefined {
+  const rundown = getRundownById(args.rundownId);
+  if (args.id) {
+    return rundown.entries[args.id];
+  }
+  if (args.cue) {
+    return Object.values(rundown.entries).find((entry) => 'cue' in entry && entry.cue === args.cue);
+  }
+}
+
+export function toRundownList(projectRundowns: Readonly<ProjectRundowns>) {
+  return { loaded: getCurrentRundownId(), rundowns: normalisedToRundownArray(projectRundowns) };
+}
+
+export function assertKnownCustomFields(...customValues: Array<EntryFieldArgs['custom'] | undefined>) {
+  const customFields = getProjectCustomFields();
+  const knownKeys = new Set(Object.keys(customFields));
+  const unknownKeys = new Set<string>();
+
+  for (const custom of customValues) {
+    if (!custom) continue;
+    for (const key of Object.keys(custom)) {
+      if (!knownKeys.has(key)) {
+        unknownKeys.add(key);
+      }
+    }
+  }
+
+  if (unknownKeys.size > 0) {
+    const missing = [...unknownKeys].join(', ');
+    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} ` +
+        `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").`,
+    );
+  }
+}
+
+/** Translates tool arguments into the payload consumed by rundown.service addEntry */
+export function toEntryPayload(args: CreateEntryArgs): EventPostPayload {
+  const { type = SupportedEntry.Event, after, before } = args;
+
+  switch (type) {
+    case SupportedEntry.Delay:
+      return { type: SupportedEntry.Delay, duration: args.duration, after, before };
+    case SupportedEntry.Milestone: {
+      const { cue, title, note, colour, custom } = args;
+      return { type: SupportedEntry.Milestone, cue, title, note, colour, custom, after, before };
+    }
+    case SupportedEntry.Group:
+      // group creation currently only accepts a title, see generateEvent in rundown.utils.ts
+      return { type: SupportedEntry.Group, title: args.title, after, before };
+    case SupportedEntry.Event: {
+      const { type: _type, rundownId: _rundownId, ...eventFields } = args;
+      return { type: SupportedEntry.Event, ...eventFields };
+    }
+    default:
+      throw new Error(`Invalid entry type: ${String(type)}`);
+  }
+}
+
+function toGroupPatch(args: CreateEntryArgs, id: EntryId): PatchWithId<OntimeGroup> | null {
+  const patch: PatchWithId<OntimeGroup> = { id };
+
+  if (args.title !== undefined) patch.title = args.title;
+  if (args.note !== undefined) patch.note = args.note;
+  if (args.colour !== undefined) patch.colour = args.colour;
+  if (args.targetDuration !== undefined) patch.targetDuration = args.targetDuration;
+  if (args.custom !== undefined) patch.custom = args.custom;
+
+  return Object.keys(patch).length > 1 ? patch : null;
+}
+
+async function updateCreatedGroup(rundownId: string, args: CreateEntryArgs, entry: OntimeEntry): Promise<OntimeEntry> {
+  if (args.type !== SupportedEntry.Group) {
+    return entry;
+  }
+
+  const patch = toGroupPatch(args, entry.id);
+  if (!patch) {
+    return entry;
+  }
+
+  return editEntry(rundownId, patch);
+}
+
+export async function createEntryForMcp(args: CreateEntryArgs) {
+  assertKnownCustomFields(args.custom);
+  const rundownId = resolveTargetRundownId(args);
+  const createdEntry = await addEntry(rundownId, toEntryPayload(args));
+  const entry = await updateCreatedGroup(rundownId, args, createdEntry);
+  return { target: getTargetMeta(rundownId), entry };
+}
+
+export async function updateEntryForMcp(args: UpdateEntryArgs) {
+  assertKnownCustomFields(args.custom);
+  const rundownId = resolveTargetRundownId(args);
+  const { rundownId: _rundownId, ...patch } = args;
+  const entry = await editEntry(rundownId, patch as PatchWithId);
+  return { target: getTargetMeta(rundownId), entry };
+}
+
+export async function deleteEntriesForMcp(args: DeleteEntriesArgs) {
+  const rundownId = resolveTargetRundownId(args);
+  const rundown = await deleteEntries(rundownId, args.ids);
+  return { target: getTargetMeta(rundownId), deleted: args.ids, order: rundown.order };
+}
+
+export async function reorderEntryForMcp(args: ReorderEntryArgs) {
+  const rundownId = resolveTargetRundownId(args);
+  const rundown = await reorderEntry(rundownId, args.entryId, args.destinationId, args.order);
+  return { target: getTargetMeta(rundownId), order: rundown.order };
+}
+
+export async function groupEntriesForMcp(args: GroupEntriesArgs) {
+  assertKnownCustomFields(args.custom);
+  const rundownId = resolveTargetRundownId(args);
+  const rundown = getRundownById(rundownId);
+
+  if (!Array.isArray(args.ids) || args.ids.length === 0) {
+    throw new Error('Provide at least one entry ID to group.');
+  }
+
+  for (const id of args.ids) {
+    const entry = rundown.entries[id];
+    if (!entry) {
+      throw new Error(`No entry with id ${id}`);
+    }
+    if (entry.type === SupportedEntry.Group) {
+      throw new Error(`Cannot group group entry ${id}. Groups cannot be nested.`);
+    }
+    if ('parent' in entry && entry.parent) {
+      throw new Error(`Cannot group nested entry ${id}. Move it out of its group first.`);
+    }
+  }
+
+  const updatedRundown = await groupEntries(rundownId, args.ids);
+  const group = Object.values(updatedRundown.entries).find(
+    (entry): entry is OntimeGroup =>
+      entry.type === SupportedEntry.Group && args.ids.every((id) => entry.entries.includes(id)),
+  );
+
+  if (!group) {
+    throw new Error('Group operation did not create a group for the provided entries.');
+  }
+
+  const patch = toGroupPatch(args, group.id);
+  const entry = patch ? await editEntry(rundownId, patch) : group;
+
+  return { target: getTargetMeta(rundownId), entry, order: updatedRundown.order };
+}
+
+export async function ungroupEntryForMcp(args: UngroupEntryArgs) {
+  const rundownId = resolveTargetRundownId(args);
+  const rundown = getRundownById(rundownId);
+  const entry = rundown.entries[args.id];
+
+  if (!entry || entry.type !== SupportedEntry.Group) {
+    throw new Error(`Group with ID ${args.id} not found or is not a group`);
+  }
+
+  const updatedRundown = await ungroupEntries(rundownId, args.id);
+  return { target: getTargetMeta(rundownId), ungrouped: args.id, order: updatedRundown.order };
+}
+
+export async function batchCreateEntriesForMcp(args: BatchCreateEntriesArgs) {
+  const { entries = [], after } = args;
+  validateBatchCreateEntries(entries);
+  const allEntries = flattenBatchCreateEntries(entries);
+  assertKnownCustomFields(...allEntries.map((entry) => entry.custom));
+  const rundownId = resolveTargetRundownId(args);
+  let previousId = after;
+  const created: OntimeEntry[] = [];
+
+  for (const entryArgs of entries) {
+    // eslint-disable-next-line no-await-in-loop -- top-level entries chain after the previously created one
+    const entry = await createBatchEntry(rundownId, entryArgs, previousId);
+    created.push(...entry.created);
+    previousId = entry.entry.id;
+  }
+
+  return { target: getTargetMeta(rundownId), created };
+}
+
+function flattenBatchCreateEntries(entries: BatchCreateEntryArgs[]): BatchCreateEntryArgs[] {
+  return entries.flatMap((entry) => [entry, ...flattenBatchCreateEntries(entry.children ?? [])]);
+}
+
+function validateBatchCreateEntries(entries: BatchCreateEntryArgs[], insideGroup = false) {
+  for (const entry of entries) {
+    if (insideGroup && entry.type === SupportedEntry.Group) {
+      throw new Error('Cannot create a group inside another group.');
+    }
+
+    if (entry.children?.length && entry.type !== SupportedEntry.Group) {
+      throw new Error('Only group entries can have children.');
+    }
+
+    validateBatchCreateEntries(entry.children ?? [], entry.type === SupportedEntry.Group);
+  }
+}
+
+async function createBatchEntry(
+  rundownId: string,
+  entryArgs: BatchCreateEntryArgs,
+  previousId?: EntryId,
+  parentId?: EntryId,
+): Promise<{ entry: OntimeEntry; created: OntimeEntry[] }> {
+  if (parentId && entryArgs.type === SupportedEntry.Group) {
+    throw new Error('Cannot create a group inside another group.');
+  }
+
+  const { children: _children, ...createArgs } = entryArgs;
+  const payload = toEntryPayload(createArgs);
+  const insertOptions = {
+    ...(previousId ? { after: previousId } : {}),
+    ...(parentId ? { parent: parentId } : {}),
+  };
+
+  const createdEntry = await addEntry(rundownId, { ...payload, ...insertOptions } as EventPostPayload);
+  const entry = await updateCreatedGroup(rundownId, createArgs, createdEntry);
+  const created = [entry];
+
+  if (entryArgs.children?.length) {
+    if (entry.type !== SupportedEntry.Group) {
+      throw new Error('Only group entries can have children.');
+    }
+
+    let previousChildId: EntryId | undefined;
+    for (const childArgs of entryArgs.children) {
+      // eslint-disable-next-line no-await-in-loop -- each entry chains after the previously created one
+      const child = await createBatchEntry(rundownId, childArgs, previousChildId, entry.id);
+      created.push(...child.created);
+      previousChildId = child.entry.id;
+    }
+  }
+
+  return { entry, created };
+}
+
+export async function batchUpdateEntriesForMcp(args: BatchUpdateEntriesArgs) {
+  assertKnownCustomFields(args.data.custom);
+  const rundownId = resolveTargetRundownId(args);
+  const rundown = await batchEditEntries(rundownId, args.ids, args.data);
+  return { target: getTargetMeta(rundownId), updated: args.ids, order: rundown.order };
+}
+
+export async function createCustomFieldForMcp(args: CreateCustomFieldArgs) {
+  const label = args.label?.trim();
+  // same constraint the HTTP route enforces in customFields.validation.ts
+  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 };
+}
+
+export async function updateCustomFieldForMcp(args: UpdateCustomFieldArgs) {
+  const projectRundowns = getDataProvider().getProjectRundowns();
+  const updated = await editCustomField(args.key, { label: args.label, colour: args.colour }, projectRundowns);
+  return { customFields: updated };
+}
+
+export async function deleteCustomFieldForMcp(args: DeleteCustomFieldArgs) {
+  const projectRundowns = getDataProvider().getProjectRundowns();
+  const updated = await deleteCustomField(args.key, projectRundowns);
+  return { customFields: updated };
+}
@@ -0,0 +1,226 @@
+/**
+ * Zod schemas for MCP tool inputs.
+ *
+ * Each schema is the single source of truth for three things:
+ * - the generated `inputSchema` served to MCP clients (via z.toJSONSchema in mcp.tools.ts)
+ * - runtime validation of incoming tool-call arguments (via .safeParse in mcp.tools.ts)
+ * - the TypeScript types used by mcp.service.ts's business logic
+ *
+ * Field shapes intentionally mirror the hand-written JSON Schema this file replaces, not
+ * the full canonical domain types in ontime-types — e.g. `colour` stays a plain string,
+ * matching what was (not) validated before this migration.
+ */
+import { z } from 'zod';
+
+import { EVENT_WRITABLE_FIELDS, RUNDOWN_TARGET_FIELD } from './mcp.schema.js';
+
+// ---- Shared fragments ----
+
+const entryTimingFields = {
+  timeStart: z.number().optional().describe('Start time in ms from midnight'),
+  timeEnd: z.number().optional().describe('End time in ms from midnight'),
+  duration: z.number().optional().describe('Duration in ms'),
+  targetDuration: z.number().optional().describe('Groups only: planned length of the group in ms'),
+};
+
+// All writable fields of any entry type, flattened — reused as the base for create/update/
+// batch schemas via .extend(). Matches the previous EntryFieldArgs shape.
+const entryFieldsSchema = z.object({ ...entryTimingFields, ...EVENT_WRITABLE_FIELDS });
+export type EntryFieldArgs = z.infer<typeof entryFieldsSchema>;
+
+const groupWritableFields = {
+  title: z.string().optional().describe('Group title shown in the rundown and views'),
+  note: z.string().optional().describe('Free-text group note for production notes or references'),
+  colour: z
+    .string()
+    .optional()
+    .describe('Hex colour (#RRGGBB) for the group — prefer the default Ontime palette from ontime://style-guide'),
+  custom: z
+    .record(z.string(), z.string())
+    .optional()
+    .describe('Custom field values keyed by existing project field key'),
+  targetDuration: z.number().optional().describe('Planned length of the group in ms'),
+};
+
+// ---- Rundown read ----
+
+export const getRundownSchema = z.object({ ...RUNDOWN_TARGET_FIELD });
+export const getRundownMetadataSchema = z.object({});
+export const getEntrySchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  id: z.string().optional().describe('Entry ID (from rundown.entries key or entry.id)'),
+  cue: z.string().optional().describe('Human-facing cue label'),
+});
+
+// ---- Rundown mutations ----
+
+export const createEntrySchema = entryFieldsSchema.extend({
+  ...RUNDOWN_TARGET_FIELD,
+  type: z
+    .enum(['event', 'delay', 'milestone', 'group'])
+    .optional()
+    .describe(
+      'Entry type, defaults to event. event: timed show item; milestone: non-timed marker; delay: schedule shift; group: named container of entries',
+    ),
+  // Overrides entryFieldsSchema's generic timing descriptions with create-specific guidance.
+  timeStart: z.number().optional().describe('Event start time in ms from midnight (e.g. 09:00 = 32400000)'),
+  timeEnd: z.number().optional().describe('Event end time in ms from midnight'),
+  duration: z
+    .number()
+    .optional()
+    .describe('Duration in ms (events: should equal timeEnd - timeStart; delays: the schedule shift)'),
+  after: z.string().optional().describe('Insert after this entry ID'),
+  before: z.string().optional().describe('Insert before this entry ID'),
+});
+
+export const updateEntrySchema = entryFieldsSchema.extend({
+  ...RUNDOWN_TARGET_FIELD,
+  id: z.string().describe('ID of the entry to update'),
+});
+
+export const deleteEntriesSchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  ids: z.array(z.string()).describe('Array of entry IDs to delete'),
+});
+
+export const reorderEntrySchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  entryId: z.string().describe('ID of the entry to move'),
+  destinationId: z.string().describe('ID of the target entry (sibling or parent group)'),
+  order: z.enum(['before', 'after', 'insert']).describe('before/after: place as sibling; insert: place inside a group'),
+});
+
+export const groupEntriesSchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  ids: z.array(z.string()).describe('Existing top-level entry IDs to group'),
+  ...groupWritableFields,
+});
+
+export const ungroupEntrySchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  id: z.string().describe('Group entry ID to dissolve'),
+});
+
+// Recursive: a group entry in a batch may include `children` of the same shape. `type`/
+// `children` are declared outside entryFieldsSchema so the lazy() wrapper can reference
+// the schema being defined.
+export interface BatchCreateEntryArgs extends EntryFieldArgs {
+  type?: 'event' | 'delay' | 'milestone' | 'group';
+  children?: BatchCreateEntryArgs[];
+}
+
+export const batchCreateEntrySchema: z.ZodType<BatchCreateEntryArgs> = z.lazy(() =>
+  entryFieldsSchema.extend({
+    type: z.enum(['event', 'delay', 'milestone', 'group']).optional().describe('Entry type, defaults to event'),
+    children: z
+      .array(batchCreateEntrySchema)
+      .optional()
+      .describe(
+        'For group entries only: child events, milestones, or delays to create inside this group in order. Nested groups are not supported.',
+      ),
+  }),
+);
+
+export const batchCreateEntriesSchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  after: z.string().optional().describe('Insert the first entry after this entry ID'),
+  entries: z.array(batchCreateEntrySchema).describe('Array of entries to create, in desired order'),
+});
+
+export const batchUpdateEntriesSchema = z.object({
+  ...RUNDOWN_TARGET_FIELD,
+  ids: z.array(z.string()).describe('Array of entry IDs to update'),
+  data: entryFieldsSchema.describe('Partial entry fields to apply to every ID'),
+});
+
+// ---- Rundown management ----
+
+export const listRundownsSchema = z.object({});
+export const createRundownSchema = z.object({ title: z.string().describe('Title for the new rundown') });
+export const loadRundownSchema = z.object({ id: z.string().describe('Rundown ID to load') });
+export const renameRundownSchema = z.object({
+  id: z.string().describe('Rundown ID to rename'),
+  title: z.string().describe('New title'),
+});
+export const deleteRundownSchema = z.object({ id: z.string().describe('Rundown ID to delete') });
+export const duplicateRundownSchema = z.object({ id: z.string().describe('Rundown ID to duplicate') });
+
+// ---- Timer & project ----
+
+export const getTimerStateSchema = z.object({});
+export const getProjectInfoSchema = z.object({});
+export const updateProjectInfoSchema = z.object({
+  title: z.string().optional().describe('Project title'),
+  description: z.string().optional().describe('Project description'),
+  url: z.string().optional().describe('URL shown on viewer pages'),
+  info: z.string().optional().describe('Info text shown on viewer pages'),
+});
+export const getCustomFieldsSchema = z.object({});
+export const createCustomFieldSchema = z.object({
+  label: z
+    .string()
+    .describe(
+      '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".',
+    ),
+  type: z
+    .enum(['text', 'image'])
+    .describe(
+      'Field type — cannot be changed after creation. Use "text" for short text values; "image" for image URLs.',
+    ),
+  colour: z
+    .string()
+    .describe(
+      'Hex colour (#RRGGBB) used to visually identify this column in the cuesheet — for department fields, match the department colour convention (see ontime://style-guide).',
+    ),
+});
+export const updateCustomFieldSchema = z.object({
+  key: z.string().describe('Current field key (from ontime_get_custom_fields)'),
+  label: z
+    .string()
+    .optional()
+    .describe('New human-readable label (optional). Changes the derived key and cascades to all entries.'),
+  colour: z.string().optional().describe('New hex colour (#RRGGBB) (optional)'),
+});
+export const deleteCustomFieldSchema = z.object({
+  key: z.string().describe('Field key to delete (from ontime_get_custom_fields)'),
+});
+
+// ---- Project file management ----
+
+export const listProjectsSchema = z.object({});
+export const loadProjectSchema = z.object({
+  filename: z.string().describe('Project filename, e.g. "my-show.json"'),
+});
+export const createProjectSchema = z.object({
+  filename: z.string().describe('Filename without extension, e.g. "my-show"'),
+  title: z.string().optional().describe('Optional project title'),
+  description: z.string().optional().describe('Optional project description'),
+});
+export const renameProjectSchema = z.object({
+  filename: z.string().describe('Current filename (with .json extension)'),
+  newFilename: z.string().describe('New filename (with .json extension)'),
+});
+export const duplicateProjectSchema = z.object({
+  filename: z.string().describe('Source filename to copy (with .json extension)'),
+  newFilename: z.string().describe('Filename of the new copy (with .json extension)'),
+});
+export const deleteProjectSchema = z.object({
+  filename: z.string().describe('Project filename to delete (with .json extension)'),
+});
+
+// ---- Inferred types consumed by mcp.service.ts (replaces its hand-written *Args types) ----
+
+export type TargetRundownArgs = z.infer<typeof getRundownSchema>;
+export type GetEntryArgs = z.infer<typeof getEntrySchema>;
+export type CreateEntryArgs = z.infer<typeof createEntrySchema>;
+export type UpdateEntryArgs = z.infer<typeof updateEntrySchema>;
+export type DeleteEntriesArgs = z.infer<typeof deleteEntriesSchema>;
+export type ReorderEntryArgs = z.infer<typeof reorderEntrySchema>;
+export type GroupEntriesArgs = z.infer<typeof groupEntriesSchema>;
+export type UngroupEntryArgs = z.infer<typeof ungroupEntrySchema>;
+export type BatchCreateEntriesArgs = z.infer<typeof batchCreateEntriesSchema>;
+export type BatchUpdateEntriesArgs = z.infer<typeof batchUpdateEntriesSchema>;
+export type ProjectInfoArgs = z.infer<typeof updateProjectInfoSchema>;
+export type CreateCustomFieldArgs = z.infer<typeof createCustomFieldSchema>;
+export type UpdateCustomFieldArgs = z.infer<typeof updateCustomFieldSchema>;
+export type DeleteCustomFieldArgs = z.infer<typeof deleteCustomFieldSchema>;
@@ -0,0 +1,454 @@
+import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import { ProjectData } from 'ontime-types';
+import { z } from 'zod';
+
+import { editCurrentProjectData, getProjectData } from '../api-data/project-data/projectData.dao.js';
+import { getProjectCustomFields, getRundownMetadata } from '../api-data/rundown/rundown.dao.js';
+import {
+  createNewRundown,
+  deleteRundown,
+  duplicateExistingRundown,
+  loadRundown,
+  renameRundown,
+} from '../api-data/rundown/rundown.service.js';
+import { getDataProvider } from '../classes/data-provider/DataProvider.js';
+import { makeNewProject } from '../models/dataModel.js';
+import {
+  createProjectWithPatch,
+  deleteProjectFile,
+  duplicateProjectFile,
+  getProjectList,
+  loadProjectFile,
+  renameProjectFile,
+} from '../services/project-service/ProjectService.js';
+import { getState } from '../stores/runtimeState.js';
+import {
+  batchCreateEntriesForMcp,
+  batchUpdateEntriesForMcp,
+  createCustomFieldForMcp,
+  createEntryForMcp,
+  deleteCustomFieldForMcp,
+  deleteEntriesForMcp,
+  findEntry,
+  getRundownById,
+  groupEntriesForMcp,
+  reorderEntryForMcp,
+  toRundownList,
+  ungroupEntryForMcp,
+  updateCustomFieldForMcp,
+  updateEntryForMcp,
+} from './mcp.service.js';
+import * as schemas from './mcp.tools.schema.js';
+
+/**
+ * Parses tool-call arguments against `schema`, throwing on failure. handleToolCall (below)
+ * already wraps every handler in try/catch and formats thrown errors into a CallToolResult,
+ * so this reuses that existing error path rather than inventing a second one — unlike the
+ * REST validation layer (apps/server/src/api-data/validation-utils/validate.ts), tool calls
+ * are not a hot request path, so .parse()'s throw-based control flow costs nothing here.
+ */
+function parseArgs<T extends z.ZodType>(schema: T, args: Record<string, unknown>): z.infer<T> {
+  return schema.parse(args);
+}
+
+// Graceful truncation to keep tool responses within typical MCP context windows
+const CHARACTER_LIMIT = 25_000;
+
+// ---- MCP tool annotation presets ----
+// https://modelcontextprotocol.io/docs/concepts/tools#tool-annotations
+const READ = { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false } as const;
+const WRITE = { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false } as const;
+const WRITE_IDEM = { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false } as const;
+const WRITE_DESTRUCTIVE = {
+  readOnlyHint: false,
+  destructiveHint: true,
+  idempotentHint: true,
+  openWorldHint: false,
+} as const;
+
+// ---- Tool definitions ----
+export const TOOL_DEFINITIONS = [
+  // --- Rundown read ---
+  {
+    name: 'ontime_get_rundown',
+    description:
+      'Get a rundown. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to read a background rundown. Returns { order: EntryId[], entries: { [id]: OntimeEntry } }. If the rundown exceeds 25 000 chars, returns only the order array with a warning — fetch individual entries with ontime_get_entry.',
+    inputSchema: z.toJSONSchema(schemas.getRundownSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_get_rundown_metadata',
+    description:
+      'Get cached metadata for the current rundown. Returns: totalDelay, totalDuration, totalDays, firstStart, lastEnd, flags (flagged entry IDs), playableEventOrder, timedEventOrder, flatEntryOrder.',
+    inputSchema: z.toJSONSchema(schemas.getRundownMetadataSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_get_entry',
+    description:
+      'Get a single entry by id or cue. Provide either id or cue (not both). Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to read a background rundown. Returns the full entry object.',
+    inputSchema: z.toJSONSchema(schemas.getEntrySchema),
+    annotations: READ,
+  },
+  // --- Rundown mutations ---
+  {
+    name: 'ontime_create_entry',
+    description:
+      'Create a new entry. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. If playback is running and rundownId is omitted or matches the loaded rundown, confirm the user intends to change the live rundown before calling. Omit after/before to append at the end. For type "event" provide title plus enough timing data for Ontime to infer a strategy: timeStart+duration calculates timeEnd, timeStart+timeEnd calculates duration and locks end, timeEnd+duration calculates timeStart, and all three prioritise duration. For "milestone" provide cue/title/note/colour and optional custom values using existing project custom field keys. For "delay" provide duration. For "group" provide title plus optional note/colour/custom/targetDuration.',
+    inputSchema: z.toJSONSchema(schemas.createEntrySchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_update_entry',
+    description:
+      'Update fields of an existing entry (event, milestone, delay or group). Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. If playback is running and rundownId is omitted or matches the loaded rundown, confirm the user intends to change the live rundown before calling. Only provided fields are changed. Event time fields (timeStart, timeEnd, duration) are reconciled server-side — you may provide any combination. Group fields: title, note, colour, custom, targetDuration. Delay field: duration. Milestone fields: cue, title, note, colour, custom. Custom values must use existing project custom field keys; adding a new custom field is a separate operation.',
+    inputSchema: z.toJSONSchema(schemas.updateEntrySchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_delete_entries',
+    description:
+      'Delete one or more entries (events, milestones, delays, or groups). Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it.',
+    inputSchema: z.toJSONSchema(schemas.deleteEntriesSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_reorder_entry',
+    description:
+      'Move an entry to a new position relative to another entry. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. Use before/after for sibling reordering; use insert for targeted moves into a group. For grouping several existing top-level entries, prefer ontime_group_entries.',
+    inputSchema: z.toJSONSchema(schemas.reorderEntrySchema),
+    annotations: WRITE_IDEM,
+  },
+  {
+    name: 'ontime_group_entries',
+    description:
+      'Create a group from existing top-level entries. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. If playback is running and rundownId is omitted or matches the loaded rundown, confirm the user intends to change the live rundown before calling. Entries must be existing top-level non-group entries; groups cannot be nested. Optional title, note, colour, custom, and targetDuration are applied to the created group.',
+    inputSchema: z.toJSONSchema(schemas.groupEntriesSchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_ungroup_entry',
+    description:
+      'Dissolve a group by moving its children to the top level where the group was. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. If playback is running and rundownId is omitted or matches the loaded rundown, confirm the user intends to change the live rundown before calling.',
+    inputSchema: z.toJSONSchema(schemas.ungroupEntrySchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_batch_create_entries',
+    description:
+      'Create multiple entries, including groups with nested children. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. If playback is running and rundownId is omitted or matches the loaded rundown, confirm the user intends to change the live rundown before calling. Use this for "build from agenda" flows to avoid many round trips. Entries are inserted in array order; if `after` is provided it positions the first top-level entry, subsequent top-level entries chain from the previous. A group entry may include `children`; those entries are created inside the group in array order. Groups cannot be nested. For events, provide title plus enough timing data for Ontime to infer a strategy: timeStart+duration calculates timeEnd, timeStart+timeEnd calculates duration and locks end, timeEnd+duration calculates timeStart, and all three prioritise duration.',
+    inputSchema: z.toJSONSchema(schemas.batchCreateEntriesSchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_batch_update_entries',
+    description:
+      'Apply the same field values to multiple entries by ID. Omit rundownId for the currently loaded live rundown, or provide a rundownId from ontime_list_rundowns to edit a background rundown without loading it. Use for bulk operations like recolouring all keynotes, skipping all breaks, or setting the same custom value on several entries. Custom values must use existing project custom field keys. Do not use for changes where each entry needs a different value, such as time shifts with different timeStart/timeEnd values; compute those per entry and call ontime_update_entry for each.',
+    inputSchema: z.toJSONSchema(schemas.batchUpdateEntriesSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  // --- Rundown management ---
+  {
+    name: 'ontime_list_rundowns',
+    description:
+      'List all rundowns in the current project. Returns rundown IDs and titles, plus the ID of the currently loaded one.',
+    inputSchema: z.toJSONSchema(schemas.listRundownsSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_create_rundown',
+    description:
+      'Create a new empty rundown in the current project. Does not switch to it — use ontime_load_rundown to activate.',
+    inputSchema: z.toJSONSchema(schemas.createRundownSchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_load_rundown',
+    description:
+      'Make a rundown the active rundown. This resets the runtime and clears playback state. If playback is running, confirm the user accepts interrupting the live rundown before calling. To edit a background rundown without interrupting playback, advise using the cuesheet view.',
+    inputSchema: z.toJSONSchema(schemas.loadRundownSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_rename_rundown',
+    description: 'Rename an existing rundown',
+    inputSchema: z.toJSONSchema(schemas.renameRundownSchema),
+    annotations: WRITE_IDEM,
+  },
+  {
+    name: 'ontime_delete_rundown',
+    description: 'Delete a rundown (cannot delete the currently loaded rundown or the last remaining rundown)',
+    inputSchema: z.toJSONSchema(schemas.deleteRundownSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_duplicate_rundown',
+    description: 'Duplicate a rundown, creating a copy with a new ID. Does not switch to the copy.',
+    inputSchema: z.toJSONSchema(schemas.duplicateRundownSchema),
+    annotations: WRITE,
+  },
+  // --- Timer & project ---
+  {
+    name: 'ontime_get_timer_state',
+    description:
+      'Get the current timer/playback state. Returns: clock (time of day), timer ({ playback, current, elapsed, phase, expectedFinish, addedTime, startedAt }), eventNow (full event object or null), eventNext (full event object or null), offset.',
+    inputSchema: z.toJSONSchema(schemas.getTimerStateSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_get_project_info',
+    description:
+      'Get current project metadata: title, description, url, info, logo, and custom header fields (array of { title, value, url }).',
+    inputSchema: z.toJSONSchema(schemas.getProjectInfoSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_update_project_info',
+    description: 'Update project metadata fields. All fields are optional — only provided fields are updated.',
+    inputSchema: z.toJSONSchema(schemas.updateProjectInfoSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_get_custom_fields',
+    description:
+      'Get the project custom field definitions. Returns { [key]: { label, type: "text"|"image", colour } }. Keys are referenced in entry.custom[key].',
+    inputSchema: z.toJSONSchema(schemas.getCustomFieldsSchema),
+    annotations: READ,
+  },
+  {
+    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.',
+    inputSchema: z.toJSONSchema(schemas.createCustomFieldSchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_update_custom_field',
+    description:
+      'Update a custom field label or colour. Changing the label renames the derived key (spaces → underscores) and updates all entry references across all rundowns. Field type cannot be changed.',
+    inputSchema: z.toJSONSchema(schemas.updateCustomFieldSchema),
+    annotations: WRITE_IDEM,
+  },
+  {
+    name: 'ontime_delete_custom_field',
+    description:
+      'Delete a custom field definition and remove its values from all entries in all rundowns. Destructive and cannot be undone — confirm with the user before calling.',
+    inputSchema: z.toJSONSchema(schemas.deleteCustomFieldSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  // --- Project file management ---
+  {
+    name: 'ontime_list_projects',
+    description: 'List all project files on disk. Returns filenames, timestamps, and the last-loaded project name.',
+    inputSchema: z.toJSONSchema(schemas.listProjectsSchema),
+    annotations: READ,
+  },
+  {
+    name: 'ontime_load_project',
+    description:
+      'Load a different project file by filename. This swaps the database and reinitialises runtime. If playback is running, confirm the user accepts interrupting the live project before calling.',
+    inputSchema: z.toJSONSchema(schemas.loadProjectSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_create_project',
+    description:
+      'Create a new project file and switch to it. This swaps the loaded project. If playback is running, confirm the user accepts interrupting the live project before calling. Omit the .json extension — Ontime appends it.',
+    inputSchema: z.toJSONSchema(schemas.createProjectSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+  {
+    name: 'ontime_rename_project',
+    description: 'Rename a project file. If the renamed project is currently loaded, it is reloaded with the new name.',
+    inputSchema: z.toJSONSchema(schemas.renameProjectSchema),
+    annotations: WRITE_IDEM,
+  },
+  {
+    name: 'ontime_duplicate_project',
+    description: 'Duplicate a project file on disk with a new filename. Does not switch to the copy.',
+    inputSchema: z.toJSONSchema(schemas.duplicateProjectSchema),
+    annotations: WRITE,
+  },
+  {
+    name: 'ontime_delete_project',
+    description: 'Delete a project file from disk. Fails if the file is currently loaded.',
+    inputSchema: z.toJSONSchema(schemas.deleteProjectSchema),
+    annotations: WRITE_DESTRUCTIVE,
+  },
+] as const;
+
+type ToolName = (typeof TOOL_DEFINITIONS)[number]['name'];
+
+// ---- Response helpers (module-level to avoid re-allocation on every tool call) ----
+
+const text = (data: unknown): string => JSON.stringify(data);
+
+export const ok = (data: unknown): CallToolResult => ({ content: [{ type: 'text', text: text(data) }] });
+
+export const err = (e: unknown): CallToolResult => ({
+  content: [{ type: 'text', text: text({ error: e instanceof Error ? e.message : String(e) }) }],
+  isError: true,
+});
+
+// ---- Tool handlers ----
+// Each handler is a thin translation wrapper: it maps the wire arguments to a typed call
+// into an existing service and formats the response. Business logic belongs in the services.
+const TOOL_HANDLERS: Record<ToolName, (args: Record<string, unknown>) => Promise<CallToolResult>> = {
+  ontime_get_rundown: async (args) => {
+    const targetArgs = parseArgs(schemas.getRundownSchema, args);
+    const rundown = getRundownById(targetArgs.rundownId);
+    const data = { order: rundown.order, entries: rundown.entries };
+    const serialised = text(data);
+    if (serialised.length > CHARACTER_LIMIT) {
+      return ok({
+        warning: `Rundown too large (${serialised.length} chars) — fetch individual entries with ontime_get_entry.`,
+        truncated: true,
+        rundownId: rundown.id,
+        order: rundown.order,
+      });
+    }
+    return ok({ rundownId: rundown.id, ...data });
+  },
+
+  ontime_get_rundown_metadata: async () => ok(getRundownMetadata()),
+
+  ontime_get_entry: async (args) => {
+    const entryArgs = parseArgs(schemas.getEntrySchema, args);
+    const entry = findEntry(entryArgs);
+    if (entry) return ok(entry);
+    if (entryArgs.id) return err(`No entry with id ${entryArgs.id}`);
+    if (entryArgs.cue) return err(`No entry with cue ${entryArgs.cue}`);
+    return err('Provide id or cue');
+  },
+
+  ontime_create_entry: async (args) => {
+    return ok(await createEntryForMcp(parseArgs(schemas.createEntrySchema, args)));
+  },
+
+  ontime_update_entry: async (args) => {
+    return ok(await updateEntryForMcp(parseArgs(schemas.updateEntrySchema, args)));
+  },
+
+  ontime_delete_entries: async (args) => {
+    return ok(await deleteEntriesForMcp(parseArgs(schemas.deleteEntriesSchema, args)));
+  },
+
+  ontime_reorder_entry: async (args) => {
+    return ok(await reorderEntryForMcp(parseArgs(schemas.reorderEntrySchema, args)));
+  },
+
+  ontime_group_entries: async (args) => {
+    return ok(await groupEntriesForMcp(parseArgs(schemas.groupEntriesSchema, args)));
+  },
+
+  ontime_ungroup_entry: async (args) => {
+    return ok(await ungroupEntryForMcp(parseArgs(schemas.ungroupEntrySchema, args)));
+  },
+
+  ontime_batch_create_entries: async (args) => {
+    return ok(await batchCreateEntriesForMcp(parseArgs(schemas.batchCreateEntriesSchema, args)));
+  },
+
+  ontime_batch_update_entries: async (args) => {
+    return ok(await batchUpdateEntriesForMcp(parseArgs(schemas.batchUpdateEntriesSchema, args)));
+  },
+
+  ontime_list_rundowns: async () => ok(toRundownList(getDataProvider().getProjectRundowns())),
+
+  ontime_create_rundown: async (args) => {
+    const { title } = parseArgs(schemas.createRundownSchema, args);
+    return ok(toRundownList(await createNewRundown(title)));
+  },
+
+  ontime_load_rundown: async (args) => {
+    const { id } = parseArgs(schemas.loadRundownSchema, args);
+    return ok(toRundownList(await loadRundown(id)));
+  },
+
+  ontime_rename_rundown: async (args) => {
+    const { id, title } = parseArgs(schemas.renameRundownSchema, args);
+    return ok(toRundownList(await renameRundown(id, title)));
+  },
+
+  ontime_delete_rundown: async (args) => {
+    const { id } = parseArgs(schemas.deleteRundownSchema, args);
+    return ok(toRundownList(await deleteRundown(id)));
+  },
+
+  ontime_duplicate_rundown: async (args) => {
+    const { id } = parseArgs(schemas.duplicateRundownSchema, args);
+    return ok(toRundownList(await duplicateExistingRundown(id)));
+  },
+
+  ontime_get_timer_state: async () => {
+    const { clock, timer, eventNow, eventNext, offset } = getState();
+    return ok({ clock, timer, eventNow, eventNext, offset });
+  },
+
+  ontime_get_project_info: async () => ok(getProjectData()),
+
+  ontime_update_project_info: async (args) => {
+    const updated = await editCurrentProjectData(parseArgs(schemas.updateProjectInfoSchema, args));
+    return ok(updated);
+  },
+
+  ontime_get_custom_fields: async () => ok(getProjectCustomFields()),
+
+  ontime_create_custom_field: async (args) => {
+    return ok(await createCustomFieldForMcp(parseArgs(schemas.createCustomFieldSchema, args)));
+  },
+
+  ontime_update_custom_field: async (args) => {
+    return ok(await updateCustomFieldForMcp(parseArgs(schemas.updateCustomFieldSchema, args)));
+  },
+
+  ontime_delete_custom_field: async (args) => {
+    return ok(await deleteCustomFieldForMcp(parseArgs(schemas.deleteCustomFieldSchema, args)));
+  },
+
+  ontime_list_projects: async () => ok(await getProjectList()),
+
+  ontime_load_project: async (args) => {
+    const { filename } = parseArgs(schemas.loadProjectSchema, args);
+    await loadProjectFile(filename);
+    return ok(await getProjectList());
+  },
+
+  ontime_create_project: async (args) => {
+    const { filename, title = '', description = '' } = parseArgs(schemas.createProjectSchema, args);
+    const project: ProjectData = { ...makeNewProject().project, title, description };
+    const newFileName = await createProjectWithPatch(filename, { project });
+    return ok({ filename: newFileName });
+  },
+
+  ontime_rename_project: async (args) => {
+    const { filename, newFilename } = parseArgs(schemas.renameProjectSchema, args);
+    await renameProjectFile(filename, newFilename);
+    return ok(await getProjectList());
+  },
+
+  ontime_duplicate_project: async (args) => {
+    const { filename, newFilename } = parseArgs(schemas.duplicateProjectSchema, args);
+    await duplicateProjectFile(filename, newFilename);
+    return ok(await getProjectList());
+  },
+
+  ontime_delete_project: async (args) => {
+    const { filename } = parseArgs(schemas.deleteProjectSchema, args);
+    await deleteProjectFile(filename);
+    return ok(await getProjectList());
+  },
+};
+
+// ---- Tool call dispatcher ----
+export async function handleToolCall(name: string, args: Record<string, unknown>): Promise<CallToolResult> {
+  const handler = TOOL_HANDLERS[name as ToolName];
+  if (!handler) {
+    return err(`Unknown tool: ${name}`);
+  }
+  try {
+    return await handler(args);
+  } catch (error) {
+    return err(error);
+  }
+}
@@ -13,6 +13,8 @@ import { socket } from './adapters/WebsocketAdapter.js';
 // Import Routers
 import { appRouter } from './api-data/index.js';
 import { integrationRouter } from './api-integration/integration.router.js';
+import { makeMcpAuthenticate } from './api-mcp/mcp.auth.js';
+import { mcpRouter } from './api-mcp/mcp.router.js';
 import { flushPendingWrites, getDataProvider } from './classes/data-provider/DataProvider.js';
 // Services
 import { logger } from './classes/Logger.js';
@@ -100,6 +102,7 @@ app.get(`${prefix}/ready`, (_req, res) => {
 app.use(`${prefix}/login`, loginRouter); // router for login flow
 app.use(`${prefix}/data`, authenticate, appRouter); // router for application data
 app.use(`${prefix}/api`, authenticate, integrationRouter); // router for integrations
+app.use(`${prefix}/mcp`, makeMcpAuthenticate(authenticate), mcpRouter); // router for MCP agent integration

 // serve static external files
 app.use(
@@ -101,9 +101,10 @@ function getCustomFields(): Readonly<CustomFields> {
  return db.data.customFields;
 }

-async function setRundown(rundownKey: string, newData: Rundown): Promise<void> {
+async function setRundown(rundownKey: string, newData: Rundown): ReadonlyPromise<ProjectRundowns> {
  db.data.rundowns[rundownKey] = structuredClone(newData);
  await persist();
+  return db.data.rundowns;
 }

 function getSettings(): Readonly<Settings> {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Claude	972a246bb6	feat(server): introduce Zod request validation, starting with MCP tools Adds Zod as the validation library for apps/server (in place of express-validator), scoped here to a low-risk slice rather than a full migration: - MCP tool-call arguments (apps/server/src/api-mcp) are now validated end to end. Every tool's inputSchema is generated from its Zod schema via z.toJSONSchema() instead of hand-maintained JSON Schema literals, and every handler now parses its arguments before use — previously every handler did an unchecked `args as SomeType` cast with no runtime validation at all. - A new validate.ts middleware (validateBody/validateParams) replaces the express-validator chokepoint for two reference routers, session and url-presets, demonstrating the pattern the remaining ~11 routers will follow in later PRs. - An oxlint no-restricted-imports guardrail keeps zod importable only from apps/server, so it can never leak into the apps/client bundle. The bulk of the REST router migration (automation, rundown, and the rest of api-data) is intentionally left for follow-up PRs to keep this change reviewable.	2026-07-18 13:34:07 +00:00
Carlos Valente	f39892dc6e	feat(navigation): persist view params customisation	2026-07-13 18:44:38 +02:00
Carlos Valente	6bcfd87851	refactor(rundown): show locked duration group indicator	2026-07-13 17:34:11 +02:00
Claude	4addb50ca4	feat(countdown): allow counting down to a group	2026-07-13 17:29:56 +02:00
Carlos Valente	161ab3fe13	refactor(timer): elapsed is active time from start	2026-07-13 15:34:31 +02:00
Carlos Valente	4f4626a163	refactor: allow larger settings panels	2026-07-13 15:33:23 +02:00
Claude	82d5f02ea0	refactor(mcp): guide agents through creating clean rundowns	2026-07-13 15:33:23 +02:00
Claude	05aaeddf22	resolver: drop dead ignoreDeprecations from tsconfig.dts.json Confirmed empirically that it now suppresses nothing under TS 7.0.2: compiling tsconfig.dts.json directly with this flag set to "6.0", "7.0", or removed entirely all produce identical (clean) output. It was a leftover suppression the previous tsdown mode never actually needed once nothing in the config triggers a deprecation warning.	2026-07-13 14:27:31 +02:00
Claude	949ab2b7dc	Upgrade TypeScript to 7.0.2 (native Go compiler) TypeScript 7 ships as a native Go binary and drastically trims the package's public JS API surface (no more `main`, and `exports['.']` now only resolves to lib/version.cjs) since the programmatic compiler API isn't stable again until 7.1. This broke apps/resolver's tsdown build, which used rolldown-plugin-dts' tsc-program mode (import ts from 'typescript'; ts.createProgram(...)) for declaration generation. Fix by switching that build to isolatedDeclarations, which lets rolldown-plugin-dts generate .d.ts via its oxc-based path instead of the TS compiler API entirely. That surfaced two isolatedDeclarations violations in ontime-types (array/Object.keys initializers lacking explicit annotations), fixed with explicit `string[]` types matching their existing inferred type. Also bumped tsdown to pick up its latest rolldown-plugin-dts, and disabled allowJs in tsconfig.dts.json since it's incompatible with isolatedDeclarations. Full workspace typecheck, lint, build, and test suite (1186 tests) pass under TypeScript 7.0.2.	2026-07-13 14:27:31 +02:00
Alex Christoffer Rasmussen	f12d3ca59c	Small cleanup (#2114 ) * refactor: propper memo for `ScheduleContext` value * chore: removed unused file `cuesheet.utils.ts` * fix: memoize event in ScheduleProvider	2026-07-11 22:20:32 +02:00
Carlos Valente	42147d4d5b	allow editing cuesheet link permissions	2026-07-01 13:24:47 +02:00
Carlos Valente	7850358039	bump ontime to version 4.10.0	2026-07-01 13:20:04 +02:00
Claude	52cae1e22f	feat(timeline): add group reference Co-authored-by: Carlos Valente <carlosvalente@pm.me>	2026-07-01 12:48:58 +02:00
Carlos Valente	48f9fb2609	expose mcp server in ontime	2026-07-01 12:48:40 +02:00
Carlos Valente	ce8a4d230b	refactor(translations): allow resetting to default values	2026-07-01 09:02:13 +02:00
Carlos Valente	1553573b94	feat(url-presets): allow presets to appear as nav menu items (#2110 )	2026-06-28 18:07:02 +02:00
Alex Christoffer Rasmussen	41a09bf5c3	fix: send refetch on all rundown edits (#2098 ) * fix(server): send refetch on all rundown edits * fix(test): cuesheet tabing * chore: remove unneeded async * refactor: small cleanups * chore: spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * chore: remove unneded async/await --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2026-06-20 12:21:11 +02:00
Claude	5dbe7afae8	feat(client): add rundown default to inherit parent group colour	2026-06-20 10:46:34 +02:00
Carlos Valente	6633cfc869	chore: minor server package upgrades	2026-06-20 09:15:23 +02:00
Carlos Valente	d127367df9	chore: minor client package upgrades	2026-06-20 09:15:23 +02:00
Carlos Valente	b21ec41ffd	chore: upgrade base-ui	2026-06-20 09:15:23 +02:00
Carlos Valente	66292bc0cf	chore: upgrade react packages	2026-06-20 09:15:23 +02:00
Alex Christoffer Rasmussen	b946b245c2	feat: create the first event from the cuesheet (#2105 ) * feat: create the first event from the cuesheet * chore: cleanup css * test: cuesheet beckground edit from empty state * feat: only show +event button when user is in edit mode and have full write perms	2026-06-17 22:31:13 +02:00
Carlos Valente	c238147b75	chore: bump node version	2026-06-11 18:58:00 +02:00