chore: update project dependencies

addresses #869f2q1vu

.browserslistrc

@@ -0,0 +1,4 @@
+# Tailwind 4's floor: browsers without cascade layers, or Chrome before 111, can't render the
+# app's CSS, so the JS isn't transpiled for them either.
+defaults and fully supports css-cascade-layers
+not chrome < 111

.ddev/config.yaml

@@ -17,8 +17,9 @@ use_dns_when_possible: true
 timezone: Europe/Berlin
 composer_version: "2"
 web_environment: [ ]
-nodejs_version: "22"
+nodejs_version: "24"
 corepack_enable: false
+omit_containers: [ddev-ssh-agent]
 
 # Key features of DDEV's config.yaml:
 

.env

@@ -44,6 +44,9 @@ MAILJET_API_KEY=
 MAILJET_API_SECRET=
 MAILJET_API_BASE_URL=https://api.mailjet.com/v3/REST
 MAILJET_DEFAULT_LIST_ID=
+# Sub-account for the travel mailing lists
+MAILJET_TRAVEL_MAILING_API_KEY=
+MAILJET_TRAVEL_MAILING_API_SECRET=
 # Development default for HTTP Basic Auth password; override in production secrets.
 MAILJET_WEBHOOK_BASIC_PASSWORD=secret
 APP_NEWSLETTER_CONFIRMATION_TTL_HOURS=1
@@ -85,8 +88,9 @@ APP_CMS_API_BASE_URL="https://www.ep-reisen.de/"
 # TYPO3 API key (X-Api-Key), sent by the typo3.client scoped client and by app:content:sync;
 # the real value per stage goes in .env.local
 APP_CMS_API_KEY=
-# Static bearer token n8n sends to the chatbot MCP endpoint (/mcp); empty refuses every request
+# Bearer tokens for the chatbot MCP endpoints (/mcp, /mcp/trips), one per client: "name:token,name:token"
-APP_MCP_TOKEN=
+# (e.g. "n8n:…,claude-desktop:…"); empty refuses every request
+APP_MCP_TOKENS=
 APP_WEBSITE_BASE_URL="https://www.ep-reisen.de/"
 APP_BASE_URL="https://my.ep-reisen.de"
 APP_CUSTOMER_SERVICE_EMAIL="[email protected]"
@@ -97,15 +101,6 @@ APP_TRAVEL_PREFER_REMOTE=false
 APP_TRAVEL_ENABLE_FALLBACK=true
 APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS=14
 
-# Compensates a BusPro export defect: a <zustieg_rueck> can omit its preis although the booking
-# engine still bills the return-leg Abfahrtsortzuschlag, so we undercharge by exactly one leg.
-# A boarding point costs the same in both directions, so the stated price is applied to both.
-# Off = report the export verbatim. Provisional until the vendor fixes the export; see
-# docs/buspro-database-reference.md section A7.
-# Flipping this needs `app:bpn:xml-cache-invalidate` and `app:bpn:refresh-travel-snapshot`,
-# because the cached travels and TravelSnapshot rows carry the parsed price.
-APP_BPN_LEVEL_BOARDING_POINT_PRICES=true
-
 # Off turns every navigation into a full page load, which the web debug toolbar needs: its loader
 # script never runs on a boosted body swap. Explicit hx-get/hx-post requests are unaffected.
 # Only for local debugging; prod and the boosted code paths (HxRedirectResponse, error modal) need it on.

.nvmrc

@@ -0,0 +1 @@
+24

assets/loading.js

