@sabstravtech/obtservices 0.2.2607131100 → 0.2.2607131200

package/angular/components/basket-panel.d.ts

@@ -1,20 +1,20 @@
 import { OnInit } from '@angular/core';
-import { InternalBasketInterface, EnterpriseBasketServiceInterface, UserServiceInterface, EnterpriseSearchServiceInterface } from '@sabstravtech/obtservices/base';
+import { InternalBasketInterface } from '@sabstravtech/obtservices/base';
 import { Router } from '@angular/router';
-import { ModalOpenerService } from '../services';
+import { EnterpriseBasketService, EnterpriseSearchService, ModalOpenerService, UserService } from '../services';
 import { BasketItem, ServiceType } from '../lib/vendor/types/graphql.angular.types';
 import { WithSubscriptionComponent } from './with-component';
 import * as i0 from "@angular/core";
 export declare class BasketPanelComponent extends WithSubscriptionComponent implements OnInit {
-    basketService: EnterpriseBasketServiceInterface;
-    userService: UserServiceInterface;
+    basketService: EnterpriseBasketService;
+    userService: UserService;
     private searchService;
     router: Router;
     modalService: ModalOpenerService;
     selectedBasketIndex: string;
     selectedBasket: InternalBasketInterface;
     ItemTypes: typeof ServiceType;
-    constructor(basketService: EnterpriseBasketServiceInterface, userService: UserServiceInterface, searchService: EnterpriseSearchServiceInterface, router: Router, modalService?: ModalOpenerService);
+    constructor(basketService: EnterpriseBasketService, userService: UserService, searchService: EnterpriseSearchService, router: Router, modalService?: ModalOpenerService);
     ngOnInit(): void;
     findBasket(baskets: InternalBasketInterface[], id: string): InternalBasketInterface;
     showCO2(): boolean;

package/angular/lib/vendor/services/chatbot-car-hire-search.service.d.ts

@@ -1,7 +1,8 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
+import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
  * Handles chatbot-driven car hire searches. Registered with
@@ -11,20 +12,20 @@ import * as i0 from "@angular/core";
  * search headlessly, then injects a `ChatCarHireResults` message so the chat
  * widget can render car hire cards.
  */
-export declare class ChatbotCarHireSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotCarHireSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
     private userService;
     readonly travelType: "car-hire";
     private pendingDepotChoice;
-    private carHireSearchParams;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, resultAwareService: ResultAwareService, userService: UserServiceInterface);
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
+    private ensureSelfTraveller;
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private runSearch;
     private buildCarHireCards;
     private calculateDays;
-    private toDepotChoice;
+    private injectNoResultsMessage;
     private injectLocationHelpMessage;
     private handleDepotSelectionReply;
     private populateCarHireParams;
@@ -32,7 +33,6 @@ export declare class ChatbotCarHireSearchService extends WithSubscriptionCompone
     private resolveVendorCode;
     private resolveLocation;
     private resolveAirportLocation;
-    private fetchAirports;
     private airportToLocation;
     private pickBestLocation;
     private toAirportDetails;
@@ -40,14 +40,12 @@ export declare class ChatbotCarHireSearchService extends WithSubscriptionCompone
     private applyAirportDropoff;
     private applyCityPickup;
     private applyCityDropoff;
-    private plainCityName;
     private toCityLocation;
     private resolveCityDepots;
     private fetchDepotsWithinRadius;
     private resolveDepot;
     private resolveEnterpriseDepot;
     private fetchEnterpriseDepots;
-    private fetchDepotsFrom;
     private toEnterpriseDepot;
     private applyPostcodePickupAndDropoff;
     private resolvePostcode;

package/angular/lib/vendor/services/chatbot-eurostar-search.service.d.ts

@@ -1,6 +1,7 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { EnterpriseSearchService } from './search.service';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
  * Handles chatbot-driven Eurostar searches. Registered with
@@ -11,21 +12,27 @@ import * as i0 from "@angular/core";
  * Once results arrive, builds `ChatEurostarResults` and patches them onto the
  * last assistant message via {@link ChatbotService.patchAssistantMessage}.
  */
-export declare class ChatbotEurostarSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotEurostarSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private userService;
     readonly travelType: "eurostar";
