sbb-mcp 0.3.0 → 0.4.1

package/dist/structured.js

@@ -0,0 +1,133 @@
+/**
+ * Pure extractors from SMAPI types to widget-friendly DTOs.
+ * Shape must stay in sync with web/src/types.ts.
+ *
+ * Keep these side-effect free. They're tested in unit tests and run on
+ * every tool invocation to populate `structuredContent` on responses.
+ */
+// ──────────────────────────────────────────────────────────────────────
+function toStation(p) {
+    return {
+        id: p.id,
+        name: p.name,
+        lat: p.geoPosition?.latitude,
+        lon: p.geoPosition?.longitude,
+    };
+}
+function parseIsoDurationMinutes(iso) {
+    const m = iso.match(/PT(?:(\d+)H)?(?:(\d+)M)?/);
+    if (!m)
+        return 0;
+    return parseInt(m[1] ?? '0', 10) * 60 + parseInt(m[2] ?? '0', 10);
+}
+function legToDTO(leg) {
+    if (leg.type === 'timed') {
+        const tl = leg;
+        return {
+            type: 'train',
+            line: tl.service.publishedLineName,
+            platform: tl.board.platform,
+            minutes: parseIsoDurationMinutes(tl.duration),
+        };
+    }
+    if (leg.type === 'transfer') {
+        const tr = leg;
+        return { type: 'walk', minutes: parseIsoDurationMinutes(tr.duration) };
+    }
+    return { type: 'walk', minutes: parseIsoDurationMinutes(leg.duration) };
+}
+export function toStationsListDTO(query, places) {
+    return { query, stations: places.map(toStation) };
+}
+export function toConnectionListDTO(collection, weather) {
+    const first = collection.trips[0];
+    const fallbackStation = { id: '', name: '—' };
+    return {
+        origin: first ? toStation(first.origin) : fallbackStation,
+        destination: first ? toStation(first.destination) : fallbackStation,
+        date: first?.startTime ?? '',
+        collectionId: collection.id,
+        connections: collection.trips.map((t) => ({
+            tripId: t.id,
+            departureTime: t.startTime,
+            arrivalTime: t.endTime,
+            durationMinutes: parseIsoDurationMinutes(t.duration),
+            transfers: t.transfers,
+            legs: t.legs.map(legToDTO),
+        })),
+        ...(weather ? { weather } : {}),
+    };
+}
+export function toTripDetailsDTO(trip) {
+    return {
+        tripId: trip.id,
+        origin: toStation(trip.origin),
+        destination: toStation(trip.destination),
+        departureTime: trip.startTime,
+        arrivalTime: trip.endTime,
+        durationMinutes: parseIsoDurationMinutes(trip.duration),
+        transfers: trip.transfers,
+        status: trip.tripStatus,
+        legs: trip.legs.map((leg) => {
+            if (leg.type === 'timed') {
+                const tl = leg;
+                return {
+                    type: 'train',
+                    line: tl.service.publishedLineName,
+                    operator: tl.service.operatorName,
+                    durationMinutes: parseIsoDurationMinutes(tl.duration),
+                    from: {
+                        name: tl.board.stopPlace.name,
+                        time: tl.board.departureTime,
+                        platform: tl.board.platform,
+                    },
+                    to: {
+                        name: tl.alight.stopPlace.name,
+                        time: tl.alight.arrivalTime,
+                        platform: tl.alight.platform,
+                    },
+                    intermediateStops: tl.intermediateStops?.map((s) => ({
+                        name: s.stopPlace.name,
+                        arrivalTime: s.arrivalTime,
+                        departureTime: s.departureTime,
+                    })),
+                    occupancy: tl.occupancy
+                        ? {
+                            firstClass: tl.occupancy.firstClass,
+                            secondClass: tl.occupancy.secondClass,
+                        }
+                        : undefined,
+                };
+            }
+            return {
+                type: 'walk',
+                durationMinutes: parseIsoDurationMinutes(leg.duration),
+            };
+        }),
+    };
+}
+export function toPricesTableDTO(results) {
+    return {
+        prices: results.map((r) => {
+            const second = r.prices.find((p) => p.class === '2');
+            const first = r.prices.find((p) => p.class === '1');
+            return {
+                tripId: r.tripId,
+                ...(second ? { secondClass: { amount: second.amount, currency: second.currency } } : {}),
+                ...(first ? { firstClass: { amount: first.amount, currency: first.currency } } : {}),
+            };
+        }),
+    };
+}
+export function toTicketCardDTO(params) {
+    return {
+        tripId: params.tripId,
+        origin: { id: params.fromId, name: params.fromName },
+        destination: { id: params.toId, name: params.toName },
+        departureTime: params.departureTime,
+        arrivalTime: params.arrivalTime,
+        primaryLink: params.primaryLink,
+        ...(params.affiliateLink ? { affiliateLink: params.affiliateLink } : {}),
+    };
+}
+//# sourceMappingURL=structured.js.map