@@ -90,7 +90,7 @@ function handleHistoryRestore() {
 function handleTimeout() {
     // Don't decrement here — htmx:afterRequest always fires alongside htmx:timeout
     // and handles the counter. This handler only shows the alert.
-    alert('Die Anfrage hat zu lange gedauert. Bitte versuchen Sie es erneut. Falls das Problem weiterhin besteht, kontaktieren Sie bitte unseren Support.')
+    alert('Die Anfrage hat zu lange gedauert. Bitte versuche es erneut. Falls das Problem weiterhin besteht, kontaktiere bitte unseren Support.')
 }
 
 function handleBeforeHistorySave() {

assets/styles/_components.css

@@ -1,9 +1,9 @@
-@import "components/button.css";
+@import "./components/button.css";
-@import "components/forms.css";
+@import "./components/forms.css";
-@import "components/gallery.css";
+@import "./components/gallery.css";
-@import "components/pagination.css";
+@import "./components/pagination.css";
-@import "components/price_calendar.css";
+@import "./components/price_calendar.css";
-@import "components/toast.css";
+@import "./components/toast.css";
-@import "components/tooltip.css";
+@import "./components/tooltip.css";
-@import "components/typography.css";
+@import "./components/typography.css";
-@import "components/rte-content.css";
+@import "./components/rte-content.css";

assets/styles/_components_admin.css

@@ -1,10 +1,10 @@
-@import "components/autocomplete.css";
+@import "./components/autocomplete.css";
-@import "components/badge.css";
+@import "./components/badge.css";
-@import "components/button.css";
+@import "./components/button.css";
-@import "components/datatable.css";
+@import "./components/datatable.css";
-@import "components/datepicker.css";
+@import "./components/datepicker.css";
-@import "components/forms.css";
+@import "./components/forms.css";
-@import "components/pagination.css";
+@import "./components/pagination.css";
-@import "components/toast.css";
+@import "./components/toast.css";
-@import "components/tooltip.css";
+@import "./components/tooltip.css";
-@import "components/typography.css";
+@import "./components/typography.css";

assets/styles/_theme.css

@@ -0,0 +1,66 @@
+/* Shared by app.css and admin.css, imported right after tailwindcss */
+@source "../../templates";
+@source "../../src";
+@source "../../assets";
+@source inline("rotate-90");
+
+@plugin "@tailwindcss/forms";
+
+@theme {
+    --font-sans: Lato, sans-serif;
+
+    --color-primary: #3d8ccb;
+    --color-secondary: #f9c700;
+    --color-primary-bg: #ebf3fa;
+    --color-primary-light: #0070e0;
+    --color-primary-medium: #165883;
+    --color-primary-dark: #18527b;
+    --color-pink: #fa1a8c;
+
+    --color-sbw-primary: #B3820F;
+    --color-sbw-secondary: #E91C26;
+    --color-sbw-primary-dark: #8D7207;
+    --color-sbw-overlay: #c20000;
+
+    --color-snz-primary: #82c3c6;
+    --color-snz-secondary: #f9c33d;
+    --color-snz-primary-dark: #82c3c6;
+
+    --color-ser-primary: #006fb6;
+    --color-ser-secondary: #DE2C1B;
+    --color-ser-primary-light: #04A4CC;
+
+    --background-image-badge-gradient: linear-gradient(120deg, rgba(150,1,103,1) 0%, rgba(158,3,106,1) 40%, rgba(250,26,140,1) 100%);
+    --background-image-brand-gradient: linear-gradient(to top right, #009fff, #165883, #18527b);
+}
+
+/*
+ * Tailwind 3 defaults that Tailwind 4 changed: borders were gray-200 instead of currentColor,
+ * and buttons had a pointer cursor.
+ */
+@layer base {
+    *,
+    ::after,
+    ::before,
+    ::backdrop,
+    ::file-selector-button {
+        border-color: var(--color-gray-200, currentcolor);
+    }
+
+    button:not(:disabled),
+    [role="button"]:not(:disabled) {
+        cursor: pointer;
+    }
+}
+
+/*
+ * Thin scrollbars without a track for inner scrolling areas. The page scrollbar takes its
+ * style from <html>, which body * leaves out. Firefox and Chrome/Edge 121+ honour these;
+ * Safari keeps its own overlay scrollbars.
+ */
+@layer base {
+    body * {
+        scrollbar-width: thin;
+        scrollbar-color: var(--color-gray-300) transparent;
+    }
+}

assets/styles/_utilities.css

@@ -1,7 +1,5 @@
-@layer utilities {
+/* Reserve the scrollbar gutter so content does not shift width when a
-    /* Reserve the scrollbar gutter so content does not shift width when a
+   scrollbar appears (e.g. when a collapsible section is opened). */
-       scrollbar appears (e.g. when a collapsible section is opened). */
+@utility scroll-stable {
-    .scroll-stable {
+    scrollbar-gutter: stable;
-        scrollbar-gutter: stable;
-    }
 }

assets/styles/admin.css

@@ -1,7 +1,4 @@
-@import "tailwindcss/base";
+@import "tailwindcss" source(none);
-@import "_base.css";
+@import "./_theme.css";
-
+@import "./_base.css" layer(base);
-@import "tailwindcss/components";
+@import "./_components_admin.css" layer(components);
-@import "_components_admin.css";
-
-@import "tailwindcss/utilities";

assets/styles/app.css

@@ -1,8 +1,5 @@
-@import "tailwindcss/base";
+@import "tailwindcss" source(none);
-@import "_base.css";
+@import "./_theme.css";
-
+@import "./_base.css" layer(base);
-@import "tailwindcss/components";
+@import "./_components.css" layer(components);
-@import "_components.css";
+@import "./_utilities.css";
-
-@import "tailwindcss/utilities";
-@import "_utilities.css";

assets/styles/components/button.css

@@ -3,15 +3,15 @@
        The line height is set with each font size (text-sm/6), because text-sm's own line height would override a plain leading-6. */
     @apply inline-flex items-center justify-center space-x-2 px-4 md:px-8 py-2 border border-transparent bg-origin-border cursor-pointer;
     @apply uppercase text-center text-sm/6 md:text-base/6;
-    @apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
+    @apply transition-colors outline-hidden focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
     @apply rounded-md;
     /* At least one line tall even when the content is only a smaller icon: line + padding + border */
-    min-height: calc(1lh + 2 * theme('spacing.2') + 2px);
+    min-height: calc(1lh + 2 * --spacing(2) + 2px);
 }
 
 .button--small {
     @apply px-2 py-1 md:px-4 text-xs/6 sm:text-sm/6;
-    min-height: calc(1lh + 2 * theme('spacing.1') + 2px);
+    min-height: calc(1lh + 2 * --spacing(1) + 2px);
 }
 
 .button--primary {

assets/styles/components/datepicker.css

@@ -3,5 +3,5 @@
 
 [data-vc-theme=light] .vc-date[data-vc-date-selected] .vc-date__btn,
 [data-vc-theme=light] .vc-date[data-vc-date-selected] .vc-date__btn:hover {
-    background-color: theme('colors.secondary');
+    background-color: var(--color-secondary);
 }

assets/styles/components/price_calendar.css

@@ -1,5 +1,5 @@
 .pc-day {
-    @apply relative w-full text-center py-1 px-0.5 text-sm leading-tight rounded text-white cursor-pointer;
+    @apply relative w-full text-center py-1 px-0.5 text-sm leading-tight rounded-sm text-white cursor-pointer;
 }
 
 .pc-day--out-of-month {
@@ -11,11 +11,11 @@
 }
 
 .pc-day[data-status="blocked-to-ok"] {
-    background: linear-gradient(to bottom right, theme('colors.gray.400') 50%, theme('colors.emerald.500') 50%);
+    background: linear-gradient(to bottom right, var(--color-gray-400) 50%, var(--color-emerald-500) 50%);
 }
 
 .pc-day[data-status="checkout-only"] {
-    background: linear-gradient(to bottom right, theme('colors.emerald.500') 50%, theme('colors.gray.400') 50%);
+    background: linear-gradient(to bottom right, var(--color-emerald-500) 50%, var(--color-gray-400) 50%);
 }
 
 .pc-day[data-status="past"] {
@@ -33,7 +33,7 @@
 .pc-day.pc-day--pending-start,
 .pc-day.pc-day--selected-start,
 .pc-day.pc-day--selected-end {
-    @apply bg-none outline-none bg-secondary text-gray-700;
+    @apply bg-none outline-hidden bg-secondary text-gray-700;
 }
 
 .pc-day.pc-day--in-range {

assets/styles/components/toast.css

@@ -1,25 +1,25 @@
 @import "toastify-js/src/toastify.css";
 
 .toastify {
-    @apply shadow-lg rounded;
+    @apply shadow-lg rounded-sm;
 }
 
 .toastify--success {
     @apply text-gray-100;
-    background: theme('colors.emerald.600');
+    background: var(--color-emerald-600);
 }
 
 .toastify--warning {
     @apply text-gray-100;
-    background: theme('colors.red.600');
+    background: var(--color-red-600);
 }
 
 .toastify--error {
     @apply text-gray-100;
-    background: theme('colors.red.700');
+    background: var(--color-red-700);
 }
 
 .toastify--info {
     @apply text-gray-100;
-    background: theme('colors.primary');
+    background: var(--color-primary);
 }

assets/styles/components/tooltip.css

@@ -1,71 +1,71 @@
 @import "tippy.js/dist/tippy.css";
 
 .tippy-box {
-  background-color: theme('colors.primary');
+  background-color: var(--color-primary);
 }
 .tippy-box[data-placement^='top'] > .tippy-arrow::before {
-  border-top-color: theme('colors.primary');
+  border-top-color: var(--color-primary);
 }
 .tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
-  border-bottom-color: theme('colors.primary');
+  border-bottom-color: var(--color-primary);
 }
 .tippy-box[data-placement^='left'] > .tippy-arrow::before {
-  border-left-color: theme('colors.primary');
+  border-left-color: var(--color-primary);
 }
 .tippy-box[data-placement^='right'] > .tippy-arrow::before {
-  border-right-color: theme('colors.primary');
+  border-right-color: var(--color-primary);
 }
 
 .sbw {
   .tippy-box {
-    background-color: theme('colors.sbw.secondary');
+    background-color: var(--color-sbw-secondary);
   }
   .tippy-box[data-placement^='top'] > .tippy-arrow::before {
-    border-top-color: theme('colors.sbw.secondary');
+    border-top-color: var(--color-sbw-secondary);
   }
   .tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
-    border-bottom-color: theme('colors.sbw.secondary');
+    border-bottom-color: var(--color-sbw-secondary);
   }
   .tippy-box[data-placement^='left'] > .tippy-arrow::before {
-    border-left-color: theme('colors.sbw.secondary');
+    border-left-color: var(--color-sbw-secondary);
   }
   .tippy-box[data-placement^='right'] > .tippy-arrow::before {
-    border-right-color: theme('colors.sbw.secondary');
+    border-right-color: var(--color-sbw-secondary);
   }
 }
 
 .snz {
   .tippy-box {
-    background-color: theme('colors.snz.primary-dark');
+    background-color: var(--color-snz-primary-dark);
   }
   .tippy-box[data-placement^='top'] > .tippy-arrow::before {
-    border-top-color: theme('colors.snz.primary-dark');
+    border-top-color: var(--color-snz-primary-dark);
   }
   .tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
-    border-bottom-color: theme('colors.snz.primary-dark');
+    border-bottom-color: var(--color-snz-primary-dark);
   }
   .tippy-box[data-placement^='left'] > .tippy-arrow::before {
-    border-left-color: theme('colors.snz.primary-dark');
+    border-left-color: var(--color-snz-primary-dark);
   }
   .tippy-box[data-placement^='right'] > .tippy-arrow::before {
-    border-right-color: theme('colors.snz.primary-dark');
+    border-right-color: var(--color-snz-primary-dark);
   }
 }
 
 .ser {
   .tippy-box {
-    background-color: theme('colors.ser.secondary');
+    background-color: var(--color-ser-secondary);
   }
   .tippy-box[data-placement^='top'] > .tippy-arrow::before {
-    border-top-color: theme('colors.ser.secondary');
+    border-top-color: var(--color-ser-secondary);
   }
   .tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
-    border-bottom-color: theme('colors.ser.secondary');
+    border-bottom-color: var(--color-ser-secondary);
   }
   .tippy-box[data-placement^='left'] > .tippy-arrow::before {
-    border-left-color: theme('colors.ser.secondary');
+    border-left-color: var(--color-ser-secondary);
   }
   .tippy-box[data-placement^='right'] > .tippy-arrow::before {
-    border-right-color: theme('colors.ser.secondary');
+    border-right-color: var(--color-ser-secondary);
   }
 }

config/packages/framework.yaml

@@ -17,7 +17,7 @@ framework:
         log: true
 
     rate_limiter:
-      # Per MCP token. A chatbot turn makes a few tool calls; this catches runaway loops.
+      # Per MCP client. A chatbot turn makes a few tool calls; this catches runaway loops.
       chatbot_mcp:
         policy: sliding_window
         limit: 60

config/packages/mcp.yaml

@@ -6,7 +6,7 @@ mcp:
         chatbot:
             name: 'MyE&P chatbot'
             version: '1.0.0'
-            instructions: 'Answers questions about the trips and website content of E&P Reisen and its brands. Every result carries a url to cite. Prices and availability are a snapshot as of dataAsOf; the booking page is binding.'
+            instructions: 'Answers questions about the trips and website content of E&P Reisen and its brands. Every result carries a url to cite. Prices and availability are a snapshot as of dataAsOf; the booking page is binding. The structured trip fields of search_trips and get_trip (dates, rooms, prices, pickups, inclusions) come from the booking system and override anything editorial text says about them: product descriptions, FAQs and search_content/get_document results can be out of date.'
             http:
                 path: /mcp
                 # DNS rebinding protection guards unauthenticated local servers. This one is
@@ -14,3 +14,17 @@ mcp:
                 allowed_hosts: false
             registry:
                 tools: ['App\Chatbot\Mcp\Tool\']
+        # The same trip tools without the website's editorial text: no search_content and
+        # get_document, and a get_trip that leaves out the product and hotel page texts.
+        # Same tokens as /mcp; a client picks the variant by the path it is pointed at.
+        chatbot_trips:
+            name: 'MyE&P chatbot (trips only)'
+            version: '1.0.0'
+            instructions: 'Answers questions about the trips of E&P Reisen and its brands: dates, rooms, prices, availability, pickups and inclusions, all from the booking system. Every result carries a url to cite. Prices and availability are a snapshot as of dataAsOf; the booking page is binding. Website texts such as descriptions, FAQs and terms are not available here: for anything the tools do not answer, refer the user to the url of the trip.'
+            http:
+                path: /mcp/trips
+                allowed_hosts: false
+            registry:
+                tools:
+                    - 'App\Chatbot\Mcp\Tool\SearchTripsTool'
+                    - 'App\Chatbot\Mcp\TripsOnly\'

config/packages/security.yaml

@@ -15,16 +15,16 @@ security:
                     mailjet:
                         password: '%env(MAILJET_WEBHOOK_BASIC_PASSWORD)%'
                         roles: [ ROLE_MAILJET_WEBHOOK ]
+        # Never consulted: McpAccessTokenHandler builds the user from the client name its
+        # token belongs to. Named only because a firewall must have a provider.
         mcp_provider:
             memory:
-                users:
+                users: []
-                    n8n:
-                        roles: [ ROLE_CHATBOT_MCP ]
 
     role_hierarchy:
-        # ROLE_CUSTOMER_EXPERT gates the booking-draft and log surfaces, which used to be
+        # ROLE_CUSTOMER_EXPERT gates the customer-service surfaces (booking drafts, travel
-        # ROLE_ADMIN only. Inheriting it here is what keeps those surfaces open to administrators
+        # mailing). Inheriting it here is what keeps them open to administrators: the booking
-        # after the #[IsGranted] attributes moved to the narrower role.
+        # drafts used to be ROLE_ADMIN only before their #[IsGranted] moved to the narrower role.
         ROLE_ADMIN:
             - ROLE_GROUPS_ADMIN
             - ROLE_CUSTOMER_EXPERT
@@ -51,7 +51,7 @@ security:
             http_basic:
                 realm: 'Mailjet Webhook'
         mcp:
-            pattern: ^/mcp$
+            pattern: ^/mcp(/trips)?$
             stateless: true
             provider: mcp_provider
             access_token:
@@ -69,7 +69,7 @@ security:
     # Note: Only the *first* access control that matches will be used
     access_control:
         - { path: ^/webhooks/mailjet/newsletter$, roles: ROLE_MAILJET_WEBHOOK, requires_channel: https }
-        - { path: ^/mcp$, roles: ROLE_CHATBOT_MCP, requires_channel: https }
+        - { path: ^/mcp(/trips)?$, roles: ROLE_CHATBOT_MCP, requires_channel: https }
         - { path: ^/authorize, roles: IS_AUTHENTICATED_REMEMBERED, requires_channel: https }
         - { path: ^/, roles: PUBLIC_ACCESS, requires_channel: https }
 

config/packages/zenstruck_schedule.yaml

@@ -29,6 +29,10 @@ zenstruck_schedule:
       frequency: "45 1 * * *"
       description: "Removes expired pending newsletter double opt-in requests"
 
+    - task: app:cleanup:travel-mailing-lists
+      frequency: "50 1 * * *"
+      description: "Deletes Mailjet travel mailing lists and their orphaned contacts 30 days after the travel started"
+
     - task: league:oauth2-server:clear-expired-tokens
       frequency: "0 * * * *"
       description: "Removes expired oauth2 tokens hourly"
@@ -67,3 +71,15 @@ when@prod:
       - task: app:bpn:sync-contingents
         frequency: "5 20-23,0-7 * * *"
         description: "Syncs the full contingent horizon hourly outside peak hours"
+
+      - task: app:content:sync
+        frequency: "0 * * * *"
+        description: "Mirrors changes in the TYPO3 content feed for the chatbot MCP server"
+
+      - task: app:content:sync --refresh
+        frequency: "5 1 * * 0"
+        description: "Refetches TYPO3 content stored more than 7 days ago, within the night window"
+
+      - task: app:content:check-freshness --max-age 150
+        frequency: "10 * * * *"
+        description: "Fails when the TYPO3 content mirror has missed more than one hourly sync"

config/services.yaml

@@ -26,6 +26,17 @@ parameters:
         LENA20: '2027-03-04'
         BOTSCHAFTER2627: '2027-04-30'
 
+    # Named travel periods of the website search ("Reisezeitraum"), offered by the chatbot's
+    # search_trips. Duplicated from the TYPO3 search configuration on purpose: update both each
+    # season. Periods may overlap; one whose end has passed is no longer offered.
+    chatbot_travel_periods:
+        - { label: 'Vorsaison', from: '2026-11-01', to: '2026-12-20' }
+        - { label: 'um Weihnachten', from: '2026-12-20', to: '2026-12-28' }
+        - { label: 'Silvester', from: '2026-12-26', to: '2027-01-03' }
+        - { label: '1 Januarwoche', from: '2027-01-02', to: '2027-01-09' }
+        - { label: 'Nachsaison', from: '2027-03-20', to: '2027-05-01' }
+        - { label: 'Ostern', from: '2027-03-20', to: '2027-04-03' }
+
     # MailJet list ids and their labels
     mailjet_lists:
         10321569: 'E&P Newsletter'
@@ -170,14 +181,6 @@ services:
               method: createMainMenu
               alias: admin_main
 
-    App\Menu\GroupsMenuBuilder:
-        arguments:
-            $factory: '@knp_menu.factory'
-        tags:
-            - name: knp_menu.menu_builder
-              method: createMainMenu
-              alias: groups_main
-
     App\Service\BpnXmlSyncManager:
         arguments:
             $xmlSource: '@xml_source.storage'
@@ -198,10 +201,6 @@ services:
         arguments:
             $retentionBufferDays: '%travel_snapshot_retention_buffer_days%'
 
-    App\BusProNet\XmlParser\TravelParser:
-        arguments:
-            $levelBoardingPointPrices: '%env(bool:APP_BPN_LEVEL_BOARDING_POINT_PRICES)%'
-
     App\Service\TravelDataProvider:
         arguments:
             $logger: '@monolog.logger.core'
@@ -338,9 +337,13 @@ services:
         $baseUrl: '%env(APP_CMS_API_BASE_URL)%'
         $apiKey: '%env(APP_CMS_API_KEY)%'
 
+    App\Chatbot\TravelPeriods:
+      arguments:
+        $periods: '%chatbot_travel_periods%'
+
     App\Security\McpAccessTokenHandler:
       arguments:
-        $token: '%env(APP_MCP_TOKEN)%'
+        $tokens: '%env(APP_MCP_TOKENS)%'
 
     App\Service\CmsDataProvider:
       arguments:
@@ -420,6 +423,9 @@ services:
     App\BpnConnect\ContingentsClient:
         parent: App\BpnConnect\AbstractApiClient
 
+    App\BpnConnect\TravelsClient:
+        parent: App\BpnConnect\AbstractApiClient
+
     App\ClickUp\ApiClient:
         arguments:
             $apiToken: '%env(default::CLICKUP_API_TOKEN)%'
@@ -435,6 +441,20 @@ services:
             $defaultListId: '%env(default::MAILJET_DEFAULT_LIST_ID)%'
             $contactMetadataFields: '%mailjet_contact_metadata_fields%'
 
+    # Travel mailing lists live in a Mailjet sub-account, which has its own key pair and keeps
+    # its contacts and lists apart from the newsletter on the main account.
+    app.mailjet.travel_mailing_client:
+        class: App\Mailjet\ApiClient
+        arguments:
+            $apiKey: '%env(default::MAILJET_TRAVEL_MAILING_API_KEY)%'
+            $apiSecret: '%env(default::MAILJET_TRAVEL_MAILING_API_SECRET)%'
+            $apiBaseUrl: '%env(default::MAILJET_API_BASE_URL)%'
+            $contactMetadataFields: '%mailjet_contact_metadata_fields%'
+
+    App\Service\TravelMailingListManager:
+        arguments:
+            $mailjet: '@app.mailjet.travel_mailing_client'
+
     App\EventListener\MaintenanceModeListener:
         arguments:
             $options:

config/services_dev.yaml

@@ -5,7 +5,7 @@ parameters:
       theme: base
       gtm_id: GTM-56LWRF
       cmp_url: https://consent.cookiefirst.com/sites/my.ep-reisen.de-28eabc35-7085-4d8f-b450-522bd1a5247c/consent.js
-    myswb.ddev.site:
+    mysbw.ddev.site:
       theme: sbw
       gtm_id: GTM-MS2C8CH
       cmp_url: https://consent.cookiefirst.com/sites/my.ski-boarderweek.de-d3641c34-8183-4b8d-b56e-c052e7a9223e/consent.js

deploy.php

@@ -40,6 +40,7 @@ $rsyncOptions = [
         '.env.dev.local.php',
         '.env.test',
         '.env.test.local',
+        '.browserslistrc',
         '.gitignore',
         '.nvmrc',
         '.php-cs-fixer.cache',
@@ -58,8 +59,7 @@ $rsyncOptions = [
         'phpunit.xml.dist',
         'public/.htaccess',
         'ray.php',
-        'tailwind.config.js',
+        'webpack.config.mjs',
-        'webpack.config.js',
         'bin/.phpunit',
         'temp/',
         'tests/',

docs/api-consumer-guide.md

@@ -172,6 +172,7 @@ an error: it returns `200` with an empty `data` array and the usual `meta`.
     {
       "busProId": 12794,
       "code": "PCJSER261226",
+      "productCode": "PCJSER",
       "product": "Semesterende - Portes du Soleil - Joliment",
       "dateFrom": "2026-12-26",
       "dateTo": "2026-12-30",
@@ -212,6 +213,11 @@ an error: it returns `200` with an empty `data` array and the usual `meta`.
 is always an int and never null; `hotel` is always an object and never null; `pickups` is always an array, possibly
 empty, never null.
 
+**`productCode`** is the code of the travel (product) the date belongs to, e.g. `DKIWE`. Key on it to
+recognise dates of the same product. Do not derive it from the date `code` by cutting off the date: some
+products run dates under a different code (`DWWMP` runs `DWWMW…`), and group travels carry each group's own
+code on the date. It is `null` for the few travels that have no code upstream.
+
 **`meta` describes the whole export, not the page.** `total`, `totalPages`, `skipped`, `pickupsWithoutMasterData`,
 `sourceGeneratedAt` and `generatedAt` are identical on every page, so you can read them once on page 1 and decide whether to walk the
 rest. `total` is the row count **after** skips, and `totalPages` is `ceil(total / perPage)`.
@@ -318,6 +324,8 @@ returns it in one page.
           "city": "Frankfurt",
           "street": "Flughafen (P36 zwischen Terminal 1 und 2)",
           "price": 5.9,
+          "returnLeg": true,
+          "returnPrice": 5.9,
           "datetime": "2026-12-03T23:30:00"
         }
       ],
@@ -389,7 +397,9 @@ such as for arriving by car.
 `GET /api/exports/travels` — a clock reading without an offset, `null` where upstream states no time — including
 rolling a bare time past midnight onto the next day. There is no separate `time` field; format `datetime` for
 display. `price` is the outbound boarding surcharge exactly as upstream states it: `null` where upstream states
-none. It is not levelled against the return leg. An id absent from
+none. The surcharge is charged **per leg**: `returnLeg` says whether the point is also served on the way back, and
+`returnPrice` is its return surcharge, again verbatim and `null` where upstream states none. Neither price is levelled
+against the other. A point served on the return leg only is not emitted. An id absent from
 `GET /api/pickups` is emitted with `code`, `city` and `street` null and counted in `pickupsWithoutMasterData`. An id
 of `0` is emitted as-is but not counted.
 
@@ -497,21 +507,74 @@ Errors: `400 {"error":"Hotel not found for hotelCode."}`, `400` with violations
 
 `502 {"error":"Failed to fetch contingent data."}` is still returned — with the same body as before — but it now means **"no usable local snapshot for this hotel"** rather than "the upstream call failed": either the hotel has never synced successfully, or its last successful sync is more than 6 hours old. Treat it as before: the data is unavailable, not empty. This matters because the alternative would be a `200` reporting every day as `BLOCKED`, which is indistinguishable from a genuinely fully-booked hotel.
 
+#### `GET /api/contingents/availability?hotelCode=…&dateFrom=…&dateTo=…` — scope `api`
+
+The raw contingent snapshot per day, without prices. Built for the iCal feed that external booking portals import, which blocks only what the contingent itself reports as unavailable.
+
+Parameters are the same as for `calendar`: `hotelCode` is required, `dateFrom` and `dateTo` are optional, `Y-m-d`, inclusive, and must be supplied together (at most 366 days). **Omit both to get every snapshot day from today to the end of the snapshot** (the 24-month sync horizon). Prices play no part in that span.
+
+Each entry, ordered by date:
+
+```json
+{"date": "2027-01-30", "status": "BLOCKED"}
+```
+
+`status` is `OK`, `BLOCKED` or `ON_REQUEST`.
+
+Two differences from `calendar`:
+
+- **No price rule.** A day without a maintained price keeps the status the contingent reports; it is not forced to `BLOCKED`.
+- **Days the snapshot lacks are left out**, not returned as `BLOCKED`. The response is not contiguous: a day without an entry has no availability data, and the feed shows it as free, as it did when it read the upstream service directly.
+
+- **Not limited to accommodations.** `hotelCode` may be any synced hotel code: an accommodation's calendar code, or the calendar hotel of a visible TYPO3 product (TYPO3's `/api/calendar-hotels`). Winter-only hotels without an accommodation are therefore served here, while `calendar` and `prices` still need an accommodation, since they need its prices.
+
+Errors are the same as for `calendar`: `400 {"error":"Hotel not found for hotelCode."}` when the code is not synced, `400` with violations for invalid parameters, and `502 {"error":"Failed to fetch contingent data."}` when there is no usable snapshot. For this endpoint the `502` is the important one: an empty list would show every day as free, so a consumer should answer with an error and let the portals keep their last import.
+
+#### `GET /api/contingents/status` — scope `api`
+
+One row per synced hotel code, sorted by code, for an overview of which hotel supports which calendar:
+
+```json
+{
+  "hotelCode": "DGS",
+  "name": "Sportclub Spinabad",
+  "sources": ["accommodation", "typo3"],
+  "accommodation": {"name": "Davos Glaris - Gruppenhaus Spinabad", "cmsCode": "DGSGRP"},
+  "pricedFrom": "2027-06-01",
+  "pricedTo": "2027-09-30",
+  "syncedAt": "2026-10-29T10:15:00+01:00",
+  "lastError": null,
+  "failureCount": 0,
+  "available": true
+}
+```
+
+- `sources`: where the code comes from, `accommodation` and/or `typo3`.
+- `name`: the hotel's name in TYPO3's calendar hotel list, `null` for a code TYPO3 does not list.
+- `accommodation`: `null` without one; `cmsCode` is the code the accommodation is known by in TYPO3, which may differ from `hotelCode`.
+- `pricedFrom`/`pricedTo`: the span of the accommodation's prices, `null` without prices. `calendar` and `prices` work only for hotels that have them.
+- `syncedAt`, `lastError`, `failureCount`: the last successful sync (`null` if none) and the failures since.
+- `available`: whether `availability` currently serves the hotel, i.e. it has synced within the last 6 hours. `false` means that endpoint answers `502`.
+
 ---
 
 ### Operating the snapshot (deployment)
 
-The snapshot is a new table populated by the scheduler, so it is **empty immediately after a deploy that runs the migration**. Until the first successful sync every hotel returns `502` — deliberately, so no consumer caches a fully-blocked calendar as if it were real availability.
+The snapshot is filled only by the scheduler, so on an empty database (a new environment, or after the snapshot tables were truncated) every hotel returns `502` until the first successful sync — deliberately, so no consumer caches a fully-blocked calendar as if it were real availability.
 
-Rollout order:
+Bringing up an environment:
 
-1. **Confirm `BPN_CONNECT_API_KEY` is valid for the target environment before deploying.** If it is rejected the sync cannot populate anything and the endpoint stays at `502`.
+1. **Confirm `BPN_CONNECT_API_KEY` is valid for the environment.** If it is rejected the sync cannot populate anything and the endpoints stay at `502`.
-2. Deploy; `database:migrate` creates the empty tables.
+2. Deploy; `database:migrate` creates the tables.
-3. Run `bin/console app:bpn:sync-contingents` on the host, promptly and ideally off-peak — a consumer that page-caches whatever it renders from a `502` may hold that for the length of its own cache period.
+3. Run `bin/console app:bpn:sync-contingents -v` on the host promptly, ideally off-peak — a consumer that page-caches whatever it renders from a `502` may hold that for the length of its own cache period.
-4. Verify: `contingent_sync_state.synced_at` populated and `failure_count` at 0 for every hotel, then spot-check one calendar response.
+4. Verify with `GET /api/contingents/status`: every row `available: true`, `failureCount` 0.
 
 Thereafter the scheduler keeps it current; a sync failing for one hotel puts only that hotel into `502` and leaves the rest serving normally.
 
+**Which hotels are synced.** Every accommodation's calendar code plus every code in TYPO3's `/api/calendar-hotels` (same `APP_CMS_API_KEY` as the other CMS calls). Each run fetches TYPO3's list first and stores it in `calendar_hotel`; when TYPO3 errors or answers with an empty list, the run logs a warning and uses the stored list, so TYPO3 being down never drops its hotels. `--hotel=<code>` accepts any code from either source. A full run deletes the snapshot of codes that are in neither source any more; they answer `400` from then on, and come back with the next run if they reappear.
+
+**TYPO3's codes must be BusPro calendar codes.** The sync sends every code to bpn-connect as is. A TYPO3 hotel whose code is a CMS code rather than the BusPro hotel code (group houses often have both, e.g. calendar code `DKS`, CMS code `DKSGRP`) is answered with a `404` by bpn-connect: that code fails on every run, logs two errors each time, and shows up in `contingents/status` with `lastError` set and `available: false`. The task itself keeps succeeding, since only a total failure fails it. The fix belongs in TYPO3, by pointing the product at a hotel whose code is the BusPro code; MyE&P does not translate CMS codes. `contingents/status` is the place to spot such codes, and `accommodation.cmsCode` there shows both codes side by side for group houses.
+
 ### Freshness and propagation
 
 There is deliberately **no change-notification endpoint**. Availability changes slowly, and the measured cost of simply refetching on a TTL is low enough that a polling/revision mechanism was not worth the extra moving parts on either side.

docs/bpn-xml-api-reference.md

@@ -167,11 +167,20 @@ fails on `Telefon-Mobil` and `Nationalität` because its `Vorgang_Details` recor
 `telefonprivat` and no `nationalitaet`.
 
 **Participants are held to less than the Anmelder** (measured 2026-09-16 on 2036, travel 12500, from a
-real step-3 `Anfrage`). Once a room is present, every `teilnehmer` needs a `Mail-Adresse`, children
+real step-3 `Anfrage`). `telefonmobil` and an empty `anschrift` pass for participants. The field list
-included: without `kommunikation` the answer is `650 … 1.Teilnehmer-Mail-Adresse, 2.Teilnehmer-Mail-Adresse`.
+above (Strasse, Plz, Ort, Telefon-Mobil for every participant) was measured on the placeholder records and
-`telefonmobil` and an empty `anschrift` pass for participants. An email identical to the Anmelder's is
+is stricter than what BusPro applies to ordinary participants.
-accepted. The field list above (Strasse, Plz, Ort, Telefon-Mobil for every participant) was measured on
+
-the placeholder records and is stricter than what BusPro applies to ordinary participants.
+**The participant `Mail-Adresse` is BusPro configuration, not a fixed rule.** Until 2026-10-13 every
+`teilnehmer` needed one once a room was present, children included: without it the answer was
+`650 … 1.Teilnehmer-Mail-Adresse, 2.Teilnehmer-Mail-Adresse`, while an email identical to the Anmelder's
+was accepted. On 2026-10-15 the requirement was switched off on the test system, and the same requests
+(no `email`, no `kommunikation`, an empty `<email/>`, adults and children, with and without a travelling
+Anmelder) all pass with an unchanged price. A committed `Buchung` (status `A`) with an email-less child
+goes through as well, both with a travelling Anmelder and with one who does not travel. BusPro now accepts a participant without an email at any age,
+so the rule MyE&P applies (required from 16, and for the applicant at any age) is enforced only by
+`ParticipantDto` and `BookingDto` validation. Production needs the same configuration before under-16s
+without an email can be booked there.
 
 **The Anmelder does not have to travel.** An `<anmelder>` that matches no `teilnehmer` (a parent booking
 for their children) returns `möglich` with the same price as the control where the Anmelder is
@@ -208,7 +217,7 @@ the same way. Ask `MOEGLICHEAENDERUNGEN` first (`<idreise>`), which answers:
 | `buchungsart` | yes | yes | Edit **hardcodes `Buchung`** (`BookingClient::updateBooking()`) |
 | `status` | yes | yes | Edit replays the value read back from BusPro — see the caveat below |
 | `idreise`, `idpartner`, `idagentur` | yes | yes | `idpartner` sent unconditionally, even with no room |
-| `anmelder` | yes | yes | Create builds it from participant[0]; edit uses `PersonalData::toPayload()`. BusPro accepts an Anmelder who is not a participant |
+| `anmelder` | yes | yes | Create builds it from participant[0], or from `BookingDto::$applicant` when the applicant does not travel; edit uses `PersonalData::toPayload()`. BusPro accepts an Anmelder who is not a participant |
 | `anmelder/bemerkung` | — | yes | Via `PersonalData::toPayload()` |
 | `teilnehmerliste` | yes | yes | |
 | `wünsche` (`unterbringungswunsch`, `beförderungswunsch`) | yes | yes | |

docs/buspro-database-reference.md

@@ -225,16 +225,12 @@ JOIN dbo.ZustiegPreis zp ON zp.IDArtZustiegPreis_FS=lb.IDArtZustiegPreis_FS
 WHERE l.IDLeistung IN (@OutboundServiceId,@ReturnServiceId);
 ```
 
-**V 2026-09-28 — the XML export can omit the return-leg price.** Since one price row is
+**V 2026-10-02 — an unpriced return leg is free.** The export can state a `preis` on the
-surfaced twice, an asymmetric pair is an export defect: on products 701 and 2435 a
+outbound `<zustieg>` but none on the matching `<zustieg_rueck>` (seen on products 701 and
-`<zustieg_rueck>` carries no `preis` although the engine still bills the return
+2435). The booking engine bills a return `Abfahrtsortzuschlag` only where the return entry
-`Abfahrtsortzuschlag`, so reading the export verbatim undercharges by one leg. Measured over
+states a price, so the export is read verbatim, per leg. A missing return price is a catalog
-all exports, a stated return price never differs from its outbound counterpart (510 pairs,
+omission for the office to fix, not something to compensate locally: pricing the return leg
-zero counter-examples). `TravelParser` therefore levels a boarding point's price across both
+from the outbound one makes the booking inquiry fail with a price mismatch.
-directions, switchable through `APP_BPN_LEVEL_BOARDING_POINT_PRICES` while the defect is open
-with the vendor. Flipping the flag needs `app:bpn:xml-cache-invalidate` and
-`app:bpn:refresh-travel-snapshot`. A point appearing **only** in `zustiege_rueck` without a
-price cannot be priced from our side — that is a catalog job.
 
 **N — the departure surcharge is computed.** Booking responses carry a position
 `art="SON" unterart="TRA"` (*Abfahrtsortzuschlag*) with no matching row type: `ArtZuschlag`

docs/chatbot-mcp.md

@@ -13,32 +13,60 @@ TYPO3 sends no dates or prices, and nothing flows back to TYPO3.
 ## Endpoint
 
 `POST /mcp` (Streamable HTTP; `GET`/`DELETE` are part of the transport), served by `symfony/mcp-bundle`
-from `config/packages/mcp.yaml`. Tools only, no resources or prompts.
+from `config/packages/mcp.yaml`. Tools only, no resources or prompts. `POST /mcp/trips` is the same
+server without the editorial content, see [Trips only](#trips-only-mcptrips).
 
-Authentication is a static bearer token, `Authorization: Bearer <APP_MCP_TOKEN>`, checked by
+Authentication is a static bearer token per client, `Authorization: Bearer <token>`, checked by
-`App\Security\McpAccessTokenHandler` on the `mcp` firewall. If `APP_MCP_TOKEN` is empty, every request is
+`App\Security\McpAccessTokenHandler` on the `mcp` firewall. `APP_MCP_TOKENS` lists the clients as
-refused. It is not the OAuth2 client-credentials flow of `/api`: n8n's MCP Client Tool node sends a fixed
+`name:token` pairs separated by commas, e.g. `APP_MCP_TOKENS="n8n:3f9c…,claude-desktop:a71e…"`. Give every
+system its own token, so one can be revoked by removing its entry without touching the others. Use tokens
+without commas, e.g. `openssl rand -hex 32`. A malformed list (no name, a duplicate name, a token shared by
+two clients) fails loudly with a 500 on `/mcp` rather than locking a client out silently. If the list is
+empty, every request is refused. It is not the OAuth2 client-credentials flow of `/api`: n8n's MCP Client Tool node sends a fixed
 header and cannot renew a token every 10 minutes.
 
-Tool calls are rate-limited per token (`chatbot_mcp` limiter, 60 per minute). The limit is there to stop
+The client name becomes the authenticated user. Tool calls are rate-limited per client (`chatbot_mcp`
+limiter, 60 per minute), so testing from Claude Desktop does not eat into n8n's budget. The limit is there to stop
 runaway agent loops. Each call is logged on the `chatbot` channel (`var/log/<env>.chatbot.log`, file
-only) with the tool, arguments, result count and duration. Nothing identifies the person chatting.
+only) with the client, tool, arguments, result count and duration. Nothing identifies the person chatting.
 
 ### n8n
 
 MCP Client Tool node: endpoint `https://<host>/mcp`, transport *HTTP Streamable*, authentication *Bearer*
-with the stage's `APP_MCP_TOKEN`. The agent prompt should tell the bot to cite each answer's `url`, and
+with n8n's own token from the stage's `APP_MCP_TOKENS`. The agent prompt should tell the bot to cite each answer's `url`, and
 that prices and availability are a snapshot (`dataAsOf`) and only the booking page is binding.
 
 ## Tools
 
 | Tool | Use | Returns |
 |---|---|---|
-| `search_trips` | Which trips exist, when, where, how much | Up to 10 trips with their next 3 matching dates, `priceFrom`, availability, `dataAsOf` |
+| `search_trips` | The website's travel search: which trips exist, when, where, how much | One result per trip × hotel × travel date (default 10, max 25), with trip `code` and `hotelCode`, "ab" price, nights, inclusions, room types, availability, link; `total` and `dataAsOf` |
 | `get_trip` | One trip by product `code`, or one date of it by date code such as `SSLMP061226` (optionally `hotelCode`) | Product text with FAQs, hotels with facts, all upcoming dates with bookable rooms, pickups for the first 3 dates |
 | `search_content` | Questions not about dates or prices | Up to 8 hits with a ~600-character excerpt |
 | `get_document` | The full text of one `search_content` hit, by `url` | Markdown body, truncated at 20 000 characters |
 
+### Trips only: `/mcp/trips`
+
+A second server (`chatbot_trips` in `config/packages/mcp.yaml`) for clients that must not answer from
+editorial website text, which can contradict the booking system, most visibly on prices. A client picks
+the variant by the path it is pointed at; tokens, rate limit and log are those of `/mcp`.
+
+- Only `search_trips` and `get_trip`. `search_content` and `get_document` do not exist here.
+- `get_trip` (`App\Chatbot\Mcp\TripsOnly\GetTripTool`) leaves out the product `description`, which
+  includes the FAQs, and each hotel's `description`.
+- What remains from TYPO3 is structured: trip and hotel names, `url`, `site`, destination, concept and
+  the hotel `facts` (beds, altitude, distances, sauna, wifi, …; no prices). Which trips exist is still
+  decided by TYPO3's products and their `searchable` flag, and the free-text `query` of `search_trips`
+  still falls back to the page texts to find a trip, without returning any of it.
+- The server instructions tell the model to refer to the trip's `url` for anything the tools don't answer.
+
+To give a client the editorial content back, point it at `/mcp` again.
+
+Editorial text (product descriptions, FAQs, pages) is maintained by hand in TYPO3 and can lag behind BusPro, e.g. an
+old price or a changed inclusion. The server instructions and the tool descriptions therefore tell the model that the
+structured trip fields of `search_trips` and `get_trip` override whatever the text says about dates, prices, pickups
+and inclusions.
+
 Every result carries the public `url`. Output is compact JSON with Markdown in the text fields.
 An empty result is `{"results": []}`. Invalid input produces a tool error the model can read.
 
@@ -47,15 +75,62 @@ Trip rules (`App\Chatbot\TripCatalog`):
 - TYPO3 products are joined to the export on `product.code`. Several products can share a code, and
   each is listed as its own trip. Hotels are joined on any entry of the TYPO3 hotel's `codes` (BusPro
   uses the matchcode aliases). A code that is one hotel's own and another's alias resolves to its owner.
-- A room is bookable unless its status is `Buchungsstop`. `available` counts rooms, so the places of a
+- BusPro has hotel names of its own (`hotel.xml`, joined on the hotel id). They are internal wording
-  date at a hotel are `Σ available × maxPax` over its bookable rooms. `persons` filters on that sum, and
+  ("NEU Sportclub Lederer Wochenenden und Kurztrips", "Vacanceole Résidence L'Edelweiss"), so a hotel is
-  `maxPrice` on the lowest bookable room price. The tools never output room counts, only `frei` or
+  shown under its TYPO3 title, and under BusPro's name only when TYPO3 has no hotel for its code.
-  `auf Anfrage`.
+  `query` searches both. Trips have no name in BusPro's export, only a code; their names are TYPO3's.
+- A room is bookable unless its status is `Buchungsstop`. The baby row (room code `Baby`) is not a room.
+  `available` counts rooms, so the places of a date at a hotel are `Σ available × maxPax` over its
+  bookable rooms. The tools never output room counts, only `frei` or `auf Anfrage`.
 - `search_trips` only offers products that TYPO3 lists in its own website search (`searchable`) and does
   not mark as unbookable. Closed group trips and staff trainings are `searchable: false`. `get_trip` still
   answers when someone names their code.
+- Pickup surcharges are per person and per leg, so each pickup carries `surchargeOutbound`, `surchargeReturn` and
+  their sum `surchargeRoundTrip`. A single figure was read by the model as the whole price. A leg listed without a
+  price is `0`, because BusPro bills only priced legs; `surchargeReturn` is absent only where the point is not
+  served on the way back.
 - The export's `guide` (name, phone) and all BusPro ids are never output.
 
+`search_trips` mirrors the search page (`/skireisen/suche/`), whose data is TYPO3's import of our own
+product export. Its rules follow TYPO3's `DateImportService` and search repository, derived per date and
+hotel in `App\Model\Chatbot\TravelDateFacts`:
+
+- **"ab" price:** the cheapest bookable room with places left, otherwise the cheapest bookable room.
+  `priceMin`/`priceMax` apply to it. The site's price bands are presets of this.
+- **Travel period:** `dateFrom`/`dateTo` match by containment (start on or after, end on or before), as on
+  the site, not by overlap. `period` names one of the site's presets, from the `chatbot_travel_periods`
+  parameter in `config/services.yaml`. It's duplicated from the TYPO3 search configuration on purpose, so
+  update both each season. Expired periods are no longer offered.
+- **`persons`:** the site's condition (a room takes groups this small: smallest `minPax` ≤ persons) **and**
+  enough places left. The site checks only the first.
+- **Room type:** capacity, as TYPO3's `RoomTypeResolver` (`App\Enum\RoomType`): `maxPax` 1–8, 9 or more
+  is `9er+`. A label containing "bett im" or "mit ander" is `mit anderen` (a shared bed, sold per bed).
+- **Accommodation:** the TYPO3 hotel `type` (1 Ferienwohnung, 2 Sportclub, 3 Apartment, 4 Gästehaus,
+  5 Pension), `App\Enum\HotelType`.
+- **Board:** the items of selection group 71 ("4x Abendessen", "Frühstück inkl. … Lunchpaket", "Vollpension",
+  …), matched by word against any item. The site keys on the first item only. "Halbpension" occurs in no
+  label, so dinner is asked as "Abendessen".
+- **Inclusions:** selection groups 7 (Skipass), 71 (board), 86 (Programm), 87 (Kurse), 89 (Events), and the
+  outbound bus when its price is 0. `bus: true` asks for any bookable outbound bus.
+- **Nights:** days between start and end. The site's "short" is ≤ 4 and its "long" is ≥ 5.
+- **`query`:** the site has no free text. A code or a name is taken at its word, so that naming a trip or
+  hotel returns that one and not every page mentioning it. The first of these that finds anything decides
+  (`TripCatalog::resolveQuery()`, `App\Chatbot\Search\NameQuery`):
+  1. a product code, a hotel code or alias, or a date code;
+  2. names holding every word of the query, compared without accents, case and German stopwords, each
+     word as a prefix: "Lederer" is "Sportclub Lederer", "Chaviere" is "Val Chavière". Names are those of
+     products, hotels (TYPO3's and BusPro's), cities, regions, countries and concepts;
+  3. names the query spells out among other words ("Hotel Chamois d'Or in Val Thorens"), where the most
+     specific kind wins: product or hotel, then city, region, country or concept;
+  4. the page texts of those records, every term required, then any term.
+
+  A matching hotel selects its own travel dates, not all hotels of its trips. A destination or concept
+  selects its trips. Matches of one step are combined, so "Österreich Sportclub" is everything in Austria
+  plus every Sportclub; `country` and `concept` narrow instead.
+- **Order:** by start date, then "ab" price. The site sorts by concept first, which the feed doesn't carry.
+- Results link to the product page. Links with the hotel preselected and the site's "Restplätze" badge need
+  two fields the TYPO3 content feed doesn't send yet (`hotelUrls`, `lowContingent`).
+
 Search (`App\Chatbot\Search\ContentSearch`) is MariaDB full text in boolean mode over
 `title, breadcrumb, body_md`. Each term becomes a prefix match, because InnoDB has no German stemming,
 and German stopwords are dropped in PHP. Relevance is weighted by type: products and hotels, then
@@ -70,8 +145,12 @@ php bin/console app:content:sync --ignore-window  # deliberate bulk run outside
 php bin/console app:content:check-freshness       # fails if the last good manifest is > 60 min old
 ```
 
-Not scheduled yet. The intended schedule is a delta sync every 15 minutes, `--refresh` on Sunday at
+Scheduled on prod (`config/packages/zenstruck_schedule.yaml`): an hourly delta sync,
-01:00, and the freshness check hourly, so that `email_on_failure` reports a stalled sync.
+`--refresh` on Sunday at 01:05, and the freshness check hourly at :10 with `--max-age 150`, so that
+`email_on_failure` reports a stalled sync but not a single missed run. Website content changes
+rarely, and an hour's delay is acceptable for the chatbot; trip data and availability do not come
+from this mirror. The refresh is off the quarter hour because a run that
+finds another one holding the lock exits successfully without doing anything.
 
 The feed is read with `X-Api-Key: <APP_CMS_API_KEY>` from `APP_CMS_API_BASE_URL`. The manifest lists
 every site whichever host serves it. The key is only sent to hosts of the sites the manifest names.
@@ -109,4 +188,4 @@ After a complete run that changed something, the codes the trip join cannot plac
 |---|---|
 | `APP_CMS_API_BASE_URL` | TYPO3 base URL per stage (also used by `CmsDataProvider`) |
 | `APP_CMS_API_KEY` | TYPO3 `X-Api-Key`: the content feed and its `contentUrl` pages, and `typo3.client` (`CmsDataProvider`) |
-| `APP_MCP_TOKEN` | Bearer token n8n sends to `/mcp` |
+| `APP_MCP_TOKENS` | Bearer tokens for `/mcp` and `/mcp/trips`, one per client: `name:token,name:token` |

migrations/Version20261029120000.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20261029120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Keys the contingent snapshot by hotel code instead of accommodation, and adds calendar_hotel for TYPO3\'s calendar hotel list.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE calendar_hotel (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(16) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_6F075DB777153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+
+        // Backfill from the linked accommodation. accommodation_id stays, nullable and no longer
+        // written, until a later migration drops it; that keeps this step reversible.
+        $this->addSql('ALTER TABLE contingent_day ADD hotel_code VARCHAR(16) DEFAULT NULL, CHANGE accommodation_id accommodation_id INT DEFAULT NULL');
+        $this->addSql('UPDATE contingent_day cd INNER JOIN accommodation a ON a.id = cd.accommodation_id SET cd.hotel_code = a.calendar_code');
+        $this->addSql('DELETE FROM contingent_day WHERE hotel_code IS NULL OR hotel_code = \'\'');
+        $this->addSql('ALTER TABLE contingent_day CHANGE hotel_code hotel_code VARCHAR(16) NOT NULL');
+        $this->addSql('DROP INDEX uniq_contingent_day_accommodation_date ON contingent_day');
+        $this->addSql('CREATE UNIQUE INDEX uniq_contingent_day_hotel_code_date ON contingent_day (hotel_code, date)');
+
+        $this->addSql('ALTER TABLE contingent_sync_state ADD hotel_code VARCHAR(16) DEFAULT NULL, CHANGE accommodation_id accommodation_id INT DEFAULT NULL');
+        $this->addSql('UPDATE contingent_sync_state s INNER JOIN accommodation a ON a.id = s.accommodation_id SET s.hotel_code = a.calendar_code');
+        $this->addSql('DELETE FROM contingent_sync_state WHERE hotel_code IS NULL OR hotel_code = \'\'');
+        $this->addSql('ALTER TABLE contingent_sync_state CHANGE hotel_code hotel_code VARCHAR(16) NOT NULL');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_737F167CC0D0E610 ON contingent_sync_state (hotel_code)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Rows of hotel codes without an accommodation cannot be expressed in the old schema.
+        // The snapshot is a cache, so the next sync of the old code rebuilds whatever is lost.
+        $this->addSql('UPDATE contingent_day cd INNER JOIN accommodation a ON a.calendar_code = cd.hotel_code SET cd.accommodation_id = a.id');
+        $this->addSql('DELETE cd FROM contingent_day cd LEFT JOIN accommodation a ON a.calendar_code = cd.hotel_code WHERE a.id IS NULL');
+        $this->addSql('DROP INDEX uniq_contingent_day_hotel_code_date ON contingent_day');
+        $this->addSql('ALTER TABLE contingent_day DROP hotel_code, CHANGE accommodation_id accommodation_id INT NOT NULL');
+        $this->addSql('CREATE UNIQUE INDEX uniq_contingent_day_accommodation_date ON contingent_day (accommodation_id, date)');
+
+        $this->addSql('UPDATE contingent_sync_state s INNER JOIN accommodation a ON a.calendar_code = s.hotel_code SET s.accommodation_id = a.id');
+        $this->addSql('DELETE s FROM contingent_sync_state s LEFT JOIN accommodation a ON a.calendar_code = s.hotel_code WHERE a.id IS NULL');
+        $this->addSql('DROP INDEX UNIQ_737F167CC0D0E610 ON contingent_sync_state');
+        $this->addSql('ALTER TABLE contingent_sync_state DROP hotel_code, CHANGE accommodation_id accommodation_id INT NOT NULL');
+
+        $this->addSql('DROP TABLE calendar_hotel');
+    }
+}

migrations/Version20261104142531.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20261104142531 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Adds travel_mailing_list to track the Mailjet contact lists created per travel until their deletion.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE travel_mailing_list (id INT AUTO_INCREMENT NOT NULL, travel_code VARCHAR(32) NOT NULL, mailjet_list_id INT NOT NULL, delete_after DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', UNIQUE INDEX UNIQ_68DC6E28BC4DD335 (travel_code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE travel_mailing_list');
+    }
+}

migrations/Version20261109074654.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20261109074654 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Allows a bus-only travel mailing list next to the full one: adds bus_leg and the list name, which replaces travel_code as the unique key.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE travel_mailing_list ADD bus_leg VARCHAR(20) DEFAULT NULL, ADD name VARCHAR(64) DEFAULT NULL');
+        // Every existing list holds all participants and is named by its travel code alone.
+        $this->addSql('UPDATE travel_mailing_list SET name = travel_code');
+        $this->addSql('ALTER TABLE travel_mailing_list MODIFY name VARCHAR(64) NOT NULL');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_68DC6E285E237E06 ON travel_mailing_list (name)');
+        $this->addSql('ALTER TABLE travel_mailing_list DROP INDEX UNIQ_68DC6E28BC4DD335, ADD INDEX IDX_68DC6E28BC4DD335 (travel_code)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Fails while a travel has two lists; delete the bus-only one first.
+        $this->addSql('ALTER TABLE travel_mailing_list DROP INDEX IDX_68DC6E28BC4DD335, ADD UNIQUE INDEX UNIQ_68DC6E28BC4DD335 (travel_code)');
+        $this->addSql('DROP INDEX UNIQ_68DC6E285E237E06 ON travel_mailing_list');
+        $this->addSql('ALTER TABLE travel_mailing_list DROP bus_leg, DROP name');
+    }
+}

package.json

@@ -1,31 +1,29 @@
 {
   "name": "myep",
   "devDependencies": {
-    "@babel/core": "^7.17.0",
+    "@babel/core": "^8.0.7",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-env": "^8.0.7",
     "@hotwired/stimulus": "^3.0.0",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/webpack-encore": "^6.0.0",
+    "@symfony/webpack-encore": "^7.2.0",
     "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/postcss": "^4.3.3",
-    "autoprefixer": "^10.4.20",
+    "babel-plugin-polyfill-corejs3": "^1.0.0",
-    "core-js": "^3.38.0",
+    "core-js": "^3.51.0",
     "cypress": "^15.5.0",
-    "file-loader": "^6.2.0",
+    "htmx.org": "^2.0.11",
-    "htmx.org": "^1.9.12",
+    "lightningcss": "^1.33.0",
     "postcss": "^8.4.49",
     "postcss-loader": "^8.1.1",
-    "regenerator-runtime": "^0.13.9",
+    "tailwindcss": "^4.3.3",
-    "tailwindcss": "^3.4.15",
     "tippy.js": "^6.3.7",
     "toastify-js": "^1.12.0",
     "webpack": "^5.74.0",
-    "webpack-cli": "^6.0.1"
+    "webpack-cli": "^7.2.3"
   },
   "license": "WTFPL",
   "private": true,
   "scripts": {
-    "dev-server": "encore dev-server",
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
@@ -37,5 +35,9 @@
     "sortablejs": "^1.15.7",
     "stimulus-use": "^0.52.3",
     "vanilla-calendar-pro": "^3.1.0"
+  },
+  "allowScripts": {
+    "cypress": true,
+    "core-js": false
   }
 }

postcss.config.js

@@ -1,7 +1,5 @@
 module.exports = {
     plugins: {
-        'postcss-import': {},
+        '@tailwindcss/postcss': {},
-        tailwindcss: {},
-        autoprefixer: {},
     }
 }

src/BpnConnect/Model/TravelMailingRecipient.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BpnConnect\Model;
+
+readonly class TravelMailingRecipient
+{
+    public function __construct(
+        public string $email,
+        public string $firstName,
+        public string $lastName,
+    ) {
+    }
+}

src/BpnConnect/Model/TravelMailingResponse.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BpnConnect\Model;
+
+use App\Enum\BusLeg;
+
+readonly class TravelMailingResponse
+{
+    /**
+     * @param TravelMailingRecipient[] $data
+     */
+    public function __construct(
+        public string $travelCode,
+        public array $data,
+        public ?BusLeg $busLeg = null,
+    ) {
+    }
+}

src/BpnConnect/TravelsClient.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BpnConnect;
+
+use App\BpnConnect\Exception\BpnConnectException;
+use App\BpnConnect\Model\TravelMailingRecipient;
+use App\BpnConnect\Model\TravelMailingResponse;
+use App\Enum\BusLeg;
+
+class TravelsClient extends AbstractApiClient
+{
+    private const string MAILING_PATH = '/api/v1/travels/mailing';
+
+    /**
+     * An unknown travel code yields an empty list, not an error: bpn-connect cannot tell it
+     * apart from a travel without confirmed participants.
+     *
+     * @param ?BusLeg $busLeg only participants who booked this bus leg, plus their bookings' applicants
+     */
+    public function getMailingRecipients(string $travelCode, ?BusLeg $busLeg = null): TravelMailingResponse
+    {
+        $query = ['travelCode' => $travelCode];
+        if (null !== $busLeg) {
+            $query['busLeg'] = $busLeg->value;
+        }
+
+        $payload = $this->request(self::MAILING_PATH, $query);
+
+        // A bpn-connect that predates the filter ignores the parameter and returns everyone, which
+        // must not end up on a list meant for bus passengers only.
+        $appliedBusLeg = $payload['meta']['bus_leg'] ?? null;
+        if ($appliedBusLeg !== $busLeg?->value) {
+            $this->logger->error('BpnConnect ignored the travel mailing bus filter', [
+                'travel_code' => $travelCode,
+                'requested_bus_leg' => $busLeg?->value,
+                'applied_bus_leg' => $appliedBusLeg,
+            ]);
+
+            throw new BpnConnectException('BpnConnect did not apply the requested bus leg filter.');
+        }
+
+        $recipients = array_map(
+            static fn (array $item) => new TravelMailingRecipient(
+                email: $item['email'],
+                firstName: $item['first_name'] ?? '',
+                lastName: $item['last_name'] ?? '',
+            ),
+            $payload['data'] ?? [],
+        );
+
+        return new TravelMailingResponse($payload['meta']['travel_code'] ?? $travelCode, $recipients, $busLeg);
+    }
+}

src/BusProNet/DataProcessor/BookingDataProcessor.php

@@ -49,8 +49,9 @@ class BookingDataProcessor
      * - ParticipantDto::fromPersonalData() clones address objects to prevent shared references
      * - For normal bookings, participant[0]'s missing address/dimensions are filled from the
      *   applicant (same person in normal bookings, but BPN may omit fields in <teilnehmer>)
-     * - For internal agency bookings, this copy is skipped: the applicant is a customer, not
+     * - The copy is skipped wherever participant[0] is NOT the applicant: internal agency
-     *   the first participant, so copying applicant data into participant[0] would be incorrect
+     *   bookings (the applicant is a customer) and split bookings (the applicant does not
+     *   travel), where it would write one person's address onto another
      */
     public function createBookingDtoFromBooking(Booking $booking, Travel $travel, bool $isInternalAgencyBooking = false): BookingDto
     {
@@ -74,32 +75,6 @@ class BookingDataProcessor
             $participantData = ParticipantDto::fromPersonalData($participant);
             $participantData->index = $index;
 
-            // For normal bookings, applicant === participant[0]: copy address and body dimensions
-            // from applicant when BPN returns full data only in <anmelder> and minimal data in
-            // <teilnehmer id="1">. Skipped for internal agency bookings where the applicant is
-            // a customer (a different entity from the first traveler).
-            if (0 === $index && false === $isInternalAgencyBooking) {
-                // Copy address if first participant has no street (indicating empty/incomplete address)
-                $isEmpty = null === $participantData->address
-                    || null === $participantData->address->street
-                    || u($participantData->address->street)->trim()->isEmpty();
-
-                if ($isEmpty) {
-                    $participantData->address = clone $booking->applicant->address;
-                }
-
-                // Copy body dimensions from applicant if not present in participant
-                if (null === $participantData->height && null !== $booking->applicant->height) {
-                    $participantData->height = $booking->applicant->height;
-                }
-                if (null === $participantData->weight && null !== $booking->applicant->weight) {
-                    $participantData->weight = $booking->applicant->weight;
-                }
-                if (null === $participantData->shoeSize && null !== $booking->applicant->shoeSize) {
-                    $participantData->shoeSize = $booking->applicant->shoeSize;
-                }
-            }
-
             // Extract service selections from booking and assign to participant DTO
             $participantData->courses = $booking
                 ->getAdditionalServicesForParticipantByGroup($index, Constants::TOKEN_COURSES);
@@ -178,14 +153,57 @@ class BookingDataProcessor
                 $roomSelection->price = $room->price;
                 $roomSelection->quantity = $bookingRoom->totalCount; // Actual quantity from booking XML (anzahl)
                 $roomSelection->capacity = $room->minPax ?? 1;
-                $roomSelection->maxQuantity = $bookingRoom->totalCount + ($room->available ?? 0);
                 $dto->roomSelections[] = $roomSelection;
             }
         }
 
+        // Runs once the participants are in place, because the decision needs the assembled DTO.
+        // The explicit flag covers internal agency bookings, whose applicant is a customer; the
+        // DTO predicate covers a split booking, whose participant[0] is a different person.
+        if (false === $isInternalAgencyBooking && $dto->isFirstParticipantApplicant()) {
+            $this->fillFirstParticipantFromApplicant($dto, $booking);
+        }
+
         return $dto;
     }
 
+    /**
+     * Fills gaps in participant[0] from the applicant, who is the same person.
+     *
+     * BPN routinely returns the full record in <anmelder> and only a minimal one in
+     * <teilnehmer id="1">. Only ever called where participant[0] IS the applicant: on a
+     * split booking or an internal agency booking this would write somebody else's address
+     * onto a traveller at the next edit submit.
+     */
+    private function fillFirstParticipantFromApplicant(BookingDto $dto, Booking $booking): void
+    {
+        $participantData = $dto->getParticipant(0);
+
+        if (null === $participantData) {
+            return;
+        }
+
+        // Copy address if first participant has no street (indicating empty/incomplete address)
+        $isEmpty = null === $participantData->address
+            || null === $participantData->address->street
+            || u($participantData->address->street)->trim()->isEmpty();
+
+        if ($isEmpty) {
+            $participantData->address = clone $booking->applicant->address;
+        }
+
+        // Copy body dimensions from applicant if not present in participant
+        if (null === $participantData->height && null !== $booking->applicant->height) {
+            $participantData->height = $booking->applicant->height;
+        }
+        if (null === $participantData->weight && null !== $booking->applicant->weight) {
+            $participantData->weight = $booking->applicant->weight;
+        }
+        if (null === $participantData->shoeSize && null !== $booking->applicant->shoeSize) {
+            $participantData->shoeSize = $booking->applicant->shoeSize;
+        }
+    }
+
     /**
      * Enriches participant service selections with data from travel model.
      *
@@ -322,6 +340,7 @@ class BookingDataProcessor
             $this->serviceProcessor->processParticipantServices($participant, $bookingData, $travelData);
         }
 
+        $this->serviceProcessor->removeCanceledParticipantsFromRooms($bookingData);
         $this->serviceProcessor->removeUnusedServices($bookingData);
         $this->personalDataSynchronizer->updateParticipantPersonalData(
             $formData->participants,

src/BusProNet/DataProcessor/BookingPayloadBuilder.php

@@ -254,7 +254,11 @@ class BookingPayloadBuilder
      */
     public function buildCreatePayload(BookingDto $bookingDto, string $bookingType): array
     {
-        $firstParticipant = $bookingDto->participants[0];
+        // The applicant is participant[0] on an ordinary booking, and a person of their own
+        // when they do not travel along.
+        $applicantSource = $bookingDto->applicantTravels
+            ? $bookingDto->participants[0]
+            : ($bookingDto->applicant ?? $bookingDto->participants[0]);
 
         $payload = [
             'buchungsart' => $bookingType,
@@ -264,36 +268,10 @@ class BookingPayloadBuilder
             'idagentur' => $bookingDto->agencyId,
         ];
 
-        // Add applicant (first participant data)
-        $payload['anmelder'] = [
-            'name' => $firstParticipant->lastName,
-            'vorname' => $firstParticipant->firstName,
-            'geschlecht' => $firstParticipant->gender ?? '',
-            'nationalitaet' => $firstParticipant->nationality ?? '',
-        ];
-
         // DO NOT include personId or addressId in create mode
         // BPN will automatically match existing customers by exact personal data (name, DOB, address)
         // Including IDs would prevent automatic matching and could cause data inconsistencies
-
+        $payload['anmelder'] = $this->buildPersonalDataPayload($applicantSource);
-        if (null !== $firstParticipant->dateOfBirth) {
-            $payload['anmelder']['geburtsdatum'] = $firstParticipant->dateOfBirth->format('d.m.Y');
-        }
-
-        // Add address for applicant
-        if (null !== $firstParticipant->address) {
-            $payload['anmelder']['anschrift'] = $firstParticipant->address->toPayload();
-        }
-
-        if (null !== $firstParticipant->email || null !== $firstParticipant->mobile) {
-            $payload['anmelder']['kommunikation'] = [];
-            if (null !== $firstParticipant->email) {
-                $payload['anmelder']['kommunikation']['email'] = $firstParticipant->email;
-            }
-            if (null !== $firstParticipant->mobile) {
-                $payload['anmelder']['kommunikation']['telefonmobil'] = $firstParticipant->mobile;
-            }
-        }
 
         // Determine if this is an inquiry booking for voucher handling
         $isInquiryBooking = 'A' === $bookingDto->bookingStatus;
@@ -301,42 +279,13 @@ class BookingPayloadBuilder
         // Add participants
         $payload['teilnehmerliste']['teilnehmer'] = [];
         foreach ($bookingDto->participants as $index => $participant) {
-            $participantData = [
-                '@id' => $index + 1,
-                'status' => self::DEFAULT_PARTICIPANT_STATUS,
-                'name' => $participant->lastName,
-                'vorname' => $participant->firstName,
-                'geschlecht' => $participant->gender ?? '',
-                'nationalitaet' => $participant->nationality ?? '',
-            ];
-
             // DO NOT include personId or addressId in create mode
             // BPN will automatically match existing customers by exact personal data (name, DOB, address)
             // Including IDs would prevent automatic matching and could cause data inconsistencies
-
+            $participantData = [
-            if (null !== $participant->dateOfBirth) {
+                '@id' => $index + 1,
-                $participantData['geburtsdatum'] = $participant->dateOfBirth->format('d.m.Y');
+                'status' => self::DEFAULT_PARTICIPANT_STATUS,
-            }
+            ] + $this->buildPersonalDataPayload($participant, true);
-
-            // Add address (always include structure, even if empty)
-            $participantData['anschrift'] = $participant->address?->toPayload() ?? [
-                'strasse' => null,
-                'plz' => null,
-                'ort' => null,
-                'ortsteil' => null,
-                'land' => null,
-            ];
-
-            // Add contact info for all participants
-            if (null !== $participant->email || null !== $participant->mobile) {
-                $participantData['kommunikation'] = [];
-                if (null !== $participant->email) {
-                    $participantData['kommunikation']['email'] = $participant->email;
-                }
-                if (null !== $participant->mobile) {
-                    $participantData['kommunikation']['telefonmobil'] = $participant->mobile;
-                }
-            }
 
             // Add body dimensions
             if (null !== $participant->height) {
@@ -434,6 +383,57 @@ class BookingPayloadBuilder
         return $payload;
     }
 
+    /**
+     * Maps one person's personal data onto the payload shape shared by anmelder and teilnehmer.
+     *
+     * @param ParticipantDto $person               The applicant or participant to map
+     * @param bool           $alwaysIncludeAddress Participants always carry the anschrift structure
+     *                                             even when empty; the anmelder only when set
+     *
+     * @return array<string, mixed>
+     */
+    private function buildPersonalDataPayload(ParticipantDto $person, bool $alwaysIncludeAddress = false): array
+    {
+        $data = [
+            'name' => $person->lastName,
+            'vorname' => $person->firstName,
+            'geschlecht' => $person->gender ?? '',
+            'nationalitaet' => $person->nationality ?? '',
+        ];
+
+        if (null !== $person->dateOfBirth) {
+            $data['geburtsdatum'] = $person->dateOfBirth->format('d.m.Y');
+        }
+
+        if (null !== $person->address) {
+            $data['anschrift'] = $person->address->toPayload();
+        } elseif ($alwaysIncludeAddress) {
+            $data['anschrift'] = [
+                'strasse' => null,
+                'plz' => null,
+                'ort' => null,
+                'ortsteil' => null,
+                'land' => null,
+            ];
+        }
+
+        // A participant may come without an email (under-16s, see ParticipantDto::$email), and
+        // BusPro accepts that, so a blank is sent as a blank rather than borrowing the applicant's.
+        $email = null !== $person->email && '' !== trim($person->email) ? $person->email : null;
+
+        if (null !== $email || null !== $person->mobile) {
+            $data['kommunikation'] = [];
+            if (null !== $email) {
+                $data['kommunikation']['email'] = $email;
+            }
+            if (null !== $person->mobile) {
+                $data['kommunikation']['telefonmobil'] = $person->mobile;
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Adds services from a mapping to the payload.
      *

src/BusProNet/DataProcessor/ParticipantServiceProcessor.php

@@ -14,8 +14,9 @@ use Psr\Log\LoggerInterface;
  * Processes participant service selections for booking updates.
  *
  * Handles the assignment and mapping of services (additional, transportation,
- * pickup, room, insurance) from participant DTOs to the booking model during
+ * pickup, insurance) from participant DTOs to the booking model during the
- * the update request workflow.
+ * update request workflow. Rooms are not taken from the DTOs: they cannot be
+ * changed in edit mode, so the booking's own room assignments are sent back.
  */
 class ParticipantServiceProcessor
 {
@@ -28,7 +29,7 @@ class ParticipantServiceProcessor
      * Resets all existing participant-to-service mappings to start with a clean slate.
      *
      * This ensures that service assignments are rebuilt from scratch based on current form selections.
-     * Includes resetting room mappings to allow room reassignments during edit.
+     * Room mappings are left alone, see removeCanceledParticipantsFromRooms().
      *
      * @param Booking $bookingData The booking data object containing services to reset
      */
@@ -39,7 +40,6 @@ class ParticipantServiceProcessor
             ...$bookingData->transportationServices,
             ...$bookingData->pickups,
             ...$bookingData->dropOffs,
-            ...$bookingData->rooms,
             ...$bookingData->insurances,
         ];
 
@@ -52,7 +52,7 @@ class ParticipantServiceProcessor
      * Processes all services for a single participant.
      *
      * This orchestrator method handles the complete service assignment workflow for one participant,
-     * including additional services, transportation services, pickup locations, and room assignments.
+     * including additional services, transportation services, pickup locations, and insurance.
      *
      * @param ParticipantDto $participant The participant data from the form
      * @param Booking        $bookingData The booking data object to update
@@ -68,7 +68,6 @@ class ParticipantServiceProcessor
         $this->processTransportationServices($participant, $bookingData, $travelData);
         $this->processPickupLocations($participant, $bookingData);
         $this->processDropOffLocations($participant, $bookingData);
-        $this->processRoomAssignment($participant, $bookingData);
         $this->processInsurance($participant, $bookingData, $travelData);
     }
 
@@ -271,27 +270,23 @@ class ParticipantServiceProcessor
     }
 
     /**
-     * Processes room assignment for a participant.
+     * Removes canceled participants from the booking's room assignments.
      *
-     * Maps the participant to their assigned room. Allows room reassignment during
+     * Room assignments cannot be changed in edit mode, so they are sent back as BusPro reports
-     * booking edits while maintaining the constraint that participants can only be
+     * them on the booking reloaded at submit, together with its anzahl. Rebuilding them from the
-     * assigned to room types that have already been booked.
+     * session would undo any reassignment made in BusPro while the edit was open, and send a
+     * zuordnung that no longer matches anzahl. Canceled participants are left out, as for every
+     * other service.
      *
-     * @param ParticipantDto $participant The participant data from the form
+     * @param Booking $bookingData The booking data object to update
-     * @param Booking        $bookingData The booking data object to update
      */
-    private function processRoomAssignment(ParticipantDto $participant, Booking $bookingData): void
+    public function removeCanceledParticipantsFromRooms(Booking $bookingData): void
     {
-        if (null === $participant->assignedRoomId) {
-            return;
-        }
-
-        // Find the room in the existing booking by ID
         foreach ($bookingData->rooms as $room) {
-            if ($room->id === $participant->assignedRoomId) {
+            $room->mapping = array_values(array_filter(
-                $room->mapping[] = $participant->index;
+                $room->mapping,
-                break;
+                fn (int $index) => 'S' !== ($bookingData->participantsStatus[$index] ?? null)
-            }
+            ));
         }
     }
 

src/BusProNet/Model/Communication.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\BusProNet\Model;
 
+use App\Validator\Constraints as AppAssert;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -15,17 +16,47 @@ use Symfony\Component\Validator\Constraints as Assert;
  */
 class Communication
 {
+    #[Assert\When(
+        expression: 'this.isPhoneNewlyEntered()',
+        constraints: [new AppAssert\PhoneNumber()],
+        groups: ['personal_data'],
+    )]
     public ?string $phone = null;
 
     #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
+    #[Assert\When(
+        expression: 'this.isMobileNewlyEntered()',
+        constraints: [new AppAssert\PhoneNumber()],
+        groups: ['personal_data'],
+    )]
     public ?string $mobile = null;
 
-    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
+    // The numbers as loaded from BusPro, which go back unchanged and are exempt from PhoneNumber.
-    #[Assert\Email(message: 'Bitte eine gültige Adresse angeben', mode: 'strict', groups: ['personal_data'])]
+    public ?string $loadedPhone = null;
+    public ?string $loadedMobile = null;
+
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_identity'])]
+    #[Assert\Email(message: 'Bitte eine gültige Adresse angeben', mode: 'strict', groups: ['personal_identity'])]
     public ?string $email = null;
 
     public bool $newsletter = false;
 
+    public function rememberLoadedNumbers(): void
+    {
+        $this->loadedPhone = $this->phone;
+        $this->loadedMobile = $this->mobile;
+    }
+
+    public function isPhoneNewlyEntered(): bool
+    {
+        return AppAssert\PhoneNumber::isNewlyEntered($this->phone, $this->loadedPhone);
+    }
+
+    public function isMobileNewlyEntered(): bool
+    {
+        return AppAssert\PhoneNumber::isNewlyEntered($this->mobile, $this->loadedMobile);
+    }
+
     /**
      * Converts the communication data to API payload format.
      *

src/BusProNet/Model/PersonalData.php

@@ -23,10 +23,12 @@ class PersonalData
     public bool $mutable = false;
     public ?string $status = null;
 
-    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_data'])]
+    // personal_identity holds what the user cannot edit in MyE&P (name and the login e-mail), so the
+    // personal-data form can validate everything else while the completeness check still sees it.
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_identity'])]
     public ?string $name = null;
 
-    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_data'])]
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_identity'])]
     public ?string $firstName = '';
 
     public ?string $salutation = null;
@@ -53,7 +55,7 @@ class PersonalData
     #[Assert\Valid(groups: ['personal_data'])]
     public Address $address;
 
-    #[Assert\Valid(groups: ['personal_data'])]
+    #[Assert\Valid(groups: ['personal_data', 'personal_identity'])]
     public Communication $communication;
 
     /** @var list<string> */

src/BusProNet/Model/Travel.php

@@ -20,6 +20,12 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 class Travel
 {
     use SortByPriceTrait;
+
+    /**
+     * CRM selection that offers the "I am not travelling myself" choice on a travel date.
+     */
+    private const NON_TRAVELLING_APPLICANT_SELECTION_ID = 1488;
+
     #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $id = null;
 
@@ -240,6 +246,15 @@ class Travel
         return false;
     }
 
+    /**
+     * Whether a booking for this travel date may be placed by an applicant who does not travel
+     * along, such as a parent booking for their children.
+     */
+    public function allowsNonTravellingApplicant(): bool
+    {
+        return $this->hasSelectionId(self::NON_TRAVELLING_APPLICANT_SELECTION_ID);
+    }
+
     /**
      * Retrieves rooms filtered by their IDs.
      *

src/BusProNet/Transport/XmlChannel.php

@@ -6,6 +6,7 @@ use App\BusProNet\Exception\ApiClientException;
 use App\BusProNet\Exception\ImmediateConnectionCloseException;
 use App\BusProNet\Exception\ResponseParserException;
 use App\BusProNet\MessageType;
+use App\BusProNet\Utility\XmlCharacterFilter;
 use App\BusProNet\XmlParser\ApiResponseParser;
 use App\Service\XmlDumpWriter;
 use Psr\Log\LoggerInterface;
@@ -208,8 +209,18 @@ class XmlChannel
      */
     private function parseResponse(MessageType $type, string $xml, array $parserArgs, string $requestId, bool $dumpOnFailure = true): mixed
     {
+        // The dump keeps the raw response; only the parser sees the filtered one.
+        $filtered = XmlCharacterFilter::strip($xml, $removed);
+        if ($removed > 0) {
+            $this->logger->warning('Removed characters not allowed in XML from API response', [
+                'request_id' => $requestId,
+                'type' => $type->value,
+                'removed' => $removed,
+            ]);
+        }
+
         try {
-            return $this->responseParser->parseXmlString($type, $xml, $parserArgs);
+            return $this->responseParser->parseXmlString($type, $filtered, $parserArgs);
         } catch (ResponseParserException $e) {
             // Keep the evidence even outside debug mode: without the raw response a parse
             // failure is not diagnosable after the fact. app:cleanup:xml-dumps prunes it.

src/BusProNet/Utility/XmlCharacterFilter.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Utility;
+
+/**
+ * Removes characters XML 1.0 does not allow from a BusPro response before it is parsed.
+ *
+ * BusPro escapes whatever a field holds into a character reference without checking it,
+ * so a NUL-padded value comes out as `&#x0;`. libxml rejects that as fatal and the whole
+ * response fails to parse, not just the field. The same applies to the raw control bytes.
+ */
+final class XmlCharacterFilter
+{
+    /**
+     * @param-out int $count the number of characters removed
+     */
+    public static function strip(string $xml, ?int &$count = null): string
+    {
+        $count = 0;
+
+        $xml = preg_replace_callback(
+            '/&#(x[0-9a-f]+|[0-9]+);/i',
+            static function (array $match) use (&$count): string {
+                $reference = $match[1];
+                $codePoint = 'x' === strtolower($reference[0]) ? hexdec(substr($reference, 1)) : (int) $reference;
+
+                if (self::isAllowed($codePoint)) {
+                    return $match[0];
+                }
+
+                ++$count;
+
+                return '';
+            },
+            $xml,
+        );
+
+        // Control bytes never occur inside a UTF-8 multibyte sequence, so a byte-wise match is safe.
+        $xml = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $xml, -1, $rawCount);
+
+        $count += $rawCount;
+
+        return $xml;
+    }
+
+    /**
+     * The Char production of XML 1.0.
+     */
+    private static function isAllowed(int|float $codePoint): bool
+    {
+        return 0x9 === $codePoint
+            || 0xA === $codePoint
+            || 0xD === $codePoint
+            || ($codePoint >= 0x20 && $codePoint <= 0xD7FF)
+            || ($codePoint >= 0xE000 && $codePoint <= 0xFFFD)
+            || ($codePoint >= 0x10000 && $codePoint <= 0x10FFFF);
+    }
+}