-    private eurostarSearchParams;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, userService: UserServiceInterface);
+    private resultsSubscription;
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private runSearch;
+    /**
+     * Render OBT's validationMessages array as a chatbot reply. Single message →
+     * inline sentence; multiple → bullet list so each issue reads clearly.
+     */
+    private formatValidationMessages;
     private subscribeToResults;
     private extractItems;
     private buildCard;
     private populateEurostarParams;
     private mapCabinClass;
     private resolveStation;
+    private normalizeTime;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChatbotEurostarSearchService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ChatbotEurostarSearchService>;
 }

package/angular/lib/vendor/services/chatbot-flight-search.service.d.ts

@@ -1,13 +1,20 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
+import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
- * Handles chatbot-driven flight searches: populates flight state from chat
- * parameters, runs `startSearch()` headlessly, and patches result cards on.
+ * Handles chatbot-driven flight searches. Registered with
+ * `ChatbotSearchDispatcherService`; not used directly.
+ *
+ * Populates the flight search state from the chatbot's parameters (same state
+ * the search form binds to via ngModel) and runs `startSearch()` headlessly
+ * so chatbot flight searches work from any page. Once results arrive, builds
+ * `ChatFlightResultCard`s and patches them onto the last assistant message
+ * via {@link ChatbotService.patchAssistantMessage}.
  */
-export declare class ChatbotFlightSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotFlightSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
@@ -19,54 +26,73 @@ export declare class ChatbotFlightSearchService extends WithSubscriptionComponen
     private static readonly NO_CARRIER_PREFERENCE;
     /** Regional/subsidiary markers, so "KLM" doesn't resolve to "KLM Cityhopper". */
     private static readonly CARRIER_SUBSIDIARY;
+    private resultsSubscription;
     /**
-     * Most recent full search parameters, cached so a {@link resort} (which only
-     * carries new ranking intent) can still render card headers/dates.
+     * The most recent full search parameters (origin, destination, dates,
+     * cabin, etc.). Cached so a {@link resort} call — whose own parameters carry
+     * only the new ranking intent (sortType / time target) — can still render
+     * card headers and dates for the trip that produced the cached results.
      */
     private lastSearchParameters;
-    private flightSearchParams;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, resultAwareService: ResultAwareService, userService: UserServiceInterface);
-    /** The flight search's current validation messages, empty-filtered. */
-    private readValidationMessages;
-    /** Patch a final assistant message and stop the searching spinner. */
-    private respondAndStop;
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private subscribeToFlightResults;
     /**
-     * Re-render the chat flight cards from the flight-search session's cached
-     * results. Used post-search and by {@link resort} (re-rank, no new search).
+     * Re-render the chat flight cards from whatever the flight-search session
+     * currently holds — the same cached results that "View Full Results" shows.
+     * Used both by the post-search subscription and by {@link resort} (which
+     * re-ranks without a new backend search). Reads `results.value` (falling
+     * back to the unfiltered `fullResults`), re-extracts the journeys, and builds
+     * cards using `parameters` (sort/time/airline/stops) so the same data can be
+     * re-ordered for a new preference.
      */
     private buildAndPatchResultsFromCache;
     /**
      * Re-rank the results already in the flight-search session for a new user
-     * preference WITHOUT a new backend search, then patch fresh cards on.
+     * preference (cheapest / fastest / shortest / nearest-to-time) WITHOUT
+     * running a new backend search. The cached itineraries are the same set the
+     * results page shows; we just re-order them via `buildFlightResults` and
+     * patch fresh cards onto the latest assistant message.
      */
     resort(parameters: ChatSearchParameters): Promise<void>;
     private buildFlightResults;
     /**
-     * Builds a map keyed by an itinerary's flight-number signature to all bookable
-     * fare variants (cabin/brand/price) for the same physical flights.
+     * Builds a map keyed by an itinerary's flight-number signature to all
+     * bookable fare variants (cabin/brand/price) for the same physical flights.
+     * For combined-return journeys the key includes both outbound + inbound
+     * flight numbers; for dual-single legs it's just that leg's numbers.
      */
     private indexFaresByFlights;