package/dist/structured.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structured.js","sourceRoot":"","sources":["../src/structured.ts"],"names":[],"mappings":"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"}

package/dist/tools.js

@@ -1,11 +1,14 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 import { isSmapiConfigured, searchPlaces, searchTrips, getTrip, paginateTrips, getTripPrices, getTripOffers, mockSearchPlaces, mockSearchTrips, mockGetTripPrices, } from './transport/index.js';
-import { formatStations, formatConnections, formatTripDetails, formatPrices, formatTicketLink, buildSbbDeepLink, appendWeatherToConnections, } from './formatters.js';
+import { formatStations, formatConnections, formatTripDetails, formatPrices, formatTicketLink, buildSbbDeepLink, } from './formatters.js';
 import { cacheGet, cacheSet, TTL } from './cache.js';
 import { SmapiError } from './transport/smapi-client.js';
 import { loadProfile, saveProfile, formatProfileSummary, isReductionCardExpired } from './profile.js';
 import { isSwissTripConfigured, fetchProfile as fetchCloudProfile, fetchTravelers, toSmapiTraveler, formatTravelersList, formatCloudProfile, } from './swisstrip.js';
+import { getWeatherSummary } from 'swiss-weather-mcp';
+import { toStationsListDTO, toConnectionListDTO, toTripDetailsDTO, toPricesTableDTO, toTicketCardDTO, } from './structured.js';
+import { registerWidgets, widgetResponseMeta, widgetToolMeta, WIDGETS } from './widgets.js';
 const useMock = !isSmapiConfigured();
 const useCloud = isSwissTripConfigured();
 /** Match SwissTrip travelers by first name (case-insensitive, fuzzy) */