src/BusProNet/XmlLoader/TravelLoader.php

@@ -307,10 +307,10 @@ class TravelLoader extends AbstractLoader
             $availability = $serviceAvailabilities[$service->id];
             $service->available = $availability->available;
 
-            // The live status is the only signal that a contingent has run out: BusPro moves a
+            // The live status is fresher than the nightly export's. The parser has already mapped it
-            // Leistung to 'Anfrage' without necessarily reporting frei="0". Only overwrite when the
+            // onto the export vocabulary. Only overwrite when the response actually carries one, so a
-            // response actually carries one, so a response that omits the attribute does not wipe
+            // response that omits the attribute does not wipe the value parsed from the XML export.
-            // the value parsed from the XML export. Mirrors TravelSnapshotManager::applyExtendedToService().
+            // Mirrors TravelSnapshotManager::applyExtendedToService().
             if (null !== $availability->status && '' !== trim($availability->status)) {
                 $service->status = $availability->status;
             }

src/BusProNet/XmlParser/AbstractParser.php

@@ -2,6 +2,7 @@
 
 namespace App\BusProNet\XmlParser;
 
+use App\BusProNet\Constants;
 use App\BusProNet\Traits\TypeConversionTrait;
 use Symfony\Component\DomCrawler\Crawler;
 
@@ -9,6 +10,19 @@ abstract class AbstractParser
 {
     use TypeConversionTrait;
 
+    /**
+     * Live availability wording for a Leistung, mapped onto the XML export's.
+     *
+     * The availability endpoints answer "buchbar" or "ausgebucht", while every availability rule
+     * compares against the export's "Frei" / "Anfrage" / "Buchungsstop". "ausgebucht" also covers
+     * a Leistung that would still take an inquiry (anfragemoeglich="J"); that is not offered
+     * either, so it maps to the booking stop.
+     */
+    private const LIVE_SERVICE_STATUS = [
+        'buchbar' => Constants::STATUS_AVAILABLE,
+        'ausgebucht' => Constants::STATUS_BLOCKED,
+    ];
+
     protected function getStringOrNullValue(Crawler $node): ?string
     {
         return 0 < $node->count() ? $node->text() : null;
@@ -87,4 +101,16 @@ abstract class AbstractParser
 
         return $value;
     }
+
+    /**
+     * Translates a live Leistung status into the export vocabulary; anything else passes through.
+     */
+    protected function toServiceStatus(?string $liveStatus): ?string
+    {
+        if (null === $liveStatus) {
+            return null;
+        }
+
+        return self::LIVE_SERVICE_STATUS[strtolower(trim($liveStatus))] ?? $liveStatus;
+    }
 }

src/BusProNet/XmlParser/AvailabilitiesParser.php

@@ -19,7 +19,7 @@ class AvailabilitiesParser extends AbstractParser
             ->each(function (Crawler $node) use (&$availabilities) {
                 $availability = new Availability();
                 $availability->serviceId = (int) $node->attr('id');
-                $availability->status = $node->attr('status');
+                $availability->status = $this->toServiceStatus($node->attr('status'));
                 $availability->available = (int) $node->attr('frei');
                 $availability->price = $this->stringToFloat($node->attr('preis'));
 

src/BusProNet/XmlParser/ExtendedAvailabilitiesParser.php

@@ -30,7 +30,7 @@ class ExtendedAvailabilitiesParser extends AbstractParser
 
                 $availability = new ExtendedAvailability();
                 $availability->serviceId = $serviceId;
-                $availability->status = $node->attr('status');
+                $availability->status = $this->toServiceStatus($node->attr('status'));
                 $availability->available = (int) $node->attr('frei');
                 $availability->price = $this->stringToFloat($node->attr('preis'));
                 $availability->dateFrom = $this->stringToDate($node->attr('termin'));

src/BusProNet/XmlParser/PersonalDataParser.php

@@ -50,6 +50,7 @@ class PersonalDataParser extends AbstractParser
             $communication->mobile = $this->getStringOrNullValue($contactDataNode->filterXPath('//telefonmobil'));
             $communication->email = $this->getStringOrNullValue($contactDataNode->filterXPath('//email'));
             $communication->newsletter = $this->getBoolValue($contactDataNode->filterXPath('//newsletter'));
+            $communication->rememberLoadedNumbers();
 
             $personalData->communication = $communication;
         }

src/BusProNet/XmlParser/TravelParser.php

@@ -29,20 +29,8 @@ class TravelParser extends AbstractParser
         Constants::PSEUDO_PRICE_ROOM_CODE,
     ];
 
-    /**
-     * `$levelBoardingPointPrices` carries no default on purpose: a hand-built parser would
-     * otherwise silently ignore APP_BPN_LEVEL_BOARDING_POINT_PRICES and price one travel tier
-     * differently from the others. The registry gave up its own default along with it, so that
-     * there is one way to build this class — through the container, or explicitly in a test.
-     *
-     * @param bool $levelBoardingPointPrices Whether to compensate the BusPro export defect that
-     *                                       omits a boarding point's return-leg price. The
-     *                                       container wires it from
-     *                                       APP_BPN_LEVEL_BOARDING_POINT_PRICES.
-     */
     public function __construct(
         private readonly AgeConstraintParserRegistry $ageConstraintRegistry,
-        private readonly bool $levelBoardingPointPrices,
     ) {
     }
 