-    /** Marketing carrier + flight number for a single leg, e.g. "BA123". */
-    private flightCode;
     private flightSignature;
     private toFareTicket;
     /**
-     * Builds chat cards for a multi-city itinerary: OBT concatenates all legs in
-     * `outboundFlights[]`, which we split by leg-date into N `ChatFlightLeg`s.
+     * Builds chat cards for a multi-city itinerary. OBT returns one bundle per
+     * search with per-leg result arrays; we surface the top N itineraries by
+     * pairing the i-th cheapest option from every leg into a single "stacked"
+     * card. This is naive (it doesn't try every combinatorial combination) but
+     * gives the user a useful headline view; View Full Results owns the proper
+     * fare-combination picker.
+     *
+     * OBT returns multi-city itineraries as a single `bundle.journeys[]` where
+     * each entry has all legs concatenated in `outboundFlights[]`. We split each
+     * itinerary by leg-date to produce N `ChatFlightLeg`s per card.
      */
     private buildMultiCityFlightResults;
     /**
-     * Split a concatenated multi-city flight list into per-leg buckets by matching
-     * each flight's depart date to a leg date (latest leg on/before it as fallback).
+     * Split a concatenated multi-city flight list into per-leg buckets. Primary
+     * key is the flight's depart date matching a leg date; falls back to the
+     * latest leg whose date is on or before the flight (covers overnight
+     * connections that depart the day before the next leg's planned date).
      */
     private splitFlightsByLeg;
     /** Build a `ChatFlightLeg` from the flights assigned to a single leg. */
     private flightsToChatLeg;
     /**
-     * Calendar days the arrival falls after departure (0 = same day, 1 = next day).
-     * Compares date components not elapsed time; returns 0 for missing/invalid.
+     * Calendar days the arrival falls after departure (0 = same day, 1 = next
+     * day). Compares date components rather than elapsed time so a 23:30 → 00:40
+     * hop still counts as +1. Returns 0 when datetimes are missing/invalid so a
+     * lack of data never hides an otherwise-valid result. Accepts either a full
+     * `CondensedResult` (outbound) or its `inbound` sub-leg.
      */
     private arrivalDayOffset;
     private formatHHmm;
@@ -75,8 +101,16 @@ export declare class ChatbotFlightSearchService extends WithSubscriptionComponen
     private formatDate;
     private formatCabinLabel;
     /**
-     * Tracks the last search's resolved airports to decide whether a follow-up
-     * refines the same journey (keep sticky options) or is a fresh search (clear).
+     * Render OBT's validationMessages array as a chatbot reply. Single message →
+     * inline sentence; multiple → bullet list so each issue reads clearly.
+     */
+    private formatValidationMessages;
+    /**
+     * Tracks the last chatbot flight search's resolved airports so we can decide
+     * whether a follow-up turn is a "refinement of the same journey" (e.g. swap
+     * MAN → AMS for LPL → AMS — same metro, user is just nudging a parameter)
+     * or a "fresh search" (e.g. MAN → AMS to BER → ATH — clearly unrelated, so
+     * any sticky options like "direct only" should be cleared).
      */
     private lastSearch;
     private static readonly NEARBY_AIRPORT_KM;
@@ -84,32 +118,34 @@ export declare class ChatbotFlightSearchService extends WithSubscriptionComponen
     private airportCoords;
     /**
      * Multi-city counterpart to `populateFlightParams`. Resolves each leg's
-     * airports, builds `IMultiDestination[]`, and switches to multiCity (full reset).
+     * origin/destination airports, builds the `IMultiDestination[]` shape the
+     * flight search expects, and switches `chosenSearchType` to multiCity.
+     * Same-journey detection is skipped (the user is describing a fundamentally
+     * new itinerary), so we always do a full reset.
      */
     private populateMultiCityFlightParams;
     /**
-     * Normalise a chat cabin value: `null` when unset, `Any` for "any"/"all"
-     * sentinels, else the mapped {@link FlightCabinClass}.
-     */
-    private resolveCabinClass;
-    /** Apply the passenger breakdown (adults/children/infants), leg-agnostic. */
-    private applyPassengers;
-    /**
-     * Apply the leg-agnostic subset of `populateFlightParams` (cabin class,
-     * passenger breakdown, sort, refundable). Shared by single/return + multi-city.
+     * Apply the subset of `populateFlightParams` that is leg-agnostic (cabin
+     * class, passenger breakdown, sort, refundable flag). Shared between
+     * single/return and multi-city paths.
      */
     private applySharedFlightParams;
     private populateFlightParams;
     private mapCabinClass;