@@ -13,7 +16,6 @@ function matchTravelersByName(all, names) {
     const matched = [];
     for (const name of names) {
         const lower = name.toLowerCase();
-        // Try exact first_name match, then label match, then partial match
         const found = all.find(t => t.first_name?.toLowerCase() === lower ||
             t.label?.toLowerCase() === lower) || all.find(t => t.first_name?.toLowerCase().startsWith(lower) ||
             t.last_name?.toLowerCase() === lower);
@@ -32,12 +34,24 @@ function errorResult(err) {
     const message = err instanceof Error ? err.message : String(err);
     return { content: [{ type: 'text', text: `Error: ${message}` }], isError: true };
 }
+/** Compute Europe/Zurich ISO timestamp for a (date, HH:MM) pair. */
+function zurichIso(date, time) {
+    const probe = new Date(`${date}T${time}:00Z`);
+    const zurichStr = probe.toLocaleString('en-US', { timeZone: 'Europe/Zurich' });
+    const zurichTime = new Date(zurichStr + ' UTC');
+    const offsetMs = zurichTime.getTime() - probe.getTime();
+    const offsetHours = Math.round(offsetMs / (60 * 60 * 1000));
+    const offsetStr = `${offsetHours >= 0 ? '+' : '-'}${String(Math.abs(offsetHours)).padStart(2, '0')}:00`;
+    return new Date(`${date}T${time}:00${offsetStr}`).toISOString();
+}
 export function createSbbMcpServer() {
     const server = new McpServer({
         name: 'sbb-mcp',
-        version: '0.3.0',
+        version: '0.4.0',
         description: 'Swiss Federal Railways (SBB/CFF/FFS) — real-time train schedules, prices, and ticket purchase links for Switzerland',
     });
+    // ─── Widget resources (ChatGPT Apps SDK) ───────────────────────────────
+    registerWidgets(server);
     // ─── Prompts ───────────────────────────────────────────────────────────
     server.prompt('plan_journey', 'Plan a train journey in Switzerland — finds connections, compares prices, and provides ticket links', {
         from: z.string().describe('Origin station (e.g. "Zurich")'),
@@ -57,7 +71,6 @@ export function createSbbMcpServer() {
         description: 'The user\'s saved travel profile (name, DOB, reduction card). Read this before showing prices or generating ticket links. If empty, ask the user for their details and save with save_profile.',
         mimeType: 'text/plain',
     }, async () => {
-        // Cloud profile takes precedence when SWISSTRIP_TOKEN is set
         if (useCloud) {
             try {
                 const cloudProfile = await fetchCloudProfile();
@@ -70,7 +83,7 @@ export function createSbbMcpServer() {
                 };
             }
             catch {
-                // Fall through to local profile on cloud error
+                // Fall through
             }
         }
         const profile = loadProfile();
@@ -97,13 +110,18 @@ export function createSbbMcpServer() {
         };
     });
     // ─── Tool: save_profile ──────────────────────────────────────────────
-    server.tool('save_profile', 'Save the user\'s travel profile locally for future sessions. Call this after asking the user for their details (name, date of birth, reduction card). Data is stored at ~/.sbb-mcp/profile.json.', {
-        first_name: z.string().optional().describe('First name (for ticket booking)'),
-        last_name: z.string().optional().describe('Last name (for ticket booking)'),
-        date_of_birth: z.string().optional().describe('Date of birth YYYY-MM-DD (for age-based pricing)'),
-        reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).optional().describe('Swiss reduction card: HALF_FARE (Halbtax), GA (General Abonnement), or NONE'),
-        reduction_card_valid_until: z.string().optional().describe('Reduction card expiry date YYYY-MM-DD (ask the user when their Halbtax/GA expires)'),
-    }, { title: 'Save Travel Profile', readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ first_name, last_name, date_of_birth, reduction_card, reduction_card_valid_until }) => {
+    server.registerTool('save_profile', {
+        title: 'Save Travel Profile',
+        description: 'Save the user\'s travel profile locally for future sessions. Call this after asking the user for their details (name, date of birth, reduction card). Data is stored at ~/.sbb-mcp/profile.json.',
+        inputSchema: {
+            first_name: z.string().optional().describe('First name (for ticket booking)'),
+            last_name: z.string().optional().describe('Last name (for ticket booking)'),
+            date_of_birth: z.string().optional().describe('Date of birth YYYY-MM-DD (for age-based pricing)'),
+            reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).optional().describe('Swiss reduction card: HALF_FARE (Halbtax), GA (General Abonnement), or NONE'),
+            reduction_card_valid_until: z.string().optional().describe('Reduction card expiry date YYYY-MM-DD (ask the user when their Halbtax/GA expires)'),
+        },
+        annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    }, async ({ first_name, last_name, date_of_birth, reduction_card, reduction_card_valid_until }) => {
         try {
             const updates = {};
             if (first_name)
@@ -125,15 +143,19 @@ export function createSbbMcpServer() {
         }
     });
     // ─── Tool: get_profile ───────────────────────────────────────────────
-    server.tool('get_profile', 'Read the user\'s saved travel profile. Check this before showing prices to use correct reduction card. If no profile exists, ask the user for their details.', {}, { title: 'Get Travel Profile', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async () => {
-        // Cloud profile takes precedence
+    server.registerTool('get_profile', {
+        title: 'Get Travel Profile',
+        description: 'Read the user\'s saved travel profile. Check this before showing prices to use correct reduction card. If no profile exists, ask the user for their details.',
+        inputSchema: {},
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    }, async () => {
         if (useCloud) {
             try {
                 const cloudProfile = await fetchCloudProfile();
                 return { content: [{ type: 'text', text: formatCloudProfile(cloudProfile) }] };
             }
             catch {
-                // Fall through to local
+                // Fall through
             }
         }
         const profile = loadProfile();
@@ -143,7 +165,12 @@ export function createSbbMcpServer() {
         return { content: [{ type: 'text', text: formatProfileSummary(profile) }] };
     });
     // ─── Tool: list_travelers (SwissTrip cloud only) ─────────────────────
-    server.tool('list_travelers', 'List all travelers in the user\'s SwissTrip account (self, partner, kids). Each traveler has their own reduction card. Use their names with get_prices for family trip pricing. Requires SWISSTRIP_TOKEN.', {}, { title: 'List Travelers', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async () => {
+    server.registerTool('list_travelers', {
+        title: 'List Travelers',
+        description: 'List all travelers in the user\'s SwissTrip account (self, partner, kids). Each traveler has their own reduction card. Use their names with get_prices for family trip pricing. Requires SWISSTRIP_TOKEN.',
+        inputSchema: {},
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    }, async () => {
         if (!useCloud) {
             return { content: [{ type: 'text', text: 'list_travelers requires a SwissTrip account connection (SWISSTRIP_TOKEN). Without it, use save_profile/get_profile for single-traveler local profiles.' }] };
         }
@@ -154,7 +181,7 @@ export function createSbbMcpServer() {
                 return { content: [{ type: 'text', text: cached }] };
             const travelers = await fetchTravelers();
             const text = formatTravelersList(travelers);
-            cacheSet(cacheKey, text, TTL.STATIONS); // ~1h cache
+            cacheSet(cacheKey, text, TTL.STATIONS);
             return { content: [{ type: 'text', text }] };
         }
         catch (err) {
@@ -162,34 +189,44 @@ export function createSbbMcpServer() {
         }
     });
     // ─── Tool 1: search_stations ──────────────────────────────────────────
-    server.tool('search_stations', 'Search for Swiss train stations, addresses, or points of interest by name. Returns station IDs needed for other tools.', {
-        query: z.string().describe('Station name to search for (e.g. "Zurich", "Bern", "Interlaken")'),
-        limit: z.number().min(1).max(20).default(10).describe('Maximum number of results'),
-    }, { title: 'Search Stations', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ query, limit }) => {
+    server.registerTool('search_stations', {
+        title: 'Search Stations',
+        description: 'Search for Swiss train stations, addresses, or points of interest by name. Returns station IDs needed for other tools.',
+        inputSchema: {
+            query: z.string().describe('Station name to search for (e.g. "Zurich", "Bern", "Interlaken")'),
+            limit: z.number().min(1).max(20).default(10).describe('Maximum number of results'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: widgetToolMeta(WIDGETS.STATIONS_LIST, 'Searching stations…', 'Stations ready'),
+    }, async ({ query, limit }) => {
         try {
-            const cacheKey = `stations:${query.toLowerCase()}:${limit}`;
-            const cached = cacheGet(cacheKey);
-            if (cached)
-                return { content: [{ type: 'text', text: cached }] };
             const stations = useMock
                 ? await mockSearchPlaces({ name: query })
                 : await searchPlaces({ name: query, type: 'STOP', numberOfResults: limit });
-            const text = formatStations(stations);
-            cacheSet(cacheKey, text, TTL.STATIONS);
-            return { content: [{ type: 'text', text }] };
+            return {
+                content: [{ type: 'text', text: formatStations(stations) }],
+                structuredContent: toStationsListDTO(query, stations),
+                _meta: widgetResponseMeta(WIDGETS.STATIONS_LIST),
+            };
         }
         catch (err) {
             return errorResult(err);
         }
     });
     // ─── Tool 2: search_connections ───────────────────────────────────────
-    server.tool('search_connections', 'Find train connections between two Swiss stations. Returns schedules with departure/arrival times, duration, transfers, and trip IDs for pricing.', {
-        from: z.string().describe('Origin station name or ID (e.g. "Zurich HB" or "8503000")'),
-        to: z.string().describe('Destination station name or ID (e.g. "Bern" or "8507000")'),
-        date: z.string().optional().describe('Travel date in YYYY-MM-DD format (default: today)'),
-        time: z.string().optional().describe('Departure time in HH:MM format (default: now)'),
-        arrival_time: z.boolean().optional().describe('If true, the time parameter is treated as desired arrival time'),
-    }, { title: 'Search Connections', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ from, to, date, time, arrival_time }) => {
+    server.registerTool('search_connections', {
+        title: 'Search Connections',
+        description: 'Find train connections between two Swiss stations. Returns schedules with departure/arrival times, duration, transfers, and trip IDs for pricing.',
+        inputSchema: {
+            from: z.string().describe('Origin station name or ID (e.g. "Zurich HB" or "8503000")'),
+            to: z.string().describe('Destination station name or ID (e.g. "Bern" or "8507000")'),
+            date: z.string().optional().describe('Travel date in YYYY-MM-DD format (default: today)'),
+            time: z.string().optional().describe('Departure time in HH:MM format (default: now)'),
+            arrival_time: z.boolean().optional().describe('If true, the time parameter is treated as desired arrival time'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: widgetToolMeta(WIDGETS.CONNECTION_LIST, 'Finding trains…', 'Connections ready'),
+    }, async ({ from, to, date, time, arrival_time }) => {
         try {
             let fromId = from;
             let toId = to;
@@ -216,25 +253,12 @@ export function createSbbMcpServer() {
             if (date || time) {
                 const d = date || new Date().toISOString().split('T')[0];
                 const t = time || '08:00';
-                // Compute correct Europe/Zurich offset (CET +01:00 or CEST +02:00)
-                const probe = new Date(`${d}T${t}:00Z`);
-                const zurichStr = probe.toLocaleString('en-US', { timeZone: 'Europe/Zurich' });
-                const zurichTime = new Date(zurichStr + ' UTC');
-                const offsetMs = zurichTime.getTime() - probe.getTime();
-                const offsetHours = Math.round(offsetMs / (60 * 60 * 1000));
-                const offsetStr = `${offsetHours >= 0 ? '+' : '-'}${String(Math.abs(offsetHours)).padStart(2, '0')}:00`;
-                const dt = new Date(`${d}T${t}:00${offsetStr}`).toISOString();
-                if (arrival_time) {
+                const dt = zurichIso(d, t);
+                if (arrival_time)
                     arrivalTime = dt;
-                }
-                else {
+                else
                     departureTime = dt;
-                }
             }
-            const cacheKey = `connections:${fromId}:${toId}:${departureTime || ''}:${arrivalTime || ''}`;
-            const cached = cacheGet(cacheKey);
-            if (cached)
-                return { content: [{ type: 'text', text: cached }] };
             const collection = useMock
                 ? await mockSearchTrips({ origin: fromId, destination: toId, departureTime })
                 : await searchTrips({
@@ -244,117 +268,146 @@ export function createSbbMcpServer() {
                     ...(arrivalTime && { arrivalTime }),
                 });
             let text = formatConnections(collection);
-            // Append destination weather if coordinates available
+            let weatherSummary;
             if (collection.trips.length > 0) {
                 const dest = collection.trips[0].destination;
                 if (dest.geoPosition) {
                     const travelDate = date || new Date().toISOString().split('T')[0];
-                    text = await appendWeatherToConnections(text, dest.geoPosition.latitude, dest.geoPosition.longitude, travelDate, dest.name || to);
+                    const name = dest.name || to;
+                    try {
+                        const summary = await getWeatherSummary(dest.geoPosition.latitude, dest.geoPosition.longitude, travelDate);
+                        if (summary) {
+                            weatherSummary = summary;
+                            text = text + `\n\n**${name} weather:** ${summary}`;
+                        }
+                    }
+                    catch {
+                        // Non-fatal
+                    }
                 }
             }
-            cacheSet(cacheKey, text, TTL.CONNECTIONS);
-            return { content: [{ type: 'text', text }] };
+            return {
+                content: [{ type: 'text', text }],
+                structuredContent: toConnectionListDTO(collection, weatherSummary ? { summary: weatherSummary } : undefined),
+                _meta: widgetResponseMeta(WIDGETS.CONNECTION_LIST),
+            };
         }
         catch (err) {
             return errorResult(err);
         }
     });
     // ─── Tool 3: get_trip_details ─────────────────────────────────────────
-    server.tool('get_trip_details', 'Get detailed information about a specific train connection including all intermediate stops, platforms, and occupancy. Use a trip ID from search_connections results.', {
-        trip_id: z.string().describe('Trip ID from search_connections results'),
-    }, { title: 'Get Trip Details', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ trip_id }) => {
+    server.registerTool('get_trip_details', {
+        title: 'Get Trip Details',
+        description: 'Get detailed information about a specific train connection including all intermediate stops, platforms, and occupancy. Use a trip ID from search_connections results.',
+        inputSchema: {
+            trip_id: z.string().describe('Trip ID from search_connections results'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: widgetToolMeta(WIDGETS.TRIP_DETAILS, 'Loading trip details…', 'Trip details ready'),
+    }, async ({ trip_id }) => {
         try {
             if (useMock) {
                 return { content: [{ type: 'text', text: 'Detailed trip information is available with live API access. In mock mode, use search_connections to see trip summaries.' }] };
             }
-            const cacheKey = `trip:${trip_id}`;
-            const cached = cacheGet(cacheKey);
-            if (cached)
-                return { content: [{ type: 'text', text: cached }] };
             const trip = await getTrip(trip_id, 'REAL_BOARDING_ALIGHTING');
-            const text = formatTripDetails(trip);
-            cacheSet(cacheKey, text, TTL.TRIP_DETAILS);
-            return { content: [{ type: 'text', text }] };
+            return {
+                content: [{ type: 'text', text: formatTripDetails(trip) }],
+                structuredContent: toTripDetailsDTO(trip),
+                _meta: widgetResponseMeta(WIDGETS.TRIP_DETAILS),
+            };
         }
         catch (err) {
             return errorResult(err);
         }
     });
     // ─── Tool 4: get_more_connections ─────────────────────────────────────
-    server.tool('get_more_connections', 'Load earlier or later train connections for a previous search. Use the collection ID from search_connections results.', {
-        collection_id: z.string().describe('Collection ID from search_connections results'),
-        direction: z.enum(['next', 'previous']).describe('"next" for later trains, "previous" for earlier trains'),
-    }, { title: 'Get More Connections', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ collection_id, direction }) => {
+    server.registerTool('get_more_connections', {
+        title: 'Get More Connections',
+        description: 'Load earlier or later train connections for a previous search. Use the collection ID from search_connections results.',
+        inputSchema: {
+            collection_id: z.string().describe('Collection ID from search_connections results'),
+            direction: z.enum(['next', 'previous']).describe('"next" for later trains, "previous" for earlier trains'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: widgetToolMeta(WIDGETS.CONNECTION_LIST, 'Loading more trains…', 'More connections ready'),
+    }, async ({ collection_id, direction }) => {
         try {
-            if (useMock) {
-                const offset = direction === 'next' ? 3 * 60 * 60 * 1000 : -3 * 60 * 60 * 1000;
-                const baseTime = new Date(Date.now() + offset).toISOString();
-                const collection = await mockSearchTrips({ origin: '8503000', destination: '8507000', departureTime: baseTime });
-                return { content: [{ type: 'text', text: formatConnections(collection) }] };
-            }
-            const collection = await paginateTrips(collection_id, direction);
-            return { content: [{ type: 'text', text: formatConnections(collection) }] };
+            const collection = useMock
+                ? await mockSearchTrips({
+                    origin: '8503000',
+                    destination: '8507000',
+                    departureTime: new Date(Date.now() + (direction === 'next' ? 3 : -3) * 60 * 60 * 1000).toISOString(),
+                })
+                : await paginateTrips(collection_id, direction);
+            return {
+                content: [{ type: 'text', text: formatConnections(collection) }],
+                structuredContent: toConnectionListDTO(collection),
+                _meta: widgetResponseMeta(WIDGETS.CONNECTION_LIST),
+            };
         }
         catch (err) {
             return errorResult(err);
         }
     });
     // ─── Tool 5: get_prices ───────────────────────────────────────────────
-    server.tool('get_prices', 'Get ticket prices for one or more train connections. Supports Half-Fare card (Halbtax) and GA travelcard discounts. When connected to SwissTrip (SWISSTRIP_TOKEN), pass traveler_names to get family pricing for multiple travelers.', {
-        trip_ids: z.array(z.string()).min(1).max(10).describe('Trip IDs from search_connections results'),
-        traveler_type: z.enum(['ADULT', 'CHILD']).default('ADULT').describe('Traveler type (used when no traveler_names given)'),
-        reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).default('HALF_FARE').describe('Swiss reduction card (used when no traveler_names given)'),
-        traveler_names: z.array(z.string()).optional().describe('Names of SwissTrip travelers to price for (e.g. ["Fabian", "Anna"]). Requires SWISSTRIP_TOKEN. Each traveler\'s reduction card is applied automatically.'),
-    }, { title: 'Get Prices', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }, async ({ trip_ids, traveler_type, reduction_card, traveler_names }) => {
+    server.registerTool('get_prices', {
+        title: 'Get Prices',
+        description: 'Get ticket prices for one or more train connections. Supports Half-Fare card (Halbtax) and GA travelcard discounts. When connected to SwissTrip (SWISSTRIP_TOKEN), pass traveler_names to get family pricing for multiple travelers.',
+        inputSchema: {
+            trip_ids: z.array(z.string()).min(1).max(10).describe('Trip IDs from search_connections results'),
+            traveler_type: z.enum(['ADULT', 'CHILD']).default('ADULT').describe('Traveler type (used when no traveler_names given)'),
+            reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).default('HALF_FARE').describe('Swiss reduction card (used when no traveler_names given)'),
+            traveler_names: z.array(z.string()).optional().describe('Names of SwissTrip travelers to price for (e.g. ["Fabian", "Anna"]). Requires SWISSTRIP_TOKEN. Each traveler\'s reduction card is applied automatically.'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: widgetToolMeta(WIDGETS.PRICES_TABLE, 'Fetching prices…', 'Prices ready'),
+    }, async ({ trip_ids, traveler_type, reduction_card, traveler_names }) => {
         try {
-            // Build travelers list — cloud multi-traveler or single manual
             let travelers;
-            let cacheKey;
             if (traveler_names && traveler_names.length > 0 && useCloud) {
-                // Fetch travelers from SwissTrip and match by name
                 const allTravelers = await fetchTravelers();
                 const matched = matchTravelersByName(allTravelers, traveler_names);
                 if (matched.length === 0) {
                     return { content: [{ type: 'text', text: `No matching travelers found. Available: ${allTravelers.map(t => t.first_name).filter(Boolean).join(', ')}. Use list_travelers to see all.` }] };
                 }
                 travelers = matched.map((t, i) => toSmapiTraveler(t, i));
-                cacheKey = `prices:${trip_ids.join(',')}:cloud:${matched.map(t => t.id).join(',')}`;
             }
             else {
                 travelers = [{ id: 'traveler-1', type: traveler_type, reductionCard: reduction_card }];
-                cacheKey = `prices:${trip_ids.join(',')}:${traveler_type}:${reduction_card}`;
             }
-            const cached = cacheGet(cacheKey);
-            if (cached)
-                return { content: [{ type: 'text', text: cached }] };
-            if (useMock) {
-                const prices = await mockGetTripPrices(trip_ids);
-                const text = formatPrices(prices);
-                cacheSet(cacheKey, text, TTL.PRICES);
-                return { content: [{ type: 'text', text }] };
-            }
-            const prices = await getTripPrices(trip_ids, travelers);
-            const text = formatPrices(prices);
-            cacheSet(cacheKey, text, TTL.PRICES);
-            return { content: [{ type: 'text', text }] };
+            const prices = useMock
+                ? await mockGetTripPrices(trip_ids)
+                : await getTripPrices(trip_ids, travelers);
+            return {
+                content: [{ type: 'text', text: formatPrices(prices) }],
+                structuredContent: toPricesTableDTO(prices),
+                _meta: widgetResponseMeta(WIDGETS.PRICES_TABLE),
+            };
         }
         catch (err) {
             return errorResult(err);
         }
     });
     // ─── Tool 6: get_ticket_link ──────────────────────────────────────────
-    server.tool('get_ticket_link', 'Get a direct purchase link to buy a train ticket on SBB.ch. Only call this when the user wants to buy a specific ticket. On mobile with SBB app installed, opens directly in the app with Halbtax/GA applied automatically. Pass traveler_names for family tickets when connected to SwissTrip.', {
-        trip_id: z.string().describe('Trip ID to purchase'),
-        from_name: z.string().describe('Origin station name (e.g. "Zürich HB")'),
-        from_id: z.string().describe('Origin station ID (e.g. "8503000")'),
-        to_name: z.string().describe('Destination station name (e.g. "Bern")'),
-        to_id: z.string().describe('Destination station ID (e.g. "8507000")'),
-        date: z.string().describe('Travel date YYYY-MM-DD'),
-        time: z.string().describe('Departure time HH:MM'),
-        traveler_type: z.enum(['ADULT', 'CHILD']).default('ADULT').describe('Traveler type (used when no traveler_names given)'),
-        reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).default('HALF_FARE').describe('Swiss reduction card (used when no traveler_names given)'),
-        traveler_names: z.array(z.string()).optional().describe('SwissTrip traveler names for family tickets. Requires SWISSTRIP_TOKEN.'),
-    }, { title: 'Get Ticket Link', readOnlyHint: true, destructiveHint: false, idempotentHint: false, openWorldHint: true }, async ({ trip_id, from_name, from_id, to_name, to_id, date, time, traveler_type, reduction_card, traveler_names }) => {
+    server.registerTool('get_ticket_link', {
+        title: 'Get Ticket Link',
+        description: 'Get a direct purchase link to buy a train ticket on SBB.ch. Only call this when the user wants to buy a specific ticket. On mobile with SBB app installed, opens directly in the app with Halbtax/GA applied automatically. Pass traveler_names for family tickets when connected to SwissTrip.',
+        inputSchema: {
+            trip_id: z.string().describe('Trip ID to purchase'),
+            from_name: z.string().describe('Origin station name (e.g. "Zürich HB")'),
+            from_id: z.string().describe('Origin station ID (e.g. "8503000")'),
+            to_name: z.string().describe('Destination station name (e.g. "Bern")'),
+            to_id: z.string().describe('Destination station ID (e.g. "8507000")'),
+            date: z.string().describe('Travel date YYYY-MM-DD'),
+            time: z.string().describe('Departure time HH:MM'),
+            traveler_type: z.enum(['ADULT', 'CHILD']).default('ADULT').describe('Traveler type (used when no traveler_names given)'),
+            reduction_card: z.enum(['HALF_FARE', 'GA', 'NONE']).default('HALF_FARE').describe('Swiss reduction card (used when no traveler_names given)'),
+            traveler_names: z.array(z.string()).optional().describe('SwissTrip traveler names for family tickets. Requires SWISSTRIP_TOKEN.'),
+        },
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: false, openWorldHint: true },
+        _meta: widgetToolMeta(WIDGETS.TICKET_CARD, 'Preparing ticket link…', 'Ticket link ready'),
+    }, async ({ trip_id, from_name, from_id, to_name, to_id, date, time, traveler_type, reduction_card, traveler_names }) => {
         try {
             const sbbLink = buildSbbDeepLink({
                 fromName: from_name,
@@ -364,7 +417,6 @@ export function createSbbMcpServer() {
                 date,
                 time,
             });
-            // Build travelers — cloud multi-traveler or single manual
             let travelers;
             if (traveler_names && traveler_names.length > 0 && useCloud) {
                 const allTravelers = await fetchTravelers();
@@ -376,7 +428,6 @@ export function createSbbMcpServer() {
             else {
                 travelers = [{ id: 'traveler-1', type: traveler_type, reductionCard: reduction_card }];
             }
-            // Try to get affiliate deep link from SMAPI (if live)
             let affiliateLink;
             if (!useMock) {
                 try {
@@ -384,10 +435,25 @@ export function createSbbMcpServer() {
                     affiliateLink = result.affiliateDeepLink;
                 }
                 catch {
-                    // Affiliate link is optional — SBB direct link always works
+                    // Non-fatal
                 }
             }
-            return { content: [{ type: 'text', text: formatTicketLink(trip_id, affiliateLink, sbbLink) }] };
+            const depIso = zurichIso(date, time);
+            return {
+                content: [{ type: 'text', text: formatTicketLink(trip_id, affiliateLink, sbbLink) }],
+                structuredContent: toTicketCardDTO({
+                    tripId: trip_id,
+                    fromName: from_name,
+                    fromId: from_id,
+                    toName: to_name,
+                    toId: to_id,
+                    departureTime: depIso,
+                    arrivalTime: depIso,
+                    primaryLink: sbbLink,
+                    affiliateLink,
+                }),
+                _meta: widgetResponseMeta(WIDGETS.TICKET_CARD),
+            };
         }
         catch (err) {
             return errorResult(err);