@@ -99,11 +87,6 @@ class TravelParser extends AbstractParser
         $travel->pickups = $this->getPickups($node->filterXPath('.//zustiege/zustieg'), $dateFrom, true);
         $travel->dropOffs = $this->getPickups($node->filterXPath('.//zustiege_rueck/zustieg_rueck'), $dateTo, false);
 
-        // A boarding point costs the same in both directions
-        if ($this->levelBoardingPointPrices) {
-            $this->applyBoardingPointPriceLevelling($travel->pickups, $travel->dropOffs);
-        }
-
         $travel->guide = $this->getGuide($node);
 
         return $travel;
@@ -466,47 +449,6 @@ class TravelParser extends AbstractParser
         }
     }
 
-    /**
-     * Levels the price of a boarding point across both travel directions.
-     *
-     * A boarding point is either free or costs the same in both directions:
-     * `ZustiegPreis` is keyed by (point, tariff scheme) and holds no per-leg price, so
-     * BusPro bills an `Abfahrtsortzuschlag` per leg at one and the same rate. An
-     * asymmetric pair is therefore always an export defect — on some products a
-     * `<zustieg_rueck>` carries no `preis` although the engine still charges the return
-     * leg — and the stated price is the one that applies to both legs.
-     *
-     * Where both directions state a price they agree in practice; the outbound one wins
-     * to keep the outcome deterministic. Points without a counterpart are left as they are.
-     *
-     * Compensating the defect locally is provisional, so it is switchable: with
-     * `$levelBoardingPointPrices` off the export is reported verbatim and the affected
-     * travels undercharge the return leg again. See
-     * `docs/buspro-database-reference.md` section A7.
-     *
-     * @param array<int, Pickup> $pickups  Pickups indexed by ID (modified in place)
-     * @param array<int, Pickup> $dropOffs Drop-offs indexed by ID (modified in place)
-     */
-    private function applyBoardingPointPriceLevelling(array $pickups, array $dropOffs): void
-    {
-        foreach ($dropOffs as $pickupId => $dropOff) {
-            if (false === isset($pickups[$pickupId])) {
-                continue;
-            }
-
-            $pickup = $pickups[$pickupId];
-            $price = $pickup->price ?? $dropOff->price;
-
-            $pickup->price = $price;
-            $pickup->priceOutbound = $price;
-            $pickup->priceInbound = $price;
-
-            $dropOff->price = $price;
-            $dropOff->priceOutbound = $price;
-            $dropOff->priceInbound = $price;
-        }
-    }
-
     /**
      * Adjusts time-only pickup entries for overnight bus routes.
      *

src/Chatbot/Mcp/Tool/GetDocumentTool.php

@@ -15,7 +15,7 @@ use Mcp\Schema\ToolAnnotations;
 
 #[McpTool(
     name: 'get_document',
-    description: 'Read the full text of one search_content hit, by its url.',
+    description: 'Read the full text of one search_content hit, by its url. Editorial text can be out of date: take dates, prices, pickups and inclusions from search_trips and get_trip instead.',
     annotations: new ToolAnnotations(readOnlyHint: true, openWorldHint: false),
 )]
 final class GetDocumentTool

src/Chatbot/Mcp/Tool/GetTripTool.php

@@ -14,7 +14,7 @@ use Mcp\Schema\ToolAnnotations;
 
 #[McpTool(
     name: 'get_trip',
-    description: 'Full details of one trip: description, included services, programme, hotel, all upcoming dates with rooms, prices per person in EUR and availability, pickup points and departure times, FAQs. Use after search_trips, or when the user names a specific trip or a booked date (date codes such as SSLMP061226 narrow the answer to that date). Prices and availability are a snapshot as of dataAsOf; the booking page is binding.',
+    description: 'Full details of one trip: description, included services, programme, hotel, all upcoming dates with rooms, prices per person in EUR and availability, pickup points and departure times, FAQs. Pickup surcharges are per person and per direction: surchargeOutbound for the way there, surchargeReturn for the way back, surchargeRoundTrip for both; quote the round trip unless the user travels one way only. Use after search_trips, or when the user names a specific trip or a booked date (date codes such as SSLMP061226 narrow the answer to that date). Prices and availability are a snapshot as of dataAsOf; the booking page is binding. description and FAQs are editorial website text and can be out of date: where they state a date, price, pickup or inclusion that differs from the structured fields, the structured fields are right.',
     annotations: new ToolAnnotations(readOnlyHint: true, openWorldHint: false),
 )]
 final class GetTripTool

src/Chatbot/Mcp/Tool/SearchContentTool.php

@@ -15,7 +15,7 @@ use Mcp\Schema\ToolAnnotations;
 
 #[McpTool(
     name: 'search_content',
-    description: "Search the websites' editorial content: destinations, hotels, travel information, FAQs, terms, blog articles, general company information. Use for questions that are not about specific dates or prices. Returns excerpts; use get_document for the full text of a hit.",
+    description: "Search the websites' editorial content: destinations, hotels, travel information, FAQs, terms, blog articles, general company information. Use for questions that are not about specific dates or prices. Returns excerpts; use get_document for the full text of a hit. Editorial text can be out of date: take dates, prices, pickups and inclusions from search_trips and get_trip instead.",
     annotations: new ToolAnnotations(readOnlyHint: true, openWorldHint: false),
 )]
 final class SearchContentTool

src/Chatbot/Mcp/Tool/SearchTripsTool.php

@@ -6,7 +6,10 @@ namespace App\Chatbot\Mcp\Tool;
 
 use App\Chatbot\Mcp\Sites;
 use App\Chatbot\Mcp\ToolCallRunner;
+use App\Chatbot\TravelPeriods;
 use App\Chatbot\TripCatalog;
+use App\Enum\HotelType;
+use App\Enum\RoomType;
 use App\Model\Chatbot\TripCriteria;
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Capability\Attribute\Schema;
@@ -16,48 +19,62 @@ use Mcp\Schema\ToolAnnotations;
 
 #[McpTool(
     name: 'search_trips',
-    description: 'Find bookable trips by structured criteria: travel period, destination, trip type, price, group size. Use for any question about which trips exist, when, where, or how much. Returns trips with their next dates and lowest prices per person in EUR. Prices and availability are a snapshot as of dataAsOf; the booking page is binding.',
+    description: 'The website\'s travel search: find bookable trips by travel period, destination, concept, price, group size, accommodation, board, room type, duration and bus. Use for any question about which trips exist, when, where or how much. Returns one result per trip, hotel and travel date with the "ab" price per person in EUR, nights, what is included, room types and a link; get_trip gives the details of one, by its code and, for one hotel, its hotelCode. Prices and availability are a snapshot as of dataAsOf; the booking page is binding.',
     annotations: new ToolAnnotations(readOnlyHint: true, openWorldHint: false),
 )]
 final class SearchTripsTool
 {
     public function __construct(
         private readonly TripCatalog $catalog,
+        private readonly TravelPeriods $periods,
         private readonly ToolCallRunner $runner,
     ) {
     }
 
     public function __invoke(
-        #[Schema(description: 'Free text matched against trip, hotel, destination and concept names and texts, e.g. "Val Thorens" or "Snowboardkurs".')]
+        #[Schema(description: 'A trip, hotel, destination or concept name, or a trip, hotel or date code, e.g. "Sportclub Lederer", "Chamois d\'Or", "Val Thorens", "SSLMP". A hotel name returns only that hotel. Use the name alone, without a question around it. Words that name nothing are looked up in the page texts, e.g. "Snowboardkurs".')]
         ?string $query = null,
-        #[Schema(description: 'Start of the travel period, YYYY-MM-DD. Trips overlapping the period match.', format: 'date')]
+        #[Schema(description: 'A named travel period of the website search: Vorsaison, um Weihnachten, Silvester, 1 Januarwoche, Ostern, Nachsaison. Use instead of dateFrom/dateTo.')]
+        ?string $period = null,
+        #[Schema(description: 'Earliest start date, YYYY-MM-DD. Trips must start on or after it.', format: 'date')]
         ?string $dateFrom = null,
-        #[Schema(description: 'End of the travel period, YYYY-MM-DD.', format: 'date')]
+        #[Schema(description: 'Latest end date, YYYY-MM-DD. Trips must end on or before it.', format: 'date')]
         ?string $dateTo = null,
         #[Schema(description: 'Country name, e.g. "Frankreich".')]
         ?string $country = null,
         #[Schema(description: 'Region, ski area or town name, e.g. "Les 3 Vallées".')]
         ?string $region = null,
-        #[Schema(description: 'Trip concept code or name, e.g. ski, party, group.')]
+        #[Schema(description: 'Trip concept code or name, e.g. Sportclub, Ski-Kurztrips, Semesterende-Skireisen.')]
         ?string $concept = null,
-        #[Schema(description: 'Maximum price per person in EUR.', minimum: 0)]
+        #[Schema(description: 'Lowest "ab" price per person in EUR.', minimum: 0)]
-        ?float $maxPrice = null,
+        ?float $priceMin = null,
-        #[Schema(description: 'Only dates with at least this many places available.', minimum: 1)]
+        #[Schema(description: 'Highest "ab" price per person in EUR.', minimum: 0)]
+        ?float $priceMax = null,
+        #[Schema(description: 'Group size: only dates bookable for this many people with enough places left.', minimum: 1)]
         ?int $persons = null,
+        #[Schema(description: 'Accommodation type.', enum: ['Ferienwohnung', 'Sportclub', 'Apartment', 'Gästehaus', 'Pension'])]
+        ?string $accommodation = null,
+        #[Schema(description: 'Included meals, matched against the board items by word: "Abendessen" (dinner; with "Frühstück" this is half board), "Frühstück", "Lunchpaket", "Vollpension", "Selbstversorger". "Halbpension" itself does not occur.')]
+        ?string $board = null,
+        #[Schema(description: 'Room type by capacity: EZ (single), DZ (double), 3er-8er, 9er+, or "mit anderen" (a bed shared with other guests).', enum: ['EZ', 'DZ', '3er', '4er', '5er', '6er', '7er', '8er', '9er+', 'mit anderen'])]
+        ?string $roomType = null,
+        #[Schema(description: 'Minimum number of nights. The website\'s "long" trips are 5 or more.', minimum: 0)]
+        ?int $nightsMin = null,
+        #[Schema(description: 'Maximum number of nights. The website\'s "short" trips are 4 or fewer.', minimum: 0)]
+        ?int $nightsMax = null,
+        #[Schema(description: 'true for dates with a bookable bus, false for dates without one.')]
+        ?bool $bus = null,
         #[Schema(description: 'true for day trips only, false to exclude them.')]
         ?bool $daytrip = null,
         #[Schema(description: Sites::DESCRIPTION, enum: Sites::IDENTIFIERS)]
         ?string $site = null,
-        #[Schema(description: 'Number of trips, default 5, at most 10.', minimum: 1, maximum: 10)]
+        #[Schema(description: 'Number of results, default 10, at most 25.', minimum: 1, maximum: 25)]
         ?int $limit = null,
     ): CallToolResult {
-        return $this->runner->run('search_trips', get_defined_vars(), function () use ($query, $dateFrom, $dateTo, $country, $region, $concept, $maxPrice, $persons, $daytrip, $site, $limit): array {
+        $arguments = get_defined_vars();
-            $from = $this->date($dateFrom, 'dateFrom');
-            $to = $this->date($dateTo, 'dateTo');
 
-            if (null !== $from && null !== $to && $from > $to) {
+        return $this->runner->run('search_trips', $arguments, function () use ($query, $period, $dateFrom, $dateTo, $country, $region, $concept, $priceMin, $priceMax, $persons, $accommodation, $board, $roomType, $nightsMin, $nightsMax, $bus, $daytrip, $site, $limit): array {
-                throw new ToolCallException('dateFrom must not be after dateTo.');
+            [$from, $to] = $this->period($period, $dateFrom, $dateTo);
-            }
 
             return $this->catalog->search(new TripCriteria(
                 query: $this->text($query),
@@ -66,15 +83,48 @@ final class SearchTripsTool
                 country: $this->text($country),
                 region: $this->text($region),
                 concept: $this->text($concept),
-                maxPrice: $maxPrice,
+                priceMin: $priceMin,
+                priceMax: $priceMax,
                 persons: $persons,
+                accommodation: null === $accommodation ? null : (HotelType::fromLabel($accommodation) ?? throw new ToolCallException('Unknown accommodation type.')),
+                board: $this->text($board),
+                roomType: null === $roomType ? null : (RoomType::tryFrom($roomType) ?? throw new ToolCallException('Unknown room type.')),
+                nightsMin: $nightsMin,
+                nightsMax: $nightsMax,
+                bus: $bus,
                 daytrip: $daytrip,
                 site: $site,
-                limit: max(1, min(10, $limit ?? 5)),
+                limit: max(1, min(25, $limit ?? 10)),
             ));
         });
     }
 
+    /**
+     * @return array{?\DateTimeImmutable, ?\DateTimeImmutable}
+     */
+    private function period(?string $period, ?string $dateFrom, ?string $dateTo): array
+    {
+        if (null !== $this->text($period)) {
+            if (null !== $this->text($dateFrom) || null !== $this->text($dateTo)) {
+                throw new ToolCallException('Use either period or dateFrom/dateTo, not both.');
+            }
+
+            $range = $this->periods->find($period)
+                ?? throw new ToolCallException(sprintf('Unknown or past period "%s". Current periods: %s.', $period, implode(', ', $this->periods->labels()) ?: 'none'));
+
+            return [$range['from'], $range['to']];
+        }
+
+        $from = $this->date($dateFrom, 'dateFrom');
+        $to = $this->date($dateTo, 'dateTo');
+
+        if (null !== $from && null !== $to && $from > $to) {
+            throw new ToolCallException('dateFrom must not be after dateTo.');
+        }
+
+        return [$from, $to];
+    }
+
     private function date(?string $value, string $name): ?\DateTimeImmutable
     {
         if (null === $value || '' === trim($value)) {

src/Chatbot/Mcp/ToolCallRunner.php

@@ -12,12 +12,13 @@ use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\RateLimiter\RateLimiterFactory;
 
 /**
- * What every chatbot tool call goes through: the per-token rate limit, the call log, and
+ * What every chatbot tool call goes through: the per-client rate limit, the call log, and
  * the answer as compact JSON.
  *
  * The SDK would pretty-print an array result and repeat it as structured content; both
  * cost the model tokens and neither helps n8n. The log records tool, arguments, result
- * count and duration, never anything about the person chatting, which n8n does not send.
+ * count, duration and the calling client (n8n, claude-desktop, …), never anything about
+ * the person chatting, which n8n does not send.
  */
 class ToolCallRunner
 {
@@ -37,10 +38,11 @@ class ToolCallRunner
     public function run(string $tool, array $arguments, callable $call): CallToolResult
     {
         $arguments = array_filter($arguments, static fn (mixed $value): bool => null !== $value);
-        $limit = $this->chatbotMcpLimiter->create($this->security->getUser()?->getUserIdentifier() ?? 'anonymous')->consume();
+        $client = $this->security->getUser()?->getUserIdentifier() ?? 'anonymous';
+        $limit = $this->chatbotMcpLimiter->create($client)->consume();
 
         if (!$limit->isAccepted()) {
-            $this->chatbotLogger->warning('MCP tool call rate-limited', ['tool' => $tool, 'arguments' => $arguments]);
+            $this->chatbotLogger->warning('MCP tool call rate-limited', ['client' => $client, 'tool' => $tool, 'arguments' => $arguments]);
 
             throw new ToolCallException(sprintf('Too many tool calls. Retry after %s.', $limit->getRetryAfter()->format('H:i:s')));
         }
@@ -50,16 +52,17 @@ class ToolCallRunner
         try {
             $result = $call();
         } catch (ToolCallException $e) {
-            $this->chatbotLogger->info('MCP tool call rejected', ['tool' => $tool, 'arguments' => $arguments, 'error' => $e->getMessage()]);
+            $this->chatbotLogger->info('MCP tool call rejected', ['client' => $client, 'tool' => $tool, 'arguments' => $arguments, 'error' => $e->getMessage()]);
 
             throw $e;
         } catch (\Throwable $e) {
-            $this->chatbotLogger->error('MCP tool call failed', ['tool' => $tool, 'arguments' => $arguments, 'exception' => $e]);
+            $this->chatbotLogger->error('MCP tool call failed', ['client' => $client, 'tool' => $tool, 'arguments' => $arguments, 'exception' => $e]);
 
             throw $e;
         }
 
         $this->chatbotLogger->info('MCP tool call', [
+            'client' => $client,
             'tool' => $tool,
             'arguments' => $arguments,
             'resultCount' => is_array($result['results'] ?? null) ? count($result['results']) : 1,

src/Chatbot/Mcp/TripsOnly/GetTripTool.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Chatbot\Mcp\TripsOnly;
+
+use App\Chatbot\Mcp\ToolCallRunner;
+use App\Chatbot\TripCatalog;
+use Mcp\Capability\Attribute\McpTool;
+use Mcp\Capability\Attribute\Schema;
+use Mcp\Exception\ToolCallException;
+use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\ToolAnnotations;
+
+/**
+ * get_trip of the trips-only server (/mcp/trips): the same trip without the product and
+ * hotel page texts, whose prices and inclusions can contradict the booking system.
+ */
+#[McpTool(
+    name: 'get_trip',
+    description: 'Full details of one trip: destination, hotels with their facts, all upcoming dates with rooms, prices per person in EUR and availability, pickup points and departure times. Pickup surcharges are per person and per direction: surchargeOutbound for the way there, surchargeReturn for the way back, surchargeRoundTrip for both; quote the round trip unless the user travels one way only. Use after search_trips, or when the user names a specific trip or a booked date (date codes such as SSLMP061226 narrow the answer to that date). Prices and availability are a snapshot as of dataAsOf; the booking page is binding. For anything this does not answer, refer the user to the trip\'s url.',
+    annotations: new ToolAnnotations(readOnlyHint: true, openWorldHint: false),
+)]
+final class GetTripTool
+{
+    public function __construct(
+        private readonly TripCatalog $catalog,
+        private readonly ToolCallRunner $runner,
+    ) {
+    }
+
+    public function __invoke(
+        #[Schema(description: 'Trip code as returned by search_trips, or a date code (dateCode) for one date of a trip.', minLength: 1)]
+        string $code,
+        #[Schema(description: 'Narrows the dates to one hotel when a trip has several.')]
+        ?string $hotelCode = null,
+    ): CallToolResult {
+        return $this->runner->run('get_trip', get_defined_vars(), function () use ($code, $hotelCode): array {
+            $trip = $this->catalog->get(trim($code), $hotelCode, editorial: false);
+
+            if (null === $trip) {
+                throw new ToolCallException(sprintf('No trip or date with code "%s". Use search_trips to find trip codes.', $code));
+            }
+
+            return $trip;
+        });
+    }
+}

src/Chatbot/Search/ContentSearchQuery.php

@@ -19,7 +19,7 @@ final class ContentSearchQuery
     private const MIN_TOKEN_LENGTH = 3;
     private const MAX_TERMS = 12;
 
-    private const STOPWORDS = [
+    public const STOPWORDS = [
         'aber', 'alle', 'allem', 'allen', 'aller', 'alles', 'als', 'also', 'am', 'an', 'ander', 'andere', 'anderen',
         'auch', 'auf', 'aus', 'bei', 'beim', 'bin', 'bis', 'bist', 'da', 'damit', 'dann', 'das', 'dass', 'dein',
         'deine', 'dem', 'den', 'denn', 'der', 'des', 'dessen', 'die', 'dies', 'diese', 'diesem', 'diesen', 'dieser',
@@ -55,12 +55,14 @@ final class ContentSearchQuery
     }
 
     /**
-     * The boolean-mode query, or null when nothing searchable is left.
+     * The boolean-mode query, or null when nothing searchable is left. With $allTerms a
+     * document has to match every term, which a name or a phrase wants and a question
+     * does not.
      */
-    public static function booleanQuery(string $text): ?string
+    public static function booleanQuery(string $text, bool $allTerms = false): ?string
     {
         $terms = self::terms($text);
 
-        return [] === $terms ? null : implode(' ', array_map(static fn (string $term): string => $term.'*', $terms));
+        return [] === $terms ? null : implode(' ', array_map(static fn (string $term): string => ($allTerms ? '+' : '').$term.'*', $terms));
     }
 }

src/Chatbot/Search/NameQuery.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Chatbot\Search;
+
+use Symfony\Component\String\UnicodeString;
+
+/**
+ * Compares free text with the names of trips, hotels, destinations and concepts.
+ *
+ * Names are compared word by word, without accents and case ("Chaviere" is "Chavière"),
+ * and without German stopwords. Unlike the full-text index, two-letter words count: they
+ * tell "Chamois d'Or" from "Chalets Chamois".
+ */
+final class NameQuery
+{
+    private const MIN_TOKEN_LENGTH = 2;
+
+    /**
+     * @return list<string>
+     */
+    public static function tokens(string $text): array
+    {
+        $words = preg_split('/[^\p{L}\p{N}]+/u', mb_strtolower($text), -1, \PREG_SPLIT_NO_EMPTY) ?: [];
+        $tokens = [];
+
+        foreach ($words as $word) {
+            if (in_array($word, ContentSearchQuery::STOPWORDS, true)) {
+                continue;
+            }
+
+            $token = (new UnicodeString($word))->ascii()->lower()->toString();
+
+            if (strlen($token) >= self::MIN_TOKEN_LENGTH || ctype_digit($token)) {
+                $tokens[$token] = true;
+            }
+        }
+
+        return array_map(strval(...), array_keys($tokens));
+    }
+
+    /**
+     * Every word of the query begins a word of the name: "Arolles" is within
+     * "3* Hotel Les Arolles (inkl. VP)".
+     *
+     * @param list<string> $query
+     * @param list<string> $name
+     */
+    public static function within(array $query, array $name): bool
+    {
+        if ([] === $query || [] === $name) {
+            return false;
+        }
+
+        foreach ($query as $word) {
+            if ([] === array_filter($name, static fn (string $nameWord): bool => str_starts_with($nameWord, $word))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * The query spells the name out among other words: "Hotel Chamois d'Or in Val Thorens"
+     * contains "Chamois d'Or".
+     *
+     * @param list<string> $query
+     * @param list<string> $name
+     */
+    public static function contains(array $query, array $name): bool
+    {
+        return [] !== $name && [] === array_diff($name, $query);
+    }
+}

src/Chatbot/TravelPeriods.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Chatbot;
+
+use Symfony\Component\Clock\ClockInterface;
+
+/**
+ * The named travel periods of the website search ("Reisezeitraum"), from the
+ * `chatbot_travel_periods` parameter.
+ *
+ * Duplicated from the TYPO3 search configuration on purpose, and updated together with it
+ * each season. Periods may overlap. A period whose end has passed is no longer offered.
+ */
+class TravelPeriods
+{
+    /**
+     * @param list<array{label: string, from: string, to: string}> $periods
+     */
+    public function __construct(
+        private readonly array $periods,
+        private readonly ClockInterface $clock,
+    ) {
+    }
+
+    /**
+     * The date range of a current period, matched case-insensitively, or null.
+     *
+     * @return array{from: \DateTimeImmutable, to: \DateTimeImmutable}|null
+     */
+    public function find(string $label): ?array
+    {
+        foreach ($this->current() as $period) {
+            if (0 === strcasecmp($period['label'], trim($label))) {
+                return ['from' => new \DateTimeImmutable($period['from']), 'to' => new \DateTimeImmutable($period['to'])];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function labels(): array
+    {
+        return array_column($this->current(), 'label');
+    }
+
+    /**
+     * @return list<array{label: string, from: string, to: string}>
+     */
+    private function current(): array
+    {
+        $today = $this->clock->now()->setTimezone(new \DateTimeZone('Europe/Berlin'))->format('Y-m-d');
+
+        return array_values(array_filter($this->periods, static fn (array $period): bool => $period['to'] >= $today));
+    }
+}

src/Chatbot/TripCatalog.php

@@ -5,8 +5,13 @@ declare(strict_types=1);
 namespace App\Chatbot;
 
 use App\BusProNet\Utility\DateCodeUtility;
+use App\BusProNet\XmlLoader\HotelLoader;
 use App\Chatbot\Search\ContentSearchQuery;
+use App\Chatbot\Search\NameQuery;
 use App\Entity\ContentDocument;
+use App\Enum\HotelType;
+use App\Enum\RoomType;
+use App\Model\Chatbot\TravelDateFacts;
 use App\Model\Chatbot\TripCriteria;
 use App\Model\Export;
 use App\Repository\ContentDocumentRepository;
@@ -21,24 +26,22 @@ use Symfony\Component\Clock\ClockInterface;
  * The join is on the product code; several TYPO3 products may share one, and each is its
  * own trip. Hotels are joined on any of the TYPO3 hotel's `codes`, because BusPro uses the
  * matchcode aliases; a code carried by more than one hotel resolves to the one whose own
- * `code` it is.
+ * `code` it is. BusPro's own hotel names (hotel.xml) are internal wording, so they are
+ * only searched, and shown just where TYPO3 has no hotel for a code.
  *
- * A room is bookable unless its status is `Buchungsstop`. `available` counts rooms, so the
+ * search() mirrors the website's travel search, get() details one trip. Free text is read
- * places of a date x hotel are the sum of `available x maxPax` over its bookable rooms.
+ * as a code or a name before it is looked up in the page texts, see resolveQuery(). A room is bookable
- * Room counts never leave this class: the website does not show them, so the tools say
+ * unless its status is `Buchungsstop`; places and prices are derived per date x hotel by
- * only whether a date is freely bookable or on request.
+ * TravelDateFacts. Room counts never leave this class: the website does not show them, so
+ * the tools say only whether a date is freely bookable or on request.
  */
 class TripCatalog
 {
     /** The feed's only language for now; trips are joined in it. */
     public const LANGUAGE = 'de';
 
-    private const STATUS_BOOKING_STOP = 'Buchungsstop';
     private const STATUS_FREE = 'Frei';
-    private const AVAILABILITY_FREE = 'frei';
-    private const AVAILABILITY_ON_REQUEST = 'auf Anfrage';
 
-    private const NEXT_DATES = 3;
     private const DATES_WITH_PICKUPS = 3;
     private const BODY_LIMIT = 20000;
     private const HOTEL_BODY_LIMIT = 8000;
@@ -48,62 +51,88 @@ class TripCatalog
     public function __construct(
         private readonly ProductExportBuilder $exportBuilder,
         private readonly ContentDocumentRepository $repository,
+        private readonly HotelLoader $hotelLoader,
         private readonly ClockInterface $clock,
         private readonly LoggerInterface $logger,
     ) {
     }
 
     /**
-     * @return array{results: list<array<string, mixed>>, dataAsOf: ?string}
+     * The website's travel search: one result per product x hotel x travel date, filtered and
+     * priced as the search page does (see TravelDateFacts and TripCriteria), sorted by date,
+     * then price.
+     *
+     * @return array{results: list<array<string, mixed>>, total: int, dataAsOf: string}
      */
     public function search(TripCriteria $criteria): array
     {
         $catalog = $this->load();
-        $products = $this->candidateProducts($catalog, $criteria);
         $today = $this->today();
+        $named = null === $criteria->query ? null : $this->resolveQuery($catalog, $criteria->query);
         $results = [];
 
-        foreach ($products as $product) {
+        foreach ($this->candidateProducts($catalog, $criteria) as $product) {
-            $data = $product->getData() ?? [];
+            $header = null;
-            $dates = [];
-            $hotelCodes = [];
 
-            foreach ($catalog['rowsByCode'][$this->normalize($data['code'] ?? null)] ?? [] as $row) {
+            foreach ($catalog['rowsByCode'][$this->normalize($product->getData()['code'] ?? null)] ?? [] as $row) {
-                $summary = $this->summarize($row);
+                if ($row['date']['from'] < $today) {
-
-                if (!$this->qualifies($row, $summary, $criteria, $today)) {
                     continue;
                 }
 
-                $dateId = $row['date']['busProId'];
+                $hotel = $catalog['hotelsByCode'][$this->normalize($row['hotel']['code'] ?? null)][0] ?? null;
-                $hotelCodes[$this->normalize($row['hotel']['code'])] = true;
+                $hotelData = $hotel?->getData() ?? [];
-                $current = $dates[$dateId] ?? null;
 
-                $dates[$dateId] = [
+                if (null !== $named
+                    && !isset($named['products'][$product->getUid()])
+                    && !isset($named['hotels'][$hotel?->getUid() ?? 0])
+                    && !isset($named['busProHotels'][$row['hotel']['busProId'] ?? 0])
+                    && (null === $named['dateCode'] || $named['dateCode'] !== $this->normalize($row['date']['code'] ?? null))) {
+                    continue;
+                }
+
+                $facts = TravelDateFacts::fromExportRow($row);
+
+                if (!$this->matches($row, $facts, HotelType::tryFrom((int) ($hotelData['type'] ?? 0)), $criteria)) {
+                    continue;
+                }
+
+                $header ??= $this->tripHeader($catalog, $product);
+
+                $results[] = [
+                    'product' => $header['name'],
+                    'code' => $header['code'],
                     'dateCode' => $row['date']['code'],
+                    'hotel' => $this->hotelName($catalog, $hotel, $row),
+                    'hotelCode' => $row['hotel']['code'],
+                    'accommodation' => HotelType::tryFrom((int) ($hotelData['type'] ?? 0))?->label(),
+                    'destination' => $header['destination'],
+                    'concept' => $header['concept'],
                     'dateFrom' => $row['date']['from'],
                     'dateTo' => $row['date']['to'],
-                    'priceFrom' => null === $current ? $summary['priceFrom'] : $this->minPrice($current['priceFrom'], $summary['priceFrom']),
+                    'nights' => $facts->nights,
-                    'availability' => self::AVAILABILITY_FREE === ($current['availability'] ?? null) ? self::AVAILABILITY_FREE : $summary['availability'],
+                    'priceFrom' => $facts->priceFrom,
+                    'includes' => $facts->includes(),
+                    'roomTypes' => array_map(static fn (RoomType $type): string => $type->value, $facts->roomTypes),
+                    'availability' => $facts->availability,
+                    'flags' => array_values(array_filter([
+                        true === ($hotelData['new'] ?? null) ? 'neu' : null,
+                        true === ($hotelData['earlybird'] ?? null) ? 'frühbucher' : null,
+                        $header['daytrip'] ? 'tagesfahrt' : null,
+                    ])),
+                    'url' => $header['url'],
+                    'site' => $header['site'],
                 ];
             }
-
-            if ([] === $dates) {
-                continue;
-            }
-
-            usort($dates, static fn (array $a, array $b): int => $a['dateFrom'] <=> $b['dateFrom']);
-
-            $results[] = $this->tripHeader($catalog, $product) + [
-                'hotels' => $this->hotelNames($catalog, array_keys($hotelCodes)),
-                'matchingDates' => count($dates),
-                'nextDates' => array_slice($dates, 0, self::NEXT_DATES),
-            ];
         }
 
-        usort($results, static fn (array $a, array $b): int => [$a['nextDates'][0]['dateFrom'], $a['name']] <=> [$b['nextDates'][0]['dateFrom'], $b['name']]);
+        usort($results, static fn (array $a, array $b): int => [$a['dateFrom'], $a['priceFrom'] ?? \PHP_FLOAT_MAX, $a['product'], $a['hotel']]
+            <=> [$b['dateFrom'], $b['priceFrom'] ?? \PHP_FLOAT_MAX, $b['product'], $b['hotel']]);
 
-        return ['results' => array_slice($results, 0, $criteria->limit), 'dataAsOf' => $this->dataAsOf($catalog['export'])];
+        return [
+            'results' => array_slice($results, 0, $criteria->limit),
+            'total' => count($results),
+            'dataAsOf' => $this->dataAsOf($catalog['export']),
+        ];
     }
 
     /**
@@ -113,9 +142,12 @@ class TripCatalog
      * booking documents (SSLMP061226 is product SSLMP on 06.12.26); it narrows the trip to
      * that date, shown even when it has already started.
      *
+     * Without $editorial the product and hotel page texts are left out, and only what is
+     * structured remains: names, links, hotel facts and everything from the booking system.
+     *
      * @return array<string, mixed>|null
      */
-    public function get(string $code, ?string $hotelCode = null): ?array
+    public function get(string $code, ?string $hotelCode = null, bool $editorial = true): ?array
     {
         $catalog = $this->load();
         $code = (new DateCodeUtility())->sanitize(trim($code));
@@ -162,8 +194,8 @@ class TripCatalog
                 static fn (ContentDocument $other): array => ['site' => $other->getSite(), 'url' => $other->getUrl()],
                 array_filter(array_slice($products, 1), static fn (ContentDocument $other): bool => null !== $other->getUrl()),
             )),
-            'description' => $this->truncate($product->getBodyMd(), self::BODY_LIMIT),
+        ] + ($editorial ? ['description' => $this->truncate($product->getBodyMd(), self::BODY_LIMIT)] : []) + [
-            'hotels' => $this->hotelDetails($catalog, $hotelCodes, $product),
+            'hotels' => $this->hotelDetails($catalog, $hotelCodes, $product, $editorial),
             'dates' => $this->dates($catalog, $rows),
             'dataAsOf' => $this->dataAsOf($catalog['export']),
         ];
@@ -212,6 +244,7 @@ class TripCatalog
      *     productsByCode: array<string, list<ContentDocument>>,
      *     hotelsByCode: array<string, list<ContentDocument>>,
      *     rowsByCode: array<string, list<array<string, mixed>>>,
+     *     busProHotels: array<int, array{code: string, name: ?string}>,
      * }
      */
     private function load(): array
@@ -248,11 +281,21 @@ class TripCatalog
         }
 
         $rowsByCode = [];
+        $busProHotels = [];
+        $masterData = $this->hotelLoader->loadAll();
+
         foreach ($export->rows as $row) {
             $code = $this->normalize($row['product']['code'] ?? null);
             if ('' !== $code) {
                 $rowsByCode[$code][] = $row;
             }
+
+            $hotelId = (int) ($row['hotel']['busProId'] ?? 0);
+            if (0 !== $hotelId && !isset($busProHotels[$hotelId])) {
+                // BusPro breaks names over lines ("Vacanceole\nRésidence L'Edelweiss").
+                $name = trim((string) preg_replace('/\s+/u', ' ', isset($masterData[$hotelId]) ? (string) $masterData[$hotelId]->name : ''));
+                $busProHotels[$hotelId] = ['code' => $this->normalize($row['hotel']['code'] ?? null), 'name' => '' === $name ? null : $name];
+            }
         }
 
         return [
@@ -261,12 +304,14 @@ class TripCatalog
             'productsByCode' => $productsByCode,
             'hotelsByCode' => $hotelsByCode,
             'rowsByCode' => $rowsByCode,
+            'busProHotels' => $busProHotels,
         ];
     }
 
     /**
      * Published products narrowed by everything the content index can resolve: site, day
-     * trip, concept, destination and free text.
+     * trip, concept and destination. Free text is applied per travel date, since it may
+     * name one hotel of a trip.
      *
      * @param array<string, mixed> $catalog
      *
@@ -281,7 +326,6 @@ class TripCatalog
         $countryUids = null === $criteria->country ? null : $this->matchingUids($records, ['country'], $criteria->country, matchCode: true);
         $regionUids = null === $criteria->region ? null : $this->matchingUids($records, ['region'], $criteria->region);
         $cityUids = null === $criteria->region ? null : $this->matchingUids($records, ['city'], $criteria->region);
-        $queryUids = null === $criteria->query ? null : $this->productUidsMatchingText($records, $criteria->query);
 
         $products = [];
 
@@ -299,8 +343,7 @@ class TripCatalog
                 || (null !== $criteria->site && $record->getSite() !== $criteria->site)
                 || (null !== $criteria->daytrip && (bool) ($data['daytrip'] ?? false) !== $criteria->daytrip)
                 || (null !== $conceptUids && !in_array($data['conceptUid'] ?? null, $conceptUids, true))
-                || (null !== $countryUids && !in_array($data['countryUid'] ?? null, $countryUids, true))
+                || (null !== $countryUids && !in_array($data['countryUid'] ?? null, $countryUids, true))) {
-                || (null !== $queryUids && !in_array($record->getUid(), $queryUids, true))) {
                 continue;
             }
 
@@ -350,27 +393,155 @@ class TripCatalog
     }
 
     /**
-     * Products reached by a full-text match on themselves or on a hotel, destination or
+     * What a free-text query asks for: whole trips, single hotels of trips, or one travel
-     * concept they belong to.
+     * date. Null when it restricts nothing.
      *
-     * @param array<string, ContentDocument> $records
+     * A code or a name is taken at its word, so naming a trip or hotel returns that one and
+     * not every page that mentions it. In order, stopping at the first that finds anything:
+     * a product, hotel or date code; names holding every word of the query; names the query
+     * spells out among other words; and only then the page texts.
      *
-     * @return list<int>
+     * @param array<string, mixed> $catalog
+     *
+     * Hotels are known twice: by their TYPO3 record and by BusPro's own name and code, which
+     * also covers a hotel TYPO3 has no record for
+     *
+     * @return array{products: array<int, true>, hotels: array<int, true>, busProHotels: array<int, true>, dateCode: ?string}|null
      */
-    private function productUidsMatchingText(array $records, string $text): array
+    private function resolveQuery(array $catalog, string $text): ?array
     {
-        $booleanQuery = ContentSearchQuery::booleanQuery($text);
+        /** @var array<string, ContentDocument> $records */
+        $records = $catalog['records'];
 
-        if (null === $booleanQuery) {
+        $matched = $this->recordsWithCode($catalog, $text) ?? $this->recordsNamed($catalog, $text);
-            return array_values(array_map(static fn (ContentDocument $record): int => $record->getUid(), array_filter($records, static fn (ContentDocument $record): bool => 'product' === $record->getType())));
+
+        if (null !== $matched) {
+            return $this->tripsOf($records, $matched);
         }
 
+        $dateCode = (new DateCodeUtility())->sanitize(trim($text));
+
+        foreach ($catalog['export']->rows as $row) {
+            if ($this->normalize($row['date']['code'] ?? null) === $dateCode) {
+                return ['products' => [], 'hotels' => [], 'busProHotels' => [], 'dateCode' => $dateCode];
+            }
+        }
+
+        $terms = ContentSearchQuery::terms($text);
+
+        if ([] === $terms) {
+            return null;
+        }
+
+        // Every term first: "Sauna Whirlpool" means both. A question rarely uses the page's
+        // own words for everything, so any term is the fallback.
+        foreach (count($terms) > 1 ? [true, false] : [false] as $allTerms) {
+            $matched = [];
+            foreach ($this->repository->matchRecords((string) ContentSearchQuery::booleanQuery($text, $allTerms), self::RECORD_TYPES, self::LANGUAGE) as $hit) {
+                $matched[$hit['type']][$hit['uid']] = true;
+            }
+
+            if ([] !== $matched) {
+                break;
+            }
+        }
+
+        return $this->tripsOf($records, $matched);
+    }
+
+    /**
+     * The products and the hotel carrying the text as their code, hotel aliases included.
+     * Matches are keyed by record type, BusPro's hotels as `busProHotel` by their id.
+     *
+     * @param array<string, mixed> $catalog
+     *
+     * @return array<string, array<int, true>>|null
+     */
+    private function recordsWithCode(array $catalog, string $text): ?array
+    {
+        $code = (new DateCodeUtility())->sanitize(trim($text));
         $matched = [];
-        foreach ($this->repository->matchRecords($booleanQuery, self::RECORD_TYPES, self::LANGUAGE) as $hit) {
+
-            $matched[$hit['type']][$hit['uid']] = true;
+        foreach ($catalog['productsByCode'][$code] ?? [] as $product) {
+            $matched['product'][$product->getUid()] = true;
         }
 
-        $uids = [];
+        if (isset($catalog['hotelsByCode'][$code][0])) {
+            $matched['hotel'][$catalog['hotelsByCode'][$code][0]->getUid()] = true;
+        }
+
+        foreach ($catalog['busProHotels'] as $hotelId => $busProHotel) {
+            if ($busProHotel['code'] === $code) {
+                $matched['busProHotel'][$hotelId] = true;
+            }
+        }
+
+        return [] === $matched ? null : $matched;
+    }
+
+    /**
+     * The records the text names. A name holding every word of the query wins: "Lederer"
+     * is "Sportclub Lederer". Otherwise the query may spell a name out among other words,
+     * and there the most specific kind wins, so that "Sportclub Lederer Saalbach" is the
+     * hotel and not everything in Saalbach.
+     *
+     * @param array<string, mixed> $catalog
+     *
+     * @return array<string, array<int, true>>|null
+     */
+    private function recordsNamed(array $catalog, string $text): ?array
+    {
+        $query = NameQuery::tokens($text);
+        $names = [];
+
+        foreach ($catalog['records'] as $record) {
+            $names[] = [$record->getType(), $record->getUid(), $record->getTitle()];
+        }
+
+        foreach ($catalog['busProHotels'] as $hotelId => $busProHotel) {
+            $names[] = ['busProHotel', $hotelId, $busProHotel['name'] ?? ''];
+        }
+
+        $within = [];
+        $contained = [];
+
+        foreach ($names as [$type, $id, $title]) {
+            $name = NameQuery::tokens($title);
+
+            if (NameQuery::within($query, $name)) {
+                $within[$type][$id] = true;
+            } elseif (NameQuery::contains($query, $name)) {
+                $contained[$type][$id] = true;
+            }
+        }
+
+        if ([] !== $within) {
+            return $within;
+        }
+
+        foreach ([['product', 'hotel', 'busProHotel'], ['city'], ['region'], ['country', 'concept']] as $types) {
+            $matched = array_intersect_key($contained, array_flip($types));
+
+            if ([] !== $matched) {
+                return $matched;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Matched records as trips: a product, destination or concept stands for the whole
+     * trips, a hotel only for itself, since a trip may have many.
+     *
+     * @param array<string, ContentDocument>  $records
+     * @param array<string, array<int, true>> $matched by type and uid
+     *
+     * @return array{products: array<int, true>, hotels: array<int, true>, busProHotels: array<int, true>, dateCode: null}
+     */
+    private function tripsOf(array $records, array $matched): array
+    {
+        $products = [];
 
         foreach ($records as $record) {
             if ('product' !== $record->getType()) {
@@ -378,79 +549,62 @@ class TripCatalog
             }
 
             $data = $record->getData() ?? [];
-            $hotelUids = is_array($data['hotelUids'] ?? null) ? $data['hotelUids'] : [];
             $regionUids = array_merge([$data['regionUid'] ?? null], is_array($data['additionalRegionUids'] ?? null) ? $data['additionalRegionUids'] : []);
 
-            $hit = isset($matched['product'][$record->getUid()])
+            if (isset($matched['product'][$record->getUid()])
-                || [] !== array_intersect($hotelUids, array_keys($matched['hotel'] ?? []))
                 || [] !== array_intersect($regionUids, array_keys($matched['region'] ?? []))
                 || isset($matched['country'][$data['countryUid'] ?? -1])
                 || isset($matched['city'][$data['cityUid'] ?? -1])
-                || isset($matched['concept'][$data['conceptUid'] ?? -1]);
+                || isset($matched['concept'][$data['conceptUid'] ?? -1])) {
-
+                $products[$record->getUid()] = true;
-            // Hotels also name their products, for products whose hotelUids miss them.
-            if (!$hit) {
-                foreach (array_keys($matched['hotel'] ?? []) as $hotelUid) {
-                    $hotelProducts = ($records['hotel:'.$hotelUid] ?? null)?->getData()['productUids'] ?? [];
-                    if (is_array($hotelProducts) && in_array($record->getUid(), $hotelProducts, true)) {
-                        $hit = true;
-                        break;
-                    }
-                }
-            }
-
-            if ($hit) {
-                $uids[] = $record->getUid();
             }
         }
 
-        return $uids;
+        return ['products' => $products, 'hotels' => $matched['hotel'] ?? [], 'busProHotels' => $matched['busProHotel'] ?? [], 'dateCode' => null];
     }
 
     /**
-     * @param array<string, mixed> $row
+     * The search page's filters on one travel date at one hotel. `persons` checks both the
+     * page's condition (the smallest group a room takes) and that enough places are left.
      *
-     * @return array{priceFrom: ?float, places: int, availability: ?string}
+     * @param array<string, mixed> $row
      */
-    private function summarize(array $row): array
+    private function matches(array $row, TravelDateFacts $facts, ?HotelType $hotelType, TripCriteria $criteria): bool
     {
-        $priceFrom = null;
+        if (!$facts->isBookable()) {
-        $places = 0;
+            return false;
-        $availability = null;
+        }
 
-        foreach ($row['rooms'] ?? [] as $room) {
+        if ((null !== $criteria->dateFrom && $row['date']['from'] < $criteria->dateFrom->format('Y-m-d'))
-            if (self::STATUS_BOOKING_STOP === ($room['status'] ?? null)) {
+            || (null !== $criteria->dateTo && $row['date']['to'] > $criteria->dateTo->format('Y-m-d'))) {
-                continue;
+            return false;
-            }
+        }
 
-            $places += (int) ($room['available'] ?? 0) * (int) ($room['maxPax'] ?? 0);
+        if ((null !== $criteria->priceMin || null !== $criteria->priceMax)
-            $availability = self::STATUS_FREE === ($room['status'] ?? null) || self::AVAILABILITY_FREE === $availability
+            && (null === $facts->priceFrom
-                ? self::AVAILABILITY_FREE
+                || (null !== $criteria->priceMin && $facts->priceFrom < $criteria->priceMin)
-                : self::AVAILABILITY_ON_REQUEST;
+                || (null !== $criteria->priceMax && $facts->priceFrom > $criteria->priceMax))) {
+            return false;
+        }
 
-            if (is_int($room['price'] ?? null) || is_float($room['price'] ?? null)) {
+        if (null !== $criteria->persons && (($facts->minPax ?? 0) > $criteria->persons || $facts->places < $criteria->persons)) {
-                $priceFrom = $this->minPrice($priceFrom, (float) $room['price']);
+            return false;
+        }
+
+        if (null !== $criteria->board) {
+            $wanted = mb_strtolower($criteria->board);
+            $boards = array_filter($facts->boards, static fn (string $board): bool => str_contains(mb_strtolower($board), $wanted));
+
+            if ([] === $boards) {
+                return false;
             }
         }
 
-        return ['priceFrom' => $priceFrom, 'places' => $places, 'availability' => $availability];
+        return (null === $criteria->accommodation || $hotelType === $criteria->accommodation)
-    }
+            && (null === $criteria->roomType || $facts->hasRoomType($criteria->roomType))
-
+            && (null === $criteria->nightsMin || $facts->nights >= $criteria->nightsMin)
-    /**
+            && (null === $criteria->nightsMax || $facts->nights <= $criteria->nightsMax)
-     * @param array<string, mixed>                                         $row
+            && (null === $criteria->bus || $facts->busAvailable === $criteria->bus);
-     * @param array{priceFrom: ?float, places: int, availability: ?string} $summary
-     */
-    private function qualifies(array $row, array $summary, TripCriteria $criteria, string $today): bool
-    {
-        $from = $row['date']['from'];
-        $to = $row['date']['to'];
-
-        return $from >= $today
-            && null !== $summary['availability']
-            && (null === $criteria->dateFrom || $to >= $criteria->dateFrom->format('Y-m-d'))
-            && (null === $criteria->dateTo || $from <= $criteria->dateTo->format('Y-m-d'))
-            && (null === $criteria->maxPrice || (null !== $summary['priceFrom'] && $summary['priceFrom'] <= $criteria->maxPrice))
-            && (null === $criteria->persons || $summary['places'] >= $criteria->persons);
     }
 
     /**
@@ -478,32 +632,13 @@ class TripCatalog
         ];
     }
 
-    /**
-     * @param array<string, mixed> $catalog
-     * @param list<string>         $hotelCodes normalized
-     *
-     * @return list<string>
-     */
-    private function hotelNames(array $catalog, array $hotelCodes): array
-    {
-        $names = [];
-        foreach ($hotelCodes as $code) {
-            $hotel = $catalog['hotelsByCode'][$code][0] ?? null;
-            if (null !== $hotel && '' !== $hotel->getTitle()) {
-                $names[$hotel->getTitle()] = true;
-            }
-        }
-
-        return array_keys($names);
-    }
-
     /**
      * @param array<string, mixed> $catalog
      * @param list<string>         $hotelCodes normalized codes of the hotels with dates
      *
      * @return list<array<string, mixed>>
      */
-    private function hotelDetails(array $catalog, array $hotelCodes, ContentDocument $product): array
+    private function hotelDetails(array $catalog, array $hotelCodes, ContentDocument $product, bool $editorial): array
     {
         $hotels = [];
 
@@ -514,8 +649,9 @@ class TripCatalog
             }
         }
 
-        // A trip without upcoming dates still describes its hotels.
+        // A trip without upcoming dates still describes its hotels. One whose dates are at
-        if ([] === $hotels) {
+        // a hotel the website does not know has none to describe.
+        if ([] === $hotelCodes) {
             foreach ((array) ($product->getData()['hotelUids'] ?? []) as $uid) {
                 $hotel = is_int($uid) ? ($catalog['records']['hotel:'.$uid] ?? null) : null;
                 if (null !== $hotel) {
@@ -529,8 +665,7 @@ class TripCatalog
             'name' => $hotel->getTitle(),
             'url' => $hotel->getUrl(),
             'facts' => is_array($hotel->getData()['facts'] ?? null) ? array_filter($hotel->getData()['facts'], static fn (mixed $value): bool => null !== $value && '' !== $value) : [],
-            'description' => $this->truncate($hotel->getBodyMd(), self::HOTEL_BODY_LIMIT),
+        ] + ($editorial ? ['description' => $this->truncate($hotel->getBodyMd(), self::HOTEL_BODY_LIMIT)] : []), $hotels));
-        ], $hotels));
     }
 
     /**
@@ -552,7 +687,7 @@ class TripCatalog
 
             $rooms = [];
             foreach ($row['rooms'] ?? [] as $room) {
-                if (self::STATUS_BOOKING_STOP === ($room['status'] ?? null)) {
+                if (TravelDateFacts::STATUS_BOOKING_STOP === ($room['status'] ?? null)) {
                     continue;
                 }
 
@@ -561,7 +696,7 @@ class TripCatalog
                     'board' => $room['boardCode'] ?? null,
                     'nights' => $room['nights'] ?? null,
                     'price' => $room['price'] ?? null,
-                    'availability' => self::STATUS_FREE === ($room['status'] ?? null) ? self::AVAILABILITY_FREE : self::AVAILABILITY_ON_REQUEST,
+                    'availability' => self::STATUS_FREE === ($room['status'] ?? null) ? TravelDateFacts::AVAILABILITY_FREE : TravelDateFacts::AVAILABILITY_ON_REQUEST,
                 ], static fn (mixed $value): bool => null !== $value);
             }
 
@@ -574,7 +709,7 @@ class TripCatalog
             ];
 
             $dates[$dateId]['hotels'][] = [
-                'hotel' => $hotel?->getTitle() ?? $row['hotel']['code'],
+                'hotel' => $this->hotelName($catalog, $hotel, $row),
                 'hotelCode' => $row['hotel']['code'],
                 'rooms' => $rooms,
                 'bookable' => [] !== $rooms,
@@ -593,6 +728,11 @@ class TripCatalog
     }
 
     /**
+     * BusPro prices a boarding point per leg, so a customer travelling both ways pays the
+     * surcharge twice. Both legs and their sum are spelled out, because a single figure
+     * reads as the whole price. A leg listed without a price is billed nothing, so it is 0;
+     * the return is absent only where the point is not served on the way back.
+     *
      * @param array<string, mixed> $row
      *
      * @return list<array<string, mixed>>
@@ -606,12 +746,17 @@ class TripCatalog
                 continue;
             }
 
+            $outbound = (float) ($pickup['price'] ?? 0);
+            $return = ($pickup['returnLeg'] ?? false) ? (float) ($pickup['returnPrice'] ?? 0) : null;
+
             $pickups[] = array_filter([
                 'city' => $pickup['city'],
                 'place' => $pickup['street'] ?? null,
                 // A clock reading without an offset, as BusPro states it.
                 'departure' => is_string($pickup['datetime'] ?? null) ? str_replace('T', ' ', substr($pickup['datetime'], 0, 16)) : null,
-                'surcharge' => $pickup['price'] ?? null,
+                'surchargeOutbound' => $outbound,
+                'surchargeReturn' => $return,
+                'surchargeRoundTrip' => null !== $return ? round($outbound + $return, 2) : null,
             ], static fn (mixed $value): bool => null !== $value);
         }
 
@@ -640,6 +785,19 @@ class TripCatalog
         return array_values(array_filter(array_unique(array_map($this->normalize(...), $codes))));
     }
 
+    /**
+     * The website's name for the hotel of a travel date, else BusPro's, else its code.
+     *
+     * @param array<string, mixed> $catalog
+     * @param array<string, mixed> $row
+     */
+    private function hotelName(array $catalog, ?ContentDocument $hotel, array $row): string
+    {
+        return $hotel?->getTitle()
+            ?? $catalog['busProHotels'][$row['hotel']['busProId'] ?? 0]['name']
+            ?? (string) $row['hotel']['code'];
+    }
+
     private function dataAsOf(Export $export): string
     {
         return ($export->sourceGeneratedAt ?? $export->generatedAt)->format('c');
@@ -654,15 +812,6 @@ class TripCatalog
         return mb_substr($text, 0, $limit)."\n\n[… gekürzt, vollständiger Text unter der URL]";
     }
 
-    private function minPrice(?float $a, ?float $b): ?float
-    {
-        if (null === $a || null === $b) {
-            return $a ?? $b;
-        }
-
-        return min($a, $b);
-    }
-
     private function today(): string
     {
         return $this->clock->now()->setTimezone(new \DateTimeZone('Europe/Berlin'))->format('Y-m-d');

src/Command/BookingRepairDraftCommand.php

@@ -1,491 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Command;
-
-use App\BusProNet\Client\BookingClient;
-use App\BusProNet\Client\TravelClient;
-use App\BusProNet\Constants;
-use App\BusProNet\DataProcessor\BookingDataProcessor;
-use App\BusProNet\Model\Booking;
-use App\BusProNet\Model\Notification;
-use App\BusProNet\Model\Service;
-use App\BusProNet\Model\Travel;
-use App\Entity\BookingEditDraft;
-use App\Entity\User;
-use App\Repository\BookingEditDraftRepository;
-use App\Security\Crypt;
-use App\Service\BookingChangeTracker;
-use App\Service\BookingEditDraftMerger;
-use App\Service\TravelDataProvider;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-/**
- * Repairs a booking edit draft that BusPro keeps rejecting.
- *
- * A draft survives every failed submission and is replayed on each re-entry into the edit flow.
- * When one selection inside it has become unacceptable to BusPro - a Leistung whose status has
- * drifted to "Anfrage" because its contingent ran out, say - the whole change is refused, nothing
- * persists, and the customer is stuck in a loop they cannot edit their way out of. Booking 98787
- * accumulated 37 such failures over two months.
- *
- * The valuable half of that draft is the personal data: names, dates of birth, contact details,
- * addresses, room remarks. Re-entering it by hand for eighty participants is not a reasonable ask.
- * So this command rebuilds the draft on top of the booking as BusPro currently holds it, keeps
- * every field the customer typed, and reverts only the service selections that BusPro will not
- * accept - naming each one, so the office can tell the customer what to pick again.
- *
- * Dry run by default. --apply writes a JSON backup of the original form data first.
- */
-#[AsCommand(
-    name: 'app:booking:repair-draft',
-    description: 'Rebuild a rejected booking edit draft, keeping typed data and reverting unacceptable service selections',
-)]
-class BookingRepairDraftCommand extends Command
-{
-    /**
-     * Draft `services` keys holding a single service id.
-     */
-    /**
-     * Date of birth the office writes into the empty slots of a template booking.
-     */
-    private const PLACEHOLDER_DATE_OF_BIRTH = '2000-01-01';
-
-    private const SINGLE_SERVICE_KEYS = ['skiPass', 'veg', 'insurance', 'rentalInsurance'];
-
-    /**
-     * Draft `services` keys holding a list of service ids.
-     *
-     * @var list<string>
-     */
-    private const LIST_SERVICE_KEYS = ['courses', 'board', 'rentals', 'additionalServices'];
-
-    /**
-     * Transport is reverted as a unit: a participant put back on their own arrival must lose the
-     * pickup and drop-off that only make sense on a coach.
-     *
-     * @var list<string>
-     */
-    private const TRANSPORT_KEYS = ['transportationOutbound', 'transportationInbound', 'pickup', 'dropOff'];
-
-    public function __construct(
-        private readonly BookingEditDraftRepository $draftRepository,
-        private readonly EntityManagerInterface $entityManager,
-        private readonly BookingClient $bookingClient,
-        private readonly TravelClient $travelClient,
-        private readonly Crypt $crypt,
-        private readonly TravelDataProvider $travelDataProvider,
-        private readonly BookingDataProcessor $bookingDataProcessor,
-        private readonly BookingEditDraftMerger $draftMerger,
-        private readonly BookingChangeTracker $changeTracker,
-        #[Autowire('%kernel.project_dir%')]
-        private readonly string $projectDir,
-    ) {
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->addOption('booking', 'b', InputOption::VALUE_REQUIRED, 'idbuchung whose draft should be repaired')
-            ->addOption('apply', null, InputOption::VALUE_NONE, 'Write the repaired draft. Without this the command only reports')
-            ->addOption('backup-dir', null, InputOption::VALUE_REQUIRED, 'Where to write the backup of the original form data', 'var/draft-backups')
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        $bookingId = $input->getOption('booking');
-        if (null === $bookingId) {
-            $io->error('--booking is required.');
-
-            return Command::INVALID;
-        }
-
-        $draft = $this->findSingleDraft($io, (int) $bookingId);
-        if (null === $draft) {
-            return Command::FAILURE;
-        }
-
-        $user = $draft->getUser();
-        $booking = $this->fetchLiveBooking($io, $user, (int) $bookingId);
-        if (null === $booking) {
-            return Command::FAILURE;
-        }
-
-        $travel = $this->travelDataProvider->getTravelData((int) $booking->dateId, $booking->hotelId, true);
-        if (null === $travel) {
-            $io->error(sprintf('No travel data for date id %d.', (int) $booking->dateId));
-
-            return Command::FAILURE;
-        }
-
-        $formData = $draft->getFormData();
-        $draftParticipants = $formData['participants'] ?? [];
-
-        if (false === $this->assertAlignment($io, $booking, $draftParticipants)) {
-            return Command::FAILURE;
-        }
-
-        $blocked = $this->collectUnbookableServices($io, $travel);
-
-        // The booking as BusPro currently holds it is the only state known to be acceptable, so
-        // it is the base everything is rebuilt on.
-        $repairedDto = $this->bookingDataProcessor->createBookingDtoFromBooking(
-            $booking,
-            $travel,
-            false,
-        );
-
-        $liveSelections = $this->changeTracker->extractUserData($repairedDto)['participants'] ?? [];
-
-        $reverted = [];
-        foreach ($draftParticipants as $index => $participantData) {
-            if (false === isset($repairedDto->participants[$index])) {
-                continue;
-            }
-
-            $filtered = $this->filterServiceSelections(
-                $participantData,
-                $liveSelections[$index]['services'] ?? [],
-                $blocked,
-                $index,
-                $reverted,
-            );
-
-            $this->draftMerger->apply($repairedDto, $index, $repairedDto->participants[$index], $filtered, $travel);
-        }
-
-        $repaired = $this->changeTracker->extractUserData($repairedDto);
-
-        $this->report($io, $formData, $repaired, $reverted, $blocked);
-
-        if (false === $input->getOption('apply')) {
-            $io->note('Dry run. Re-run with --apply to write the repaired draft.');
-
-            return Command::SUCCESS;
-        }
-
-        $backupPath = $this->writeBackup($draft, (string) $input->getOption('backup-dir'));
-        $io->success(sprintf('Original form data backed up to %s', $backupPath));
-
-        $draft->setFormData($repaired);
-        $this->entityManager->flush();
-
-        $io->success(sprintf('Draft %d repaired.', (int) $draft->getId()));
-
-        return Command::SUCCESS;
-    }
-
-    private function findSingleDraft(SymfonyStyle $io, int $bookingId): ?BookingEditDraft
-    {
-        $drafts = $this->draftRepository->findBy(['bookingId' => $bookingId]);
-
-        if ([] === $drafts) {
-            $io->error(sprintf('No draft found for booking %d.', $bookingId));
-
-            return null;
-        }
-
-        if (count($drafts) > 1) {
-            $io->error(sprintf('Booking %d has %d drafts; resolve by hand.', $bookingId, count($drafts)));
-
-            return null;
-        }
-
-        $draft = $drafts[0];
-        $io->definitionList(
-            ['Draft' => sprintf('%d (user %d)', (int) $draft->getId(), (int) $draft->getUser()->getId())],
-            ['Created' => $draft->getCreatedAt()->format('Y-m-d H:i')],
-            ['Last saved' => $draft->getUpdatedAt()->format('Y-m-d H:i')],
-            ['Participants' => (string) count($draft->getFormData()['participants'] ?? [])],
-        );
-
-        return $draft;
-    }
-
-    private function fetchLiveBooking(SymfonyStyle $io, User $user, int $bookingId): ?Booking
-    {
-        $result = $this->bookingClient->getBooking(
-            (string) $user->getEmail(),
-            $this->crypt->decrypt((string) $user->getPassword()),
-            $bookingId,
-        );
-
-        if ($result instanceof Notification) {
-            $io->error(sprintf('Vorgang_Details failed: %d %s', (int) $result->code, (string) $result->message));
-
-            return null;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Refuses to repair a draft whose positions no longer line up with the live booking.
-     *
-     * Drafts are merged positionally, by array index, with no identity check. Empty template
-     * slots are interchangeable, so they prove nothing; the participants BusPro already knows by
-     * date of birth are the only anchors available. If one of those has moved, every later
-     * position is suspect and rebuilding would quietly graft data onto the wrong people.
-     *
-     * @param array<int, array<string, mixed>> $draftParticipants
-     */
-    private function assertAlignment(SymfonyStyle $io, Booking $booking, array $draftParticipants): bool
-    {
-        $liveCount = count($booking->participants);
-        $draftCount = count($draftParticipants);
-
-        if ($liveCount !== $draftCount) {
-            $io->warning(sprintf(
-                'Live booking has %d participants, the draft has %d. Seats were added or removed since the draft was written.',
-                $liveCount,
-                $draftCount,
-            ));
-        }
-
-        $anchors = 0;
-        $mismatches = [];
-
-        foreach (array_values($booking->participants) as $index => $participant) {
-            $liveDob = $participant->dateOfBirth?->format('Y-m-d');
-            if (null === $liveDob || self::PLACEHOLDER_DATE_OF_BIRTH === $liveDob) {
-                continue;
-            }
-
-            ++$anchors;
-            $draftDob = $draftParticipants[$index]['personalData']['dateOfBirth'] ?? null;
-
-            if (null !== $draftDob && $draftDob !== $liveDob) {
-                $mismatches[] = sprintf('position %d: live %s, draft %s', $index + 1, $liveDob, $draftDob);
-            }
-        }
-
-        if ([] !== $mismatches) {
-            $io->error('Draft positions no longer match the live booking:');
-            $io->listing($mismatches);
-            $io->comment('Repairing would move typed data onto the wrong participants. Resolve by hand.');
-
-            return false;
-        }
-
-        $io->text(sprintf('Alignment verified against %d participant(s) BusPro already knows.', $anchors));
-
-        return true;
-    }
-
-    /**
-     * Collects the services BusPro will not accept as an addition.
-     *
-     * A Leistung only takes new participants while its own status is "Frei"; anything else is the
-     * condition behind "Status der Leistung (A) ist unterschiedlich zum Status des Teilnehmers".
-     * Live availability is preferred over the travel data, which lags behind it.
-     *
-     * @return array<int, string> service id => status
-     */
-    private function collectUnbookableServices(SymfonyStyle $io, Travel $travel): array
-    {
-        $statuses = [];
-        foreach ([...$travel->additionalServices, ...$travel->transportationServices] as $service) {
-            if (null !== $service->id && null !== $service->status) {
-                $statuses[$service->id] = $service->status;
-            }
-        }
-
-        $live = $this->travelClient->getAvailabilitiesExtended((int) $travel->id);
-        if ($live instanceof Notification) {
-            $io->warning(sprintf(
-                'VERFUEGBARKEIT2 failed (%d %s); falling back to travel data, which may be stale.',
-                (int) $live->code,
-                (string) $live->message,
-            ));
-        } else {
-            foreach ($live->getServices() as $availability) {
-                if (null !== $availability->serviceId && null !== $availability->status && '' !== trim($availability->status)) {
-                    $statuses[$availability->serviceId] = $availability->status;
-                }
-            }
-        }
-
-        $blocked = array_filter($statuses, static fn (string $status): bool => Constants::STATUS_AVAILABLE !== $status);
-
-        if ([] === $blocked) {
-            $io->text('Every service on this travel is currently "Frei".');
-
-            return [];
-        }
-
-        $rows = [];
-        foreach ($blocked as $serviceId => $status) {
-            $service = $travel->additionalServices[$serviceId] ?? $travel->transportationServices[$serviceId] ?? null;
-            $label = $service instanceof Service ? (string) $service->label : '?';
-            $rows[] = [$serviceId, $label, $status];
-        }
-
-        $io->section('Services that cannot take new participants');
-        $io->table(['id', 'Leistung', 'status'], $rows);
-
-        return $blocked;
-    }
-
-    /**
-     * Drops the draft's selections that would add a participant to a service BusPro has closed.
-     *
-     * Removing a key leaves the live booking's own value in place, because the merger applies
-     * only the keys it is given. Selections BusPro still accepts - a different ski pass, a meal
-     * preference - are kept, so the customer loses as little as possible.
-     *
-     * @param array<string, mixed> $participantData
-     * @param array<string, mixed> $liveServices
-     * @param array<int, string>   $blocked
-     * @param list<string>         $reverted
-     *
-     * @return array<string, mixed>
-     */
-    private function filterServiceSelections(
-        array $participantData,
-        array $liveServices,
-        array $blocked,
-        int $index,
-        array &$reverted,
-    ): array {
-        if (false === isset($participantData['services']) || [] === $blocked) {
-            return $participantData;
-        }
-
-        $services = $participantData['services'];
-        $position = $index + 1;
-
-        foreach (self::SINGLE_SERVICE_KEYS as $key) {
-            $selected = $services[$key] ?? null;
-            if (null !== $selected && isset($blocked[$selected]) && ($liveServices[$key] ?? null) !== $selected) {
-                unset($services[$key]);
-                $reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $selected, $blocked[$selected]);
-            }
-        }
-
-        foreach (self::LIST_SERVICE_KEYS as $key) {
-            $selected = $services[$key] ?? null;
-            if (false === is_array($selected)) {
-                continue;
-            }
-
-            $liveList = $liveServices[$key] ?? [];
-            $kept = [];
-            foreach ($selected as $serviceId) {
-                if (isset($blocked[$serviceId]) && false === in_array($serviceId, $liveList, true)) {
-                    $reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $serviceId, $blocked[$serviceId]);
-
-                    continue;
-                }
-
-                $kept[] = $serviceId;
-            }
-
-            $services[$key] = $kept;
-        }
-
-        foreach (['transportationOutbound', 'transportationInbound'] as $key) {
-            $selected = $services[$key] ?? null;
-            if (null === $selected || false === isset($blocked[$selected]) || ($liveServices[$key] ?? null) === $selected) {
-                continue;
-            }
-
-            $reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $selected, $blocked[$selected]);
-
-            // Transport reverts as a unit, pickup and drop-off included.
-            foreach (self::TRANSPORT_KEYS as $transportKey) {
-                unset($services[$transportKey]);
-            }
-
-            break;
-        }
-
-        $participantData['services'] = $services;
-
-        return $participantData;
-    }
-
-    /**
-     * @param array<string, mixed> $original
-     * @param array<string, mixed> $repaired
-     * @param list<string>         $reverted
-     * @param array<int, string>   $blocked
-     */
-    private function report(SymfonyStyle $io, array $original, array $repaired, array $reverted, array $blocked): void
-    {
-        $io->section('Typed data preserved');
-
-        $fields = ['firstName', 'lastName', 'dateOfBirth', 'email', 'mobile'];
-        $kept = 0;
-        $lost = [];
-
-        foreach ($original['participants'] ?? [] as $index => $participantData) {
-            foreach ($fields as $field) {
-                $before = $participantData['personalData'][$field] ?? null;
-                if (null === $before || '' === $before) {
-                    continue;
-                }
-
-                $after = $repaired['participants'][$index]['personalData'][$field] ?? null;
-                if ($before === $after) {
-                    ++$kept;
-
-                    continue;
-                }
-
-                $lost[] = sprintf('participant %d: %s', $index + 1, $field);
-            }
-        }
-
-        $io->text(sprintf('<info>%d</info> personal-data field(s) carried over.', $kept));
-
-        if ([] !== $lost) {
-            $io->warning(sprintf('%d field(s) could NOT be carried over:', count($lost)));
-            $io->listing(array_slice($lost, 0, 25));
-        }
-
-        $io->section('Service selections reverted');
-
-        if ([] === $reverted) {
-            $io->text([] === $blocked
-                ? 'None - no service on this travel is closed.'
-                : 'None - the draft selects no closed service.');
-
-            return;
-        }
-
-        $io->warning(sprintf('%d selection(s) reverted to the booked state. The customer must choose again:', count($reverted)));
-        $io->listing($reverted);
-    }
-
-    private function writeBackup(BookingEditDraft $draft, string $backupDir): string
-    {
-        $directory = $this->projectDir.'/'.trim($backupDir, '/');
-        if (false === is_dir($directory)) {
-            mkdir($directory, 0o775, true);
-        }
-
-        $path = sprintf(
-            '%s/draft-%d-booking-%d-%s.json',
-            $directory,
-            (int) $draft->getId(),
-            $draft->getBookingId(),
-            (new \DateTimeImmutable())->format('Ymd-His'),
-        );
-
-        file_put_contents($path, json_encode($draft->getFormData(), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE));
-
-        return $path;
-    }
-}

src/Command/BpnSyncContingentsCommand.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Command;
 
-use App\Entity\Groups\Accommodation;
-use App\Repository\Groups\AccommodationRepository;
 use App\Repository\Groups\ContingentDayRepository;
 use App\Repository\Groups\ContingentSyncStateRepository;
+use App\Service\ContingentHotelDirectory;
 use App\Service\ContingentSnapshotManager;
 use Carbon\CarbonImmutable;
 use Psr\Log\LoggerInterface;
@@ -28,14 +27,18 @@ use Symfony\Component\Console\Style\SymfonyStyle;
  *
  * Scheduled over the full horizon throughout: every 15 minutes during peak hours, hourly
  * outside them. The options exist for ad-hoc runs — a narrower --horizon-months, or --hotel
- * to re-sync a single accommodation while debugging.
+ * to re-sync a single hotel code while debugging.
+ *
+ * Syncs every code of {@see ContingentHotelDirectory}: the accommodations' calendar codes plus
+ * TYPO3's calendar hotels. A full run also drops the snapshot of codes that have left both
+ * sources, so the snapshot tables only ever describe hotels that are still synced.
  */
 class BpnSyncContingentsCommand extends Command
 {
     use LockableTrait;
 
     public function __construct(
-        private readonly AccommodationRepository $accommodationRepository,
+        private readonly ContingentHotelDirectory $hotelDirectory,
         private readonly ContingentSyncStateRepository $syncStateRepository,
         private readonly ContingentDayRepository $dayRepository,
         private readonly ContingentSnapshotManager $snapshotManager,
@@ -51,8 +54,8 @@ class BpnSyncContingentsCommand extends Command
     {
         $this
             ->addOption('horizon-months', null, InputOption::VALUE_REQUIRED, 'How many months ahead to sync (defaults to the full horizon)', '24')
-            ->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single calendarCode')
+            ->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single hotel code')
-            ->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before an accommodation is eligible (ignored with --force)', '0')
+            ->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before a hotel is eligible (ignored with --force)', '0')
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Sync even if the snapshot was refreshed recently')
         ;
     }
@@ -79,10 +82,13 @@ class BpnSyncContingentsCommand extends Command
         $dateFrom = $today->toDateTimeImmutable();
         $dateTo = $today->addMonths($horizonMonths)->toDateTimeImmutable();
 
-        $accommodations = $this->resolveAccommodations(is_string($hotelCode) ? $hotelCode : null);
+        $this->hotelDirectory->refresh();
+        // array_keys() turns a numeric code into an int.
+        $allHotelCodes = array_map('strval', array_keys($this->hotelDirectory->all()));
+        $hotelCodes = is_string($hotelCode) ? array_values(array_intersect($allHotelCodes, [$hotelCode])) : $allHotelCodes;
 
-        if ([] === $accommodations) {
+        if ([] === $hotelCodes) {
-            $io->warning('No accommodation with a calendarCode matched.');
+            $io->warning('No accommodation calendarCode or TYPO3 calendar hotel matched.');
 
             return Command::SUCCESS;
         }
@@ -92,19 +98,19 @@ class BpnSyncContingentsCommand extends Command
         $changed = 0;
         $failedCodes = [];
 
-        foreach ($accommodations as $accommodation) {
+        foreach ($hotelCodes as $code) {
-            if (!$force && $this->isFresh($accommodation, $staleAfterMinutes)) {
+            if (!$force && $this->isFresh($code, $staleAfterMinutes)) {
                 ++$skipped;
 
                 continue;
             }
 
-            $result = $this->snapshotManager->sync($accommodation, $dateFrom, $dateTo);
+            $result = $this->snapshotManager->sync($code, $dateFrom, $dateTo);
             ++$processed;
 
             if (!$result->successful) {
-                $failedCodes[] = (string) $accommodation->getCalendarCode();
+                $failedCodes[] = $code;
-                $io->warning(sprintf('%s: %s', (string) $accommodation->getCalendarCode(), (string) $result->error));
+                $io->warning(sprintf('%s: %s', $code, (string) $result->error));
 
                 continue;
             }
@@ -115,7 +121,7 @@ class BpnSyncContingentsCommand extends Command
 
             $io->writeln(sprintf(
                 '<info>%s</info>: %s (+%d ~%d -%d, %d beyond the previous horizon)',
-                (string) $accommodation->getCalendarCode(),
+                $code,
                 $result->changed ? 'changed' : 'unchanged',
                 $result->added,
                 $result->updated,
@@ -149,6 +155,21 @@ class BpnSyncContingentsCommand extends Command
         $deleted = $this->dayRepository->deleteBefore($today->subDay()->toDateTimeImmutable());
         $io->note(sprintf('Deleted %d outdated snapshot days.', $deleted));
 
+        // Only a full run knows the whole set. A code that left both sources is not served any
+        // more (the availability endpoint answers 400 for it), so its snapshot is dead weight;
+        // should it come back, the next run rebuilds it.
+        if (!is_string($hotelCode)) {
+            $orphanedDays = $this->dayRepository->deleteExceptHotelCodes($allHotelCodes);
+            $orphanedStates = $this->syncStateRepository->deleteExceptHotelCodes($allHotelCodes);
+
+            if ($orphanedStates > 0) {
+                $this->logger->info('Dropped the contingent snapshot of hotel codes that are no longer synced', [
+                    'hotels' => $orphanedStates,
+                    'days' => $orphanedDays,
+                ]);
+            }
+        }
+
         // Only a *total* failure is worth failing the task over: that means upstream is down or
         // the API key is rejected, and the scheduler's failure mail is genuinely actionable.
         // A single hotel breaking must stay quiet — this task runs every 15 minutes during the
@@ -158,27 +179,13 @@ class BpnSyncContingentsCommand extends Command
         return $processed > 0 && $failed === $processed ? Command::FAILURE : Command::SUCCESS;
     }
 
-    /**
+    private function isFresh(string $hotelCode, int $staleAfterMinutes): bool
-     * @return Accommodation[]
-     */
-    private function resolveAccommodations(?string $hotelCode): array
-    {
-        if (null === $hotelCode) {
-            return $this->accommodationRepository->findAllWithCalendarCode();
-        }
-
-        $accommodation = $this->accommodationRepository->findOneByCalendarCode($hotelCode);
-
-        return null !== $accommodation ? [$accommodation] : [];
-    }
-
-    private function isFresh(Accommodation $accommodation, int $staleAfterMinutes): bool
     {
         if (0 === $staleAfterMinutes) {
             return false;
         }
 
-        $syncedAt = $this->syncStateRepository->findOneByAccommodation($accommodation)?->getSyncedAt();
+        $syncedAt = $this->syncStateRepository->findOneByHotelCode($hotelCode)?->getSyncedAt();
 
         if (null === $syncedAt) {
             return false;

src/Command/CleanupTravelMailingListsCommand.php

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Command;
+
+use App\Entity\TravelMailingList;
+use App\Exception\NewsletterProviderException;
+use App\Repository\TravelMailingListRepository;
+use App\Service\TravelMailingListManager;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+#[AsCommand(
+    name: 'app:cleanup:travel-mailing-lists',
+    description: 'Deletes travel mailing lists and their orphaned contacts from Mailjet 30 days after the travel started',
+)]
+class CleanupTravelMailingListsCommand extends Command
+{
+    public function __construct(
+        private readonly TravelMailingListRepository $travelMailingListRepository,
+        private readonly TravelMailingListManager $travelMailingListManager,
+        private readonly LoggerInterface $logger,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $mailingLists = $this->travelMailingListRepository->findDueForDeletion(new \DateTimeImmutable());
+        if ([] === $mailingLists) {
+            $io->success('No travel mailing lists due for deletion.');
+
+            return Command::SUCCESS;
+        }
+
+        // A travel's lists are deleted together (see TravelMailingListManager::delete()), including
+        // one that is not due yet because the travel's start date moved after it was created.
+        $travelCodes = array_unique(array_map(static fn (TravelMailingList $mailingList) => $mailingList->getTravelCode(), $mailingLists));
+
+        $failed = 0;
+        $deletedLists = 0;
+        foreach ($travelCodes as $travelCode) {
+            $travelLists = $this->travelMailingListRepository->findByTravelCode($travelCode);
+            $listIds = implode(', ', array_map(static fn (TravelMailingList $mailingList) => $mailingList->getMailjetListId(), $travelLists));
+
+            try {
+                $deletedContacts = $this->travelMailingListManager->delete($travelLists);
+                $deletedLists += count($travelLists);
+                $io->writeln(sprintf('Deleted %s (lists %s) and %d orphaned contact(s).', $travelCode, $listIds, $deletedContacts));
+            } catch (NewsletterProviderException $exception) {
+                // The rows of lists not yet deleted stay, so the next run picks them up again.
+                ++$failed;
+                $this->logger->error('Delete travel mailing lists failed', [
+                    'travel_code' => $travelCode,
+                    'mailjet_list_ids' => $listIds,
+                    'error' => $exception->getMessage(),
+                ]);
+                $io->error(sprintf('%s (lists %s): %s', $travelCode, $listIds, $exception->getMessage()));
+            }
+        }
+
+        if ($failed > 0) {
+            return Command::FAILURE;
+        }
+
+        $io->success(sprintf('Deleted %d travel mailing list(s).', $deletedLists));
+
+        return Command::SUCCESS;
+    }
+}

src/Controller/Account/PersonalDataController.php

@@ -158,9 +158,16 @@ class PersonalDataController extends AbstractController
             return $this->redirectToRoute('app_personal_data');
         }
 
+        // The form leaves these out of validation because the user has no field for them, so they
+        // are reported separately. Skipped for a failed load, which would list every field.
+        $invalidIdentityFields = null !== $personalData->addressId
+            ? $this->completenessChecker->invalidIdentityFields($personalData)
+            : [];
+
         return $this->render('account/personal_data.html.twig', [
             'personalData' => $personalData,
             'personalDataForm' => $personalDataForm,
+            'invalidIdentityFields' => $invalidIdentityFields,
             'newsletterSubscribed' => $newsletterSubscribed,
             'newsletterPendingConfirmation' => $newsletterPendingConfirmation,
         ]);

src/Controller/Admin/AccommodationBooking/IndexController.php

@@ -52,7 +52,7 @@ class IndexController extends AbstractController
             $request->query->getInt('page', 1),
             $request->query->getInt('limit', 20),
             [
-                'defaultSortFieldName' => 'booking.createdAt',
+                'defaultSortFieldName' => 'booking.updatedAt',
                 'defaultSortDirection' => 'DESC',
             ]
         );

src/Controller/Admin/Log/DownloadController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controller\Admin\Log;
 
+use App\Security\Voter\AdministrativeAccessVoter;
 use App\Service\XmlDumpReader;
 use League\Flysystem\FilesystemException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -12,7 +13,7 @@ use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
-#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
 class DownloadController extends AbstractController
 {
     public function __construct(private readonly XmlDumpReader $xmlDumpReader)

src/Controller/Admin/Log/FilterController.php

@@ -8,13 +8,14 @@ use App\Controller\Traits\ListFilterTrait;
 use App\Form\Admin\Filter\LogEntryFilterType;
 use App\Form\Model\Filter\LogEntryFilterDto;
 use App\Repository\LogEntryRepository;
+use App\Security\Voter\AdministrativeAccessVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
-#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
 class FilterController extends AbstractController
 {
     use ListFilterTrait;

src/Controller/Admin/Log/IndexController.php

@@ -8,6 +8,7 @@ use App\Controller\Traits\ListFilterTrait;
 use App\Form\Admin\Filter\LogEntryFilterType;
 use App\Form\Model\Filter\LogEntryFilterDto;
 use App\Repository\LogEntryRepository;
+use App\Security\Voter\AdministrativeAccessVoter;
 use Knp\Component\Pager\PaginatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -15,7 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
-#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
 class IndexController extends AbstractController
 {
     use ListFilterTrait;

src/Controller/Admin/Log/XmlDumpController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Controller\Admin\Log;
 
 use App\Entity\LogEntry;
+use App\Security\Voter\AdministrativeAccessVoter;
 use App\Service\XmlDumpReader;
 use League\Flysystem\FilesystemException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -12,7 +13,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
-#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+#[IsGranted(AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS)]
 class XmlDumpController extends AbstractController
 {
     public function __construct(private readonly XmlDumpReader $xmlDumpReader)

src/Controller/Admin/TravelMailing/CreateListController.php

@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Admin\TravelMailing;
+
+use App\BpnConnect\Exception\BpnConnectException;
+use App\BpnConnect\TravelsClient;
+use App\BusProNet\Utility\DateCodeUtility;
+use App\Entity\TravelMailingList;
+use App\Exception\NewsletterProviderException;
+use App\Form\Model\TravelMailingLookupDto;
+use App\Repository\TravelMailingListRepository;
+use App\Service\TravelDataProvider;
+use App\Service\TravelMailingListManager;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+class CreateListController extends AbstractController
+{
+    public const string CSRF_TOKEN_ID = 'create_travel_mailing_list';
+
+    public function __construct(
+        private readonly TravelsClient $travelsClient,
+        private readonly TravelDataProvider $travelDataProvider,
+        private readonly TravelMailingListRepository $travelMailingListRepository,
+        private readonly TravelMailingListManager $travelMailingListManager,
+        private readonly LoggerInterface $adminLogger,
+    ) {
+    }
+
+    #[Route('/admin/travel-mailing/list', name: 'app_admin_travelmailing_createlist', methods: ['POST'])]
+    public function index(Request $request): Response
+    {
+        if (!$this->isCsrfTokenValid(self::CSRF_TOKEN_ID, $request->request->getString('_token'))) {
+            throw $this->createAccessDeniedException('Invalid CSRF token.');
+        }
+
+        $lookup = new TravelMailingLookupDto();
+        $lookup->travelCode = (new DateCodeUtility())->sanitize($request->request->getString('travelCode'));
+        $lookup->busOnly = $request->request->getBoolean('busOnly');
+        $travelCode = $lookup->travelCode;
+        $busLeg = $lookup->getBusLeg();
+        $returnUrl = $this->generateUrl('app_admin_travelmailing', array_filter([
+            'travelCode' => $travelCode,
+            'busOnly' => $lookup->busOnly ? 1 : null,
+        ]));
+
+        $name = TravelMailingList::nameFor($travelCode, $busLeg);
+        if (null !== $this->travelMailingListRepository->findOneByName($name)) {
+            $this->addFlash('error', sprintf('Die Mailjet-Liste %s gibt es bereits.', $name));
+
+            return $this->redirect($returnUrl);
+        }
+
+        $travelStartsAt = $this->travelDataProvider->mapDateCodeToStartDate($travelCode);
+        if (null === $travelStartsAt) {
+            $this->addFlash('error', sprintf('Für %s ist kein Reisebeginn bekannt, die Liste könnte nicht automatisch gelöscht werden.', $travelCode));
+
+            return $this->redirect($returnUrl);
+        }
+
+        // Fetched again rather than posted from the page, so the list holds what BusPro reports now.
+        try {
+            $recipients = $this->travelsClient->getMailingRecipients($travelCode, $busLeg)->data;
+        } catch (BpnConnectException) {
+            $this->addFlash('error', 'Die Teilnehmerliste konnte nicht von BusPro abgerufen werden. Bitte später erneut versuchen.');
+
+            return $this->redirect($returnUrl);
+        }
+
+        if ([] === $recipients) {
+            $this->addFlash('error', sprintf('Keine Empfänger für %s gefunden.', $travelCode));
+
+            return $this->redirect($returnUrl);
+        }
+
+        try {
+            $mailingList = $this->travelMailingListManager->create($travelCode, $recipients, $busLeg, $travelStartsAt);
+        } catch (NewsletterProviderException $exception) {
+            $this->adminLogger->error('Create travel mailing list failed', [
+                'travel_code' => $travelCode,
+                'error' => $exception->getMessage(),
+            ]);
+            $this->addFlash('error', 'Die Mailjet-Liste konnte nicht angelegt werden: '.$exception->getMessage());
+
+            return $this->redirect($returnUrl);
+        }
+
+        $this->adminLogger->info('Create travel mailing list', [
+            'travel_code' => $travelCode,
+            'mailjet_list_id' => $mailingList->getMailjetListId(),
+            'bus_leg' => $busLeg?->value,
+            'recipients' => count($recipients),
+        ]);
+        $this->addFlash('success', sprintf('Die Mailjet-Liste %s wurde mit %d Empfängern angelegt.', $mailingList->getName(), count($recipients)));
+
+        return $this->redirect($returnUrl);
+    }
+}

src/Controller/Admin/TravelMailing/IndexController.php

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Admin\TravelMailing;
+
+use App\BpnConnect\Exception\BpnConnectException;
+use App\BpnConnect\TravelsClient;
+use App\BusProNet\Utility\DateCodeUtility;
+use App\Entity\TravelMailingList;
+use App\Form\Admin\TravelMailingLookupType;
+use App\Form\Model\TravelMailingLookupDto;
+use App\Repository\TravelMailingListRepository;
+use App\Service\TravelDataProvider;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_CUSTOMER_EXPERT')]
+class IndexController extends AbstractController
+{
+    public function __construct(
+        private readonly TravelsClient $travelsClient,
+        private readonly TravelDataProvider $travelDataProvider,
+        private readonly TravelMailingListRepository $travelMailingListRepository,
+    ) {
+    }
+
+    #[Route('/admin/travel-mailing', name: 'app_admin_travelmailing')]
+    public function index(Request $request): Response
+    {
+        $lookup = new TravelMailingLookupDto();
+        $form = $this->createForm(TravelMailingLookupType::class, $lookup, [
+            'action' => $this->generateUrl('app_admin_travelmailing'),
+        ]);
+        $form->handleRequest($request);
+
+        $result = null;
+        $travelLabel = null;
+        $travelStartsAt = null;
+        $mailingLists = [];
+        $mailingList = null;
+        $listName = null;
+        $failed = false;
+        if ($form->isSubmitted() && $form->isValid()) {
+            // The local index matches codes exactly, so "lpjmp-281126" has to become "LPJMP281126"
+            // before the label lookup; bpn-connect gets the same code to keep both in step.
+            $travelCode = (new DateCodeUtility())->sanitize((string) $lookup->travelCode);
+
+            try {
+                $result = $this->travelsClient->getMailingRecipients($travelCode, $lookup->getBusLeg());
+                $travelLabel = $this->travelDataProvider->mapDateCodeToLabel($travelCode);
+                $travelStartsAt = $this->travelDataProvider->mapDateCodeToStartDate($travelCode);
+                $mailingLists = $this->travelMailingListRepository->findByTravelCode($travelCode);
+                // The list matching the current filter, if one exists, replaces the create button.
+                $listName = TravelMailingList::nameFor($travelCode, $lookup->getBusLeg());
+                foreach ($mailingLists as $existing) {
+                    if ($listName === $existing->getName()) {
+                        $mailingList = $existing;
+                    }
+                }
+            } catch (BpnConnectException) {
+                // The client has already logged the cause; the page only needs to say it failed.
+                $failed = true;
+            }
+        }
+
+        return $this->render('admin/travel_mailing/index.html.twig', [
+            'form' => $form,
+            'result' => $result,
+            'travel_label' => $travelLabel,
+            'travel_starts_at' => $travelStartsAt,
+            'mailing_lists' => $mailingLists,
+            'mailing_list' => $mailingList,
+            'list_name' => $listName,
+            'failed' => $failed,
+        ]);
+    }
+}

src/Controller/Api/ContingentController.php

@@ -11,7 +11,9 @@ use App\Model\ContingentCalendarQuery;
 use App\Model\ContingentPricesQuery;
 use App\Repository\Groups\AccommodationPriceRepository;
 use App\Repository\Groups\AccommodationRepository;
+use App\Repository\Groups\ContingentSyncStateRepository;
 use App\Service\AccommodationPriceCoverage;
+use App\Service\ContingentHotelDirectory;
 use App\Service\ContingentSnapshotReader;
 use App\Service\PriceTimelineBuilder;
 use Carbon\CarbonImmutable;
@@ -33,6 +35,8 @@ class ContingentController extends AbstractController
         private readonly ContingentSnapshotReader $snapshotReader,
         private readonly PriceTimelineBuilder $priceTimelineBuilder,
         private readonly AccommodationPriceCoverage $priceCoverage,
+        private readonly ContingentHotelDirectory $hotelDirectory,
+        private readonly ContingentSyncStateRepository $syncStateRepository,
         private readonly LoggerInterface $logger,
     ) {
     }
@@ -107,7 +111,7 @@ class ContingentController extends AbstractController
         // An empty or stale snapshot must not be served as though every day were blocked: that
         // is a plausible-looking 200 nobody can distinguish from real data. Fail the way this
         // endpoint always failed instead, so existing consumers need no change.
-        $statuses = $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo);
+        $statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
 
         if (null === $statuses) {
             return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
@@ -133,6 +137,86 @@ class ContingentController extends AbstractController
         return $this->json($data);
     }
 
+    /**
+     * The snapshot as it is, for the iCal feed: no price rule, and days the snapshot lacks are
+     * left out rather than blocked, so a portal shows them as free like it did with the feed
+     * that read bpn-connect directly.
+     *
+     * Serves every synced hotel code, including TYPO3's calendar hotels that have no
+     * accommodation (winter-only hotels).
+     */
+    #[Route(path: '/contingents/availability', name: 'api_contingents_availability', methods: ['GET'])]
+    public function availability(
+        #[MapQueryString(validationFailedStatusCode: Response::HTTP_BAD_REQUEST)]
+        ContingentCalendarQuery $query,
+    ): JsonResponse {
+        if (null === $this->hotelDirectory->find($query->hotelCode)) {
+            $this->logger->error('Hotel not found for hotelcode '.$query->hotelCode);
+
+            return $this->json(['error' => 'Hotel not found for hotelCode.'], Response::HTTP_BAD_REQUEST);
+        }
+
+        // Without a range: from today to wherever the snapshot ends.
+        $dateFrom = $query->dateFromDate() ?? CarbonImmutable::now()->setTime(0, 0);
+        $dateTo = $query->dateToDate();
+
+        // Same reasoning as calendar(): a missing or stale snapshot must not pass for real data.
+        // Here it matters even more, since an empty feed would show every day as free.
+        $statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
+
+        if (null === $statuses) {
+            return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
+        }
+
+        ksort($statuses);
+
+        $data = [];
+
+        foreach ($statuses as $date => $status) {
+            $data[] = ['date' => (string) $date, 'status' => $status->value];
+        }
+
+        return $this->json($data);
+    }
+
+    /**
+     * One row per synced hotel code, for the overview of which hotel supports which calendar.
+     *
+     * `available` is whether `availability` currently serves the hotel; calendar and price table
+     * additionally need an accommodation with prices, which `pricedFrom`/`pricedTo` show.
+     */
+    #[Route(path: '/contingents/status', name: 'api_contingents_status', methods: ['GET'])]
+    public function status(): JsonResponse
+    {
+        $states = $this->syncStateRepository->findAllIndexedByHotelCode();
+
+        $data = [];
+
+        foreach ($this->hotelDirectory->all() as $hotel) {
+            $state = $states[$hotel->code] ?? null;
+            $accommodation = $hotel->accommodation;
+            $bounds = null !== $accommodation ? $this->priceRepository->findPricedDateBoundsByHotelCode($hotel->code) : null;
+
+            $data[] = [
+                'hotelCode' => $hotel->code,
+                'name' => $hotel->calendarHotel?->getName(),
+                'sources' => array_map(static fn ($source) => $source->value, $hotel->sources()),
+                'accommodation' => null !== $accommodation ? [
+                    'name' => $accommodation->getName(),
+                    'cmsCode' => $accommodation->getEffectiveCmsCode(),
+                ] : null,
+                'pricedFrom' => null !== $bounds ? $bounds['from']->format('Y-m-d') : null,
+                'pricedTo' => null !== $bounds ? $bounds['to']->format('Y-m-d') : null,
+                'syncedAt' => $state?->getSyncedAt()?->format(\DateTimeInterface::ATOM),
+                'lastError' => $state?->getLastError(),
+                'failureCount' => $state?->getFailureCount() ?? 0,
+                'available' => $this->snapshotReader->isCurrent($state),
+            ];
+        }
+
+        return $this->json($data);
+    }
+
     /**
      * @param AccommodationPrice[] $prices
      * @param array<string, true>  $covered

src/Controller/Booking/Create/Step2Controller.php

@@ -9,6 +9,7 @@ use App\Entity\User;
 use App\Exception\BookingSessionNotFoundException;
 use App\Exception\HotelNotInTravelException;
 use App\Exception\TravelNotFoundException;
+use App\Form\BookingApplicantTravelsType;
 use App\Form\BookingCreateStep2Type;
 use App\Form\Model\BookingDto;
 use App\Form\Model\ParticipantDto;
@@ -22,10 +23,12 @@ use App\Service\RoomAssigner;
 use App\Service\TravelDataProvider;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Validator\ConstraintViolationInterface;
 
 /**
  * Handles the second step of the booking creation process using card-based UI.
@@ -80,14 +83,32 @@ class Step2Controller extends AbstractBookingCreateController
 
         $this->ensureCorrectNumberOfParticipants($bookingCreateDto);
 
+        // A session can still hold a split for a travel date that does not offer the choice.
+        if (false === $bookingCreateDto->applicantTravels
+            && false === $bookingCreateDto->travel->allowsNonTravellingApplicant()) {
+            $bookingCreateDto->restoreTravellingApplicant();
+        }
+
+        // The account's own data belongs to whoever is the applicant: participant[0] normally,
+        // and the separate applicant record when they do not travel along.
         $user = $this->getUser();
-        if ($user instanceof User
+        if ($user instanceof User) {
-            && isset($bookingCreateDto->participants[0])
+            if (false === $bookingCreateDto->applicantTravels) {
-            && $this->prepopulationService->shouldPrefillApplicant($bookingCreateDto->participants[0])) {
+                $bookingCreateDto->applicant ??= new ParticipantDto();
-            $bookingCreateDto->participants[0] = $this->prepopulationService->prefillApplicantFromUser(
+
-                $user,
+                if ($this->prepopulationService->shouldPrefillApplicant($bookingCreateDto->applicant)) {
-                $bookingCreateDto->participants[0]
+                    $bookingCreateDto->applicant = $this->prepopulationService->prefillApplicantFromUser(
-            );
+                        $user,
+                        $bookingCreateDto->applicant
+                    );
+                }
+            } elseif (isset($bookingCreateDto->participants[0])
+                && $this->prepopulationService->shouldPrefillApplicant($bookingCreateDto->participants[0])) {
+                $bookingCreateDto->participants[0] = $this->prepopulationService->prefillApplicantFromUser(
+                    $user,
+                    $bookingCreateDto->participants[0]
+                );
+            }
         }
 
         // Validate room assignments against current selection (handles back-navigation from step 2 to step 1)
@@ -122,6 +143,10 @@ class Step2Controller extends AbstractBookingCreateController
         $templateData = [
             'form' => $form->createView(),
             'bookingCreateContext' => $context,
+            'applicantErrors' => $this->collectApplicantErrors($form),
+            'applicantTravelsForm' => $this
+                ->createForm(BookingApplicantTravelsType::class, $bookingCreateDto)
+                ->createView(),
         ];
 
         return $this->render('booking/create/step_2.html.twig', $templateData);
@@ -200,6 +225,42 @@ class Step2Controller extends AbstractBookingCreateController
         ];
     }
 
+    /**
+     * Pulls out the violations that belong to the applicant block rather than a participant.
+     *
+     * The step-2 form carries no fields of its own, so every violation surfaces at the form root
+     * and the page can only say "check the participants". An incomplete applicant would then be
+     * an invisible blocker: nothing on the page is marked and the button simply does nothing.
+     *
+     * @param FormInterface<mixed> $form
+     *
+     * @return string[] Messages to render on the applicant card
+     */
+    private function collectApplicantErrors(FormInterface $form): array
+    {
+        if (false === $form->isSubmitted()) {
+            return [];
+        }
+
+        $messages = [];
+
+        foreach ($form->getErrors(true) as $error) {
+            $cause = $error->getCause();
+
+            if (false === $cause instanceof ConstraintViolationInterface) {
+                continue;
+            }
+
+            if (false === str_contains($cause->getPropertyPath(), 'applicant')) {
+                continue;
+            }
+
+            $messages[] = $error->getMessage();
+        }
+
+        return array_values(array_unique($messages));
+    }
+
     /**
      * Rejects a room selection that resolves to no participants at all.
      *

src/Controller/Booking/Create/Step2ParticipantController.php

@@ -4,8 +4,11 @@ declare(strict_types=1);
 
 namespace App\Controller\Booking\Create;
 
+use App\Form\BookingApplicantTravelsType;
+use App\Form\BookingApplicantType;
 use App\Form\BookingParticipantType;
 use App\Form\Model\BookingDto;
+use App\Form\Model\ParticipantDto;
 use App\Htmx\HxTrait;
 use App\Service\ApplicantInsuranceCascade;
 use App\Service\BookingConfigurator;
@@ -130,6 +133,135 @@ class Step2ParticipantController extends AbstractController
         );
     }
 
+    /**
+     * Flips the booking-level "I am not travelling myself" choice.
+     *
+     * Toggling on moves participant[0]'s personal data into the applicant record and leaves
+     * behind a blank traveller that keeps only its index and room assignment: the services were
+     * derived from an age that no longer applies. Toggling off moves it back.
+     *
+     * Only offered where the travel date allows it; elsewhere the request changes nothing.
+     */
+    #[Route(
+        path: '/bookings/create/applicant-toggle',
+        name: 'app_booking_create_step_2_applicant_toggle',
+        methods: ['POST']
+    )]
+    public function toggleApplicantTravels(Request $request): Response
+    {
+        $result = $this->loadBookingDtoOrRedirect($request);
+        if ($result instanceof Response) {
+            return $result;
+        }
+        $bookingDto = $result;
+
+        if (false === $bookingDto->travel->allowsNonTravellingApplicant()) {
+            return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
+        }
+
+        $this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
+
+        // Captured before handleRequest(), which binds the new choice straight onto the DTO.
+        $previousChoice = $bookingDto->applicantTravels;
+
+        $form = $this->createForm(BookingApplicantTravelsType::class, $bookingDto);
+        $form->handleRequest($request);
+
+        if (false === $form->isSubmitted() || false === $form->isValid()) {
+            return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
+        }
+
+        $applicantTravels = $bookingDto->applicantTravels;
+
+        if ($applicantTravels !== $previousChoice) {
+            $this->participantFormSupportService->ensureParticipantExists($bookingDto, 0);
+
+            if (false === $applicantTravels) {
+                $bookingDto->applicant = $bookingDto->participants[0];
+                $bookingDto->applicant->index = null;
+                $bookingDto->participants[0] = $this->participantFormSupportService
+                    ->createBlankTravellerFrom($bookingDto->applicant);
+            } else {
+                $bookingDto->restoreTravellingApplicant();
+            }
+
+            // Family insurance is not offered on a split booking, so a choice already made on
+            // participant[0] has to go with it.
+            if (false === $applicantTravels) {
+                $this->participantFormSupportService->clearFamilyInsurance($bookingDto);
+            }
+
+            $this->bookingService->preselectDefaultServices($bookingDto);
+            $this->applicantInsuranceCascade->apply($bookingDto);
+            $this->bookingService->applyCreateBookingStatusRules($bookingDto);
+        }
+
+        $this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
+
+        // The choice rebuilds the whole participant list, so navigate rather than swap a fragment.
+        return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
+    }
+
+    /**
+     * Contact data of an applicant who does not travel along.
+     *
+     * Guests only. A logged-in applicant's data comes from their account and is rendered as
+     * static text on the step-2 card, because editing it here would create a duplicate BusPro
+     * record - the same reason participant[0] is static when the applicant travels.
+     */
+    #[Route(
+        path: '/bookings/create/applicant',
+        name: 'app_booking_create_applicant'
+    )]
+    public function editApplicant(Request $request): Response
+    {
+        $result = $this->loadBookingDtoOrRedirect($request);
+        if ($result instanceof Response) {
+            return $result;
+        }
+        $bookingDto = $result;
+
+        if (true === $bookingDto->applicantTravels || false === $bookingDto->travel->allowsNonTravellingApplicant()) {
+            return $this->redirectToRoute('app_booking_create_step_2');
+        }
+
+        $bookingDto->applicant ??= new ParticipantDto();
+
+        $form = $this->createForm(BookingApplicantType::class, $bookingDto->applicant);
+        $form->handleRequest($request);
+
+        // Same `#KUN#` shortcut the participant forms offer: a last name of '#KUN#' fills the
+        // whole block with dummy data instead of saving what was typed.
+        if ($form->isSubmitted()
+            && $this->prepopulationService->isDummyDataFillRequested($bookingDto->applicant, $bookingDto->getMode())) {
+            $this->prepopulationService->fillDummyApplicant($bookingDto->applicant);
+            $this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
+
+            return $this->redirectToRoute('app_booking_create_applicant');
+        }
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
+
+            return $this->redirectToRoute('app_booking_create_step_2');
+        }
+
+        // Keep an invalid submission in the session so the entered data survives a reload.
+        $this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
+
+        $bookingCreateContext = $this->createContextFactory->create(
+            $bookingDto,
+            RoomPricingCalculator::PRICING_MODE_SELECTION
+        );
+
+        return $this->render('booking/create/applicant.html.twig', [
+            'form' => $form,
+            'bookingCreateContext' => $bookingCreateContext,
+            'bookingDto' => $bookingCreateContext->bookingDto,
+            'summaryData' => $bookingCreateContext->summaryData,
+        ]);
+    }
+
     /**
      * @param FormInterface<mixed>                        $form
      * @param array<array{type: string, message: string}> $notifications

src/Controller/Groups/Booking/Step1Controller.php

@@ -240,7 +240,7 @@ class Step1Controller extends AbstractController
         \DateTimeImmutable $dateTo,
     ): array {
         $contingentStatus = null !== $accommodation
-            ? $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo) ?? []
+            ? $this->snapshotReader->statusesFor($hotelCode, $dateFrom, $dateTo) ?? []
             : [];
 
         $prices = $this->priceRepository->findByHotelCodeAndDateRange($hotelCode, $dateFrom, $dateTo);

src/Dashboard/Contract/DashboardWidgetProviderInterface.php

@@ -17,7 +17,8 @@ interface DashboardWidgetProviderInterface
 {
     /**
      * The role this widget requires, checked with isGranted() — so a widget requiring
-     * ROLE_GROUPS_MANAGER also appears for the roles above it in the hierarchy.
+     * ROLE_GROUPS_MANAGER also appears for the roles above it in the hierarchy. A voter
+     * attribute such as ADMINISTRATIVE_ACCESS works too, for a widget every admin-area role sees.
      */
     public function getRequiredRole(): string;
 

src/Dashboard/Widget/RecentLogEntriesWidgetProvider.php

@@ -9,7 +9,7 @@ use App\Entity\LogEntry;
 use App\Model\DashboardWidget;
 use App\Model\DashboardWidgetEntry;
 use App\Repository\LogEntryRepository;
-use App\Security\Role;
+use App\Security\Voter\AdministrativeAccessVoter;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -37,7 +37,7 @@ class RecentLogEntriesWidgetProvider implements DashboardWidgetProviderInterface
 
     public function getRequiredRole(): string
     {
-        return Role::CUSTOMER_EXPERT;
+        return AdministrativeAccessVoter::ADMINISTRATIVE_ACCESS;
     }
 
     public function getPriority(): int

src/Entity/Groups/CalendarHotel.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Groups;
+
+use App\Repository\Groups\CalendarHotelRepository;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Local copy of the last calendar hotel list TYPO3 answered successfully.
+ *
+ * Kept so the contingent sync still covers TYPO3's hotels while TYPO3 is unreachable. Written
+ * only by {@see \App\Service\ContingentHotelDirectory::refresh()}, never by hand: the list is
+ * TYPO3's, this is not a third place to maintain hotel codes in.
+ */
+#[ORM\Entity(repositoryClass: CalendarHotelRepository::class)]
+#[ORM\Table(name: 'calendar_hotel')]
+class CalendarHotel
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 16, unique: true)]
+    private ?string $code = null;
+
+    #[ORM\Column(length: 255)]
+    private ?string $name = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getCode(): ?string
+    {
+        return $this->code;
+    }
+
+    public function setCode(string $code): self
+    {
+        $this->code = $code;
+
+        return $this;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

src/Entity/Groups/ContingentDay.php

@@ -12,11 +12,14 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Local snapshot of a single day of contingent availability as reported by bpn-connect.
  *
+ * Keyed by hotel code, not by accommodation: the snapshot also covers TYPO3's calendar hotels,
+ * which have no `Accommodation`.
+ *
  * Written exclusively by the scheduled sync, never by a user, hence no Blameable/Timestampable.
  */
 #[ORM\Entity(repositoryClass: ContingentDayRepository::class)]
 #[ORM\Table(name: 'contingent_day')]
-#[ORM\UniqueConstraint(name: 'uniq_contingent_day_accommodation_date', columns: ['accommodation_id', 'date'])]
+#[ORM\UniqueConstraint(name: 'uniq_contingent_day_hotel_code_date', columns: ['hotel_code', 'date'])]
 class ContingentDay
 {
     #[ORM\Id]
@@ -24,8 +27,15 @@ class ContingentDay
     #[ORM\Column]
     private ?int $id = null;
 
+    #[ORM\Column(length: 16)]
+    private ?string $hotelCode = null;
+
+    /**
+     * Superseded by $hotelCode and no longer written. Only rows from before the switch still
+     * carry it; it stays mapped until the column is dropped, so the switch can be rolled back.
+     */
     #[ORM\ManyToOne]
-    #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(nullable: true, onDelete: 'CASCADE')]
     private ?Accommodation $accommodation = null;
 
     #[ORM\Column(type: Types::DATE_IMMUTABLE)]
@@ -39,6 +49,18 @@ class ContingentDay
         return $this->id;
     }
 
+    public function getHotelCode(): ?string
+    {
+        return $this->hotelCode;
+    }
+
+    public function setHotelCode(string $hotelCode): self
+    {
+        $this->hotelCode = $hotelCode;
+
+        return $this;
+    }
+
     public function getAccommodation(): ?Accommodation
     {
         return $this->accommodation;

src/Entity/Groups/ContingentSyncState.php

@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Bookkeeping for the scheduled contingent sync of a single accommodation.
+ * Bookkeeping for the scheduled contingent sync of a single hotel code.
  *
  * `changedAt` records when the sync last saw a day appear, vanish or switch status within the
  * horizon it had already reached; `horizonTo` is how far that reach extends.
@@ -23,8 +23,14 @@ class ContingentSyncState
     #[ORM\Column]
     private ?int $id = null;
 
+    #[ORM\Column(length: 16, unique: true)]
+    private ?string $hotelCode = null;
+
+    /**
+     * Superseded by $hotelCode, see {@see ContingentDay::$accommodation}.
+     */
     #[ORM\OneToOne]
-    #[ORM\JoinColumn(nullable: false, unique: true, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(nullable: true, unique: true, onDelete: 'CASCADE')]
     private ?Accommodation $accommodation = null;
 
     /**
@@ -48,9 +54,9 @@ class ContingentSyncState
     #[ORM\Column]
     private int $failureCount = 0;
 
-    public function __construct(?Accommodation $accommodation = null)
+    public function __construct(?string $hotelCode = null)
     {
-        $this->accommodation = $accommodation;
+        $this->hotelCode = $hotelCode;
     }
 
     public function getId(): ?int
@@ -58,6 +64,11 @@ class ContingentSyncState
         return $this->id;
     }
 
+    public function getHotelCode(): ?string
+    {
+        return $this->hotelCode;
+    }
+
     public function getAccommodation(): ?Accommodation
     {
         return $this->accommodation;

src/Entity/TravelMailingList.php

@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use App\Enum\BusLeg;
+use App\Repository\TravelMailingListRepository;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * A Mailjet contact list created for one travel's participants. The row exists so the list can
+ * be deleted again once the travel is past; the list itself is never updated after creation.
+ *
+ * A travel can have two lists, one for all participants and one for bus passengers only, told
+ * apart by their name.
+ */
+#[ORM\Entity(repositoryClass: TravelMailingListRepository::class)]
+#[ORM\Index(columns: ['travel_code'])]
+class TravelMailingList
+{
+    private const string BUS_ONLY_SUFFIX = ' nur Bus';
+
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    private ?int $id = null;
+
+    #[ORM\Column(type: 'string', length: 32)]
+    private string $travelCode;
+
+    /** The Mailjet list name. */
+    #[ORM\Column(type: 'string', length: 64, unique: true)]
+    private string $name;
+
+    #[ORM\Column(type: 'integer')]
+    private int $mailjetListId;
+
+    /** The bus leg its participants were filtered by; null when it holds all participants. */
+    #[ORM\Column(length: 20, nullable: true, enumType: BusLeg::class)]
+    private ?BusLeg $busLeg;
+
+    #[ORM\Column(type: 'datetime_immutable')]
+    private \DateTimeImmutable $deleteAfter;
+
+    #[ORM\Column(type: 'datetime_immutable')]
+    private \DateTimeImmutable $createdAt;
+
+    public function __construct(string $travelCode, int $mailjetListId, ?BusLeg $busLeg, \DateTimeImmutable $deleteAfter)
+    {
+        $this->travelCode = $travelCode;
+        $this->name = self::nameFor($travelCode, $busLeg);
+        $this->mailjetListId = $mailjetListId;
+        $this->busLeg = $busLeg;
+        $this->deleteAfter = $deleteAfter;
+        $this->createdAt = new \DateTimeImmutable();
+    }
+
+    public static function nameFor(string $travelCode, ?BusLeg $busLeg): string
+    {
+        return null !== $busLeg ? $travelCode.self::BUS_ONLY_SUFFIX : $travelCode;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTravelCode(): string
+    {
+        return $this->travelCode;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getMailjetListId(): int
+    {
+        return $this->mailjetListId;
+    }
+
+    public function getBusLeg(): ?BusLeg
+    {
+        return $this->busLeg;
+    }
+
+    public function getDeleteAfter(): \DateTimeImmutable
+    {
+        return $this->deleteAfter;
+    }
+
+    public function getCreatedAt(): \DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+}

src/Enum/BusLeg.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+/**
+ * Which bus leg a travel participant must have booked to be selected, as bpn-connect's travel
+ * mailing endpoint takes it (`busLeg`).
+ */
+enum BusLeg: string
+{
+    case Outbound = 'outbound';
+    case Inbound = 'inbound';
+    case Any = 'any';
+    case Both = 'both';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::Outbound => 'Busreisende (Hinfahrt)',
+            self::Inbound => 'Busreisende (Rückfahrt)',
+            self::Any => 'Busreisende (Hin- oder Rückfahrt)',
+            self::Both => 'Busreisende (Hin- und Rückfahrt)',
+        };
+    }
+}

src/Enum/ContingentHotelSource.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+/**
+ * Where a hotel code in the contingent snapshot comes from. A code can have both.
+ */
+enum ContingentHotelSource: string
+{
+    /** The calendarCode of a group house (`Accommodation`). */
+    case Accommodation = 'accommodation';
+
+    /** The calendar hotel of a visible TYPO3 product, from TYPO3's `/api/calendar-hotels`. */
+    case Typo3 = 'typo3';
+}

src/Enum/HotelType.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+/**
+ * The accommodation type of a TYPO3 hotel record (`type` in the content feed), as the
+ * website's travel search filters it ("Unterkunft"). Values and labels follow the website's
+ * Hotel::$typeLabels.
+ */
+enum HotelType: int
+{
+    case HolidayFlat = 1;
+    case SportsClub = 2;
+    case Apartment = 3;
+    case GuestHouse = 4;
+    case Pension = 5;
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::HolidayFlat => 'Ferienwohnung',
+            self::SportsClub => 'Sportclub',
+            self::Apartment => 'Apartment',
+            self::GuestHouse => 'Gästehaus',
+            self::Pension => 'Pension',
+        };
+    }
+
+    public static function fromLabel(string $label): ?self
+    {
+        foreach (self::cases() as $case) {
+            if (0 === strcasecmp($case->label(), trim($label))) {
+                return $case;
+            }
+        }
+
+        return null;
+    }
+}

src/Enum/RoomType.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+/**
+ * Room type as the website's travel search filters it ("Zimmerarten").
+ *
+ * Taken from the room's capacity, as TYPO3's RoomTypeResolver does since the room-code
+ * mapping was retired: `maxPax` 1-8 maps directly, 9 and up is "9er+". A bed shared with
+ * other customers is sold per bed (`maxPax` 1), so it is recognised by its label instead;
+ * without that, a bed in a dorm would count as an Einzelzimmer.
+ */
+enum RoomType: string
+{
+    case ForOne = 'EZ';
+    case ForTwo = 'DZ';
+    case ForThree = '3er';
+    case ForFour = '4er';
+    case ForFive = '5er';
+    case ForSix = '6er';
+    case ForSeven = '7er';
+    case ForEight = '8er';
+    case ForNinePlus = '9er+';
+    case WithOthers = 'mit anderen';
+
+    /** The "Babypreis 0-2 Jährige" row: priced like a room, but not one. */
+    public const BABY_CODE = 'Baby';
+
+    /** Label phrases (lower case) that mark a bed shared with other customers. */
+    private const WITH_OTHERS_MARKERS = ['bett im', 'mit ander'];
+
+    /**
+     * Null for the baby row, which is not a room.
+     */
+    public static function classify(?string $code, ?string $label, ?int $maxPax, ?int $minPax): ?self
+    {
+        if (self::BABY_CODE === trim((string) $code)) {
+            return null;
+        }
+
+        $label = mb_strtolower((string) $label);
+        foreach (self::WITH_OTHERS_MARKERS as $marker) {
+            if (str_contains($label, $marker)) {
+                return self::WithOthers;
+            }
+        }
+
+        $pax = ($maxPax ?? 0) > 0 ? (int) $maxPax : (int) $minPax;
+
+        return match (true) {
+            $pax >= 9 => self::ForNinePlus,
+            $pax >= 1 => [1 => self::ForOne, self::ForTwo, self::ForThree, self::ForFour, self::ForFive, self::ForSix, self::ForSeven, self::ForEight][$pax],
+            // No usable occupancy: TYPO3 files it under "mit anderen" as well.
+            default => self::WithOthers,
+        };
+    }
+}

src/Form/Admin/TravelMailingLookupType.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form\Admin;
+
+use App\Form\Model\TravelMailingLookupDto;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Submits as GET with an empty block prefix, so a lookup is the plain URL `?travelCode=…`
+ * (plus `&busOnly=1`) and can be bookmarked or shared.
+ *
+ * @extends AbstractType<TravelMailingLookupDto>
+ */
+class TravelMailingLookupType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->add('travelCode', TextType::class, [
+            'label' => 'Reisecode',
+            'attr' => [
+                'placeholder' => 'z. B. LPJMP281126',
+            ],
+        ]);
+        $builder->add('busOnly', CheckboxType::class, [
+            'label' => 'nur '.TravelMailingLookupDto::BUS_LEG->label(),
+            'required' => false,
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => TravelMailingLookupDto::class,
+            'method' => 'GET',
+            'csrf_protection' => false,
+        ]);
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return '';
+    }
+}

src/Form/BookingApplicantTravelsType.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form;
+
+use App\Form\Model\BookingDto;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * The booking-level choice "do I travel along myself?".
+ *
+ * Rendered inside the step 2 form, so the template emits the widget alone and never a second
+ * <form> tag; htmx posts the enclosed inputs, the CSRF token among them, to the toggle route.
+ *
+ * Validation is switched off: this form only carries the choice, and running the step 2 groups
+ * here would report every gap in the participant data the moment somebody flips the radio.
+ *
+ * @extends AbstractType<BookingDto>
+ */
+class BookingApplicantTravelsType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->add('applicantTravels', ChoiceType::class, [
+            'label' => 'Wer reist mit?',
+            'choices' => [
+                'Ich reise selbst mit' => true,
+                // Note the literal non-breaking space in "z. B." - it keeps the abbreviation
+                // from wrapping, and replacing it with a plain space is a silent regression.
+                'Ich buche für andere (z. B. mein Kind)' => false,
+            ],
+            'expanded' => true,
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => BookingDto::class,
+            'validation_groups' => false,
+        ]);
+    }
+}

src/Form/BookingApplicantType.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form;
+
+use App\BusProNet\Form\CountryType;
+use App\Form\Model\ParticipantDto;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Contact data of an applicant who does not travel along.
+ *
+ * Bound to ParticipantDto rather than a contact DTO of its own: the fields are the same
+ * personal-data set, and a second near-identical type would only have to be kept in step with
+ * this one. Only shown to guests; a logged-in applicant's data comes from their account and is
+ * rendered as static text, because editing it here would create a duplicate BusPro record.
+ *
+ * Validation runs in the dedicated 'booking_applicant' group, which BookingDto::validateApplicant()
+ * owns, so the applicant is checked independently of the participant cards.
+ *
+ * @extends AbstractType<ParticipantDto>
+ */
+class BookingApplicantType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('firstName', TextType::class, [
+                'label' => 'Vorname',
+                'required' => true,
+            ])
+            ->add('lastName', TextType::class, [
+                'label' => 'Nachname',
+                'required' => true,
+            ])
+            ->add('gender', ChoiceType::class, [
+                'label' => 'Gender',
+                'required' => true,
+                'placeholder' => false,
+                'choices' => [
+                    'männlich' => 'M',
+                    'weiblich' => 'W',
+                    'divers' => 'D',
+                ],
+            ])
+            ->add('nationality', CountryType::class, [
+                'label' => 'Nationalität',
+                'required' => true,
+                'property' => 'nationality',
+                'placeholder' => 'Bitte auswählen...',
+                'preferred_choices' => ['D', 'A', 'CH'],
+            ])
+            ->add('dateOfBirth', BirthdayType::class, [
+                'label' => 'Geburtsdatum',
+                'required' => true,
+                'widget' => 'text',
+                'input' => 'datetime_immutable',
+                'html5' => false,
+            ])
+            ->add('email', EmailType::class, [
+                'label' => 'E-Mail',
+                'required' => true,
+                'attr' => [
+                    'autocomplete' => 'leave-me-alone-chrome',
+                ],
+            ])
+            ->add('mobile', TextType::class, [
+                'label' => 'Telefon (mobil)',
+                'required' => true,
+                'attr' => [
+                    'autocomplete' => 'leave-me-alone-chrome',
+                ],
+            ])
+            ->add('address', AddressType::class, [
+                'label' => 'Adresse',
+                'required' => true,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => ParticipantDto::class,
+            'validation_groups' => ['booking_applicant', 'booking_create'],
+        ]);
+    }
+}

src/Form/BookingCreateStep2Type.php

@@ -31,8 +31,9 @@ class BookingCreateStep2Type extends AbstractType
         $resolver->setDefaults([
             'data_class' => BookingDto::class,
             'validation_groups' => function (FormInterface $form) {
-                // Create mode: always strict validation
+                // Create mode: always strict validation. 'booking_applicant' additionally
-                return ['strict_required', 'booking_create'];
+                // requires a complete applicant when they do not travel along.
+                return ['strict_required', 'booking_create', 'booking_applicant'];
             },
         ]);
     }

src/Form/BookingParticipantType.php

@@ -222,7 +222,6 @@ class BookingParticipantType extends AbstractType
             $form->add('mobile', TextType::class, $this->mergeFieldState([
                 'label' => 'Telefon (mobil)',
                 'required' => false,
-                'sanitize_html' => true,
                 'property_path' => 'participant.mobile',
                 'attr' => [
                     'autocomplete' => 'leave-me-alone-chrome',

src/Form/Model/BookingDto.php

@@ -58,11 +58,40 @@ class BookingDto
      */
     public string $bookingStatus = 'F';
 
+    /**
+     * Booking status the travel itself calls for when the booking starts, before any room is
+     * selected and before the create-flow status rules run. Step 1 falls back to it whenever
+     * no on-request room is selected, so the status can move back from 'A'.
+     *
+     * Null in sessions started before it was introduced.
+     */
+    public ?string $initialBookingStatus = null;
+
     /**
      * Reference to booking entity (only populated in edit mode).
      */
     public ?Booking $booking = null;
 
+    /**
+     * Whether the applicant travels along, i.e. is also participant[0].
+     *
+     * Create mode only: it is the booking-level choice behind "Ich reise selbst mit".
+     * In edit mode the split is derived from the loaded booking instead, see
+     * isFirstParticipantApplicant().
+     */
+    public bool $applicantTravels = true;
+
+    /**
+     * The applicant's own personal data, used only when they do not travel.
+     *
+     * Reuses ParticipantDto for the personal fields rather than introducing a second,
+     * near-identical contact DTO. Its index stays null, which is what tells the shared
+     * 'booking_applicant' rules apart from an ordinary traveller, and validateApplicant()
+     * below drives its checks explicitly rather than by cascade, so the violations land
+     * under 'applicant.' exactly once.
+     */
+    public ?ParticipantDto $applicant = null;
+
     /**
      * Fingerprint of the booking state when loaded from API (edit mode only).
      * This property stores the original state and is never updated after initial load.
@@ -173,6 +202,105 @@ class BookingDto
         return $this->participants[$index] ?? null;
     }
 
+    /**
+     * Ends a split: the applicant takes the participant[0] slot back and travels again.
+     *
+     * The traveller who held the slot is dropped; only the room assignment carries over,
+     * the mirror image of what the split left behind.
+     */
+    public function restoreTravellingApplicant(): void
+    {
+        $restored = $this->applicant;
+
+        if (null !== $restored) {
+            $restored->index = 0;
+            $restored->assignedRoomId = ($this->participants[0] ?? null)?->assignedRoomId;
+            $this->participants[0] = $restored;
+        }
+
+        $this->applicant = null;
+        $this->applicantTravels = true;
+    }
+
+    /**
+     * Whether the participant at $index has to supply an email address.
+     *
+     * Everyone does except an under-16 who is not the applicant; BusPro itself accepts a blank
+     * for any participant. Validation enforces this in two parts, the Assert\When on
+     * ParticipantDto::$email (age) and validateFirstParticipantApplicant() (the applicant), and
+     * this is the same rule in one place for the field state. A participant that does not exist
+     * yet counts as needing one, matching the "unknown counts as an adult" stance of isChild().
+     */
+    public function requiresParticipantEmail(int $index): bool
+    {
+        $participant = $this->getParticipant($index);
+
+        if (null === $participant || false === $participant->isChild()) {
+            return true;
+        }
+
+        return 0 === $index && true === $this->isFirstParticipantApplicant();
+    }
+
+    /**
+     * The applicant's email address, wherever the applicant is held.
+     *
+     * - participant[0] where they are the applicant
+     * - create, split: the separate applicant block
+     * - edit, split: the loaded booking's anmelder, since $applicant is only filled in create mode
+     */
+    public function getApplicantEmail(): ?string
+    {
+        if (true === $this->isFirstParticipantApplicant()) {
+            $email = $this->getParticipant(0)?->email;
+        } elseif (self::MODE_CREATE === $this->getMode()) {
+            $email = $this->applicant?->email;
+        } else {
+            $email = $this->booking?->applicant?->communication->email;
+        }
+
+        if (null === $email || '' === trim($email)) {
+            return null;
+        }
+
+        return trim($email);
+    }
+
+    /**
+     * Whether participant[0] is also the applicant.
+     *
+     * This is the single predicate for "the first participant IS the booking's contact".
+     * It replaces the former practice of reading isInternalAgencyBooking() to mean the
+     * same thing, which only held because the internal agency was the one case where
+     * applicant and participant[0] differed.
+     *
+     * - create: the booking-level choice. The agency plays no part here: internal agency
+     *   bookings are made in the BusPro backend and only ever edited in this application.
+     * - edit, internal agency: always false, their applicant is a customer who is not the
+     *   first traveller
+     * - edit, otherwise: derived from the loaded booking. A null person id on either side
+     *   counts as "same", so incomplete BPN data keeps today's stricter, locked-down behaviour.
+     */
+    public function isFirstParticipantApplicant(): bool
+    {
+        if (self::MODE_CREATE === $this->getMode()) {
+            return $this->applicantTravels;
+        }
+
+        if ($this->isInternalAgencyBooking()) {
+            return false;
+        }
+
+        $applicantPersonId = $this->booking?->applicant?->personId;
+        $firstParticipantPersonId = $this->getParticipant(0)?->personId;
+
+        if (null === $applicantPersonId || null === $firstParticipantPersonId) {
+            return true;
+        }
+
+        return $applicantPersonId === $firstParticipantPersonId;
+    }
+
     /**
      * Determines if this is a family booking based on participant age distribution.
      *
@@ -182,6 +310,13 @@ class BookingDto
      */
     public function isFamilyBooking(): bool
     {
+        // Family insurance is not offered when the applicant does not travel. The age
+        // distribution alone would not rule it out: an 18-year-old sibling travelling with a
+        // younger child still satisfies the adult/child counts below.
+        if (false === $this->applicantTravels) {
+            return false;
+        }
+
         $adults = 0;
         $children = 0;
 
@@ -204,6 +339,47 @@ class BookingDto
         return ($adults >= 1 && $adults <= 2) && ($children >= 1);
     }
 
+    /**
+     * Requires a complete, adult applicant whenever the applicant does not travel.
+     *
+     * Delegates the field checks to ParticipantDto::validateApplicantCompleteness(), which the
+     * applicant form runs directly through the 'booking_applicant' group.
+     */
+    #[Assert\Callback(groups: ['booking_applicant'])]
+    public function validateApplicant(ExecutionContextInterface $context): void
+    {
+        if (true === $this->applicantTravels) {
+            return;
+        }
+
+        if (null === $this->applicant) {
+            $context->buildViolation('Bitte gib die Daten der anmeldenden Person an.')
+                ->atPath('applicant')
+                ->addViolation();
+
+            return;
+        }
+
+        $this->applicant->validateApplicantCompleteness($context, 'applicant.');
+    }
+
+    /**
+     * Requires a complete address and an email from participant[0] only where they are the applicant.
+     *
+     * BusPro asks neither of an ordinary participant, so on a split booking the traveller at index 0
+     * is not asked for an address, and an under-16 there may leave the email blank.
+     */
+    #[Assert\Callback(groups: ['strict_required'])]
+    public function validateFirstParticipantApplicant(ExecutionContextInterface $context): void
+    {
+        if (false === $this->isFirstParticipantApplicant()) {
+            return;
+        }
+
+        $this->getParticipant(0)?->validateApplicantEmail($context, 'participants[0].');
+        $this->getParticipant(0)?->validateAddressFields($context, 'participants[0].');
+    }
+
     #[Assert\Callback]
     public function validateBankAccount(ExecutionContextInterface $context): void
     {

src/Form/Model/ParticipantDto.php

@@ -21,8 +21,9 @@ class ParticipantDto
     /**
      * Age below which a participant counts as a child.
      *
-     * Children may share an email address with an adult and are not required to have one of
+     * Children may share an email address with an adult, and have the applicant's address
-     * their own; both rules go through isChild(), so this is the only place the age lives.
+     * pre-filled for them; both rules go through isChild(), so this is the only place the
+     * age lives.
      */
     public const CHILD_AGE_THRESHOLD = 16;
 
@@ -79,18 +80,30 @@ class ParticipantDto
     #[Assert\NotNull(message: 'Bitte angeben', groups: ['strict_required'])]
     public ?\DateTimeImmutable $dateOfBirth = null;
 
-    // Requiredness is delegated to requiresOwnEmail() so the constraint and the field state
+    // BusPro accepts a participant without an email address, so this is the only gate. Under-16s
-    // conditions cannot state the rule differently.
+    // may leave it blank, everyone else needs one. An under-16 applicant needs one as well; that
+    // case depends on the booking and is enforced by BookingDto::validateFirstParticipantApplicant()
+    // and ParticipantEditDto::validateApplicant(). It stays a property constraint so the missing-field
+    // labels keep their order (see BookingEditPreFlightChecker).
     #[Assert\Email(message: 'Bitte eine gültige E-Mail Adresse angeben', mode: 'strict', groups: ['booking_edit', 'booking_create'])]
     #[Assert\When(
-        expression: 'this.requiresOwnEmail()',
+        expression: 'not this.isChild()',
         constraints: [new Assert\NotBlank(message: 'Bitte angeben')],
-        groups: ['strict_required']
+        groups: ['strict_required'],
     )]
     public ?string $email = null;
 
+    #[Assert\When(
+        expression: 'this.isMobileNewlyEntered()',
+        constraints: [new AppAssert\PhoneNumber()],
+        groups: ['booking_edit', 'booking_create'],
+    )]
     public ?string $mobile = null;
 
+    // The number as loaded from BusPro, which goes back unchanged and is exempt from PhoneNumber.
+    // Public so it survives the session round trip through __unserialize().
+    public ?string $loadedMobile = null;
+
     #[Assert\Valid(groups: ['booking_edit', 'booking_create'])]
     #[Assert\NotNull(message: 'Bitte Adresse angeben', groups: ['applicant_address'])]
     public ?Address $address = null;
@@ -236,6 +249,7 @@ class ParticipantDto
         $instance->nationality = $personalData->nationality ?: 'D';
         $instance->email = $personalData->communication->email;
         $instance->mobile = $personalData->communication->mobile;
+        $instance->loadedMobile = $personalData->communication->mobile;
         $instance->dateOfBirth = $personalData->dateOfBirth;
         $instance->height = $personalData->height;
         $instance->weight = $personalData->weight;
@@ -250,6 +264,11 @@ class ParticipantDto
         return $instance;
     }
 
+    public function isMobileNewlyEntered(): bool
+    {
+        return AppAssert\PhoneNumber::isNewlyEntered($this->mobile, $this->loadedMobile);
+    }
+
     public function isApplicant(): bool
     {
         return 0 === $this->index;
@@ -369,22 +388,6 @@ class ParticipantDto
      *
      * @return bool True if participant is under the age threshold, false otherwise or if age unknown
      */
-    /**
-     * Decides whether this participant has to supply an email address of their own.
-     *
-     * The applicant is the booking's contact and always has to be reachable. Everyone else only
-     * needs an address once they are old enough to have one, so children are exempt. An unknown
-     * date of birth counts as an adult, following isChild().
-     *
-     * Single source for the rule: the Assert\When on $email enforces it, and the 'required'
-     * field state conditions in CreateFieldStateProvider/EditFieldStateProvider render the
-     * matching mandatory marker.
-     */
-    public function requiresOwnEmail(): bool
-    {
-        return $this->isApplicant() || false === $this->isChild();
-    }
-
     public function isChild(int $ageThreshold = self::CHILD_AGE_THRESHOLD): bool
     {
         $age = $this->getAge();
@@ -495,28 +498,95 @@ class ParticipantDto
     }
 
     /**
-     * Validates that the participant has a complete address when required.
+     * Validates that this person is usable as the booking's applicant.
      *
-     * In regular create/edit submission flows this only applies to participant 0.
+     * Runs on its own in the 'booking_applicant' group, which only the applicant form activates,
-     * The edit overview preflight checks address fields separately for the applicant only.
+     * the way 'applicant_address' already scopes the address NotNull above. BookingDto delegates
+     * to the same body for the step-2 submit, so the rule has one home.
      */
-    #[Assert\Callback(groups: ['strict_required'])]
+    #[Assert\Callback(groups: ['booking_applicant'])]
-    public function validateApplicantAddress(ExecutionContextInterface $context): void
+    public function validateAsApplicant(ExecutionContextInterface $context): void
     {
-        // Only validate applicant's address in regular create/edit submission flows.
+        // The applicant record is the only ParticipantDto without an index. Travellers carry one,
-        if (0 !== $this->index) {
+        // and BookingDto cascades the 'booking_applicant' group into $participants as well, so
+        // without this guard every traveller would be held to the applicant's rules - an adult
+        // address and a minimum age of 18.
+        if (null !== $this->index) {
             return;
         }
 
-        $this->validateAddressFields($context);
+        $this->validateApplicantCompleteness($context);
     }
 
-    private function validateAddressFields(ExecutionContextInterface $context): void
+    /**
+     * Shared body. $pathPrefix places the violations in the caller's object graph; it is not a
+     * callback itself, because Symfony passes the constraint payload as the second argument.
+     */
+    public function validateApplicantCompleteness(ExecutionContextInterface $context, string $pathPrefix = ''): void
+    {
+        foreach (['firstName', 'lastName', 'gender', 'nationality', 'email', 'mobile'] as $field) {
+            $value = $this->$field;
+            if (null === $value || '' === trim($value)) {
+                $context->buildViolation('Bitte angeben')
+                    ->atPath($pathPrefix.$field)
+                    ->addViolation();
+            }
+        }
+
+        $this->validateAddressFields($context, $pathPrefix);
+
+        if (null === $this->dateOfBirth) {
+            $context->buildViolation('Bitte angeben')
+                ->atPath($pathPrefix.'dateOfBirth')
+                ->addViolation();
+
+            return;
+        }
+
+        $age = $this->getAge();
+        if (null !== $age && 18 > $age) {
+            $context->buildViolation('Die anmeldende Person muss volljährig sein.')
+                ->atPath($pathPrefix.'dateOfBirth')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * Validates that this person, as the booking's contact, has an email address.
+     *
+     * The property constraint on $email already holds everyone aged 16 or older (and anyone
+     * without a date of birth) to it, so this only adds the under-16 contact and never reports
+     * the same field twice. Like validateAddressFields(), the callers decide who the contact is.
+     */
+    public function validateApplicantEmail(ExecutionContextInterface $context, string $pathPrefix = ''): void
+    {
+        if (false === $this->isChild()) {
+            return;
+        }
+
+        if (null !== $this->email && false === u($this->email)->trim()->isEmpty()) {
+            return;
+        }
+
+        $context->buildViolation('Bitte angeben')
+            ->atPath($pathPrefix.'email')
+            ->addViolation();
+    }
+
+    /**
+     * Validates that this person has a complete address.
+     *
+     * Only the booking's contact needs one: BusPro does not require an anschrift from an
+     * ordinary participant (measured on 2036, an empty anschrift passes). Deciding who the
+     * contact is needs the booking, so the callers own the gate and this method only ever
+     * runs the field checks. $pathPrefix places the violations in the caller's object graph.
+     */
+    public function validateAddressFields(ExecutionContextInterface $context, string $pathPrefix = ''): void
     {
         // Address object is required for the validated participant
         if (null === $this->address) {
             $context->buildViolation('Bitte angeben')
-                ->atPath('address')
+                ->atPath($pathPrefix.'address')
                 ->addViolation();
 
             return;
@@ -525,25 +595,25 @@ class ParticipantDto
         // Validate address subfields
         if (null === $this->address->street || u($this->address->street)->trim()->isEmpty()) {
             $context->buildViolation('Bitte angeben')
-                ->atPath('address.street')
+                ->atPath($pathPrefix.'address.street')
                 ->addViolation();
         }
 
         if (null === $this->address->postCode || u($this->address->postCode)->trim()->isEmpty()) {
             $context->buildViolation('Bitte angeben')
-                ->atPath('address.postCode')
+                ->atPath($pathPrefix.'address.postCode')
                 ->addViolation();
         }
 
         if (null === $this->address->city || u($this->address->city)->trim()->isEmpty()) {
             $context->buildViolation('Bitte angeben')
-                ->atPath('address.city')
+                ->atPath($pathPrefix.'address.city')
                 ->addViolation();
         }
 
         if (null === $this->address->country || u($this->address->country)->trim()->isEmpty()) {
             $context->buildViolation('Bitte angeben')
-                ->atPath('address.country')
+                ->atPath($pathPrefix.'address.country')
                 ->addViolation();
         }
     }

src/Form/Model/ParticipantEditDto.php

@@ -92,12 +92,37 @@ class ParticipantEditDto
         }
     }
 
+    /**
+     * Requires a complete address and an email from the participant form's applicant only.
+     *
+     * Mirrors BookingDto::validateFirstParticipantApplicant() for the per-participant form, which
+     * binds this wrapper rather than the booking.
+     */
+    #[Assert\Callback(groups: ['strict_required'])]
+    public function validateApplicant(ExecutionContextInterface $context): void
+    {
+        if (false === $this->participant->isApplicant()) {
+            return;
+        }
+
+        if (false === $this->bookingContext->isFirstParticipantApplicant()) {
+            return;
+        }
+
+        $this->participant->validateApplicantEmail($context, 'participant.');
+        $this->participant->validateAddressFields($context, 'participant.');
+    }
+
     /**
      * Validates that non-applicant adult participants have unique email addresses.
      *
      * Exempt from validation:
-     * - Applicant (index 0): Can share email with dependents they're booking for
+     * - The applicant: can share an email with dependents they're booking for
-     * - Children (under 16): Can share email addresses with adults
+     * - Children (under 16): Can share email addresses with adults, or have none at all
+     *
+     * Where the applicant does not travel they are not among the participants, so their address
+     * is checked separately: an adult traveller may not reuse it, just as on an ordinary booking
+     * an adult may not reuse participant[0]'s.
      *
      * Email comparison is case-insensitive and whitespace is normalized.
      */
@@ -109,8 +134,9 @@ class ParticipantEditDto
             return;
         }
 
-        // In regular create/edit submission flows, the applicant can share an email with dependents.
+        // The applicant can share an email with dependents. On a split booking participant[0] is
-        if (true === $this->participant->isApplicant()) {
+        // an ordinary traveller, so an adult there is held to uniqueness like everyone else.
+        if (true === $this->participant->isApplicant() && true === $this->bookingContext->isFirstParticipantApplicant()) {
             return;
         }
 
@@ -119,7 +145,7 @@ class ParticipantEditDto
             return;
         }
 
-        // Skip if email is null or empty (handled by @Email and @NotBlank constraints)
+        // Nothing to compare. Whether a blank is allowed is the property constraint's business.
         if (null === $this->participant->email || u($this->participant->email)->trim()->isEmpty()) {
             return;
         }
@@ -157,5 +183,17 @@ class ParticipantEditDto
                 return;
             }
         }
+
+        if (true === $this->bookingContext->isFirstParticipantApplicant()) {
+            return;
+        }
+
+        $applicantEmail = $this->bookingContext->getApplicantEmail();
+
+        if (null !== $applicantEmail && $normalizedEmail === u($applicantEmail)->lower()->toString()) {
+            $context->buildViolation('Diese E-Mail Adresse wird bereits von der anmeldenden Person verwendet')
+                ->atPath('participant.email')
+                ->addViolation();
+        }
     }
 }

src/Form/Model/TravelMailingLookupDto.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form\Model;
+
+use App\Enum\BusLeg;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class TravelMailingLookupDto
+{
+    /**
+     * The leg "bus passengers only" stands for: whoever takes the bus out, whatever their return.
+     */
+    public const BusLeg BUS_LEG = BusLeg::Outbound;
+
+    #[Assert\NotBlank(message: 'Bitte einen Reisecode angeben.')]
+    public ?string $travelCode = null;
+
+    public bool $busOnly = false;
+
+    public function getBusLeg(): ?BusLeg
+    {
+        return $this->busOnly ? self::BUS_LEG : null;
+    }
+}

src/Form/Model/VoucherPurchaseDto.php

@@ -8,6 +8,7 @@ use App\BusProNet\Model\Address;
 use App\BusProNet\Model\PersonalData;
 use App\BusProNet\Model\VoucherPaymentMethod;
 use App\BusProNet\Model\VoucherTemplate;
+use App\Validator\Constraints as AppAssert;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -69,10 +70,24 @@ class VoucherPurchaseDto
     #[Assert\Valid]
     public Address $address;
 
+    #[Assert\When(
+        expression: 'this.isPhoneNewlyEntered()',
+        constraints: [new AppAssert\PhoneNumber()],
+        groups: ['voucher_step_2'],
+    )]
     public ?string $phone = null;
 
+    #[Assert\When(
+        expression: 'this.isMobileNewlyEntered()',
+        constraints: [new AppAssert\PhoneNumber()],
+        groups: ['voucher_step_2'],
+    )]
     public ?string $mobile = null;
 