+    private normalizeTime;
     private resolveAirport;
     /**
-     * Build the de-duplicated list of carrier search terms from the `airlines`
-     * array (or singular airline/airlineCode), dropping sentinels + sub-2-char.
+     * Build the de-duplicated list of carrier search terms from the chat
+     * parameters. Prefers the `airlines` array (up to {@link MAX_PREFERRED_CARRIERS})
+     * when present, else falls back to the singular airline/airlineCode. Drops
+     * "no preference" sentinels ("any"/"all"/empty) and terms shorter than 2 chars.
      */
     private collectCarrierTerms;
     /**
-     * Resolve an airline term to a real {code, name} from searchAirlines,
-     * highest-confidence first: exact code, exact name, then non-subsidiary match.
+     * Resolve a single airline search term to a real {code, name} from the
+     * searchAirlines GraphQL source, trying the highest-confidence match first:
+     * exact IATA code, exact name, then non-subsidiary startsWith/contains — so
+     * "KLM" resolves to "KLM Royal Dutch Airlines" rather than "KLM Cityhopper".
      */
     private resolveCarrier;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChatbotFlightSearchService, never>;

package/angular/lib/vendor/services/chatbot-hotel-search.service.d.ts

@@ -1,8 +1,9 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface, HotelEnterpriseSearchInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
+import { EnterpriseSearchService } from './search.service';
 import { HotelAvalibilityService } from './hotel-avallibility.service';
 import { ResultAwareService } from './result-aware.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
  * Handles chatbot-driven hotel searches. Registered with
@@ -13,25 +14,24 @@ import * as i0 from "@angular/core";
  * a `ChatHotelResults` message so the chat widget can render hotel cards.
  * Works from any page — no search form component needs to be mounted.
  */
-export declare class ChatbotHotelSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotHotelSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private hotelAvalibilityService;
     private resultAwareService;
     private userService;
     readonly travelType: "hotel";
+    private availabilitySubscription;
     lastParameters: ChatSearchParameters | null;
-    hotelSearchParams: HotelEnterpriseSearchInterface;
     markAsLoading(): void;
     get hasHotelResults(): boolean;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, hotelAvalibilityService: HotelAvalibilityService, resultAwareService: ResultAwareService, userService: UserServiceInterface);
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, hotelAvalibilityService: HotelAvalibilityService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
-    private makeAvailabilitySubjects;
-    private awaitAvailability$;
-    private buildSearchHeader;
+    private ensureSelfTraveller;
     private runSearch;
     private runSearchFromOffset;
     private buildHotelCards;
+    private injectNoResultsMessage;
     private sortHotels;
     private cheapestRoomTotal;
     private populateHotelParams;

package/angular/lib/vendor/services/chatbot-lounge-search.service.d.ts

@@ -1,7 +1,8 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
+import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
  * Handles chatbot-driven lounge searches. Registered with
@@ -12,17 +13,18 @@ import * as i0 from "@angular/core";
  * Once results arrive, builds `ChatLoungeResultCard`s and patches them onto
  * the last assistant message via {@link ChatbotService.patchAssistantMessage}.
  */
-export declare class ChatbotLoungeSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotLoungeSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
     private userService;
     readonly travelType: "lounge";
-    private loungeSearchParams;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, resultAwareService: ResultAwareService, userService: UserServiceInterface);
+    private resultsSubscription;
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private subscribeToLoungeResults;
     private buildLoungeCards;
+    private formatValidationMessages;
     private populateLoungeParams;
     private resolveAirport;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChatbotLoungeSearchService, never>;

package/angular/lib/vendor/services/chatbot-rail-search.service.d.ts

@@ -1,7 +1,8 @@
-import { ChatSearchParameters, ChatbotTravelHandler, EnterpriseSearchServiceInterface, UserServiceInterface } from '@sabstravtech/obtservices/base';
+import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
 import { ChatbotService } from './chatbot.service';
+import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
-import { WithSubscriptionComponent } from '../../../components/with-component';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 /**
  * Handles chatbot-driven rail searches. Registered with
@@ -13,15 +14,20 @@ import * as i0 from "@angular/core";
  * `ChatRailResultCard`s and patches them onto the last assistant message
  * via {@link ChatbotService.patchAssistantMessage}.
  */
-export declare class ChatbotRailSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotRailSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
     private userService;
     readonly travelType: "rail";