+    // The numbers prefilled from BusPro, which are exempt from PhoneNumber.
+    public ?string $loadedPhone = null;
+    public ?string $loadedMobile = null;
+
     #[Assert\NotBlank(message: 'Bitte angeben', groups: ['voucher_step_2'])]
     #[Assert\Email(message: 'Bitte eine gültige Adresse angeben', mode: 'strict', groups: ['voucher_step_2'])]
     public ?string $email = null;
@@ -90,6 +105,16 @@ class VoucherPurchaseDto
         $this->address->country = 'D';
     }
 
+    public function isPhoneNewlyEntered(): bool
+    {
+        return AppAssert\PhoneNumber::isNewlyEntered($this->phone, $this->loadedPhone);
+    }
+
+    public function isMobileNewlyEntered(): bool
+    {
+        return AppAssert\PhoneNumber::isNewlyEntered($this->mobile, $this->loadedMobile);
+    }
+
     public function getBuyerFullName(): string
     {
         return trim(sprintf('%s %s', $this->firstName ?? '', $this->lastName ?? ''));
@@ -119,6 +144,8 @@ class VoucherPurchaseDto
         $this->address->country ??= 'D';
         $this->phone = $personalData->communication->phone;
         $this->mobile = $personalData->communication->mobile;
+        $this->loadedPhone = $this->phone;
+        $this->loadedMobile = $this->mobile;
         $this->email = $loginEmail;
     }
 }

src/Form/PersonalDataType.php

@@ -81,12 +81,10 @@ class PersonalDataType extends AbstractType
                 'label' => 'Telefon',
                 'required' => false,
                 'property_path' => 'communication.phone',
-                'sanitize_html' => true,
             ])
             ->add('mobile', TextType::class, [
                 'label' => 'Mobil',
                 'property_path' => 'communication.mobile',
-                'sanitize_html' => true,
             ])
         ;
     }

src/Form/RegistrationType.php

@@ -35,7 +35,7 @@ class RegistrationType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => RegistrationDto::class,
-            'validation_groups' => ['Default', 'personal_data'],
+            'validation_groups' => ['Default', 'personal_data', 'personal_identity'],
         ]);
     }
 }

src/Form/Service/Condition/FirstParticipantIsApplicantCondition.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form\Service\Condition;
+
+use App\Form\Model\BookingDto;
+use App\Form\Service\Contract\FieldConditionInterface;
+
+/**
+ * Condition for "participant[0] is the booking's applicant".
+ *
+ * Use it where a field is only mandatory because BusPro asks it of the Anmelder rather than of
+ * an ordinary participant, such as mobile and address (an empty anschrift passes for a
+ * participant, measured on 2036).
+ *
+ * FirstParticipantCondition remains the right choice where plain index 0 is meant, such as
+ * showing a field on the first card regardless of who that person is.
+ */
+class FirstParticipantIsApplicantCondition implements FieldConditionInterface
+{
+    /**
+     * @param BookingDto           $bookingDto       The current booking data
+     * @param int                  $participantIndex The index of the participant being evaluated
+     * @param array<string, mixed> $formData         Current form data (unused)
+     */
+    public function evaluate(BookingDto $bookingDto, int $participantIndex, array $formData): bool
+    {
+        return 0 === $participantIndex && $bookingDto->isFirstParticipantApplicant();
+    }
+
+    /**
+     * @return string[] Empty array - the applicant choice does not change during form interaction
+     */
+    public function getDependentFields(): array
+    {
+        return [];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Checks if participant[0] is the applicant';
+    }
+}