-    private railSearchParams;
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchServiceInterface, resultAwareService: ResultAwareService, userService: UserServiceInterface);
+    private resultsSubscription;
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
+    /**
+     * Render OBT's validationMessages array as a chatbot reply. Single message →
+     * inline sentence; multiple → bullet list so each issue reads clearly.
+     */
+    private formatValidationMessages;
     /**
      * Subscribe to ResultAwareService for the next rail result emission, build
      * the top-N cards per leg, then patch the last assistant message so the
@@ -30,11 +36,10 @@ export declare class ChatbotRailSearchService extends WithSubscriptionComponent
     private subscribeToRailResults;
     private buildRailResults;
     private buildInboundCards;
-    /** Keep the first entry for each distinct `index`, preserving order. */
-    private dedupeByIndex;
     private toRailCard;
     private formatDate;
     private populateRailParams;
+    private normalizeTime;
     private preferRailStation;
     private resolveRailStation;
     private lookupRailStations;

package/angular/lib/vendor/services/chatbot-search-dispatcher.service.d.ts

@@ -4,8 +4,6 @@ import { ChatbotFlightSearchService } from './chatbot-flight-search.service';
 import { ChatbotRailSearchService } from './chatbot-rail-search.service';
 import { ChatbotHotelSearchService } from './chatbot-hotel-search.service';
 import { ChatbotLoungeSearchService } from './chatbot-lounge-search.service';
-import { ChatbotFastTrackSearchService } from './chatbot-fast-track-search.service';
-import { ChatbotParkingSearchService } from './chatbot-parking-search.service';
 import { ChatbotCarHireSearchService } from './chatbot-car-hire-search.service';
 import { ChatbotTaxiSearchService } from './chatbot-taxi-search.service';
 import { ChatbotService } from './chatbot.service';
@@ -26,11 +24,9 @@ export declare class ChatbotSearchDispatcherService {
     private chatbotService;
     private initialised;
     private readonly handlers;
-    constructor(chatbotService: ChatbotService, rail: ChatbotRailSearchService, flight: ChatbotFlightSearchService, hotel: ChatbotHotelSearchService, carHire: ChatbotCarHireSearchService, eurostar: ChatbotEurostarSearchService, lounge: ChatbotLoungeSearchService, fastTrack: ChatbotFastTrackSearchService, parking: ChatbotParkingSearchService, taxi: ChatbotTaxiSearchService);
+    constructor(chatbotService: ChatbotService, rail: ChatbotRailSearchService, flight: ChatbotFlightSearchService, hotel: ChatbotHotelSearchService, carHire: ChatbotCarHireSearchService, eurostar: ChatbotEurostarSearchService, lounge: ChatbotLoungeSearchService, taxi: ChatbotTaxiSearchService);
     /** Call once at app start. Idempotent. */
     init(): void;
-    /** Run a handler promise, logging any rejection without breaking the stream. */
-    private run;
     /**
      * Whether a global handler is registered for the given travel type. Used by
      * search forms to know which travel types they should skip (avoiding

package/angular/lib/vendor/services/chatbot-taxi-search.service.d.ts

@@ -1,27 +1,21 @@
 import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtservices/base';
-import { WithSubscriptionComponent } from '../../../components/with-component';
 import { ChatbotService } from './chatbot.service';
 import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
 import { UserService } from './user.service';
 import * as i0 from "@angular/core";
-export declare class ChatbotTaxiSearchService extends WithSubscriptionComponent implements ChatbotTravelHandler {
+export declare class ChatbotTaxiSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
     private userService;
     readonly travelType: "taxi";
-    private taxiSearchParams;
-    chatbotFilterId: string | null;
-    lastParameters: ChatSearchParameters | null;
-    get hasTaxiResults(): boolean;
-    markAsLoading(): void;
     constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private runSearch;
     private buildTaxiCards;
+    private injectNoResultsMessage;
     private populateTaxiParams;
-    private prepareAddress;
     private searchAndResolveGeoLocation;
     private locationDataToResolved;
     private resolveGeoLocation;

package/angular/lib/vendor/services/chatbot.service.d.ts

@@ -1,22 +1,16 @@
 import { OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
 import { Subject } from 'rxjs';
-import { BaseChatbotService, BotFaq, ChatFeedbackAck, ChatMessage, ChatSearchParameters, ChatTokenEvent, ChatToolEvent, ChatWsResponse, CondensedResult, UserCapabilities, IRiskFlag } from '@sabstravtech/obtservices/base';
 import { WebTokenService } from '../services/webtoken.service';
 import { Environment } from '../classes/environment';
+import { BaseChatbotService, BotFaq, ChatFeedbackAck, ChatMessage, ChatSearchParameters, ChatTokenEvent, ChatToolEvent, ChatWsResponse, CondensedResult, UserCapabilities, IRiskFlag } from '@sabstravtech/obtservices/base';
 import { ResultAwareService } from './result-aware.service';
 import { UserService } from './user.service';
-import { EnterpriseBasketService } from './enterprise-basket.service';
-import { EnterpriseSearchService } from './search.service';
 import * as i0 from "@angular/core";
 export declare class ChatbotService extends BaseChatbotService implements OnDestroy {
     private webTokenService;
     private resultAwareService;
     private environment;
     private userService;
-    private basketService;
-    private searchService;
-    private router;
     private messagesSubject;
     messages$: import("rxjs").Observable<ChatMessage[]>;
     private loadingSubject;
@@ -52,7 +46,7 @@ export declare class ChatbotService extends BaseChatbotService implements OnDest
     /** Tracks the user ID that owns the current chat session, to detect user switches. */
     private sessionOwnerId;
     private userChangeSubscription;
-    constructor(webTokenService: WebTokenService, resultAwareService: ResultAwareService, environment: Environment, userService: UserService, basketService: EnterpriseBasketService, searchService: EnterpriseSearchService, router: Router);
+    constructor(webTokenService: WebTokenService, resultAwareService: ResultAwareService, environment: Environment, userService: UserService);
     ngOnDestroy(): void;
     protected getRequestUrl(): string | null;
     protected getAuthToken(): string | null;
@@ -78,10 +72,6 @@ export declare class ChatbotService extends BaseChatbotService implements OnDest
      */
     private resolveAllowedFlightCabins;
     protected getUserFirstName(): string | undefined;
-    /** The active basket selected in the floating basket, if any. */
-    protected getActiveBasketId(): string | undefined;
-    protected executeBasketDeletion(): Promise<void>;
-    protected executeStartAgain(): Promise<void>;
     /** Set by ChatbotCarHireSearchService when the user is choosing from a depot list. */
     depotSelectionHandler: ((text: string) => Promise<boolean>) | null;
     connect(): void;

package/angular/lib/vendor/services/result-aware.service.d.ts

@@ -1,5 +1,7 @@
 import { Router } from '@angular/router';
-import { CondensedResult, ChatRailFareTicket, ChatFlightFareTicket, EnterpriseBasketServiceInterface, EnterpriseSearchServiceInterface, FlightEnterpriseSearchInterface, HotelEnterpriseSearchInterface, RailEnterpriseSearchInterface } from '@sabstravtech/obtservices/base';
+import { EnterpriseSearchService } from './search.service';
+import { EnterpriseBasketService } from './enterprise-basket.service';
+import { CondensedResult, ChatRailFareTicket, ChatFlightFareTicket } from '@sabstravtech/obtservices/base';
 import * as i0 from "@angular/core";
 export declare class ResultAwareService {
     private searchService;
@@ -18,10 +20,7 @@ export declare class ResultAwareService {
     private flightInboundRaw;
     private resultsAvailableSubject;
     resultsAvailable$: import("rxjs").Observable<boolean>;
-    flightSearchParams: FlightEnterpriseSearchInterface;
-    railSearchParams: RailEnterpriseSearchInterface;
-    hotelSearchParams: HotelEnterpriseSearchInterface;
-    constructor(searchService: EnterpriseSearchServiceInterface, basketService: EnterpriseBasketServiceInterface, router: Router);
+    constructor(searchService: EnterpriseSearchService, basketService: EnterpriseBasketService, router: Router);
     captureFlightResults(results: any[]): void;
     captureRailResults(quoteResult: any): void;
     captureHotelResults(results: any[]): void;
@@ -76,6 +75,7 @@ export declare class ResultAwareService {
     private condenseRailResults;
     private derivePolicyStatus;
     private derivePolicyMessages;
+    private getFirstCabinClassName;
     private filterDownCompressedReturnRailOptions;
     selectHotelRoom(hotelIndex: number, roomId: string): Promise<void>;
     private executeHotelSelection;

package/angular/services.d.ts

@@ -24,8 +24,5 @@ export * from './lib/vendor/services/chatbot-hotel-search.service';
 export * from './lib/vendor/services/chatbot-car-hire-search.service';
 export * from './lib/vendor/services/chatbot-taxi-search.service';
 export * from './lib/vendor/services/chatbot-eurostar-search.service';
-export * from './lib/vendor/services/chatbot-lounge-search.service';
-export * from './lib/vendor/services/chatbot-fast-track-search.service';
-export * from './lib/vendor/services/chatbot-parking-search.service';
 export * from './lib/vendor/services/chatbot-search-dispatcher.service';
 export * from './lib/vendor/services/result-aware.service';

package/base/lib/utils/search-helpers.d.ts

@@ -1,5 +1,4 @@
 import { ServiceType } from '../vendor/types/graphql.types';
-import { LocationDetails, SearchDiscoverLocationResult } from '../vendor/types/types';
 import { SearchObject } from '../vendor/interfaces/search-objects.interface';
 /**
  * Get the ServiceType for a start tab string
@@ -15,11 +14,3 @@ export declare function getServiceTypeFromPriority(searchObjects: {
  * Check if the selected service type is NOT an offline booking type
  */
 export declare function isNotOfflineBookingType(serviceType: ServiceType): boolean;
-/**
- * Map a discover-locations result onto the LocationDetails domain shape.
- *
- * The discover-locations query returns loosely-typed results (`type` is a plain
- * string and most fields are nullable). This normalises them to LocationDetails,
- * converting null to undefined so downstream resolvers get the expected shape.
- */
-export declare function discoverToLocationDetails(d: SearchDiscoverLocationResult): LocationDetails;

package/base/lib/vendor/interfaces/Ienterprise-basket.service.d.ts

@@ -32,7 +32,6 @@ export interface EnterpriseBasketServiceInterface extends BasketServiceMinimalMI
     highlightBasketItemsEmitter: Subject<GetUserBasketItemResult[]>;
     autoSuggestDefaultsLoading: BehaviorSubject<boolean>;
     loadingSupplementaryBookingInfo: BehaviorSubject<boolean>;
-    deletingBasket: BehaviorSubject<boolean>;
     chosenEvolviSeat: BehaviorSubject<any>;
     evolviSeatReservationResponse: BehaviorSubject<any>;
     evolviWantToReserveSeat: BehaviorSubject<any>;
@@ -51,14 +50,13 @@ export interface EnterpriseBasketServiceInterface extends BasketServiceMinimalMI
     basketUpdating: boolean;
     isApprovedBasket: boolean;
     updatingBasket: boolean;
-    miUpdating: BehaviorSubject<boolean>;
     missingMIs: ValidationResponse[];
     miViewed: boolean;
     addToBasket(item: AddItemToBasket.Variables, intBasket: InternalBasketInterface, searchService: SearchServiceMinimal, travellers: Traveller[], requiresReasonKeys: string[], invokedSplit?: boolean, ignoreInvokedCheck?: boolean): Promise<DifferentInvokdedUserReasons>;
     getRequiresReasonService(): RequiresReasonServiceInterface;
     getRequiresOverrideReasonService(): RequiresOverrideReasonServiceInterface;
     canCancel(basketItem: BasketItem): Observable<BeforeCancellationInfo>;
-    createBasket(createdByBolt?: boolean, createdByGut?: boolean): Promise<InternalBasketInterface>;
+    createBasket(createdByBolt: boolean, createdByGut?: boolean): Promise<InternalBasketInterface>;
     loadBasket(id: string, forceload?: boolean): void;
     removeBasketItem(basketId: string, item: GetUserBasketItemResult): Promise<void>;
     getDefaultBasket(): Promise<InternalBasketInterface>;
@@ -69,7 +67,7 @@ export interface EnterpriseBasketServiceInterface extends BasketServiceMinimalMI
     getNumberItemsForBasket(basket: InternalBasketInterface): number;
     removeBasket(basketid: string): Observable<unknown>;
     removeExpiredItems(id: string): void;
-    continueSearchAndBook(basketItems: any[], itiniaryUrl: string[], searchService: SearchServiceMinimal): string[];
+    continueSearchAndBook(basketItems: any[], itiniaryUrl: string[], searchService: SearchServiceMinimal): {};
     addTravellers(basketid: string, basketItem: BasketItem, travellers: Traveller[], index: number): void;
     setLeadPassenger(basketid: string, basketItem: BasketItem, travellers: Traveller, index: number, guest?: LeadPassengerType): void;
     revalidate(basketid: string): Promise<void>;