src/Form/Service/Condition/FirstParticipantReadOnlyCondition.php

@@ -10,15 +10,19 @@ use App\Form\Service\Contract\FieldConditionInterface;
 /**
  * Condition that determines if the first participant's personal data should be read-only.
  *
- * This condition evaluates read-only state based on agency type and authentication state,
+ * It fires only where participant[0] IS the booking's applicant, which
- * replacing the previous personId-based detection with agency code-based detection.
+ * BookingDto::isFirstParticipantApplicant() decides: the booking-level choice in create mode,
+ * and anmelder vs. participant[0] person id in edit mode, where internal agency bookings
+ * always answer false.
  *
  * Business Rules:
  * - CREATE mode (anonymous user): First participant data is editable (user must fill it in)
- * - CREATE mode (logged-in, non-internal agency): First participant = applicant, data is read-only
+ * - CREATE mode (logged-in, participant[0] is the applicant): data is prepopulated, read-only
- * - CREATE mode (logged-in, internal agency): First participant ≠ applicant, data is editable
+ * - CREATE mode (applicant does not travel): participant[0] is an ordinary traveller, data is
- * - EDIT mode (internal agency): First participant ≠ applicant, data is editable (mutability applies separately)
+ *   editable
- * - EDIT mode (non-internal agency): First participant = applicant, always read-only
+ * - EDIT mode (participant[0] is the applicant): always read-only
+ * - EDIT mode (split booking, or internal agency): participant[0] ≠ applicant, editable here
+ *   (PersonalDataMutabilityCondition still applies separately)
  *
  * Non-first participants are never affected by this condition - they return false here
  * but may still be read-only via PersonalDataMutabilityCondition in edit mode.
@@ -36,45 +40,31 @@ class FirstParticipantReadOnlyCondition implements FieldConditionInterface
      */
     public function evaluate(BookingDto $bookingDto, int $participantIndex, array $formData): bool
     {
-        // This condition only applies to first participant (agency-based read-only)
+        // This condition only applies to the first participant.
         // Non-first participants: return false here, but may still be read-only via PersonalDataMutabilityCondition
         if (0 !== $participantIndex) {
             return false;
         }
 
-        $participant = $bookingDto->getParticipant($participantIndex);
+        // participant[0] is a traveller in their own right: nothing to protect here.
-
+        if (false === $bookingDto->isFirstParticipantApplicant()) {
-        // CREATE mode logic
-        if (BookingDto::MODE_CREATE === $bookingDto->getMode()) {
-            // Anonymous user (no personId) = must fill in data = editable
-            if (null === $participant?->personId) {
-                return false;
-            }
-
-            // Internal agency = first participant ≠ applicant = editable
-            if ($bookingDto->isInternalAgencyBooking()) {
-                return false;
-            }
-
-            // Logged-in user with non-internal agency = data prepopulated = read-only
-            return true;
-        }
-
-        // EDIT mode logic
-        // Internal agency = first participant ≠ applicant = editable (mutability check applies separately)
-        if ($bookingDto->isInternalAgencyBooking()) {
             return false;
         }
 
-        // Non-internal agency = first participant = applicant = always read-only
+        if (BookingDto::MODE_CREATE === $bookingDto->getMode()) {
+            // Anonymous user (no personId) = must fill in data = editable
+            return null !== $bookingDto->getParticipant($participantIndex)?->personId;
+        }
+
+        // EDIT mode: participant[0] is the applicant, whose record is owned by the account.
         return true;
     }
 
     /**
      * Returns field names that this condition depends on.
      *
-     * This condition is based on agency code and personId which are set during initialization
+     * This condition is based on the applicant split and personId, which are set during
-     * and don't change during form interaction, so no field dependencies.
+     * initialization and don't change during form interaction, so no field dependencies.
      *
      * @return string[] Empty array - no field dependencies
      */
@@ -90,6 +80,6 @@ class FirstParticipantReadOnlyCondition implements FieldConditionInterface
      */
     public function getDescription(): string
     {
-        return 'First participant personal data is read-only for non-internal agency bookings with logged-in users';
+        return 'First participant personal data is read-only when they are also the applicant';
     }
 }