diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 155f8ba..4c4d088 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -31,11 +31,23 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <!-- ===== Application ===== -->
+    <!-- usesCleartextTraffic was `true`, commented "allows http if any". There
+         is no http:// endpoint left in the app: every host it talks to —
+         api.doormile.com, queue.workolik.com, the OSM tile server and the OSRM
+         router — is https, and all of them present valid publicly trusted
+         certificates.
+
+         Left on, the flag is a standing invitation: a URL that later arrives
+         from a payload or a config would be fetched in the clear on the
+         rider's mobile network, carrying his session and his position. Off,
+         that request fails and somebody fixes the URL. Turned off alongside
+         the certificate bypass in MyHttpOverrides, which was the other half
+         of the same hole. -->
     <application
         android:label="Doormile Rider"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:usesCleartextTraffic="true"> <!-- allows http if any -->
+        android:usesCleartextTraffic="false">
 
         <!-- No maps key. The Google Maps SDK is no longer used: tiles come
              from OpenStreetMap and routes from OSRM, both keyless, drawn by
diff --git a/lib/background/backgroundservice.dart b/lib/background/backgroundservice.dart
index 6edf304..1630592 100644
--- a/lib/background/backgroundservice.dart
+++ b/lib/background/backgroundservice.dart
@@ -1,981 +1,995 @@
-import 'dart:async';
-import 'dart:convert';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_tts/flutter_tts.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:http/http.dart' as http;
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:audioplayers/audioplayers.dart';
-import 'dart:math' as math;
-
-import 'package:miler/providers/pickuplog/pickuplog_provider.dart';
-import 'package:miler/providers/notifications/notificationservce.dart';
-import 'package:miler/views/helpers/constants/apiconstants.dart';
-import 'package:miler/utils/kalman_filter.dart';
-
-/// Background service for managing active pickup logs
-class BackgroundCollectionLog {
-  static MilerKalmanFilter? _kf;
-  static DateTime? _lastUpdateTime;
-
-  static final CreatePickupLogProvider _logProvider = CreatePickupLogProvider();
-  static final http.Client _httpClient = http.Client();
-  static final FlutterTts _tts = FlutterTts();
-  static final AudioPlayer _proximityPlayer = AudioPlayer();
-
-  static const double _idleThresholdMeters = 10; // ~5-10m tolerance
-  static const double _proximityThresholdMeters =
-      50.0; // 50 meters for arrival alert
-  static const String _activePickupsKey = 'active_pickup';
-  static const String _payloadKeyPrefix = 'pickup_payload_';
-  static const String _offlineLogKey = 'offline_pickup_logs';
-  static const String _proximityAlertKeyPrefix = 'pickup_proximity_alerted_';
-
-  static bool _isPosting = false;
-  static bool _ttsReady = false;
-  static bool _audioReady = false;
-
-  /// Process active Pickups: fetch from API, filter active, and post logs
-  static Future<void> processActivePickups() async {
-    if (_isPosting) {
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Already posting, skipping...');
-      return;
-    }
-    _isPosting = true;
-
-    try {
-      // Get userid from SharedPreferences
-      final prefs = await SharedPreferences.getInstance();
-      final userId = prefs.getInt('userid') ?? prefs.getInt('userId') ?? 0;
-
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Checking for user: $userId');
-
-      if (userId == 0) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] ❌ No user ID found in prefs');
-        return;
-      }
-
-      // Get current date dynamically (YYYY-MM-DD format)
-      final now = DateTime.now();
-      final today = '${now.year}-${_pad(now.month)}-${_pad(now.day)}';
-
-      // Build API URL using v1 endpoint (getpickup)
-      final bool isLive = ApiConstants.mainRoute == 'live';
-      final baseUrl = isLive
-          ? ApiConstants.currentPickupLive
-          : ApiConstants.currentPickupDev;
-
-      final uri = Uri.parse(baseUrl).replace(
-        queryParameters: {
-          'userid': userId.toString(),
-          'fromdate': today,
-          'todate': today,
-          't': DateTime.now().millisecondsSinceEpoch.toString(),
-        },
-      );
-
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Fetching Pickup: $uri');
-
-      // Fetch pickup from API using v1 endpoint
-      final pickups = await _fetchPickupsFromApi(uri);
-
-      debugPrint(
-        '[ACTIVE_COLLECTION_LOG][BG] API returned ${pickups.length} items',
-      );
-
-      // Filter for active bookings only
-      final activeOrders = pickups.whereType<Map<String, dynamic>>().where((
-        Booking,
-      ) {
-        final status = (Booking['orderstatus']?.toString().toLowerCase() ?? '')
-            .trim();
-        final isActive = status == 'active';
-        return isActive;
-      }).toList();
-
-      if (activeOrders.isEmpty) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] No active bookings found');
-        // ✅ Still check shift end even if no active pickup
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] 🔍 Checking shift end time...');
-        await checkShiftEnd();
-        return;
-      }
-
-      debugPrint(
-        '[ACTIVE_COLLECTION_LOG][BG] Found ${activeOrders.length} active Pickup',
-      );
-
-      // Post logs for each active pickup
-      for (final Booking in activeOrders) {
-        final orderId = (Booking['orderid'] ?? '').toString();
-        if (orderId.isEmpty) continue;
-
-        // Get current coordinates once per Booking to reuse for proximity + log
-        final Map<String, String>? coords = await _getCoordinatesWithFallback();
-        if (coords != null) {
-          await _checkProximityAlert(Booking, coords);
-        }
-
-        // Get payload from SharedPreferences or create new one
-        Map<String, dynamic>? payload = await _loadPayload(orderId);
-        if (payload == null) {
-          // Create new payload from Booking data with userId from SharedPreferences
-          payload = _createPayload(Booking, userId);
-          await _persistPayload(orderId, payload);
-          await _markAsActive(orderId);
-        } else {
-          // Ensure userid is set correctly in existing payload
-          payload['userid'] = userId;
-        }
-
-        // Post the log
-        await _postPickupLog(orderId, payload, currentCoords: coords);
-      }
-
-      // ✅ CRITICAL: Check if shift end time has passed (backup to alarm)
-      await checkShiftEnd();
-
-      // Attempt to flush offline logs
-      await _flushOfflineLogs();
-    } catch (e) {
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Error processing: $e');
-    } finally {
-      _isPosting = false;
-    }
-  }
-
-  /// Post pickup log for a specific Booking
-  static Future<void> _postPickupLog(
-    String orderId,
-    Map<String, dynamic> payload, {
-    Map<String, String>? currentCoords,
-  }) async {
-    Map<String, dynamic>? payloadWithCoords;
-    try {
-      // Get current coordinates
-      final coords = currentCoords ?? await _getCoordinatesWithFallback();
-      if (coords == null) {
-        return;
-      }
-
-      // Distance calculation is now fully handled by LiveTrackingService in the background.
-      // 03-14: Removed redundant 60-second background calculations to avoid logic conflicts.
-      final pickupId = payload['pickupid']?.toString() ?? '';
-
-      // Create log date timestamp
-      final now = DateTime.now();
-      final logDate =
-          '${now.year}-${_pad(now.month)}-${_pad(now.day)} ${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
-
-      // Retrieve final cumulative KM to send
-      double riderKmsToSend = 0.0;
-      if (pickupId.isNotEmpty) {
-        try {
-          final prefs = await SharedPreferences.getInstance();
-          riderKmsToSend =
-              double.tryParse(
-                prefs.getString('pickup_tracking_${pickupId}_cumulativeKm') ??
-                    '0',
-              ) ??
-              0.0;
-        } catch (_) {}
-      }
-
-      // Build payload with coordinates and timestamp
-      payloadWithCoords = <String, dynamic>{
-        ...payload,
-        'logdate': logDate,
-        'latitude': coords['lat'] ?? '0',
-        'longitude': coords['lng'] ?? '0',
-        'raw_latitude': coords['raw_lat'] ?? '0',
-        'raw_longitude': coords['raw_lng'] ?? '0',
-        'velocity_lat': coords['velocity_lat'] ?? '0',
-        'velocity_lng': coords['velocity_lng'] ?? '0',
-        'speed': coords['speed'] ?? '0',
-        'heading': coords['heading'] ?? '0',
-        'riderkms': riderKmsToSend,
-        'logstatus': await _resolveLogStatus(orderId, coords),
-      };
-
-      // Determine API endpoint
-      final url = ApiConstants.mainRoute == 'live'
-          ? ApiConstants.createPickupLogLive
-          : ApiConstants.createPickupLogDev;
-
-      // Post the log
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Posting pickup log for $orderId');
-
-      final result = await _logProvider
-          .createPickupLog(payloadWithCoords)
-          .timeout(
-            const Duration(seconds: 8),
-            onTimeout: () =>
-                throw TimeoutException('Pickup log post timeout for $orderId'),
-          );
-
-      if (result != null) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Success for $orderId');
-        await _persistLastLogLocation(orderId, coords);
-      } else {
-        debugPrint(
-          '[ACTIVE_COLLECTION_LOG][BG] Warning: No response for $orderId',
-        );
-      }
-    } catch (e) {
-      debugPrint(
-        '[ACTIVE_COLLECTION_LOG][BG] Failed to post log for $orderId: $e',
-      );
-      // Offline fallback
-      if (payloadWithCoords != null) {
-        await _saveToOfflineQueue(orderId, payloadWithCoords);
-      }
-    }
-  }
-
-  /// Create payload from pickup Booking data
-  static Map<String, dynamic> _createPayload(
-    Map<String, dynamic> pickup,
-    int userId,
-  ) {
-    return <String, dynamic>{
-      'logid': 0,
-      'tenantid': pickup['tenantid'] ?? 0,
-      'partnerid': pickup['partnerid'] ?? 0,
-      'locationid': pickup['locationid'] ?? 0,
-      'orderheaderid': pickup['orderheaderid'] ?? 0,
-      'pickupid': pickup['pickupid'] ?? 0,
-      'userid': userId,
-      'orderid': (pickup['orderid'] ?? '').toString(),
-      'orderstatus': 'active',
-    };
-  }
-
-  /// Get coordinates with fallback (current position -> last known -> cached)
-  static Future<Map<String, String>?> _getCoordinatesWithFallback() async {
-    Map<String, String> result = {
-      'lat': '0',
-      'lng': '0',
-      'raw_lat': '0',
-      'raw_lng': '0',
-      'speed': '0',
-      'heading': '0',
-      'velocity_lat': '0',
-      'velocity_lng': '0',
-    };
-
-    try {
-      // 1. Check if location services are enabled
-      final serviceEnabled = await Geolocator.isLocationServiceEnabled();
-      if (!serviceEnabled) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Location services disabled');
-        return await _getCachedCoordinatesAsMap();
-      }
-
-      // 2. Check permissions
-      final permission = await Geolocator.checkPermission();
-      if (permission == LocationPermission.denied ||
-          permission == LocationPermission.deniedForever) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Location permission denied');
-        return await _getCachedCoordinatesAsMap();
-      }
-
-      Position? position;
-      try {
-        position = await Geolocator.getCurrentPosition(
-          locationSettings: const LocationSettings(
-            accuracy: LocationAccuracy.high,
-          ),
-        ).timeout(const Duration(seconds: 5));
-      } catch (e) {
-        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Failed to get current pos: $e');
-        position = await Geolocator.getLastKnownPosition();
-      }
-
-      if (position != null) {
-        final now = DateTime.now();
-        double outLat = position.latitude;
-        double outLng = position.longitude;
-        double speed = position.speed;
-        double heading = position.heading;
-
-        // Decompose velocity for Kalman
-        final double headingRadians = heading * (math.pi / 180.0);
-        final double velocityLng = speed * math.sin(headingRadians);
-        final double velocityLat = speed * math.cos(headingRadians);
-
-        if (_kf == null) {
-          _kf = MilerKalmanFilter(lat: outLat, lng: outLng);
-        } else {
-          final double dt = _lastUpdateTime != null
-              ? now.difference(_lastUpdateTime!).inMilliseconds / 1000.0
-              : 30.0;
-
-          _kf!.predict(dt);
-          _kf!.update(outLat, outLng);
-          outLat = _kf!.x[0];
-          outLng = _kf!.x[1];
-        }
-        _lastUpdateTime = now;
-
-        result = {
-          'lat': outLat.toString(),
-          'lng': outLng.toString(),
-          'raw_lat': position.latitude.toString(),
-          'raw_lng': position.longitude.toString(),
-          'speed': speed.toStringAsFixed(2),
-          'heading': heading.toStringAsFixed(2),
-          'velocity_lat': velocityLat.toStringAsFixed(4),
-          'velocity_lng': velocityLng.toStringAsFixed(4),
-        };
-
-        await _cacheCoordinates(result['lat']!, result['lng']!);
-        return result;
-      }
-
-      return await _getCachedCoordinatesAsMap();
-    } catch (e) {
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Error getting coords: $e');
-      return await _getCachedCoordinatesAsMap();
-    }
-  }
-
-  static Future<Map<String, String>?> _getCachedCoordinatesAsMap() async {
-    final coords = await _getCachedCoordinates();
-    if (coords == null) return null;
-    return {
-      'lat': coords.$1,
-      'lng': coords.$2,
-      'raw_lat': coords.$1,
-      'raw_lng': coords.$2,
-      'speed': '0',
-      'heading': '0',
-      'velocity_lat': '0',
-      'velocity_lng': '0',
-    };
-  }
-
-  /// Cache coordinates to SharedPreferences
-  static Future<void> _cacheCoordinates(String lat, String lng) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setString('last_lat', lat);
-      await prefs.setString('last_lng', lng);
-    } catch (_) {}
-  }
-
-  /// Get cached coordinates from SharedPreferences
-  static Future<(String, String)?> _getCachedCoordinates() async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final lat = (prefs.getString('last_lat') ?? '').trim();
-      final lng = (prefs.getString('last_lng') ?? '').trim();
-      if (lat.isNotEmpty && lng.isNotEmpty) {
-        return (lat, lng);
-      }
-    } catch (_) {}
-    return null;
-  }
-
-  /// Load payload from SharedPreferences
-  static Future<Map<String, dynamic>?> _loadPayload(String orderId) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final jsonStr = prefs.getString('$_payloadKeyPrefix$orderId');
-      if (jsonStr == null || jsonStr.isEmpty) return null;
-      final decoded = jsonDecode(jsonStr);
-      if (decoded is Map<String, dynamic>) return decoded;
-      if (decoded is Map) return decoded.cast<String, dynamic>();
-    } catch (_) {}
-    return null;
-  }
-
-  /// Persist payload to SharedPreferences
-  static Future<void> _persistPayload(
-    String orderId,
-    Map<String, dynamic> payload,
-  ) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setString('$_payloadKeyPrefix$orderId', jsonEncode(payload));
-    } catch (_) {}
-  }
-
-  /// Mark Booking as active in SharedPreferences
-  static Future<void> _markAsActive(String orderId) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final list = prefs.getStringList(_activePickupsKey) ?? <String>[];
-      if (!list.contains(orderId)) {
-        list.add(orderId);
-        await prefs.setStringList(_activePickupsKey, list);
-      }
-    } catch (_) {}
-  }
-
-  /// Fetch pickup from API using v1 endpoint
-  static Future<List<dynamic>> _fetchPickupsFromApi(Uri uri) async {
-    try {
-      final res = await _httpClient
-          .get(uri)
-          .timeout(const Duration(seconds: 10));
-
-      if (res.statusCode >= 200 && res.statusCode < 300) {
-        final decoded = json.decode(res.body);
-
-        final data = decoded is Map<String, dynamic>
-            ? (decoded['details'] ?? decoded['data'] ?? decoded)
-            : decoded;
-
-        if (data is List) {
-          return data;
-        }
-        if (data is Map && data['items'] is List) {
-          return data['items'] as List;
-        }
-
-        return [];
-      }
-      return [];
-    } catch (e) {
-      return [];
-    }
-  }
-
-  /// Helper to pad numbers with leading zero
-  static String _pad(int n) => n.toString().padLeft(2, '0');
-
-  static Future<int> _resolveLogStatus(
-    String orderId,
-    Map<String, String> coords,
-  ) async {
-    try {
-      final last = await _loadLastLogLocation(orderId);
-      if (last != null) {
-        final lastLat = last.$1;
-        final lastLng = last.$2;
-        final currentLat = double.tryParse(coords['lat'] ?? '0') ?? 0;
-        final currentLng = double.tryParse(coords['lng'] ?? '0') ?? 0;
-        if (currentLat != 0 &&
-            currentLng != 0 &&
-            lastLat != 0 &&
-            lastLng != 0) {
-          final distance = Geolocator.distanceBetween(
-            lastLat,
-            lastLng,
-            currentLat,
-            currentLng,
-          );
-          if (distance <= _idleThresholdMeters) {
-            return 1; // idle
-          }
-        }
-      }
-    } catch (e) {
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG] logstatus error: $e');
-    }
-    return 0; // moving
-  }
-
-  static Future<(double, double)?> _loadLastLogLocation(String orderId) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final jsonStr = prefs.getString('last_log_loc_$orderId');
-      if (jsonStr == null || jsonStr.isEmpty) return null;
-      final decoded = jsonDecode(jsonStr);
-      if (decoded is Map<String, dynamic>) {
-        final lat = double.tryParse('${decoded['lat']}') ?? 0;
-        final lng = double.tryParse('${decoded['lng']}') ?? 0;
-        if (lat != 0 && lng != 0) return (lat, lng);
-      }
-    } catch (_) {}
-    return null;
-  }
-
-  static Future<void> _persistLastLogLocation(
-    String orderId,
-    Map<String, String> coords,
-  ) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setString(
-        'last_log_loc_$orderId',
-        jsonEncode({'lat': coords['lat'], 'lng': coords['lng']}),
-      );
-    } catch (_) {}
-  }
-
-  // ---------------- Offline Queue Logic ----------------
-
-  static Future<void> _flushOfflineLogs() async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final List<String> queue = prefs.getStringList(_offlineLogKey) ?? [];
-      if (queue.isEmpty) return;
-
-      debugPrint(
-        '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Flushing ${queue.length} offline logs...',
-      );
-
-      final List<String> remaining = [];
-      bool anySuccess = false;
-
-      final url = ApiConstants.mainRoute == 'live'
-          ? ApiConstants.createPickupLogLive
-          : ApiConstants.createPickupLogDev;
-
-      for (final itemStr in queue) {
-        try {
-          final Map<String, dynamic> item = jsonDecode(itemStr);
-          final String orderId = item['orderId'] ?? '';
-          final Map<String, dynamic> payload = Map<String, dynamic>.from(
-            item['payload'] ?? {},
-          );
-
-          if (payload.isEmpty) continue;
-
-          debugPrint(
-            '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Retrying for orderId: $orderId',
-          );
-
-          final result = await _logProvider
-              .createPickupLog(payload)
-              .timeout(const Duration(seconds: 8));
-
-          if (result != null) {
-            debugPrint(
-              '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Success for orderId: $orderId',
-            );
-            anySuccess = true;
-          } else {
-            remaining.add(itemStr);
-          }
-        } catch (e) {
-          remaining.add(itemStr);
-        }
-      }
-
-      if (anySuccess || remaining.length != queue.length) {
-        await prefs.setStringList(_offlineLogKey, remaining);
-      }
-    } catch (e) {
-      debugPrint('[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Flush error: $e');
-    }
-  }
-
-  static Future<void> _saveToOfflineQueue(
-    String orderId,
-    Map<String, dynamic> payload,
-  ) async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      final List<String> queue = prefs.getStringList(_offlineLogKey) ?? [];
-
-      final item = jsonEncode({
-        'orderId': orderId,
-        'payload': payload,
-        'timestamp': DateTime.now().millisecondsSinceEpoch,
-      });
-
-      queue.add(item);
-      await prefs.setStringList(_offlineLogKey, queue);
-      debugPrint(
-        '[ACTIVE_PICKUP_LOG][BG][OFFLINE] Saved to queue. Total: ${queue.length}',
-      );
-    } catch (e) {
-      debugPrint('[ACTIVE_PICKUP_LOG][BG][OFFLINE] Error saving to queue: $e');
-    }
-  }
-
-  // ---------------- Auto Shift End Logic ----------------
-
-  /// Check if shift has ended and trigger auto-break if needed
-  static Future<void> checkShiftEnd() async {
-    try {
-      debugPrint('[AUTO_SHIFT_END] 🔍 Starting shift end check...');
-      final prefs = await SharedPreferences.getInstance();
-
-      // 1. Check if currently On Duty
-      final int onduty = prefs.getInt('onduty') ?? 0;
-      debugPrint('[AUTO_SHIFT_END] 📊 Current onduty status: $onduty');
-      if (onduty != 1) {
-        debugPrint('[AUTO_SHIFT_END] ⏭️ Rider not on duty, skipping check');
-        return; // Already offline
-      }
-
-      // 2. Get Shift Timings
-      final String startTimeStr = prefs.getString('starttime') ?? '';
-      final String endTimeStr = prefs.getString('endtime') ?? '';
-      debugPrint(
-        '[AUTO_SHIFT_END] ⏰ Shift times - Start: "$startTimeStr", End: "$endTimeStr"',
-      );
-
-      if (endTimeStr.isEmpty) {
-        debugPrint(
-          '[AUTO_SHIFT_END] ⚠️ No endtime found, cannot check shift end',
-        );
-        return;
-      }
-
-      // 3. Parse Times (Assumed format HH:mm:ss)
-      final now = DateTime.now();
-
-      final endParts = endTimeStr.split(':');
-      if (endParts.length < 2) return;
-
-      final int endHour = int.tryParse(endParts[0]) ?? 0;
-      final int endMinute = int.tryParse(endParts[1]) ?? 0;
-      final int endSecond = endParts.length > 2
-          ? (int.tryParse(endParts[2]) ?? 0)
-          : 0;
-
-      // Create DateTime for end time on TODAY
-      final DateTime endToday = DateTime(
-        now.year,
-        now.month,
-        now.day,
-        endHour,
-        endMinute,
-        endSecond,
-      );
-
-      bool isShiftOver = false;
-
-      if (startTimeStr.isNotEmpty) {
-        final startParts = startTimeStr.split(':');
-        if (startParts.length >= 2) {
-          final int startHour = int.tryParse(startParts[0]) ?? 0;
-          final int startMinute = int.tryParse(startParts[1]) ?? 0;
-
-          // Create DateTime for start time on TODAY
-          final DateTime startToday = DateTime(
-            now.year,
-            now.month,
-            now.day,
-            startHour,
-            startMinute,
-          );
-
-          // Check for overnight shift (Start > End in 24-hour format, e.g. 22:00 to 06:00)
-          // This means shift crosses midnight
-          final double startVal = startHour + (startMinute / 60.0);
-          final double endVal = endHour + (endMinute / 60.0);
-
-          if (startVal > endVal) {
-            // ✅ OVERNIGHT SHIFT (crosses midnight, e.g. 22:00 to 06:00)
-            // Shift is over if current time is AFTER end time today AND BEFORE start time today
-            // Example: End 06:00, Start 22:00
-            // - Now 23:00 -> After 22:00 (start) -> Still in shift (ACTIVE)
-            // - Now 05:00 -> Before 06:00 (end) -> Still in shift from yesterday (ACTIVE)
-            // - Now 10:00 -> After 06:00 (end) AND Before 22:00 (start) -> Shift OVER
-
-            debugPrint(
-              '[AUTO_SHIFT_END] 🌙 Overnight shift detected (Start: ${_pad(startHour)}:${_pad(startMinute)}, End: ${_pad(endHour)}:${_pad(endMinute)})',
-            );
-            debugPrint(
-              '[AUTO_SHIFT_END] 📅 Current time: ${_pad(now.hour)}:${_pad(now.minute)}',
-            );
-
-            if (now.isAfter(endToday) && now.isBefore(startToday)) {
-              // We're in the gap period between end and start -> shift is OVER
-              isShiftOver = true;
-              debugPrint(
-                '[AUTO_SHIFT_END] ✅ Overnight shift: In gap period -> SHIFT OVER',
-              );
-            } else {
-              // We're either before end (still in shift from yesterday) or after start (still in shift today)
-              isShiftOver = false;
-              debugPrint('[AUTO_SHIFT_END] ✅ Overnight shift: Still active');
-            }
-          } else {
-            // ✅ NORMAL DAY SHIFT (e.g. 09:00 to 17:00, doesn't cross midnight)
-            // Shift is over if current time is AFTER end time
-            debugPrint(
-              '[AUTO_SHIFT_END] ☀️ Day shift detected (Start: ${_pad(startHour)}:${_pad(startMinute)}, End: ${_pad(endHour)}:${_pad(endMinute)})',
-            );
-            debugPrint(
-              '[AUTO_SHIFT_END] 📅 Current time: ${_pad(now.hour)}:${_pad(now.minute)}, End time: ${_pad(endHour)}:${_pad(endMinute)}',
-            );
-
-            if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
-              isShiftOver = true;
-              debugPrint('[AUTO_SHIFT_END] ✅ Day shift: Shift ended');
-            } else {
-              isShiftOver = false;
-              debugPrint('[AUTO_SHIFT_END] ✅ Day shift: Still active');
-            }
-          }
-        } else {
-          // Fallback if start time parse fails: assume day shift
-          debugPrint(
-            '[AUTO_SHIFT_END] ⚠️ Could not parse start time, assuming day shift',
-          );
-          if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
-            isShiftOver = true;
-          }
-        }
-      } else {
-        // Fallback if no start time: assume day shift
-        debugPrint(
-          '[AUTO_SHIFT_END] ⚠️ No start time provided, assuming day shift',
-        );
-        if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
-          isShiftOver = true;
-        }
-      }
-
-      // 4. Trigger Auto End if Shift is Over
-      debugPrint(
-        '[AUTO_SHIFT_END] 📅 Time check result - isShiftOver: $isShiftOver, Current: ${_pad(now.hour)}:${_pad(now.minute)}, End: ${_pad(endHour)}:${_pad(endMinute)}',
-      );
-      if (isShiftOver) {
-        debugPrint(
-          '[AUTO_SHIFT_END] ⏰ Shift ended (Start: $startTimeStr, End: $endTimeStr). Current: ${_pad(now.hour)}:${_pad(now.minute)}',
-        );
-        await _autoEndShift(prefs);
-      } else {
-        debugPrint('[AUTO_SHIFT_END] ✅ Shift not ended yet, continuing...');
-      }
-    } catch (e) {
-      debugPrint('[AUTO_SHIFT_END] ❌ Error checking shift end: $e');
-      debugPrint('[AUTO_SHIFT_END] Stack trace: ${StackTrace.current}');
-    }
-  }
-
-  static Future<void> _autoEndShift(SharedPreferences prefs) async {
-    try {
-      debugPrint(
-        '[AUTO_SHIFT_END] 🚀 Initiating auto-break and offline sequence...',
-      );
-
-      // 1. Get Required IDs
-      final int userid = prefs.getInt('userid') ?? prefs.getInt('userId') ?? 0;
-      final int partnerid =
-          prefs.getInt('partnerid') ?? prefs.getInt('partnerId') ?? 0;
-      final int shiftid =
-          prefs.getInt('shiftid') ?? prefs.getInt('shiftId') ?? 0;
-      final int logid = prefs.getInt('logid') ?? prefs.getInt('logId') ?? 0;
-
-      if (userid == 0) {
-        debugPrint(
-          '[AUTO_SHIFT_END] ❌ Missing userid, cannot create break log',
-        );
-        return;
-      }
-
-      // 2. Get Location
-      final Map<String, String>? coords = await _getCoordinatesWithFallback();
-      final String lat = coords?['lat'] ?? '0';
-      final String lng = coords?['lng'] ?? '0';
-
-      // 3. Prepare Break Log Payload
-      final now = DateTime.now();
-      final int localBreakId =
-          (DateTime.now().millisecondsSinceEpoch % 900) + 100; // Random-ish ID
-      final String breakdate =
-          '${now.year}-${_pad(now.month)}-${_pad(now.day)} ${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
-      final String breakstart =
-          '${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
-
-      final payload = <String, dynamic>{
-        "breakid": localBreakId,
-        "logid": logid,
-        "breakdate": breakdate,
-        "userid": userid,
-        "partnerid": partnerid,
-        "shiftid": shiftid,
-        "breakstart": breakstart,
-        "breakend": "",
-        "breakhours": 0.0,
-        "latitude": lat,
-        "longitude": lng,
-      };
-
-      // 4. Call API to Create Break
-      final url = ApiConstants.mainRoute == 'live'
-          ? ApiConstants.createBreakRiderLogLive
-          : ApiConstants.createBreakRiderLogDev;
-
-      debugPrint('[AUTO_SHIFT_END] Creating break log: $url');
-
-      // We use a separate provider instance or http call if needed,
-      // but _logProvider is for pickup logs. We need a generic post or use http directly.
-      // Since we don't have BreakRiderLogProvider here, we'll use http directly for simplicity and isolation.
-
-      try {
-        final response = await _httpClient
-            .post(
-              Uri.parse(url),
-              headers: {'Content-Type': 'application/json'},
-              body: jsonEncode(payload),
-            )
-            .timeout(const Duration(seconds: 10));
-
-        if (response.statusCode >= 200 && response.statusCode < 300) {
-          debugPrint('[AUTO_SHIFT_END] ✅ Break log created successfully');
-
-          // Parse response to get server break ID if needed, but mainly we just need to go offline
-          final body = jsonDecode(response.body);
-          final det = (body['details'] is Map) ? body['details'] : body;
-          final serverBreakId = det['breakid'];
-
-          if (serverBreakId != null) {
-            await prefs.setInt(
-              'breakId',
-              int.tryParse('$serverBreakId') ?? localBreakId,
-            );
-          }
-          await prefs.setString('breakStart', breakstart);
-          await prefs.setInt('break_start_epoch', now.millisecondsSinceEpoch);
-        } else {
-          debugPrint(
-            '[AUTO_SHIFT_END] ⚠️ Failed to create break log: ${response.statusCode}',
-          );
-        }
-      } catch (e) {
-        debugPrint('[AUTO_SHIFT_END] ❌ API Error: $e');
-        // Even if API fails, we MUST go offline locally to prevent further issues
-      }
-
-      // 5. Set Offline Locally
-      await prefs.setInt('onduty', 0);
-      await prefs.setBool('online', false);
-
-      // 6. Update Rider Log (Set Duty = 0)
-      // We should also update the main rider log to say onduty=0
-      final updateUrl = ApiConstants.mainRoute == 'live'
-          ? ApiConstants.updateRiderLogLive
-          : ApiConstants.updateRiderLogDev;
-
-      final updatePayload = {
-        "userid": userid,
-        "onduty": 0,
-        "latitude": lat,
-        "longitude": lng,
-      };
-
-      try {
-        await _httpClient
-            .post(
-              Uri.parse(updateUrl),
-              headers: {'Content-Type': 'application/json'},
-              body: jsonEncode(updatePayload),
-            )
-            .timeout(const Duration(seconds: 5));
-        debugPrint('[AUTO_SHIFT_END] ✅ Rider status updated to Offline');
-      } catch (_) {}
-
-      debugPrint('[AUTO_SHIFT_END] 🏁 Auto-shift end sequence complete.');
-    } catch (e) {
-      debugPrint('[AUTO_SHIFT_END] Critical error in _autoEndShift: $e');
-    }
-  }
-
-  /// Trigger proximity alert once per pickup when within threshold
-  static Future<void> _checkProximityAlert(
-    Map<String, dynamic> Booking,
-    Map<String, String> coords,
-  ) async {
-    try {
-      final pickupId = (Booking['pickupid'] ?? Booking['orderid'] ?? '')
-          .toString();
-      if (pickupId.isEmpty) return;
-
-      final dropLatRaw =
-          (Booking['droplat'] ??
-                  Booking['DropLat'] ??
-                  Booking['pickuplat'] ??
-                  '')
-              .toString();
-      final dropLngRaw =
-          (Booking['droplon'] ??
-                  Booking['droplong'] ??
-                  Booking['DropLon'] ??
-                  Booking['DropLong'] ??
-                  Booking['pickuplong'] ??
-                  '')
-              .toString();
-      final dropLat = double.tryParse(dropLatRaw) ?? 0.0;
-      final dropLng = double.tryParse(dropLngRaw) ?? 0.0;
-      if (dropLat == 0 ||
-          dropLng == 0 ||
-          dropLat.abs() > 90 ||
-          dropLng.abs() > 180) {
-        return;
-      }
-
-      final riderLat = double.tryParse(coords['lat'] ?? '0') ?? 0.0;
-      final riderLng = double.tryParse(coords['lng'] ?? '0') ?? 0.0;
-      if (riderLat == 0 ||
-          riderLng == 0 ||
-          riderLat.abs() > 90 ||
-          riderLng.abs() > 180) {
-        return;
-      }
-
-      final distanceMeters = Geolocator.distanceBetween(
-        dropLat,
-        dropLng,
-        riderLat,
-        riderLng,
-      );
-
-      if (distanceMeters <= _proximityThresholdMeters) {
-        await NotificationServce.showLocalNotification(
-          title: 'Near pickup location',
-          body: 'You’ve reached your destination. Please update the status.',
-        );
-
-        final played = await _playProximityAudio();
-
-        debugPrint(
-          '[PROXIMITY] Alerted pickupId=$pickupId at ${distanceMeters.toStringAsFixed(1)}m '
-          'target=($dropLat,$dropLng) rider=($riderLat,$riderLng) played=$played',
-        );
-      } else {
-        debugPrint(
-          '[PROXIMITY] Skipped alert for pickupId=$pickupId | distance=${distanceMeters.toStringAsFixed(1)}m',
-        );
-      }
-    } catch (e) {
-      debugPrint('[PROXIMITY] Error sending alert: $e');
-    }
-  }
-
-  static Future<bool> _playProximityAudio() async {
-    try {
-      if (!_audioReady) {
-        await _proximityPlayer.setReleaseMode(ReleaseMode.stop);
-        await _proximityPlayer.setVolume(1.0);
-        _audioReady = true;
-      }
-      // Attempt to play bundled destination audio
-      await _proximityPlayer.stop();
-      await _proximityPlayer.play(AssetSource('audio/destination.mp3'));
-      debugPrint('[PROXIMITY][AUDIO] Playing destination.mp3');
-      return true;
-    } catch (e) {
-      debugPrint('[PROXIMITY][AUDIO] Error playing destination clip: $e');
-    }
-
-    // Fallback to TTS if audio fails
-    try {
-      // Initialize once
-      if (!_ttsReady) {
-        await _tts.setLanguage('en-US');
-        await _tts.setSpeechRate(0.9);
-        await _tts.setVolume(1.0);
-        await _tts.setPitch(1.0);
-        _ttsReady = true;
-      }
-      // Speak without awaiting completion to avoid blocking
-      await _tts.speak(
-        'You have reached your destination. Please update the pickup status.',
-      );
-      debugPrint('[PROXIMITY][TTS] Spoke destination prompt');
-      return true;
-    } catch (e) {
-      debugPrint('[PROXIMITY][TTS] Error speaking prompt: $e');
-    }
-    return false;
-  }
-}
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_tts/flutter_tts.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:http/http.dart' as http;
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:audioplayers/audioplayers.dart';
+import 'dart:math' as math;
+
+import 'package:miler/providers/pickuplog/pickuplog_provider.dart';
+import 'package:miler/data/device_telemetry.dart';
+import 'package:miler/providers/notifications/notificationservce.dart';
+import 'package:miler/views/helpers/constants/apiconstants.dart';
+import 'package:miler/utils/kalman_filter.dart';
+
+/// Background service for managing active pickup logs
+class BackgroundCollectionLog {
+  static MilerKalmanFilter? _kf;
+  static DateTime? _lastUpdateTime;
+
+  static final CreatePickupLogProvider _logProvider = CreatePickupLogProvider();
+  static final http.Client _httpClient = http.Client();
+  static final FlutterTts _tts = FlutterTts();
+  static final AudioPlayer _proximityPlayer = AudioPlayer();
+
+  static const double _idleThresholdMeters = 10; // ~5-10m tolerance
+  static const double _proximityThresholdMeters =
+      50.0; // 50 meters for arrival alert
+  static const String _activePickupsKey = 'active_pickup';
+  static const String _payloadKeyPrefix = 'pickup_payload_';
+  static const String _offlineLogKey = 'offline_pickup_logs';
+  static const String _proximityAlertKeyPrefix = 'pickup_proximity_alerted_';
+
+  static bool _isPosting = false;
+  static bool _ttsReady = false;
+  static bool _audioReady = false;
+
+  /// Process active Pickups: fetch from API, filter active, and post logs
+  static Future<void> processActivePickups() async {
+    if (_isPosting) {
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Already posting, skipping...');
+      return;
+    }
+    _isPosting = true;
+
+    try {
+      // Get userid from SharedPreferences
+      final prefs = await SharedPreferences.getInstance();
+      final userId = prefs.getInt('userid') ?? prefs.getInt('userId') ?? 0;
+
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Checking for user: $userId');
+
+      if (userId == 0) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] ❌ No user ID found in prefs');
+        return;
+      }
+
+      // Get current date dynamically (YYYY-MM-DD format)
+      final now = DateTime.now();
+      final today = '${now.year}-${_pad(now.month)}-${_pad(now.day)}';
+
+      // Build API URL using v1 endpoint (getpickup)
+      final bool isLive = ApiConstants.mainRoute == 'live';
+      final baseUrl = isLive
+          ? ApiConstants.currentPickupLive
+          : ApiConstants.currentPickupDev;
+
+      final uri = Uri.parse(baseUrl).replace(
+        queryParameters: {
+          'userid': userId.toString(),
+          'fromdate': today,
+          'todate': today,
+          't': DateTime.now().millisecondsSinceEpoch.toString(),
+        },
+      );
+
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Fetching Pickup: $uri');
+
+      // Fetch pickup from API using v1 endpoint
+      final pickups = await _fetchPickupsFromApi(uri);
+
+      debugPrint(
+        '[ACTIVE_COLLECTION_LOG][BG] API returned ${pickups.length} items',
+      );
+
+      // Filter for active bookings only
+      final activeOrders = pickups.whereType<Map<String, dynamic>>().where((
+        Booking,
+      ) {
+        final status = (Booking['orderstatus']?.toString().toLowerCase() ?? '')
+            .trim();
+        final isActive = status == 'active';
+        return isActive;
+      }).toList();
+
+      if (activeOrders.isEmpty) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] No active bookings found');
+        // ✅ Still check shift end even if no active pickup
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] 🔍 Checking shift end time...');
+        await checkShiftEnd();
+        return;
+      }
+
+      debugPrint(
+        '[ACTIVE_COLLECTION_LOG][BG] Found ${activeOrders.length} active Pickup',
+      );
+
+      // Post logs for each active pickup
+      for (final Booking in activeOrders) {
+        final orderId = (Booking['orderid'] ?? '').toString();
+        if (orderId.isEmpty) continue;
+
+        // Get current coordinates once per Booking to reuse for proximity + log
+        final Map<String, String>? coords = await _getCoordinatesWithFallback();
+        if (coords != null) {
+          await _checkProximityAlert(Booking, coords);
+        }
+
+        // Get payload from SharedPreferences or create new one
+        Map<String, dynamic>? payload = await _loadPayload(orderId);
+        if (payload == null) {
+          // Create new payload from Booking data with userId from SharedPreferences
+          payload = _createPayload(Booking, userId);
+          await _persistPayload(orderId, payload);
+          await _markAsActive(orderId);
+        } else {
+          // Ensure userid is set correctly in existing payload
+          payload['userid'] = userId;
+        }
+
+        // Post the log
+        await _postPickupLog(orderId, payload, currentCoords: coords);
+      }
+
+      // ✅ CRITICAL: Check if shift end time has passed (backup to alarm)
+      await checkShiftEnd();
+
+      // Attempt to flush offline logs
+      await _flushOfflineLogs();
+    } catch (e) {
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Error processing: $e');
+    } finally {
+      _isPosting = false;
+    }
+  }
+
+  /// Post pickup log for a specific Booking
+  static Future<void> _postPickupLog(
+    String orderId,
+    Map<String, dynamic> payload, {
+    Map<String, String>? currentCoords,
+  }) async {
+    Map<String, dynamic>? payloadWithCoords;
+    try {
+      // Get current coordinates
+      final coords = currentCoords ?? await _getCoordinatesWithFallback();
+      if (coords == null) {
+        return;
+      }
+
+      // Distance calculation is now fully handled by LiveTrackingService in the background.
+      // 03-14: Removed redundant 60-second background calculations to avoid logic conflicts.
+      final pickupId = payload['pickupid']?.toString() ?? '';
+
+      // Create log date timestamp
+      final now = DateTime.now();
+      final logDate =
+          '${now.year}-${_pad(now.month)}-${_pad(now.day)} ${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
+
+      // Retrieve final cumulative KM to send
+      double riderKmsToSend = 0.0;
+      if (pickupId.isNotEmpty) {
+        try {
+          final prefs = await SharedPreferences.getInstance();
+          riderKmsToSend =
+              double.tryParse(
+                prefs.getString('pickup_tracking_${pickupId}_cumulativeKm') ??
+                    '0',
+              ) ??
+              0.0;
+        } catch (_) {}
+      }
+
+      // ── The handset's state rides with the breadcrumb ──
+      //
+      // `POST /miler/consignments/logs` carries `battery` and `is_background`,
+      // and the provider forwards both — but this payload never put them in,
+      // so every per-stop breadcrumb reached the console with a position and
+      // nothing to explain a gap in the trail. Read from the same place the
+      // rider heartbeat reads it. See [DeviceTelemetry].
+      final telemetry = await DeviceTelemetry.read(locationService: coords['status']);
+
+      // Build payload with coordinates and timestamp
+      payloadWithCoords = <String, dynamic>{
+        ...payload,
+        ...telemetry.toPayload(),
+        // This posts from the background isolate, which is the whole point of
+        // it — it is what keeps the trail alive while the app is off screen.
+        'is_background': true,
+        'logdate': logDate,
+        'latitude': coords['lat'] ?? '0',
+        'longitude': coords['lng'] ?? '0',
+        'raw_latitude': coords['raw_lat'] ?? '0',
+        'raw_longitude': coords['raw_lng'] ?? '0',
+        'velocity_lat': coords['velocity_lat'] ?? '0',
+        'velocity_lng': coords['velocity_lng'] ?? '0',
+        'speed': coords['speed'] ?? '0',
+        'heading': coords['heading'] ?? '0',
+        'riderkms': riderKmsToSend,
+        'logstatus': await _resolveLogStatus(orderId, coords),
+      };
+
+      // Determine API endpoint
+      final url = ApiConstants.mainRoute == 'live'
+          ? ApiConstants.createPickupLogLive
+          : ApiConstants.createPickupLogDev;
+
+      // Post the log
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Posting pickup log for $orderId');
+
+      final result = await _logProvider
+          .createPickupLog(payloadWithCoords)
+          .timeout(
+            const Duration(seconds: 8),
+            onTimeout: () =>
+                throw TimeoutException('Pickup log post timeout for $orderId'),
+          );
+
+      if (result != null) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Success for $orderId');
+        await _persistLastLogLocation(orderId, coords);
+      } else {
+        debugPrint(
+          '[ACTIVE_COLLECTION_LOG][BG] Warning: No response for $orderId',
+        );
+      }
+    } catch (e) {
+      debugPrint(
+        '[ACTIVE_COLLECTION_LOG][BG] Failed to post log for $orderId: $e',
+      );
+      // Offline fallback
+      if (payloadWithCoords != null) {
+        await _saveToOfflineQueue(orderId, payloadWithCoords);
+      }
+    }
+  }
+
+  /// Create payload from pickup Booking data
+  static Map<String, dynamic> _createPayload(
+    Map<String, dynamic> pickup,
+    int userId,
+  ) {
+    return <String, dynamic>{
+      'logid': 0,
+      'tenantid': pickup['tenantid'] ?? 0,
+      'partnerid': pickup['partnerid'] ?? 0,
+      'locationid': pickup['locationid'] ?? 0,
+      'orderheaderid': pickup['orderheaderid'] ?? 0,
+      'pickupid': pickup['pickupid'] ?? 0,
+      'userid': userId,
+      'orderid': (pickup['orderid'] ?? '').toString(),
+      'orderstatus': 'active',
+    };
+  }
+
+  /// Get coordinates with fallback (current position -> last known -> cached)
+  static Future<Map<String, String>?> _getCoordinatesWithFallback() async {
+    Map<String, String> result = {
+      'lat': '0',
+      'lng': '0',
+      'raw_lat': '0',
+      'raw_lng': '0',
+      'speed': '0',
+      'heading': '0',
+      'velocity_lat': '0',
+      'velocity_lng': '0',
+    };
+
+    try {
+      // 1. Check if location services are enabled
+      final serviceEnabled = await Geolocator.isLocationServiceEnabled();
+      if (!serviceEnabled) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Location services disabled');
+        return await _getCachedCoordinatesAsMap();
+      }
+
+      // 2. Check permissions
+      final permission = await Geolocator.checkPermission();
+      if (permission == LocationPermission.denied ||
+          permission == LocationPermission.deniedForever) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Location permission denied');
+        return await _getCachedCoordinatesAsMap();
+      }
+
+      Position? position;
+      try {
+        position = await Geolocator.getCurrentPosition(
+          locationSettings: const LocationSettings(
+            accuracy: LocationAccuracy.high,
+          ),
+        ).timeout(const Duration(seconds: 5));
+      } catch (e) {
+        debugPrint('[ACTIVE_COLLECTION_LOG][BG] Failed to get current pos: $e');
+        position = await Geolocator.getLastKnownPosition();
+      }
+
+      if (position != null) {
+        final now = DateTime.now();
+        double outLat = position.latitude;
+        double outLng = position.longitude;
+        double speed = position.speed;
+        double heading = position.heading;
+
+        // Decompose velocity for Kalman
+        final double headingRadians = heading * (math.pi / 180.0);
+        final double velocityLng = speed * math.sin(headingRadians);
+        final double velocityLat = speed * math.cos(headingRadians);
+
+        if (_kf == null) {
+          _kf = MilerKalmanFilter(lat: outLat, lng: outLng);
+        } else {
+          final double dt = _lastUpdateTime != null
+              ? now.difference(_lastUpdateTime!).inMilliseconds / 1000.0
+              : 30.0;
+
+          _kf!.predict(dt);
+          _kf!.update(outLat, outLng);
+          outLat = _kf!.x[0];
+          outLng = _kf!.x[1];
+        }
+        _lastUpdateTime = now;
+
+        result = {
+          'lat': outLat.toString(),
+          'lng': outLng.toString(),
+          'raw_lat': position.latitude.toString(),
+          'raw_lng': position.longitude.toString(),
+          'speed': speed.toStringAsFixed(2),
+          'heading': heading.toStringAsFixed(2),
+          'velocity_lat': velocityLat.toStringAsFixed(4),
+          'velocity_lng': velocityLng.toStringAsFixed(4),
+        };
+
+        await _cacheCoordinates(result['lat']!, result['lng']!);
+        return result;
+      }
+
+      return await _getCachedCoordinatesAsMap();
+    } catch (e) {
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] Error getting coords: $e');
+      return await _getCachedCoordinatesAsMap();
+    }
+  }
+
+  static Future<Map<String, String>?> _getCachedCoordinatesAsMap() async {
+    final coords = await _getCachedCoordinates();
+    if (coords == null) return null;
+    return {
+      'lat': coords.$1,
+      'lng': coords.$2,
+      'raw_lat': coords.$1,
+      'raw_lng': coords.$2,
+      'speed': '0',
+      'heading': '0',
+      'velocity_lat': '0',
+      'velocity_lng': '0',
+    };
+  }
+
+  /// Cache coordinates to SharedPreferences
+  static Future<void> _cacheCoordinates(String lat, String lng) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('last_lat', lat);
+      await prefs.setString('last_lng', lng);
+    } catch (_) {}
+  }
+
+  /// Get cached coordinates from SharedPreferences
+  static Future<(String, String)?> _getCachedCoordinates() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final lat = (prefs.getString('last_lat') ?? '').trim();
+      final lng = (prefs.getString('last_lng') ?? '').trim();
+      if (lat.isNotEmpty && lng.isNotEmpty) {
+        return (lat, lng);
+      }
+    } catch (_) {}
+    return null;
+  }
+
+  /// Load payload from SharedPreferences
+  static Future<Map<String, dynamic>?> _loadPayload(String orderId) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonStr = prefs.getString('$_payloadKeyPrefix$orderId');
+      if (jsonStr == null || jsonStr.isEmpty) return null;
+      final decoded = jsonDecode(jsonStr);
+      if (decoded is Map<String, dynamic>) return decoded;
+      if (decoded is Map) return decoded.cast<String, dynamic>();
+    } catch (_) {}
+    return null;
+  }
+
+  /// Persist payload to SharedPreferences
+  static Future<void> _persistPayload(
+    String orderId,
+    Map<String, dynamic> payload,
+  ) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('$_payloadKeyPrefix$orderId', jsonEncode(payload));
+    } catch (_) {}
+  }
+
+  /// Mark Booking as active in SharedPreferences
+  static Future<void> _markAsActive(String orderId) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final list = prefs.getStringList(_activePickupsKey) ?? <String>[];
+      if (!list.contains(orderId)) {
+        list.add(orderId);
+        await prefs.setStringList(_activePickupsKey, list);
+      }
+    } catch (_) {}
+  }
+
+  /// Fetch pickup from API using v1 endpoint
+  static Future<List<dynamic>> _fetchPickupsFromApi(Uri uri) async {
+    try {
+      final res = await _httpClient
+          .get(uri)
+          .timeout(const Duration(seconds: 10));
+
+      if (res.statusCode >= 200 && res.statusCode < 300) {
+        final decoded = json.decode(res.body);
+
+        final data = decoded is Map<String, dynamic>
+            ? (decoded['details'] ?? decoded['data'] ?? decoded)
+            : decoded;
+
+        if (data is List) {
+          return data;
+        }
+        if (data is Map && data['items'] is List) {
+          return data['items'] as List;
+        }
+
+        return [];
+      }
+      return [];
+    } catch (e) {
+      return [];
+    }
+  }
+
+  /// Helper to pad numbers with leading zero
+  static String _pad(int n) => n.toString().padLeft(2, '0');
+
+  static Future<int> _resolveLogStatus(
+    String orderId,
+    Map<String, String> coords,
+  ) async {
+    try {
+      final last = await _loadLastLogLocation(orderId);
+      if (last != null) {
+        final lastLat = last.$1;
+        final lastLng = last.$2;
+        final currentLat = double.tryParse(coords['lat'] ?? '0') ?? 0;
+        final currentLng = double.tryParse(coords['lng'] ?? '0') ?? 0;
+        if (currentLat != 0 &&
+            currentLng != 0 &&
+            lastLat != 0 &&
+            lastLng != 0) {
+          final distance = Geolocator.distanceBetween(
+            lastLat,
+            lastLng,
+            currentLat,
+            currentLng,
+          );
+          if (distance <= _idleThresholdMeters) {
+            return 1; // idle
+          }
+        }
+      }
+    } catch (e) {
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG] logstatus error: $e');
+    }
+    return 0; // moving
+  }
+
+  static Future<(double, double)?> _loadLastLogLocation(String orderId) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonStr = prefs.getString('last_log_loc_$orderId');
+      if (jsonStr == null || jsonStr.isEmpty) return null;
+      final decoded = jsonDecode(jsonStr);
+      if (decoded is Map<String, dynamic>) {
+        final lat = double.tryParse('${decoded['lat']}') ?? 0;
+        final lng = double.tryParse('${decoded['lng']}') ?? 0;
+        if (lat != 0 && lng != 0) return (lat, lng);
+      }
+    } catch (_) {}
+    return null;
+  }
+
+  static Future<void> _persistLastLogLocation(
+    String orderId,
+    Map<String, String> coords,
+  ) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString(
+        'last_log_loc_$orderId',
+        jsonEncode({'lat': coords['lat'], 'lng': coords['lng']}),
+      );
+    } catch (_) {}
+  }
+
+  // ---------------- Offline Queue Logic ----------------
+
+  static Future<void> _flushOfflineLogs() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final List<String> queue = prefs.getStringList(_offlineLogKey) ?? [];
+      if (queue.isEmpty) return;
+
+      debugPrint(
+        '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Flushing ${queue.length} offline logs...',
+      );
+
+      final List<String> remaining = [];
+      bool anySuccess = false;
+
+      final url = ApiConstants.mainRoute == 'live'
+          ? ApiConstants.createPickupLogLive
+          : ApiConstants.createPickupLogDev;
+
+      for (final itemStr in queue) {
+        try {
+          final Map<String, dynamic> item = jsonDecode(itemStr);
+          final String orderId = item['orderId'] ?? '';
+          final Map<String, dynamic> payload = Map<String, dynamic>.from(
+            item['payload'] ?? {},
+          );
+
+          if (payload.isEmpty) continue;
+
+          debugPrint(
+            '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Retrying for orderId: $orderId',
+          );
+
+          final result = await _logProvider
+              .createPickupLog(payload)
+              .timeout(const Duration(seconds: 8));
+
+          if (result != null) {
+            debugPrint(
+              '[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Success for orderId: $orderId',
+            );
+            anySuccess = true;
+          } else {
+            remaining.add(itemStr);
+          }
+        } catch (e) {
+          remaining.add(itemStr);
+        }
+      }
+
+      if (anySuccess || remaining.length != queue.length) {
+        await prefs.setStringList(_offlineLogKey, remaining);
+      }
+    } catch (e) {
+      debugPrint('[ACTIVE_COLLECTION_LOG][BG][OFFLINE] Flush error: $e');
+    }
+  }
+
+  static Future<void> _saveToOfflineQueue(
+    String orderId,
+    Map<String, dynamic> payload,
+  ) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final List<String> queue = prefs.getStringList(_offlineLogKey) ?? [];
+
+      final item = jsonEncode({
+        'orderId': orderId,
+        'payload': payload,
+        'timestamp': DateTime.now().millisecondsSinceEpoch,
+      });
+
+      queue.add(item);
+      await prefs.setStringList(_offlineLogKey, queue);
+      debugPrint(
+        '[ACTIVE_PICKUP_LOG][BG][OFFLINE] Saved to queue. Total: ${queue.length}',
+      );
+    } catch (e) {
+      debugPrint('[ACTIVE_PICKUP_LOG][BG][OFFLINE] Error saving to queue: $e');
+    }
+  }
+
+  // ---------------- Auto Shift End Logic ----------------
+
+  /// Check if shift has ended and trigger auto-break if needed
+  static Future<void> checkShiftEnd() async {
+    try {
+      debugPrint('[AUTO_SHIFT_END] 🔍 Starting shift end check...');
+      final prefs = await SharedPreferences.getInstance();
+
+      // 1. Check if currently On Duty
+      final int onduty = prefs.getInt('onduty') ?? 0;
+      debugPrint('[AUTO_SHIFT_END] 📊 Current onduty status: $onduty');
+      if (onduty != 1) {
+        debugPrint('[AUTO_SHIFT_END] ⏭️ Rider not on duty, skipping check');
+        return; // Already offline
+      }
+
+      // 2. Get Shift Timings
+      final String startTimeStr = prefs.getString('starttime') ?? '';
+      final String endTimeStr = prefs.getString('endtime') ?? '';
+      debugPrint(
+        '[AUTO_SHIFT_END] ⏰ Shift times - Start: "$startTimeStr", End: "$endTimeStr"',
+      );
+
+      if (endTimeStr.isEmpty) {
+        debugPrint(
+          '[AUTO_SHIFT_END] ⚠️ No endtime found, cannot check shift end',
+        );
+        return;
+      }
+
+      // 3. Parse Times (Assumed format HH:mm:ss)
+      final now = DateTime.now();
+
+      final endParts = endTimeStr.split(':');
+      if (endParts.length < 2) return;
+
+      final int endHour = int.tryParse(endParts[0]) ?? 0;
+      final int endMinute = int.tryParse(endParts[1]) ?? 0;
+      final int endSecond = endParts.length > 2
+          ? (int.tryParse(endParts[2]) ?? 0)
+          : 0;
+
+      // Create DateTime for end time on TODAY
+      final DateTime endToday = DateTime(
+        now.year,
+        now.month,
+        now.day,
+        endHour,
+        endMinute,
+        endSecond,
+      );
+
+      bool isShiftOver = false;
+
+      if (startTimeStr.isNotEmpty) {
+        final startParts = startTimeStr.split(':');
+        if (startParts.length >= 2) {
+          final int startHour = int.tryParse(startParts[0]) ?? 0;
+          final int startMinute = int.tryParse(startParts[1]) ?? 0;
+
+          // Create DateTime for start time on TODAY
+          final DateTime startToday = DateTime(
+            now.year,
+            now.month,
+            now.day,
+            startHour,
+            startMinute,
+          );
+
+          // Check for overnight shift (Start > End in 24-hour format, e.g. 22:00 to 06:00)
+          // This means shift crosses midnight
+          final double startVal = startHour + (startMinute / 60.0);
+          final double endVal = endHour + (endMinute / 60.0);
+
+          if (startVal > endVal) {
+            // ✅ OVERNIGHT SHIFT (crosses midnight, e.g. 22:00 to 06:00)
+            // Shift is over if current time is AFTER end time today AND BEFORE start time today
+            // Example: End 06:00, Start 22:00
+            // - Now 23:00 -> After 22:00 (start) -> Still in shift (ACTIVE)
+            // - Now 05:00 -> Before 06:00 (end) -> Still in shift from yesterday (ACTIVE)
+            // - Now 10:00 -> After 06:00 (end) AND Before 22:00 (start) -> Shift OVER
+
+            debugPrint(
+              '[AUTO_SHIFT_END] 🌙 Overnight shift detected (Start: ${_pad(startHour)}:${_pad(startMinute)}, End: ${_pad(endHour)}:${_pad(endMinute)})',
+            );
+            debugPrint(
+              '[AUTO_SHIFT_END] 📅 Current time: ${_pad(now.hour)}:${_pad(now.minute)}',
+            );
+
+            if (now.isAfter(endToday) && now.isBefore(startToday)) {
+              // We're in the gap period between end and start -> shift is OVER
+              isShiftOver = true;
+              debugPrint(
+                '[AUTO_SHIFT_END] ✅ Overnight shift: In gap period -> SHIFT OVER',
+              );
+            } else {
+              // We're either before end (still in shift from yesterday) or after start (still in shift today)
+              isShiftOver = false;
+              debugPrint('[AUTO_SHIFT_END] ✅ Overnight shift: Still active');
+            }
+          } else {
+            // ✅ NORMAL DAY SHIFT (e.g. 09:00 to 17:00, doesn't cross midnight)
+            // Shift is over if current time is AFTER end time
+            debugPrint(
+              '[AUTO_SHIFT_END] ☀️ Day shift detected (Start: ${_pad(startHour)}:${_pad(startMinute)}, End: ${_pad(endHour)}:${_pad(endMinute)})',
+            );
+            debugPrint(
+              '[AUTO_SHIFT_END] 📅 Current time: ${_pad(now.hour)}:${_pad(now.minute)}, End time: ${_pad(endHour)}:${_pad(endMinute)}',
+            );
+
+            if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
+              isShiftOver = true;
+              debugPrint('[AUTO_SHIFT_END] ✅ Day shift: Shift ended');
+            } else {
+              isShiftOver = false;
+              debugPrint('[AUTO_SHIFT_END] ✅ Day shift: Still active');
+            }
+          }
+        } else {
+          // Fallback if start time parse fails: assume day shift
+          debugPrint(
+            '[AUTO_SHIFT_END] ⚠️ Could not parse start time, assuming day shift',
+          );
+          if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
+            isShiftOver = true;
+          }
+        }
+      } else {
+        // Fallback if no start time: assume day shift
+        debugPrint(
+          '[AUTO_SHIFT_END] ⚠️ No start time provided, assuming day shift',
+        );
+        if (now.isAfter(endToday) || now.isAtSameMomentAs(endToday)) {
+          isShiftOver = true;
+        }
+      }
+
+      // 4. Trigger Auto End if Shift is Over
+      debugPrint(
+        '[AUTO_SHIFT_END] 📅 Time check result - isShiftOver: $isShiftOver, Current: ${_pad(now.hour)}:${_pad(now.minute)}, End: ${_pad(endHour)}:${_pad(endMinute)}',
+      );
+      if (isShiftOver) {
+        debugPrint(
+          '[AUTO_SHIFT_END] ⏰ Shift ended (Start: $startTimeStr, End: $endTimeStr). Current: ${_pad(now.hour)}:${_pad(now.minute)}',
+        );
+        await _autoEndShift(prefs);
+      } else {
+        debugPrint('[AUTO_SHIFT_END] ✅ Shift not ended yet, continuing...');
+      }
+    } catch (e) {
+      debugPrint('[AUTO_SHIFT_END] ❌ Error checking shift end: $e');
+      debugPrint('[AUTO_SHIFT_END] Stack trace: ${StackTrace.current}');
+    }
+  }
+
+  static Future<void> _autoEndShift(SharedPreferences prefs) async {
+    try {
+      debugPrint(
+        '[AUTO_SHIFT_END] 🚀 Initiating auto-break and offline sequence...',
+      );
+
+      // 1. Get Required IDs
+      final int userid = prefs.getInt('userid') ?? prefs.getInt('userId') ?? 0;
+      final int partnerid =
+          prefs.getInt('partnerid') ?? prefs.getInt('partnerId') ?? 0;
+      final int shiftid =
+          prefs.getInt('shiftid') ?? prefs.getInt('shiftId') ?? 0;
+      final int logid = prefs.getInt('logid') ?? prefs.getInt('logId') ?? 0;
+
+      if (userid == 0) {
+        debugPrint(
+          '[AUTO_SHIFT_END] ❌ Missing userid, cannot create break log',
+        );
+        return;
+      }
+
+      // 2. Get Location
+      final Map<String, String>? coords = await _getCoordinatesWithFallback();
+      final String lat = coords?['lat'] ?? '0';
+      final String lng = coords?['lng'] ?? '0';
+
+      // 3. Prepare Break Log Payload
+      final now = DateTime.now();
+      final int localBreakId =
+          (DateTime.now().millisecondsSinceEpoch % 900) + 100; // Random-ish ID
+      final String breakdate =
+          '${now.year}-${_pad(now.month)}-${_pad(now.day)} ${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
+      final String breakstart =
+          '${_pad(now.hour)}:${_pad(now.minute)}:${_pad(now.second)}';
+
+      final payload = <String, dynamic>{
+        "breakid": localBreakId,
+        "logid": logid,
+        "breakdate": breakdate,
+        "userid": userid,
+        "partnerid": partnerid,
+        "shiftid": shiftid,
+        "breakstart": breakstart,
+        "breakend": "",
+        "breakhours": 0.0,
+        "latitude": lat,
+        "longitude": lng,
+      };
+
+      // 4. Call API to Create Break
+      final url = ApiConstants.mainRoute == 'live'
+          ? ApiConstants.createBreakRiderLogLive
+          : ApiConstants.createBreakRiderLogDev;
+
+      debugPrint('[AUTO_SHIFT_END] Creating break log: $url');
+
+      // We use a separate provider instance or http call if needed,
+      // but _logProvider is for pickup logs. We need a generic post or use http directly.
+      // Since we don't have BreakRiderLogProvider here, we'll use http directly for simplicity and isolation.
+
+      try {
+        final response = await _httpClient
+            .post(
+              Uri.parse(url),
+              headers: {'Content-Type': 'application/json'},
+              body: jsonEncode(payload),
+            )
+            .timeout(const Duration(seconds: 10));
+
+        if (response.statusCode >= 200 && response.statusCode < 300) {
+          debugPrint('[AUTO_SHIFT_END] ✅ Break log created successfully');
+
+          // Parse response to get server break ID if needed, but mainly we just need to go offline
+          final body = jsonDecode(response.body);
+          final det = (body['details'] is Map) ? body['details'] : body;
+          final serverBreakId = det['breakid'];
+
+          if (serverBreakId != null) {
+            await prefs.setInt(
+              'breakId',
+              int.tryParse('$serverBreakId') ?? localBreakId,
+            );
+          }
+          await prefs.setString('breakStart', breakstart);
+          await prefs.setInt('break_start_epoch', now.millisecondsSinceEpoch);
+        } else {
+          debugPrint(
+            '[AUTO_SHIFT_END] ⚠️ Failed to create break log: ${response.statusCode}',
+          );
+        }
+      } catch (e) {
+        debugPrint('[AUTO_SHIFT_END] ❌ API Error: $e');
+        // Even if API fails, we MUST go offline locally to prevent further issues
+      }
+
+      // 5. Set Offline Locally
+      await prefs.setInt('onduty', 0);
+      await prefs.setBool('online', false);
+
+      // 6. Update Rider Log (Set Duty = 0)
+      // We should also update the main rider log to say onduty=0
+      final updateUrl = ApiConstants.mainRoute == 'live'
+          ? ApiConstants.updateRiderLogLive
+          : ApiConstants.updateRiderLogDev;
+
+      final updatePayload = {
+        "userid": userid,
+        "onduty": 0,
+        "latitude": lat,
+        "longitude": lng,
+      };
+
+      try {
+        await _httpClient
+            .post(
+              Uri.parse(updateUrl),
+              headers: {'Content-Type': 'application/json'},
+              body: jsonEncode(updatePayload),
+            )
+            .timeout(const Duration(seconds: 5));
+        debugPrint('[AUTO_SHIFT_END] ✅ Rider status updated to Offline');
+      } catch (_) {}
+
+      debugPrint('[AUTO_SHIFT_END] 🏁 Auto-shift end sequence complete.');
+    } catch (e) {
+      debugPrint('[AUTO_SHIFT_END] Critical error in _autoEndShift: $e');
+    }
+  }
+
+  /// Trigger proximity alert once per pickup when within threshold
+  static Future<void> _checkProximityAlert(
+    Map<String, dynamic> Booking,
+    Map<String, String> coords,
+  ) async {
+    try {
+      final pickupId = (Booking['pickupid'] ?? Booking['orderid'] ?? '')
+          .toString();
+      if (pickupId.isEmpty) return;
+
+      final dropLatRaw =
+          (Booking['droplat'] ??
+                  Booking['DropLat'] ??
+                  Booking['pickuplat'] ??
+                  '')
+              .toString();
+      final dropLngRaw =
+          (Booking['droplon'] ??
+                  Booking['droplong'] ??
+                  Booking['DropLon'] ??
+                  Booking['DropLong'] ??
+                  Booking['pickuplong'] ??
+                  '')
+              .toString();
+      final dropLat = double.tryParse(dropLatRaw) ?? 0.0;
+      final dropLng = double.tryParse(dropLngRaw) ?? 0.0;
+      if (dropLat == 0 ||
+          dropLng == 0 ||
+          dropLat.abs() > 90 ||
+          dropLng.abs() > 180) {
+        return;
+      }
+
+      final riderLat = double.tryParse(coords['lat'] ?? '0') ?? 0.0;
+      final riderLng = double.tryParse(coords['lng'] ?? '0') ?? 0.0;
+      if (riderLat == 0 ||
+          riderLng == 0 ||
+          riderLat.abs() > 90 ||
+          riderLng.abs() > 180) {
+        return;
+      }
+
+      final distanceMeters = Geolocator.distanceBetween(
+        dropLat,
+        dropLng,
+        riderLat,
+        riderLng,
+      );
+
+      if (distanceMeters <= _proximityThresholdMeters) {
+        await NotificationServce.showLocalNotification(
+          title: 'Near pickup location',
+          body: 'You’ve reached your destination. Please update the status.',
+        );
+
+        final played = await _playProximityAudio();
+
+        debugPrint(
+          '[PROXIMITY] Alerted pickupId=$pickupId at ${distanceMeters.toStringAsFixed(1)}m '
+          'target=($dropLat,$dropLng) rider=($riderLat,$riderLng) played=$played',
+        );
+      } else {
+        debugPrint(
+          '[PROXIMITY] Skipped alert for pickupId=$pickupId | distance=${distanceMeters.toStringAsFixed(1)}m',
+        );
+      }
+    } catch (e) {
+      debugPrint('[PROXIMITY] Error sending alert: $e');
+    }
+  }
+
+  static Future<bool> _playProximityAudio() async {
+    try {
+      if (!_audioReady) {
+        await _proximityPlayer.setReleaseMode(ReleaseMode.stop);
+        await _proximityPlayer.setVolume(1.0);
+        _audioReady = true;
+      }
+      // Attempt to play bundled destination audio
+      await _proximityPlayer.stop();
+      await _proximityPlayer.play(AssetSource('audio/destination.mp3'));
+      debugPrint('[PROXIMITY][AUDIO] Playing destination.mp3');
+      return true;
+    } catch (e) {
+      debugPrint('[PROXIMITY][AUDIO] Error playing destination clip: $e');
+    }
+
+    // Fallback to TTS if audio fails
+    try {
+      // Initialize once
+      if (!_ttsReady) {
+        await _tts.setLanguage('en-US');
+        await _tts.setSpeechRate(0.9);
+        await _tts.setVolume(1.0);
+        await _tts.setPitch(1.0);
+        _ttsReady = true;
+      }
+      // Speak without awaiting completion to avoid blocking
+      await _tts.speak(
+        'You have reached your destination. Please update the pickup status.',
+      );
+      debugPrint('[PROXIMITY][TTS] Spoke destination prompt');
+      return true;
+    } catch (e) {
+      debugPrint('[PROXIMITY][TTS] Error speaking prompt: $e');
+    }
+    return false;
+  }
+}
diff --git a/lib/background/foreground_service.dart b/lib/background/foreground_service.dart
index 116c5d6..3272c13 100644
--- a/lib/background/foreground_service.dart
+++ b/lib/background/foreground_service.dart
@@ -10,11 +10,10 @@ import 'package:miler/views/helpers/constants/apiconstants.dart';
 import 'package:miler/providers/Riderlog/riderlog_provider.dart';
 import 'package:miler/background/backgroundservice.dart';
 import 'package:geolocator/geolocator.dart';
+import 'package:miler/data/device_telemetry.dart';
 import 'package:miler/utils/kalman_filter.dart';
 import 'package:miler/utils/mqtt_service.dart';
 import 'package:miler/views/helpers/constants/mqtt_constants.dart';
-import 'package:battery_plus/battery_plus.dart';
-import 'package:connectivity_plus/connectivity_plus.dart';
 
 class _BackgroundRiderLog {
   static MilerKalmanFilter? _kf;
@@ -165,6 +164,24 @@ class _BackgroundRiderLog {
       final int? logid = prefs.getInt('logId') ?? prefs.getInt('logid');
       final String orderId = prefs.getString('current_riding_order_id') ?? '';
 
+      // ── The handset's own state goes IN the heartbeat ──
+      //
+      // It used to be gathered further down, after this post had already gone,
+      // and published to MQTT alone — so the console reading `/miler/logs` had
+      // a position and nothing else, and drew an em dash against Battery,
+      // Connection, GPS Accuracy and Location Service on a rider whose phone
+      // was reporting all four.
+      //
+      // Read here, once, and spread into the payload below. The MQTT publish
+      // further down reuses the same values rather than asking again, so the
+      // two lanes cannot disagree about the same second. See [DeviceTelemetry].
+      final telemetry = await DeviceTelemetry.read(
+        // The fix lookup already resolved this to get a position at all;
+        // asking a second time can disagree with itself if the rider toggles
+        // the setting in between.
+        locationService: loc['status'],
+      );
+
       final payload = {
         "logid": logid ?? 0,
         "userid": userid,
@@ -189,6 +206,15 @@ class _BackgroundRiderLog {
         "userfcmtoken": userfcmtoken ?? '',
         "username": (username ?? '').trim(),
         "orderid": orderId,
+        // What the dispatcher needs when a rider goes quiet: the battery, the
+        // signal, whether location is even on, and how good the last fix was.
+        ...telemetry.toPayload(),
+        // Only a measured one — a `0` reads on the console as a perfect fix.
+        if ((loc['accuracy'] ?? '0') != '0') "accuracy": loc['accuracy'],
+        // This heartbeat is the *background* one — it is what keeps reporting
+        // while the app is not on screen, which is exactly the state the
+        // console's App State column exists to show.
+        "is_background": true,
       };
 
       final firstName = prefs.getString('firstname') ?? '';
@@ -223,18 +249,13 @@ class _BackgroundRiderLog {
       }
 
       if (mqttService.isConnected) {
-        // Gather Telemetry
-        final battery = Battery();
-        final int batteryLevel = await battery.batteryLevel;
-        final BatteryState batteryState = await battery.batteryState;
-        final isCharging =
-            batteryState == BatteryState.charging ||
-            batteryState == BatteryState.full;
-
-        final connectivity = await Connectivity().checkConnectivity();
-        final String connType = connectivity.isNotEmpty
-            ? connectivity.first.toString().split('.').last
-            : 'none';
+        // The same reading the heartbeat above carried — not a second one.
+        // Two reads a second apart can report two batteries, and the console
+        // then shows one number on the live tile and a different one in the
+        // trail it is drawn from.
+        final int batteryLevel = telemetry.battery ?? 0;
+        final bool isCharging = telemetry.isCharging ?? false;
+        final String connType = telemetry.connection ?? 'none';
 
         // 1. Direct Telemetry (Feeding the /full API)
         mqttService.publish('battery', '$batteryLevel%');
diff --git a/lib/controllers/pickups_controller.dart b/lib/controllers/pickups_controller.dart
index 0556a32..bd5d641 100644
--- a/lib/controllers/pickups_controller.dart
+++ b/lib/controllers/pickups_controller.dart
@@ -9,6 +9,7 @@ import 'package:latlong2/latlong.dart' show LatLng;
 import 'package:miler/helpers/miler_router.dart';
 import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:miler/data/accepted_store.dart';
 import 'package:geolocator/geolocator.dart';
 
 import 'package:miler/views/helpers/constants/apiconstants.dart';
@@ -574,6 +575,29 @@ class PickupsController extends GetxController
         }
       }
 
+      // ── Written down, not only sent ──
+      //
+      // This figure is the only measurement of the leg that exists: the backend
+      // does not reliably send a distance back on `GET /miler/bookings`, and
+      // until now the app posted this and kept nothing, so Activity's `km
+      // ridden` had no row to total and printed an em dash on a day of real
+      // riding. Recorded against the stop so the record that gets filed carries
+      // it — see [kStopKmKey] and `addCompletedBookings`.
+      //
+      // Best-effort: a preferences write must never cost the rider a pickup
+      // that has otherwise succeeded.
+      if (calculatedKms > 0) {
+        try {
+          final prefs = await SharedPreferences.getInstance();
+          await prefs.setString(
+            kStopKmKey(pickupId),
+            calculatedKms.toStringAsFixed(2),
+          );
+        } catch (e) {
+          debugPrint('[PICKED] could not record the distance: $e');
+        }
+      }
+
       final payload = <String, dynamic>{
         'pickupid': pickupId,
         // Not sent to the backend — the legacy shape carries it and the mapper
diff --git a/lib/controllers/riderlog.dart b/lib/controllers/riderlog.dart
index 61bc29c..25e7225 100644
--- a/lib/controllers/riderlog.dart
+++ b/lib/controllers/riderlog.dart
@@ -15,6 +15,7 @@ import 'package:miler/controllers/logcontroller.dart';
 import 'package:miler/background/foreground_service.dart' as fg;
 import 'package:miler/utils/kalman_filter.dart';
 import 'package:miler/utils/mqtt_service.dart';
+import 'package:miler/data/device_telemetry.dart';
 import 'package:miler/views/helpers/constants/mqtt_constants.dart';
 import 'package:battery_plus/battery_plus.dart';
 import 'package:miler/controllers/connectivity_mixin.dart';
@@ -260,6 +261,14 @@ class RiderLogController extends GetxController
         }
       } catch (_) {}
 
+      // The handset's own state — see [DeviceTelemetry] for why this is read
+      // here and not published to MQTT alone. The console's Battery,
+      // Connection, GPS Accuracy and Location Service columns are read off the
+      // rider log, and until now nothing put them in it.
+      final telemetry = await DeviceTelemetry.read(
+        locationService: loc['status'],
+      );
+
       final Map<String, dynamic> payload = {
         // Base from server template
         ...baseTemplate,
@@ -288,6 +297,14 @@ class RiderLogController extends GetxController
         'applocationid': applocationid ?? 0,
         'userfcmtoken': userfcmtoken ?? '',
         'orderid': orderId,
+        ...telemetry.toPayload(),
+        // Only a measured one. A `0` here would draw on the console as a
+        // perfect fix rather than as no fix at all.
+        if ((loc['accuracy'] ?? '').isNotEmpty) 'accuracy': loc['accuracy'],
+        // This is the *foreground* controller — the rider has the app open.
+        // The background heartbeat sends true, and the difference between the
+        // two is what the console's App State column reports.
+        'is_background': false,
       };
 
       // --- MQTT LOGIC ( Lane Split ) ---
@@ -325,6 +342,10 @@ class RiderLogController extends GetxController
         'heading': loc['heading'] ?? '0',
         'status': riderStatus,
         'orderid': orderId,
+        // The same reading the log above carries, so the live lane and the
+        // trail cannot report two different batteries a second apart.
+        ...telemetry.toPayload(),
+        if ((loc['accuracy'] ?? '').isNotEmpty) 'accuracy': loc['accuracy'],
       });
 
       // Ensure rider identity fields are clean:
@@ -779,6 +800,19 @@ class RiderLogController extends GetxController
       'heading': '0',
       'velocity_lat': '0',
       'velocity_lng': '0',
+      // ── Two fields the background lookup has always returned and this one
+      //    did not ──
+      //
+      // `accuracy` is how good the fix is and `status` is whether location is
+      // switched on at all — the two the console draws under GPS Accuracy and
+      // Location Service. Absent here, the foreground heartbeat had nothing to
+      // send and would have had to invent a `0`, which reads as a *perfect*
+      // fix rather than as no fix.
+      //
+      // Empty, not zero: an unknown accuracy is dropped from the payload by
+      // the caller and drawn as an em dash, which is the truth.
+      'accuracy': '',
+      'status': 'unknown',
     };
     try {
       final needsFetch =
@@ -786,7 +820,10 @@ class RiderLogController extends GetxController
       if (!needsFetch) return result;
 
       final serviceEnabled = await Geolocator.isLocationServiceEnabled();
-      if (!serviceEnabled) return result;
+      if (!serviceEnabled) {
+        result['status'] = 'disabled';
+        return result;
+      }
 
       LocationPermission permission = await Geolocator.checkPermission();
       if (permission == LocationPermission.denied) {
@@ -794,8 +831,12 @@ class RiderLogController extends GetxController
       }
       if (permission == LocationPermission.denied ||
           permission == LocationPermission.deniedForever) {
+        result['status'] = permission == LocationPermission.deniedForever
+            ? 'denied_forever'
+            : 'denied';
         return result;
       }
+      result['status'] = 'enabled';
 
       final Position pos = await Geolocator.getCurrentPosition(
         locationSettings: const LocationSettings(
@@ -836,6 +877,8 @@ class RiderLogController extends GetxController
         'heading': heading.toStringAsFixed(2),
         'velocity_lat': velocityLat.toStringAsFixed(4),
         'velocity_lng': velocityLng.toStringAsFixed(4),
+        'accuracy': pos.accuracy.toStringAsFixed(1),
+        'status': 'enabled',
       };
     } catch (_) {
       return result;
diff --git a/lib/data/accepted_store.dart b/lib/data/accepted_store.dart
index e688bbb..1e5353f 100644
--- a/lib/data/accepted_store.dart
+++ b/lib/data/accepted_store.dart
@@ -71,7 +71,7 @@ Future<void> migrateLegacyStores() async {
     _kConsignmentIdsKeyBase,
     _kOutForDeliveryKeyBase,
     _kNotLoadedKeyBase,
-    _kBagLabelsKeyBase,
+    _kOrderLabelsKeyBase,
   ]) {
     await _drainLegacy(base, scope);
   }
@@ -117,7 +117,7 @@ Future<void> clearScopedStores() async {
     _kConsignmentIdsKeyBase,
     _kOutForDeliveryKeyBase,
     _kNotLoadedKeyBase,
-    _kBagLabelsKeyBase,
+    _kOrderLabelsKeyBase,
   ]) {
     await prefs.remove(scope.scoped(base));
     await prefs.remove(base);
@@ -296,6 +296,26 @@ String kStopStartedKey(Object pickupId) => 'stop_started_$pickupId';
 /// Written by the stop map screen when it starts the pickup.
 String kStopArrivedKey(Object pickupId) => 'pickup_start_$pickupId';
 
+/// Prefs key holding the kilometres the app measured for a stop as it closed.
+///
+/// ── The app measured this, posted it, and kept no copy ──
+///
+/// `PickupsController.updateToPicked` works out how far the rider came —
+/// `Geolocator.distanceBetween`, rider fix to pickup point — and sends it as
+/// `actualkms`. Then it dropped it. The number existed for the length of one
+/// HTTP request.
+///
+/// Which is why Activity's `km ridden` read an em dash on a day the rider had
+/// plainly ridden: [StopCompliance] looks for `actualkms` on the row, the row
+/// never carried one, and `GET /miler/bookings` does not reliably send the
+/// distance back. The app was the only thing that knew, and it forgot.
+///
+/// So it is written here as it is posted, and [addCompletedBookings] merges it
+/// onto the record it files — the same rescue it already performs for the two
+/// clocks beside it, for the same reason: the moment the fact is true is the
+/// moment to write it down.
+String kStopKmKey(Object pickupId) => 'stop_km_$pickupId';
+
 /// Record a finished stop. [cancelled] separates "could not complete" from a
 /// clean pickup/delivery — Activity shows both, worded differently.
 ///
@@ -362,10 +382,18 @@ Future<void> addCompletedBookings(
       final arrived = prefs.getString(kStopArrivedKey(pickupId));
       if (started != null && started.isNotEmpty) copy['startedat'] = started;
       if (arrived != null && arrived.isNotEmpty) copy['arrivedat'] = arrived;
+      // The distance the app measured as it closed this stop — see
+      // [kStopKmKey]. A figure already on the row wins: that one came from the
+      // hub, and this is the app's own measurement standing in for it.
+      final km = prefs.getString(kStopKmKey(pickupId));
+      if (km != null && km.isNotEmpty && (copy['actualkms'] ?? '') == '') {
+        copy['actualkms'] = km;
+      }
       // Cleared, or a stop worked twice in a day (a resumed skip) reports the
       // first attempt's clock against the second attempt's completion.
       await prefs.remove(kStopStartedKey(pickupId));
       await prefs.remove(kStopArrivedKey(pickupId));
+      await prefs.remove(kStopKmKey(pickupId));
     }
 
     // Stamped with the session that produced it, so a row read back later
@@ -795,26 +823,36 @@ Future<void> addNotLoadedOrderIds(List<String> ids) async {
 }
 
 // ─────────────────────────────────────────────────────────────────────────
-// BAG IDENTITY — which bag an order travels in, for as long as it travels
+// THE COUNTER'S OWN LABEL — carried for as long as the order travels
 //
 // ── Why this is stored rather than recomputed ──
 //
-// A bag number is the order's position in the load it came off — Joe is Bag 1
-// of the five that left Vidhya Kitchen. Recomputing that later from whatever
-// list happens to be on screen is how identity breaks: deliver Joe, and a
-// position-derived Arun silently becomes Bag 1. The rider is then looking for a
-// bag labelled 1 that is in a customer's hallway.
+// A kitchen that prints labels prints them once, at the counter, and the label
+// is what the rider matches against the object in his hands for the rest of the
+// day. Recomputing anything from whatever list happens to be on screen is how
+// identity breaks — deliver one order and a position-derived label silently
+// moves to another, sending the rider looking for something that is already in
+// a customer's hallway.
 //
-// So the pairing is fixed once, at the counter, at the moment the manifest is
-// confirmed — and read back unchanged through delivery, skip, completion and a
-// day of intermittent signal. See [BagManifest], which derives it; this only
-// remembers what it derived.
+// So the pairing is fixed once, at the moment the manifest is confirmed, and
+// read back unchanged through delivery, skip, completion and a day of
+// intermittent signal. See [OrderManifest.labelFor], which reads it off the
+// payload; this only remembers what was read.
+//
+// ── It is empty on most routes now, and that is correct ──
+//
+// This used to hold `Bag 1 … Bag n`, manufactured from each order's position
+// when the payload printed nothing — so every route stored a set of references
+// no counter had ever issued. Only a label the kitchen actually printed is
+// stored now, which on a route that prints none means nothing is stored at all
+// and every screen simply shows no tag.
 // ─────────────────────────────────────────────────────────────────────────
-const String _kBagLabelsKeyBase = 'order_bag_labels';
+const String _kOrderLabelsKeyBase = 'order_bag_labels';
 
-/// Remembers which bag each order travels in. Merges, never replaces: a rider
-/// works two kitchens and the second load must not erase the first.
-Future<void> saveBagLabels(Map<String, String> byOrderId) async {
+/// Remembers the label a counter printed on each order. Merges, never
+/// replaces: a rider works two kitchens and the second load must not erase the
+/// first. Orders with no printed label contribute nothing.
+Future<void> saveOrderLabels(Map<String, String> byOrderId) async {
   final clean = {
     for (final e in byOrderId.entries)
       if (e.key.trim().isNotEmpty && e.value.trim().isNotEmpty)
@@ -823,19 +861,20 @@ Future<void> saveBagLabels(Map<String, String> byOrderId) async {
   if (clean.isEmpty) return;
 
   final prefs = await SharedPreferences.getInstance();
-  final merged = {...await getBagLabels(), ...clean};
+  final merged = {...await getOrderLabels(), ...clean};
   // Stored as `id\u0000label` rows: SharedPreferences has no map type, and a
-  // NUL separator cannot collide with an order id or a bag label.
-  await prefs.setStringList(await _scopedKey(_kBagLabelsKeyBase), [
+  // NUL separator cannot collide with an order id or a printed label.
+  await prefs.setStringList(await _scopedKey(_kOrderLabelsKeyBase), [
     for (final e in merged.entries) '${e.key}\u0000${e.value}',
   ]);
 }
 
-/// The bag each order is in, as recorded at pickup. Empty before any load.
-Future<Map<String, String>> getBagLabels() async {
+/// The label each order carries, as recorded at pickup. Empty before any load,
+/// and empty all day on a route whose counters print nothing.
+Future<Map<String, String>> getOrderLabels() async {
   final prefs = await SharedPreferences.getInstance();
   final rows =
-      prefs.getStringList(await _scopedKey(_kBagLabelsKeyBase)) ??
+      prefs.getStringList(await _scopedKey(_kOrderLabelsKeyBase)) ??
       const <String>[];
   return {
     for (final row in rows)
@@ -854,7 +893,7 @@ Future<void> clearServiceRunState() async {
   await prefs.remove(await _scopedKey(_kCollectedOrderIdsKeyBase));
   await prefs.remove(await _scopedKey(_kOutForDeliveryKeyBase));
   await prefs.remove(await _scopedKey(_kNotLoadedKeyBase));
-  await prefs.remove(await _scopedKey(_kBagLabelsKeyBase));
+  await prefs.remove(await _scopedKey(_kOrderLabelsKeyBase));
 }
 
 // ─────────────────────────────────────────────────────────────────────────
@@ -933,16 +972,16 @@ Future<int> purgeDemoRecords() async {
   // Harmless on its own, but this store exists to be the one place that knows
   // which bag an order is in, and a stale entry is exactly the kind of thing
   // that is trusted later precisely because it is stored.
-  final bags =
-      prefs.getStringList(await _scopedKey(_kBagLabelsKeyBase)) ??
+  final labels =
+      prefs.getStringList(await _scopedKey(_kOrderLabelsKeyBase)) ??
       const <String>[];
-  if (bags.isNotEmpty) {
-    final kept = bags
+  if (labels.isNotEmpty) {
+    final kept = labels
         .where((row) => !_looksLikeDemoId(row.split('\u0000').first))
         .toList();
-    if (kept.length != bags.length) {
-      dropped += bags.length - kept.length;
-      await prefs.setStringList(await _scopedKey(_kBagLabelsKeyBase), kept);
+    if (kept.length != labels.length) {
+      dropped += labels.length - kept.length;
+      await prefs.setStringList(await _scopedKey(_kOrderLabelsKeyBase), kept);
     }
   }
 
diff --git a/lib/data/api_config.dart b/lib/data/api_config.dart
index dbafc39..8a9979d 100644
--- a/lib/data/api_config.dart
+++ b/lib/data/api_config.dart
@@ -524,9 +524,92 @@ class ApiConfig {
       'parcels': booking['parcels'] ?? const [],
       'starttime': s(booking['createdat']),
       'eta': s(booking['eta']),
+
+      // ── The row's own clocks, carried verbatim ──
+      //
+      // This adapter builds a **fixed map**, so a field it does not name is a
+      // field the app can never see — the same trap `step` and `stoptype` were
+      // in. Every timestamp on the booking was in that trap, and the cost was
+      // not cosmetic: [ServiceDay] dates a row by exactly these key names, so
+      // an adapted row carried nothing to date it by and *every* screen that
+      // asks "does this belong to today" had to answer "cannot tell".
+      //
+      // That is how yesterday's assignments stayed on Home. The filter was
+      // never missing so much as starved: it was asking a question of fields
+      // this method had already thrown away.
+      //
+      // Copied under the names the wire uses, with no reshaping and no
+      // parsing. [ServiceDay] and [parseStamp] own the reading of them —
+      // Doormile sends IST wall-clock in naive columns, sometimes with a
+      // trailing `Z` it never had, and the one place that knows that should
+      // stay the one place that knows it.
+      for (final k in timestampFieldNames)
+        if (booking[k] != null && booking[k].toString().trim().isNotEmpty)
+          k: booking[k],
+
+      // ── And the row's distances, for the same reason ──
+      //
+      // `cumulativekms` was named above and the rest were not, so the whole
+      // distance vocabulary was dropped here: `kms` (what the hub planned),
+      // `riderkms` (what the rider actually covered) and the `compliance` block
+      // the contract carries them in.
+      //
+      // [StopCompliance] reads exactly those names, so it answered `null` for
+      // every adapted row — and Activity's `km ridden` totalled zero all day
+      // and printed an em dash. Same failure as the timestamps, on a different
+      // set of fields: a fixed map cannot pass on what it does not name.
+      for (final k in distanceFieldNames)
+        if (booking[k] != null && booking[k].toString().trim().isNotEmpty)
+          k: booking[k],
     };
   }
 
+  /// Every distance key a booking row is known to carry, copied through
+  /// [pickupFromBooking] untouched.
+  ///
+  /// Kept in step with [StopCompliance], which is what reads them. `compliance`
+  /// is a nested object rather than a number and is passed on whole — this
+  /// adapter's job is to stop losing fields, not to reshape them.
+  static const List<String> distanceFieldNames = [
+    // What the hub planned for this stop.
+    'kms',
+    'km',
+    // What the rider actually covered. `riderkms` is the backend's name;
+    // `actualkms` is the name this app posts on its own pickup write.
+    'riderkms',
+    'actualkms',
+    // The contract's block, carrying both plus the on-time verdict.
+    'compliance',
+  ];
+
+  /// Every timestamp key a booking row is known to carry, copied through
+  /// [pickupFromBooking] untouched.
+  ///
+  /// Deliberately a superset of what any one endpoint sends: a name that is
+  /// absent costs one map lookup, and a name that is missing costs a screen
+  /// its ability to tell today from yesterday. Kept in step with
+  /// `ServiceDay.timeKeys`, which is what reads them.
+  static const List<String> timestampFieldNames = [
+    'createdat',
+    'createdon',
+    'updatedat',
+    'updatedon',
+    'modifiedon',
+    'pickedtime',
+    'picked_time',
+    'deliverytime',
+    'deliveredat',
+    'completedat',
+    'expected_pickup_time',
+    'expectedpickuptime',
+    'slotstarttime',
+    'slotendtime',
+    'slotfrom',
+    'slotto',
+    'assignedat',
+    'assignedon',
+  ];
+
   static List<Map<String, dynamic>> pickupsFromBookings(dynamic data) {
     if (data is List) {
       return data.whereType<Map>().map((b) => pickupFromBooking(b)).toList();
diff --git a/lib/data/bag_manifest.dart b/lib/data/bag_manifest.dart
deleted file mode 100644
index 55054f6..0000000
--- a/lib/data/bag_manifest.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-import 'package:miler/data/milk_run.dart';
-import 'package:miler/views/Dashboard/pickups/stop_type.dart';
-
-/// ─────────────────────────────────────────────────────────────────────────
-/// ONE PICKUP ORDER = ONE BAG
-///
-/// The rule the whole rider workflow rests on, in one file so it cannot be
-/// stated two different ways on two screens.
-///
-/// If a kitchen has five pickup orders, the rider is handed **five bags** — one
-/// per order — and ends up with **five deliveries**, each carrying the bag it
-/// arrived in:
-///
-/// ```
-///   Order 1 → Bag 1 → Joe
-///   Order 2 → Bag 2 → Arun
-///   Order 3 → Bag 3 → Priya
-/// ```
-///
-/// ── Why this is a file and not a `+ 1` at each call site ──
-///
-/// Every screen in the pickup half of the app has to answer "how many bags?"
-/// and "which bag is this?", and every screen that answered it independently
-/// answered it differently: one showed a backend `Quantity` (an order's item
-/// count, not a bag count), one showed a bare `baglabel` when the payload
-/// happened to carry one and nothing at all when it did not, and the kitchen
-/// heading counted "meals". A rider standing at a counter comparing "5 meals"
-/// on his phone with four bags on the shelf has no way to tell which of the two
-/// numbers is wrong.
-///
-/// So the count is **derived from the orders**, always, and there is no second
-/// quantity anywhere that can disagree with it.
-///
-/// ── What is derived, and what is never invented ──
-///
-///  • **The count** is `orders.length`. It cannot drift, because it is not
-///    stored — a bag is what an order arrives in.
-///  • **The identity** prefers the label the backend printed on the physical
-///    bag ([stopBagLabel]) and falls back to the order's **position in its own
-///    pickup group** — `Bag 1`, `Bag 2` — which is what a rider counting a
-///    shelf actually uses.
-///
-/// Nothing here fabricates a crate, a tote or a quantity the backend has not
-/// sent. If a future contract ever puts more than one bag on an order, this is
-/// the one file that changes.
-/// ─────────────────────────────────────────────────────────────────────────
-class BagManifest {
-  BagManifest._();
-
-  /// One line of a pickup manifest: the order, the customer it is for, and the
-  /// bag it travels in.
-  ///
-  /// Deliberately carries the stop itself: every caller that renders a manifest
-  /// also needs to act on the orders behind it, and pairing them here is what
-  /// stops a screen from rendering five lines and posting four ids.
-  static List<BagLine> forGroup(List<Map<String, dynamic>> stops) => [
-    for (var i = 0; i < stops.length; i++)
-      BagLine(
-        stop: stops[i],
-        orderId: MilkRun.idOf(stops[i]),
-        customer: customerOf(stops[i]),
-        bag: _bagFor(stops[i], i),
-      ),
-  ];
-
-  /// The bag one order travels in, given the group it was collected with.
-  ///
-  /// [stops] must be the whole pickup group in route order — the position in it
-  /// *is* the bag number when the backend has not printed one.
-  static String bagFor(
-    Map<String, dynamic> stop,
-    List<Map<String, dynamic>> group,
-  ) {
-    final id = MilkRun.idOf(stop);
-    final index = group.indexWhere((s) => MilkRun.idOf(s) == id);
-    return _bagFor(stop, index < 0 ? 0 : index);
-  }
-
-  static String _bagFor(Map<String, dynamic> stop, int index) {
-    final printed = stopBagLabel(stop);
-    return printed.isNotEmpty ? printed : 'Bag ${index + 1}';
-  }
-
-  /// `5 bags` — the load, in the unit the rider actually carries.
-  ///
-  /// It used to print `5 orders · 5 bags`: the two halves of the one-bag-per-
-  /// order rule side by side, as a check the rider could eyeball. On a device
-  /// that check cost the header the fact it exists for — a real kitchen name
-  /// plus `13 orders · 13 bags` pushed `11 to accept` off the row, and the
-  /// clause that truncated was the one that changes what he does next.
-  ///
-  /// One number survives, and it is the physical one: the rows underneath are
-  /// named `Bag 1 … Bag n` and a settled group says `n bags collected`, so
-  /// "bags" is the word this column already speaks. No information is lost —
-  /// the rule makes the counts identical — and the verifiable statement lives
-  /// where the verifying happens: the manifest list itself, one line per bag.
-  static String countLabel(int orders) {
-    return orders == 1 ? '1 bag' : '$orders bags';
-  }
-
-  /// The name the bag is going to, for a manifest line.
-  static String customerOf(Map<String, dynamic> stop) =>
-      (stop['pickupcustomer'] ??
-              stop['customername'] ??
-              stop['tenantname'] ??
-              '')
-          .toString()
-          .trim();
-}
-
-/// One row of a pickup manifest. See [BagManifest.forGroup].
-class BagLine {
-  final Map<String, dynamic> stop;
-  final String orderId;
-  final String customer;
-  final String bag;
-
-  const BagLine({
-    required this.stop,
-    required this.orderId,
-    required this.customer,
-    required this.bag,
-  });
-}
diff --git a/lib/data/consignment_state.dart b/lib/data/consignment_state.dart
index 5027bdb..fbd7802 100644
--- a/lib/data/consignment_state.dart
+++ b/lib/data/consignment_state.dart
@@ -176,8 +176,100 @@ extension ConsignmentStateX on ConsignmentState {
   /// widened it on 21 Aug 2026 so a failed attempt is reportable the moment
   /// the parcel is collected, not only once the round has started.
   bool get canSkip => needsRelease || isDeliverable;
+
+  /// Why **Start ride** could not set off, in words a rider can act on — or
+  /// null when this state is not a reason to refuse one.
+  ///
+  /// ── The screen was reading the state machine out loud ──
+  ///
+  /// When `start-delivery` refuses, the backend answers with an assertion
+  /// about its own model: *"consignment is Inwarded_At_Hub, not
+  /// Collected_By_Miler"*. That sentence was passed through to the rider
+  /// verbatim, on the reasoning that the server's own words beat a guess — and
+  /// that reasoning is right about *whose* answer it is and wrong about *what
+  /// kind of sentence* it is. `Inwarded_At_Hub` is a database enum. It is not
+  /// something a man holding a phone at a kitchen counter can do anything
+  /// with, and he had no way to tell it from a bug.
+  ///
+  /// So the state is translated here, in the file that owns the vocabulary,
+  /// exactly once. Every sentence answers the only two questions he has: is
+  /// this mine, and is sliding again going to help.
+  ///
+  /// Null for [outForDelivery], [collectedByMiler] and [unknown] — the first
+  /// two are not refusals at all and the third is not an answer, so the caller
+  /// falls back rather than inventing a cause.
+  String? get startRefusalSentence => switch (this) {
+    // Converted and not yet routed. The one refusal here that a second slide
+    // in a minute genuinely can clear.
+    ConsignmentState.created =>
+      'Your office is still setting this one up. Give it a moment and slide '
+          'again.',
+    // The logistics network has it. Said without naming a building the rider
+    // has never been to — what matters is that it is not his round.
+    ConsignmentState.inwardedAtHub ||
+    ConsignmentState.tripsheetLoaded ||
+    ConsignmentState.inTransit =>
+      "This one has already been handed on — it's not yours to deliver.",
+    ConsignmentState.delivered =>
+      'This one has already been delivered. Nothing left to start.',
+    ConsignmentState.rtoInitiated || ConsignmentState.returnedToSender =>
+      'This one is going back to the sender, so there is no delivery to '
+          'start.',
+    ConsignmentState.missing || ConsignmentState.damaged =>
+      'Your office has flagged a problem with this parcel. They have to clear '
+          'it before it can go out.',
+    ConsignmentState.cancelled =>
+      'This one has been cancelled. There is nothing to deliver.',
+    ConsignmentState.outForDelivery ||
+    ConsignmentState.collectedByMiler ||
+    ConsignmentState.unknown => null,
+  };
 }
 
+/// The consignment state a **start-delivery** refusal names, or
+/// [ConsignmentState.unknown] when it names none this build knows.
+///
+/// ── Reading a state out of a sentence, safely ──
+///
+/// Parsing prose is normally a bad idea, and this is the case where it is not,
+/// because it does not depend on the prose. `POST
+/// /miler/consignments/:id/start-delivery` accepts **exactly one** state —
+/// `Collected_By_Miler`. So of the state names a refusal from that endpoint
+/// mentions, the only one that cannot be describing where the consignment
+/// actually *is* is the one that would have been accepted. Drop that, and
+/// whatever is left is the answer — whichever order the words come in, and
+/// however the sentence is later reworded.
+///
+/// This exists because the state read can fail twice: the row need not carry
+/// `consignmentstatus`, and `GET /miler/consignments/:id` can 404 on an older
+/// deployment. In that case the refusal itself is the only thing that knows
+/// what happened, and throwing it away costs the rider a real answer.
+///
+/// Matches only the wire's own shape — capitalised words joined by
+/// underscores — so an ordinary sentence yields nothing.
+ConsignmentState consignmentStateNamedInRefusal(String message) {
+  if (message.isEmpty) return ConsignmentState.unknown;
+  for (final m in RegExp(
+    r'[A-Za-z]+(?:_[A-Za-z]+)+',
+  ).allMatches(message)) {
+    final state = consignmentStateFromRaw(m.group(0));
+    if (state == ConsignmentState.unknown) continue;
+    // The state the endpoint requires, not the state it found.
+    if (state == ConsignmentState.collectedByMiler) continue;
+    return state;
+  }
+  return ConsignmentState.unknown;
+}
+
+/// True when [message] is the backend talking to itself.
+///
+/// A refusal carrying a wire enum — `Inwarded_At_Hub`, `Out_for_Delivery` — is
+/// a state-machine assertion, not a sentence for a rider, and it must never
+/// reach a screen. Anything else the server says is prose written for a person
+/// and is worth more than a generic apology, so it is still passed through.
+bool namesWireState(String message) =>
+    RegExp(r'[A-Za-z]+(?:_[A-Za-z]+)+').hasMatch(message);
+
 /// What the app is allowed to do with a consignment, decided from the
 /// authoritative server state rather than from a booking row or a local flag.
 enum DeliverGate {
diff --git a/lib/data/device_telemetry.dart b/lib/data/device_telemetry.dart
new file mode 100644
index 0000000..871d56c
--- /dev/null
+++ b/lib/data/device_telemetry.dart
@@ -0,0 +1,133 @@
+import 'package:battery_plus/battery_plus.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter/foundation.dart';
+import 'package:geolocator/geolocator.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// WHAT THE CONSOLE NEEDS TO SEE ABOUT THE HANDSET
+///
+/// The dispatcher watching a rider is not only asking *where is he*. When a
+/// rider stops reporting, the question is **why** — and the answers are all
+/// facts about the phone: the battery died, the signal dropped, he turned
+/// location off, the app went to the background and the OS stopped waking it.
+/// `POST /miler/logs` has fields for every one of them:
+///
+/// ```
+///   battery  is_charging  connection  location_service  accuracy  is_background
+/// ```
+///
+/// ── Why the console was showing an em dash for all of it ──
+///
+/// Not because nothing was measured. Every one of these was already being read
+/// on the heartbeat — and published to **MQTT only**, in a block that ran
+/// *after* the log had been posted. So the telemetry existed, reached a
+/// different transport, and the rider-log row the console actually reads
+/// carried nothing but a position.
+///
+/// It was two lanes for one fact, and the lane the console reads was the empty
+/// one. This is the reader both now share: one place that knows how to ask the
+/// handset, so the MQTT publish and the log post cannot report different
+/// batteries a second apart.
+///
+/// ── Never throws, never blocks ──
+///
+/// Telemetry is the least important thing the app does. A permissions prompt, a
+/// platform channel that hangs, a plugin missing on a desktop test host — none
+/// of them may cost the rider his heartbeat, so every read is guarded
+/// individually and an unavailable one simply does not appear in the map.
+/// A field that is absent renders as the em dash it already rendered as; a
+/// field that is *wrong* would be read as fact by somebody making a decision.
+/// ─────────────────────────────────────────────────────────────────────────
+class DeviceTelemetry {
+  /// Battery percentage, or null when the platform will not say.
+  final int? battery;
+
+  /// True while on the charger — a rider at 12% and charging is not the same
+  /// problem as a rider at 12% and riding.
+  final bool? isCharging;
+
+  /// `wifi`, `mobile`, `none` … as the platform names it.
+  final String? connection;
+
+  /// `enabled`, `disabled`, `denied`, `denied_forever`, `unknown`.
+  ///
+  /// The one field here that is about a *choice the rider made*, which is why
+  /// it is worth a column of its own on the console: a disabled location
+  /// service explains a silent rider completely, and no amount of staring at
+  /// his last position does.
+  final String? locationService;
+
+  const DeviceTelemetry({
+    this.battery,
+    this.isCharging,
+    this.connection,
+    this.locationService,
+  });
+
+  /// Reads what the handset will say about itself, right now.
+  ///
+  /// [locationService] can be supplied by a caller that has just resolved a
+  /// fix and already knows — the position lookup has to ask the same question
+  /// to get a fix at all, and asking twice can disagree with itself when the
+  /// rider toggles the setting between the two calls.
+  static Future<DeviceTelemetry> read({String? locationService}) async {
+    int? level;
+    bool? charging;
+    try {
+      final battery = Battery();
+      level = await battery.batteryLevel;
+      final state = await battery.batteryState;
+      charging =
+          state == BatteryState.charging || state == BatteryState.full;
+    } catch (e) {
+      debugPrint('[TELEMETRY] battery unavailable: $e');
+    }
+
+    String? connection;
+    try {
+      final result = await Connectivity().checkConnectivity();
+      connection = result.isNotEmpty
+          ? result.first.toString().split('.').last
+          : 'none';
+    } catch (e) {
+      debugPrint('[TELEMETRY] connectivity unavailable: $e');
+    }
+
+    var service = locationService;
+    if (service == null || service.isEmpty || service == 'unknown') {
+      try {
+        service = await Geolocator.isLocationServiceEnabled()
+            ? 'enabled'
+            : 'disabled';
+      } catch (e) {
+        debugPrint('[TELEMETRY] location service unavailable: $e');
+        service = null;
+      }
+    }
+
+    return DeviceTelemetry(
+      battery: level,
+      isCharging: charging,
+      connection: connection,
+      locationService: service,
+    );
+  }
+
+  /// The heartbeat payload's own field names, ready to spread into it.
+  ///
+  /// Only what was actually read: an absent key is a field the console draws as
+  /// unknown, which is the truth. A `0` battery or a `none` connection standing
+  /// in for "could not ask" is a fact somebody would act on.
+  Map<String, dynamic> toPayload() => <String, dynamic>{
+    if (battery != null) 'battery': '$battery',
+    if (isCharging != null) 'is_charging': isCharging,
+    if (connection != null && connection!.isNotEmpty) 'connection': connection,
+    if (locationService != null && locationService!.isNotEmpty)
+      'location_service': locationService,
+  };
+
+  @override
+  String toString() =>
+      'battery=$battery charging=$isCharging '
+      'connection=$connection location=$locationService';
+}
diff --git a/lib/data/meal_run_mock.dart b/lib/data/meal_run_mock.dart
index 4e41ecc..b80a0ff 100644
--- a/lib/data/meal_run_mock.dart
+++ b/lib/data/meal_run_mock.dart
@@ -149,7 +149,7 @@ class MealRunMock {
       lat: 11.0271,
       lng: 76.9962,
       kitchen: _vidhya,
-      bag: 'DG-1001',
+      label: 'DG-1001',
       meals: 1,
     ),
     _drop(
@@ -161,7 +161,7 @@ class MealRunMock {
       lat: 11.0248,
       lng: 76.9941,
       kitchen: _vidhya,
-      bag: 'DG-1002',
+      label: 'DG-1002',
       meals: 1,
     ),
     _drop(
@@ -173,7 +173,7 @@ class MealRunMock {
       lat: 11.0043,
       lng: 76.9518,
       kitchen: _vidhya,
-      bag: 'DG-1003',
+      label: 'DG-1003',
       meals: 1,
     ),
     _drop(
@@ -185,7 +185,7 @@ class MealRunMock {
       lat: 11.0168,
       lng: 76.9558,
       kitchen: _vidhya,
-      bag: 'DG-1004',
+      label: 'DG-1004',
       meals: 1,
     ),
     _drop(
@@ -197,7 +197,7 @@ class MealRunMock {
       lat: 10.9925,
       lng: 77.0289,
       kitchen: _vidhya,
-      bag: 'DG-1005',
+      label: 'DG-1005',
       meals: 1,
     ),
 
@@ -211,7 +211,7 @@ class MealRunMock {
       lat: 11.0181,
       lng: 76.9603,
       kitchen: _annapoorna,
-      bag: 'AM-2001',
+      label: 'AM-2001',
       meals: 1,
     ),
     _drop(
@@ -223,7 +223,7 @@ class MealRunMock {
       lat: 10.9871,
       lng: 76.9931,
       kitchen: _annapoorna,
-      bag: 'AM-2002',
+      label: 'AM-2002',
       meals: 1,
     ),
     _drop(
@@ -235,7 +235,7 @@ class MealRunMock {
       lat: 10.9903,
       lng: 76.9977,
       kitchen: _annapoorna,
-      bag: 'AM-2003',
+      label: 'AM-2003',
       meals: 1,
     ),
     _drop(
@@ -247,7 +247,7 @@ class MealRunMock {
       lat: 11.0221,
       lng: 76.9391,
       kitchen: _annapoorna,
-      bag: 'AM-2004',
+      label: 'AM-2004',
       meals: 1,
     ),
   ];
@@ -303,7 +303,7 @@ class MealRunMock {
       int locationId,
     })
     kitchen,
-    required String bag,
+    required String label,
     required int meals,
   }) => <String, dynamic>{
     // `MOCK-` so `purgeDemoRecords()` recognises anything that leaks into a
@@ -334,11 +334,11 @@ class MealRunMock {
     // bag identity all key off these.
     'kitchenid': kitchen.id,
     'kitchenname': kitchen.name,
-    'baglabel': bag,
+    'baglabel': label,
 
     // A drop, and how many boxes are in it. One order is one bag — the count
     // here is the *meal* count inside that bag, and nothing reads it as a bag
-    // count. See [BagManifest].
+    // count. See [OrderManifest].
     'type': 'delivery',
     'deliveryqty': meals,
     'quantity': meals,
diff --git a/lib/data/milk_run.dart b/lib/data/milk_run.dart
index cf1e3a8..26b008e 100644
--- a/lib/data/milk_run.dart
+++ b/lib/data/milk_run.dart
@@ -102,7 +102,60 @@ class MilkRun {
   // fabricated kitchen.
 
   /// The stable key a stop groups under for pickup.
-  static String sourceKeyOf(Map<String, dynamic> stop) {
+  ///
+  /// ── The address is the last witness, and it was not being asked ──
+  ///
+  /// Id, then name, then `'none'` — and `'none'` is its own bucket per the note
+  /// above, on the sound principle that the app must not fabricate a kitchen.
+  ///
+  /// What that missed is that a stop with no source id and no source name is
+  /// not a stop with no *place*. It still says where it is collected from: the
+  /// pickup address, which is on every row, and which two orders off the same
+  /// counter share exactly because it is the same counter.
+  ///
+  /// The cost of not asking was visible on a real morning. Eight orders came
+  /// from one kitchen, seven carrying its id and one not, and the eighth could
+  /// not be grouped with its siblings — so it fell out of the dropdown into a
+  /// flat header of its own, titled with the customer's name, reading as a
+  /// second place the rider had to ride to. Seven bags in a list and one
+  /// stranded above it, off the same shelf.
+  ///
+  /// Grouping by address is not a fabricated kitchen: it is the weakest true
+  /// statement available — *these are collected from the same address* — and it
+  /// is only reached when the two stronger ones are absent. A row with no
+  /// address at all still gets `'none'`, and still stands alone.
+  /// [within] is the rest of the day, when the caller has it. A stop that
+  /// names no counter **adopts the one its neighbours name at the same
+  /// address** — which is the half of this that the reported case actually
+  /// needed: seven of the eight carried the kitchen's id and the eighth carried
+  /// nothing, so keying the odd one out by its address alone still left it in a
+  /// bucket of its own, correctly grouped with nobody.
+  ///
+  /// Only ever *adopts*, never overrides: a stop with its own identity is
+  /// keyed by it and does not consult the day at all. So two counters that
+  /// share a street cannot merge, and a row cannot be pulled away from the id
+  /// the hub gave it.
+  static String sourceKeyOf(
+    Map<String, dynamic> stop, {
+    List<Map<String, dynamic>> within = const [],
+  }) {
+    final own = _identityKeyOf(stop);
+    if (own.isNotEmpty) return own;
+
+    final place = _addressKey(stop);
+    if (place.isEmpty) return 'none';
+
+    for (final other in within) {
+      if (_addressKey(other) != place) continue;
+      final identified = _identityKeyOf(other);
+      if (identified.isNotEmpty) return identified;
+    }
+    return 'at:$place';
+  }
+
+  /// The counter this stop names for itself — `id:…`, `name:…`, or `''` when
+  /// the payload names none.
+  static String _identityKeyOf(Map<String, dynamic> stop) {
     final id =
         (stop['sourceid'] ??
                 stop['kitchenid'] ??
@@ -113,7 +166,25 @@ class MilkRun {
     if (id.isNotEmpty && id != '0') return 'id:$id';
     final name = sourceNameOf(stop).toLowerCase();
     if (name.isNotEmpty) return 'name:$name';
-    return 'none';
+    return '';
+  }
+
+  /// A pickup address reduced to something two rows can be compared on.
+  ///
+  /// Case, spacing and punctuation all vary between rows the same hub wrote —
+  /// `12, SNS Colony` and `12 SNS COLONY ` are one place — so everything but
+  /// the letters and digits is dropped before comparing. Deliberately not
+  /// `compactAddress`: that is written to be *read*, and a key should not
+  /// change because a display rule was tuned.
+  static String _addressKey(Map<String, dynamic> stop) {
+    final raw =
+        (stop['pickupaddress'] ??
+                stop['PickupAddress'] ??
+                stop['pickup_address'] ??
+                '')
+            .toString()
+            .toLowerCase();
+    return raw.replaceAll(RegExp(r'[^a-z0-9]'), '');
   }
 
   /// The kitchen's name as the rider reads it, or '' when the payload has none.
@@ -177,10 +248,14 @@ class MilkRun {
     Map<String, dynamic> stop,
     List<Map<String, dynamic>> stops,
   ) {
-    final key = sourceKeyOf(stop);
+    // The day is passed on both sides so a row that names no counter is
+    // gathered with the ones that do — see [sourceKeyOf]. Without it the bulk
+    // collect would leave behind exactly the order the route card had just
+    // learned to group in, which is the two-readers failure in a new place.
+    final key = sourceKeyOf(stop, within: stops);
     return [
       for (final s in stops)
-        if (sourceKeyOf(s) == key) s,
+        if (sourceKeyOf(s, within: stops) == key) s,
     ];
   }
 
diff --git a/lib/data/order_events.dart b/lib/data/order_events.dart
index 5a7cadc..8e5e514 100644
--- a/lib/data/order_events.dart
+++ b/lib/data/order_events.dart
@@ -131,10 +131,49 @@ Future<void> stampOrderEvent(
 
 /// Stamps one event against several orders at once — a kitchen handover, an
 /// accept-all, a released round.
-Future<void> stampOrderEvents(Iterable<Object> orderIds, String event) async {
-  final at = DateTime.now();
-  for (final id in orderIds) {
-    await stampOrderEvent(id, event, at: at);
+Future<void> stampOrderEvents(Iterable<Object> orderIds, String event) async =>
+    stampOrderEventsAndRead(orderIds, event);
+
+/// [stampOrderEvents], and hands back the whole ledger it just wrote.
+///
+/// ── Why the batch is one read and one write ──
+///
+/// [stampOrderEvent] is a read-modify-write of the entire ledger, and the loop
+/// that called it did that **once per order**. A rider holding sixty bookings
+/// therefore paid sixty decodes and sixty encodes of a JSON blob that grows
+/// with his day, on every poll — which is why the call site had to fire it into
+/// the dark with `unawaited` and could never use the result.
+///
+/// It is used now: [WorkRepository] merges the assignment stamp back onto the
+/// rows it just fetched, so "when did this reach me" is a fact on the stop
+/// rather than a second store every screen has to join for itself. That needs
+/// the ledger *after* the write, which is the other half of why this exists.
+///
+/// Still written once — an order that already carries [event] keeps the clock
+/// it has.
+Future<Map<String, Map<String, String>>> stampOrderEventsAndRead(
+  Iterable<Object> orderIds,
+  String event,
+) async {
+  try {
+    final prefs = await SharedPreferences.getInstance();
+    final all = await _read(prefs);
+    final at = DateTime.now().toIso8601String();
+
+    var added = 0;
+    for (final raw in orderIds) {
+      final id = raw.toString().trim();
+      if (id.isEmpty) continue;
+      final mine = all.putIfAbsent(id, () => <String, String>{});
+      if (mine.containsKey(event)) continue;
+      mine[event] = at;
+      added++;
+    }
+    if (added > 0) await prefs.setString(_kKey, jsonEncode(all));
+    return all;
+  } catch (e) {
+    debugPrint('[EVENTS] could not stamp $event on a batch: $e');
+    return const {};
   }
 }
 
@@ -170,9 +209,24 @@ Future<void> clearOrderEvents(Object orderId) async {
 ///
 /// The ledger is per-order and nothing prunes it on read, so without this it
 /// grows for the life of the install — the same trap `removeCollectedOrderIds`
-/// exists to avoid. Two days rather than one, because a shift that crosses
-/// midnight must not lose its own morning.
-Future<void> pruneOrderEvents({int keepDays = 2}) async {
+/// exists to avoid.
+///
+/// ── Why two days was not enough once Home read this ──
+///
+/// It was two, on the reasoning that a shift crossing midnight must not lose
+/// its own morning. That is the right floor for a *timeline*, which is all this
+/// fed. It is the wrong floor for a **day filter**.
+///
+/// [OrderEvent.assigned] is now what dates a booking the backend dates with
+/// nothing, and an order still sitting in the queue undecided carries that one
+/// stamp and no other. At two days it was pruned on the third morning, the next
+/// fetch stamped it afresh with *that* day's clock, and a booking from Monday
+/// reappeared on Thursday's Home as Thursday's work — the precise failure the
+/// filter was added to stop, arriving three days late.
+///
+/// A fortnight is well past any open booking's life, and the cost is a few
+/// hundred bytes: the entry is an id and up to five short strings.
+Future<void> pruneOrderEvents({int keepDays = 14}) async {
   try {
     final prefs = await SharedPreferences.getInstance();
     final all = await _read(prefs);
diff --git a/lib/data/order_manifest.dart b/lib/data/order_manifest.dart
new file mode 100644
index 0000000..ea4a23f
--- /dev/null
+++ b/lib/data/order_manifest.dart
@@ -0,0 +1,114 @@
+import 'package:miler/data/milk_run.dart';
+import 'package:miler/views/Dashboard/pickups/stop_type.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// WHAT THE RIDER COLLECTS AT A COUNTER, AS A LIST HE CAN COUNT
+///
+/// One pickup order is one handover. If a kitchen has five pickup orders the
+/// rider is handed five things and ends up with five deliveries, each carrying
+/// what it arrived in. That rule lives here so it cannot be stated two
+/// different ways on two screens.
+///
+/// ── Why this is a file and not a `+ 1` at each call site ──
+///
+/// Every screen in the pickup half of the app has to answer "how many?" and
+/// "which one is this?", and every screen that answered independently answered
+/// differently: one showed a backend `Quantity` (an order's item count, not a
+/// count of handovers), one showed a bare printed label when the payload
+/// happened to carry one and nothing at all when it did not, and the kitchen
+/// heading counted "meals". A rider standing at a counter comparing "5 meals"
+/// on his phone with four items on the shelf has no way to tell which of the
+/// two numbers is wrong.
+///
+/// So the count is **derived from the orders**, always, and there is no second
+/// quantity anywhere that can disagree with it.
+///
+/// ── The invented numbering is gone ──
+///
+/// This used to name every line `Bag 1 … Bag n`, falling back to the order's
+/// position in its group whenever the payload printed no label of its own. Two
+/// things were wrong with that, and only the second is about the word.
+///
+/// The number was **the app's own invention presented as a physical fact**. It
+/// counted positions in a list the app had built, and it was drawn as a tag in
+/// the corner of every row where it read like something stencilled on a
+/// container. A rider matching a shelf against it was matching against the
+/// app's arithmetic, not against anything the kitchen had written; and the rail
+/// beside it already numbers the same rows, so the tag mostly restated the node
+/// two columns to its left in louder type.
+///
+/// A label the counter **actually printed** is a different thing entirely — it
+/// is a fact about an object in front of him — so it survives, verbatim, under
+/// whatever name the kitchen gave it. What is never done again is manufacturing
+/// one where none exists.
+///
+/// Nothing here fabricates a crate, a tote or a quantity the backend has not
+/// sent. If a future contract ever puts more than one handover on an order,
+/// this is the one file that changes.
+/// ─────────────────────────────────────────────────────────────────────────
+class OrderManifest {
+  OrderManifest._();
+
+  /// One line per order: the stop, who it is for, and the label the counter
+  /// printed on it — empty when it printed none.
+  ///
+  /// Deliberately carries the stop itself: every caller that renders a manifest
+  /// also needs to act on the orders behind it, and pairing them here is what
+  /// stops a screen from rendering five lines and posting four ids.
+  static List<ManifestLine> forGroup(List<Map<String, dynamic>> stops) => [
+    for (var i = 0; i < stops.length; i++)
+      ManifestLine(
+        stop: stops[i],
+        orderId: MilkRun.idOf(stops[i]),
+        customer: customerOf(stops[i]),
+        label: labelFor(stops[i]),
+      ),
+  ];
+
+  /// The label physically printed on one order's handover, or `''`.
+  ///
+  /// Read straight off the payload and never derived. A counter that prints
+  /// nothing leaves this empty, and the row simply carries no tag — which is
+  /// honest, where a manufactured `Bag 4` was a shelf reference the shelf had
+  /// never heard of.
+  static String labelFor(Map<String, dynamic> stop) => stopPrintedLabel(stop);
+
+  /// `5 orders` — the load, in the unit everything else on the screen counts.
+  ///
+  /// It printed `5 orders · 5 bags` once: the two halves of one rule side by
+  /// side, as a check the rider could eyeball. That cost the header the fact it
+  /// exists for — a real kitchen name plus `13 orders · 13 bags` pushed
+  /// `11 to accept` off the row — so it was cut to the physical half, `13 bags`.
+  ///
+  /// Now that the app no longer names anything a bag, the surviving half is the
+  /// one the rest of the screen already speaks: the rows underneath are orders,
+  /// the chip counts orders, the hub assigns orders. One word, everywhere.
+  static String countLabel(int orders) =>
+      orders == 1 ? '1 order' : '$orders orders';
+
+  /// The name the order is going to, for a manifest line.
+  static String customerOf(Map<String, dynamic> stop) =>
+      (stop['pickupcustomer'] ??
+              stop['customername'] ??
+              stop['tenantname'] ??
+              '')
+          .toString()
+          .trim();
+}
+
+/// One row of a pickup manifest. See [OrderManifest.forGroup].
+class ManifestLine {
+  final Map<String, dynamic> stop;
+  final String orderId;
+  final String customer;
+
+  /// What the counter printed on this order, or `''` when it printed nothing.
+  final String label;
+
+  const ManifestLine({
+    required this.stop,
+    required this.orderId,
+    required this.customer,
+    this.label = '',
+  });
+}
diff --git a/lib/data/service_day.dart b/lib/data/service_day.dart
index f38ac3b..e4873ce 100644
--- a/lib/data/service_day.dart
+++ b/lib/data/service_day.dart
@@ -89,7 +89,22 @@ abstract final class ServiceDay {
     'modifiedon',
     'updatedat',
     'expected_pickup_time',
+    'expectedpickuptime',
     'createdat',
+    'createdon',
+    // ── Last, because it is the app's own guess and not the hub's record ──
+    //
+    // When the booking first appeared in this rider's queue, written by
+    // [WorkRepository] and merged onto the row there. It is the weakest answer
+    // on this list — a booking the rider's phone met for the first time this
+    // morning may have been raised last night — so every clock the backend
+    // actually sends outranks it.
+    //
+    // It is on the list because the alternative is worse. A row the backend
+    // dates with nothing is a row no screen can place, and the observable
+    // result was yesterday's assignments sitting on Home under a heading that
+    // says today. An approximate day beats no day.
+    'assignedat',
   ];
 
   /// The service day [row] belongs to, or `''` when it carries nothing usable.
@@ -154,6 +169,83 @@ abstract final class ServiceDay {
     return day == (now ?? today);
   }
 
+  /// The rows of [stops] that belong to [now], for a screen that shows the
+  /// rider's **live** work — Home's run, Deliveries' queue.
+  ///
+  /// ── Why the work screens needed this and Activity did not ──
+  ///
+  /// `GET /miler/bookings` returns the rider's whole **open** set, not his day.
+  /// A booking assigned on Tuesday and never closed comes back on Wednesday and
+  /// on Thursday, so every screen built from that call was showing a week and
+  /// calling it today: yesterday's stops inside the kitchen dropdown, inside
+  /// the trip counts, inside the progress ring and inside the delivery queue.
+  ///
+  /// Activity already filtered, with [belongsToToday], and that is why the two
+  /// halves of the app disagreed about the same order. This is the same
+  /// predicate, applied at the same kind of boundary — the fetch — so that
+  /// every figure a screen prints is computed from one set rather than each
+  /// widget filtering for itself. A filter inside a card would have left the
+  /// counts above it still totalling Tuesday.
+  ///
+  /// ── The burden of proof is on the row ──
+  ///
+  /// Undated rows go too, exactly as they do on Activity. They are rare now:
+  /// `ApiConfig.pickupFromBooking` carries every clock the backend sends
+  /// instead of dropping them at the adapter, and `WorkRepository` stamps
+  /// `assignedat` on everything still in front of the rider. A stop with no
+  /// date at all is one the app has never seen as open work, which is not this
+  /// morning's assignment.
+  ///
+  /// ── One safety net, and it is deliberately narrow ──
+  ///
+  /// If the day came back with rows and **not one of them** can be dated, that
+  /// is not a stale queue — it is the app having lost the ability to date
+  /// anything at all, and the answer to that is not to show a rider an empty
+  /// screen while his hub believes he has twenty stops. That case keeps
+  /// everything and says so in the log. One undated row among dated ones is a
+  /// data defect and is dropped; *every* row undated is a broken build, and
+  /// blanking the screen would hide it behind something that reads like good
+  /// news.
+  ///
+  /// [where] names the caller in the log line, so two screens filtering the
+  /// same day are told apart. Nothing is deleted anywhere: this is a view
+  /// filter, and both local stores and the backend keep every record they had.
+  static List<Map<String, dynamic>> onlyToday(
+    List<Map<String, dynamic>> stops, {
+    String? now,
+    String where = 'DAY',
+  }) {
+    if (stops.isEmpty) return stops;
+    final day = now ?? today;
+
+    final kept = <Map<String, dynamic>>[];
+    var undated = 0;
+    for (final s in stops) {
+      if (of(s).isEmpty) {
+        undated++;
+        logUndated(s);
+        continue;
+      }
+      if (belongsToToday(s, now: day)) kept.add(s);
+    }
+
+    if (undated == stops.length) {
+      debugPrint(
+        '[$where] $day — not one of ${stops.length} stops carries a date. '
+        'Showing the lot rather than an empty day; check the adapter.',
+      );
+      return stops;
+    }
+
+    if (kept.length != stops.length) {
+      debugPrint(
+        '[$where] $day — kept ${kept.length} of ${stops.length} stops'
+        '${undated > 0 ? ' ($undated undated)' : ''}',
+      );
+    }
+    return kept;
+  }
+
   /// The standard [belongsToToday] undated reporter: names the row, says which
   /// fields were looked for, and stays out of release logs.
   ///
diff --git a/lib/data/service_profile.dart b/lib/data/service_profile.dart
index 328f3b6..763e026 100644
--- a/lib/data/service_profile.dart
+++ b/lib/data/service_profile.dart
@@ -572,10 +572,12 @@ Future<ServiceProfile> resolveServiceProfile() async {
   // patterns collide. Tenant 13 carrying a display name that normalises to
   // `doormile` — which is, after all, the company that owns the tenant record —
   // resolved that rider to Logistics and never consulted the id at all. On the
-  // Logistics line `_unreleased` is empty by design, so the **Start round** bar
-  // does not render, and once `MILER_COLLECTED_STATE_ENABLED` is on his
-  // collected parcels strand at `Collected_By_Miler` with no control to release
-  // them. A global flag gets one safe shot, and this was the loose end in it.
+  // Logistics line a rider has no customer round at all — he carries what he
+  // collects to the hub — so nothing in the app will ever call
+  // `start-delivery` for him. Once `MILER_COLLECTED_STATE_ENABLED` is on, a
+  // meal rider resolved onto Logistics has his collected orders strand at
+  // `Collected_By_Miler` with no control anywhere that releases them. A global
+  // flag gets one safe shot, and this was the loose end in it.
   //
   // A deliberate statement about a known tenant outranks a match on a word
   // nobody on either side of the API controls the spelling of.
diff --git a/lib/data/stop_area.dart b/lib/data/stop_area.dart
index 71b7a69..a083212 100644
--- a/lib/data/stop_area.dart
+++ b/lib/data/stop_area.dart
@@ -157,6 +157,36 @@ String areaOf(Map<String, dynamic> stop, {bool preferDrop = true}) {
   return '';
 }
 
+/// Where a stop is **collected from**, as the payload writes it, or `''`.
+///
+/// ── Why this is not [areaOf] with `preferDrop: false` ──
+///
+/// [areaOf] answers "which neighbourhood", and deliberately throws away
+/// everything that is not a locality name — which is the right answer for a
+/// list of twenty stops and the wrong one for the counter the rider is riding
+/// to. He needs the street to find the door.
+///
+/// Three screens were each reading the same four key names for this and one of
+/// them, the route card, was reading none of them at all. One reader, so a
+/// payload that spells it `pickup_address` cannot answer on the preview sheet
+/// and stay blank on the card behind it.
+///
+/// Returns `''` rather than a placeholder: a card prints nothing where there is
+/// no address, which is honest, where "Address not available" is a line of
+/// furniture saying the app has failed.
+String pickupAddressOf(Map<String, dynamic> stop) {
+  for (final key in const [
+    'pickupaddress',
+    'PickupAddress',
+    'pickup_address',
+    'address',
+  ]) {
+    final raw = (stop[key] ?? '').toString().trim();
+    if (raw.isNotEmpty && raw.toLowerCase() != 'null') return raw;
+  }
+  return '';
+}
+
 /// A full address, minus the boilerplate a geocoder appends.
 ///
 /// The record page prints the address in full — it is the one screen whose
diff --git a/lib/data/work_repository.dart b/lib/data/work_repository.dart
index b28eba6..2291700 100644
--- a/lib/data/work_repository.dart
+++ b/lib/data/work_repository.dart
@@ -228,23 +228,19 @@ class WorkRepository {
     // it is the timeline contradicting itself in the rider's face. Anything the
     // backend already reports as past his hands is skipped, and stays skipped
     // forever because [stampOrderEvent] never overwrites.
-    unawaited(
-      stampOrderEvents(
-        mapped
-            .where((s) {
-              final st = stopStatusOf(s);
-              return !st.isWorkComplete &&
-                  !st.isCancelled &&
-                  !st.isRejected &&
-                  !st.isSkipped &&
-                  !st.isPicked &&
-                  !st.isDeliveryLeg;
-            })
-            .map((s) => (s['orderid'] ?? '').toString())
-            .where((id) => id.isNotEmpty),
-        OrderEvent.assigned,
-      ),
-    );
+    //
+    // ── And it is read back onto the row ──
+    //
+    // It used to be fired into the dark with `unawaited`: written for one
+    // screen's timeline, and joined by that screen alone. That left every other
+    // screen with no clock at all on a row the backend dates with nothing, and
+    // "does this belong to today" is a question three of them ask.
+    //
+    // So the stamp comes back as `assignedat` — a field on the stop, like any
+    // other. Awaited rather than fired off, because a row that reaches Home
+    // before its own clock does is a row Home cannot place, and the batch is
+    // one read and one write of a small blob. See [stampOrderEventsAndRead].
+    await _stampAssignment(mapped);
 
     _loadedAt = DateTime.now();
     return _publish(
@@ -286,6 +282,59 @@ class WorkRepository {
     }
   }
 
+  /// Writes each stop's assignment clock onto it, in place, as `assignedat`.
+  ///
+  /// ── Which rows are stamped, and which only read ──
+  ///
+  /// Only work still in front of the rider is *stamped* — see the note at the
+  /// call site: the ledger did not exist when a stop that is already delivered
+  /// arrived, so its first sighting is whenever the app happened to be opened,
+  /// and an `Assigned 3:34 PM` above a `Delivered 11:57 AM` is the timeline
+  /// contradicting itself.
+  ///
+  /// Every row is **read**, though, finished ones included. A stop the rider
+  /// collected this morning was stamped this morning while it was still ahead
+  /// of him, and that clock is exactly what keeps it inside today's trip — drop
+  /// it and the progress ring loses its own denominator the moment the work is
+  /// done.
+  ///
+  /// A backend clock always wins: this only fills a gap, never overwrites.
+  static Future<void> _stampAssignment(List<Map<String, dynamic>> day) async {
+    if (day.isEmpty) return;
+    try {
+      final ledger = await stampOrderEventsAndRead(
+        day
+            .where((s) {
+              final st = stopStatusOf(s);
+              return !st.isWorkComplete &&
+                  !st.isCancelled &&
+                  !st.isRejected &&
+                  !st.isSkipped &&
+                  !st.isPicked &&
+                  !st.isDeliveryLeg;
+            })
+            .map((s) => (s['orderid'] ?? '').toString())
+            .where((id) => id.isNotEmpty),
+        OrderEvent.assigned,
+      );
+      if (ledger.isEmpty) return;
+
+      for (final stop in day) {
+        final id = (stop['orderid'] ?? '').toString().trim();
+        if (id.isEmpty) continue;
+        final at = ledger[id]?[OrderEvent.assigned];
+        if (at == null || at.isEmpty) continue;
+        final existing = (stop['assignedat'] ?? '').toString().trim();
+        if (existing.isNotEmpty) continue;
+        stop['assignedat'] = at;
+      }
+    } catch (e) {
+      // A day with no assignment clocks is a day the screens date by whatever
+      // the backend sent. Never worth failing the fetch over.
+      debugPrint('[WORK] could not read the assignment ledger: $e');
+    }
+  }
+
   /// Turns a refused call into the thing the rider does about it.
   static LoadFailureKind _classify(ApiResult res) => switch (res.status) {
     0 => LoadFailureKind.offline,
diff --git a/lib/helpers/http_overrides.dart b/lib/helpers/http_overrides.dart
index 36ccf39..1c911c0 100644
--- a/lib/helpers/http_overrides.dart
+++ b/lib/helpers/http_overrides.dart
@@ -1,10 +1,36 @@
 import 'dart:io';
 
+/// ─────────────────────────────────────────────────────────────────────────
+/// THE APP VALIDATES CERTIFICATES AGAIN
+///
+/// This class used to override `badCertificateCallback` to return `true` for
+/// every certificate, on every host, and it was installed globally in three
+/// places — `main`, the background isolate and the notification handler. That
+/// is not a lenient setting; it is **TLS switched off**. Any network the rider's
+/// phone joins could present a self-signed certificate for `api.doormile.com`
+/// and the app would hand over his session token, his live position and the
+/// day's cash figures without a word.
+///
+/// It is the kind of thing that gets added once to get past a staging server
+/// and then ships. Both live hosts were checked before removing it and both
+/// present valid, publicly-trusted certificates — `api.doormile.com` and
+/// `queue.workolik.com` verify strictly under TLS 1.3 against Let's Encrypt.
+/// Nothing needed the bypass.
+///
+/// ── What is left, and why the class is still here ──
+///
+/// Dart's default `HttpClient` already validates properly, so the honest
+/// version of this override is one that changes nothing about trust. It stays
+/// as a named place to put a real connection policy — a timeout, a proxy, a
+/// pinned certificate — so that the next person who needs one has somewhere
+/// obvious to put it that is not "turn the checks off".
+///
+/// **Never restore the callback.** If a host genuinely cannot present a valid
+/// certificate, pin *that host's* certificate here; do not trust every host on
+/// the internet to work around one.
+/// ─────────────────────────────────────────────────────────────────────────
 class MyHttpOverrides extends HttpOverrides {
   @override
-  HttpClient createHttpClient(SecurityContext? context) {
-    return super.createHttpClient(context)
-      ..badCertificateCallback =
-          (X509Certificate cert, String host, int port) => true;
-  }
+  HttpClient createHttpClient(SecurityContext? context) =>
+      super.createHttpClient(context);
 }
diff --git a/lib/providers/Riderlog/riderlog_provider.dart b/lib/providers/Riderlog/riderlog_provider.dart
index ea0e60c..8b34c7c 100644
--- a/lib/providers/Riderlog/riderlog_provider.dart
+++ b/lib/providers/Riderlog/riderlog_provider.dart
@@ -125,6 +125,17 @@ Future<Map<String, dynamic>?> _heartbeat(Map data) async {
       connection: _s(data['connection']).isEmpty
           ? null
           : _s(data['connection']),
+      // ── This was being dropped on the floor ──
+      //
+      // Every other device field on the heartbeat was forwarded and this one
+      // was not, so `location_service` could never reach `/miler/logs` however
+      // faithfully the caller supplied it — and the console's Location Service
+      // column had no field to read. It is the single most useful thing on
+      // that panel: a rider who has turned location off explains his own
+      // silence, and nothing else on the row can.
+      locationService: _s(data['location_service']).isEmpty
+          ? null
+          : _s(data['location_service']),
       isBackground: data['is_background'] == true,
     ),
   );
diff --git a/lib/test/tmp_m/m.dart b/lib/test/tmp_m/m.dart
deleted file mode 100644
index ea64caf..0000000
--- a/lib/test/tmp_m/m.dart
+++ /dev/null
@@ -1,84 +0,0 @@
-import 'dart:ui' as ui;
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:miler/views/helpers/constants/Colorconstants.dart';
-import 'package:miler/views/helpers/constants/Font_constant.dart';
-
-/// Mirrors `_calloutBitmap` in map.dart so the drawing maths can be checked
-/// headless — the real one is private to a State inside a `part` file.
-Future<({int w, int h})> callout(String text, double dpr) async {
-  const double padH = 12, padV = 9, radius = 12, tail = 9, tailW = 14;
-  const double maxTextWidth = 190;
-  final painter = TextPainter(
-    text: TextSpan(
-      text: text,
-      style: TextStyle(
-        fontSize: 12 * dpr,
-        height: 1.25,
-        fontWeight: FontWeight.w600,
-        color: ColorConstants.slateText,
-        fontFamily: FontConstants.fontFamily,
-      ),
-    ),
-    maxLines: 2,
-    ellipsis: '…',
-    textDirection: TextDirection.ltr,
-  )..layout(maxWidth: maxTextWidth * dpr);
-
-  final w = painter.width + padH * 2 * dpr;
-  final h = painter.height + padV * 2 * dpr;
-  final totalH = h + tail * dpr;
-
-  final rec = ui.PictureRecorder();
-  final canvas = Canvas(rec);
-  final body = RRect.fromRectAndRadius(
-    Rect.fromLTWH(0, 0, w, h),
-    Radius.circular(radius * dpr),
-  );
-  canvas.drawRRect(
-    body.shift(Offset(0, 1.5 * dpr)),
-    Paint()
-      ..color = Colors.black.withValues(alpha: 0.18)
-      ..maskFilter = MaskFilter.blur(BlurStyle.normal, 3 * dpr),
-  );
-  canvas.drawRRect(body, Paint()..color = Colors.white);
-  final tip = Path()
-    ..moveTo(w / 2 - tailW / 2 * dpr, h - 1)
-    ..lineTo(w / 2, totalH)
-    ..lineTo(w / 2 + tailW / 2 * dpr, h - 1)
-    ..close();
-  canvas.drawPath(tip, Paint()..color = Colors.white);
-  canvas.drawRRect(
-    RRect.fromRectAndCorners(
-      Rect.fromLTWH(0, 0, 4 * dpr, h),
-      topLeft: Radius.circular(radius * dpr),
-      bottomLeft: Radius.circular(radius * dpr),
-    ),
-    Paint()..color = ColorConstants.primary,
-  );
-  painter.paint(canvas, Offset(padH * dpr + 2 * dpr, padV * dpr));
-
-  final img = await rec.endRecording().toImage(w.ceil(), totalH.ceil());
-  final bytes = await img.toByteData(format: ui.ImageByteFormat.png);
-  if (bytes == null) throw StateError('no png');
-  return (w: img.width, h: img.height);
-}
-
-void main() {
-  testWidgets('callout rasterises at every dpr', (tester) async {
-    for (final dpr in [1.0, 2.0, 3.0]) {
-      final r = await callout('18, Chinnavedampatti Road, Coimbatore', dpr);
-      print('dpr=$dpr  ${r.w}x${r.h}px');
-      expect(r.w, greaterThan(0));
-      expect(r.h, greaterThan(0));
-    }
-    // A very long address must clamp, not grow without bound.
-    final long = await callout(
-      'Plot 42B, Second Cross Street, Behind Sri Ramakrishna Mills, '
-      'Ganapathy Post, Coimbatore, Tamil Nadu 641006',
-      3.0,
-    );
-    print('long address at dpr=3: ${long.w}x${long.h}px');
-    expect(long.w, lessThanOrEqualTo((190 + 24) * 3 + 2));
-  });
-}
diff --git a/lib/views/Dashboard/home/homepage.dart b/lib/views/Dashboard/home/homepage.dart
index 2c4ea00..07771f5 100644
--- a/lib/views/Dashboard/home/homepage.dart
+++ b/lib/views/Dashboard/home/homepage.dart
@@ -64,12 +64,13 @@ import 'package:miler/views/Dashboard/pickups/collect_payment.dart';
 import 'package:miler/views/Dashboard/pickups/stop_type.dart';
 import 'package:miler/widget/Bottom_page.dart';
 import 'package:miler/data/meal_run_mock.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/milk_run.dart';
 import 'package:miler/data/order_events.dart';
 import 'package:miler/data/work_domain.dart';
 import 'package:miler/data/work_repository.dart';
 import 'package:miler/data/pickup_locations.dart';
+import 'package:miler/data/service_day.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/helpers/constants/miler_type.dart';
 import 'package:miler/views/Dashboard/home/pickup_preview_sheet.dart';
@@ -241,9 +242,22 @@ class _HomepageState extends State<Homepage>
   Set<String> _closedIds = <String>{};
   Set<String> _rejectedIds = <String>{};
 
+  /// Notices when the day underneath the screen has moved on.
+  ///
+  /// [_fetchQueues] filters against `ServiceDay.today` *as read at fetch time*,
+  /// so the route on screen is only ever as fresh as the last fetch. See
+  /// [_rolloverCheck].
+  final ServiceDayRollover _day = ServiceDayRollover();
+
+  /// Fires at the next local midnight. See [_armRollover].
+  Timer? _rollover;
+
   /// Which trip tab is open.
   int _selectedTripIndex = 0;
 
+  /// True once the rider has picked a tab himself. See [_settleTripTab].
+  bool _tripTabChosen = false;
+
   /// Stops the rider has ticked, for "accept just these".
   Set<String> _selectedStopIds = <String>{};
 
@@ -258,6 +272,7 @@ class _HomepageState extends State<Homepage>
     }
     _pollerSubscription?.cancel();
     _locationTimer?.cancel();
+    _rollover?.cancel();
     _httpClient.close();
     super.dispose();
   }
@@ -271,6 +286,7 @@ class _HomepageState extends State<Homepage>
     _ensureLocationPermission();
     _ensureCameraPermission();
     _startPolling();
+    _armRollover();
     // What the counters are actually called, joined on the location id the
     // booking already carries. One request, cached, and every failure resolves
     // to "use the row's own name" — see [PickupLocations].
@@ -971,6 +987,11 @@ class _HomepageState extends State<Homepage>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     super.didChangeAppLifecycleState(state);
+    // Before the early return below: a resume inside the same foreground state
+    // still has to notice a midnight that passed while the phone was in the
+    // rider's pocket, and that is the case the timer cannot cover — both
+    // platforms suspend timers in the background.
+    if (state == AppLifecycleState.resumed) _rolloverCheck();
     final bool foreground = state == AppLifecycleState.resumed;
     if (foreground == _pollForeground) return;
     _pollForeground = foreground;
@@ -1175,7 +1196,15 @@ class _HomepageState extends State<Homepage>
       // are still on the rider's route — their parcels are still to be
       // collected and their kilometres still to be ridden. The route brief
       // must count them or it understates the day.
-      final acceptedStops = await getAcceptedBookings();
+      // Through the day filter as well. The accepted store is deliberately
+      // *not* pruned to today — it is "what have I taken on", and an id set
+      // that forgets a stop would flip that stop back to pending under the
+      // rider's thumb — but the route brief above the run is a statement about
+      // **this** day's kilometres and parcels. Yesterday's accepted-and-unclosed
+      // booking belongs in the set and not in that total.
+      //
+      // Only the rows are filtered; `acceptedIds` above is left whole.
+      final acceptedStops = _todayOnly(await getAcceptedBookings());
       if (mounted && acceptedStops.length != _acceptedStops.length) {
         setState(() => _acceptedStops = acceptedStops);
       } else {
@@ -1192,7 +1221,9 @@ class _HomepageState extends State<Homepage>
       //
       // Accepted stops still also appear on Bookings — that is where he WORKS
       // them. Home is where he watches the trip fill up.
-      final allStops = items.whereType<Map<String, dynamic>>().toList();
+      final allStops = _todayOnly(
+        items.whereType<Map<String, dynamic>>().toList(),
+      );
 
       // ── The skip store is the truth about what is parked ──
       //
@@ -1311,6 +1342,8 @@ class _HomepageState extends State<Homepage>
           }
         }
       });
+      // After the state is applied, because the slots are derived from it.
+      _settleTripTab();
     } catch (e) {
       debugPrint('[FETCH_QUEUES] Error: $e');
       if (mounted) setState(() => _fetchFailed = true);
@@ -1322,6 +1355,108 @@ class _HomepageState extends State<Homepage>
     }
   }
 
+  /// Opens Home on a tab that has work on it.
+  ///
+  /// ── Why this became necessary ──
+  ///
+  /// The tab index is a **day part**, not a position: slot 0 is the morning
+  /// whether or not the rider has morning work. That is the right model, and
+  /// while nothing could place a trip by day part it cost nothing — every trip
+  /// fell into the undated bucket and landed on Trip 1, so Trip 1 was where the
+  /// work was.
+  ///
+  /// Now that [Trip.dayPartTimeOf] can place them, a rider whose whole day is
+  /// an afternoon run has his work under Trip 2 — correctly — and Home opened
+  /// on Trip 1 and told him his hub had assigned him nothing. The fix for one
+  /// screen must not hand him a worse version of the same lie.
+  ///
+  /// So the landing tab is the first slot that actually holds stops. Three
+  /// things keep it from fighting the rider:
+  ///
+  ///  • It gives up the moment he taps a tab himself — [_tripTabChosen]. An
+  ///    empty Trip 3 he chose deliberately is an answer he asked for.
+  ///  • It gives up the moment the tab it is on has work, so it lands once and
+  ///    then stops moving under him.
+  ///  • It never *hides* a slot. The tabs still show all three, empty ones
+  ///    included, because "the day has room left in it" is a fact he plans
+  ///    around.
+  void _settleTripTab() {
+    if (_tripTabChosen || !mounted) return;
+    final trips = _trips;
+    final here = trips.tripAt(_selectedTripIndex);
+    if (here != null && here.stops.isNotEmpty) return;
+
+    final slots = trips.slots;
+    for (var i = 0; i < slots.length; i++) {
+      final t = slots[i];
+      if (t == null || t.stops.isEmpty) continue;
+      if (i != _selectedTripIndex) {
+        setState(() {
+          _selectedTripIndex = i;
+          _selectedStopIds.clear();
+        });
+      }
+      return;
+    }
+  }
+
+  /// ── Home is today's work, and only today's ──
+  ///
+  /// The rule, and the reasoning behind every part of it, is
+  /// [ServiceDay.onlyToday] — shared with the Deliveries queue, because the two
+  /// screens showing the rider's live work must not disagree about which day it
+  /// is. What is local here is only *which* day: the one the screen is
+  /// currently showing, adopted so the midnight check below compares against
+  /// the pixels rather than reading the wall clock twice.
+  List<Map<String, dynamic>> _todayOnly(List<Map<String, dynamic>> stops) {
+    _day.rollIfNeeded();
+    return ServiceDay.onlyToday(stops, now: _day.day, where: 'HOME');
+  }
+
+  /// ── The day ending under a screen that is already open ──
+  ///
+  /// [ServiceDay] answers "which day is this row" at read time, which is right
+  /// for the data and not sufficient for the screen: [_fetchQueues] filters
+  /// against the day *as read when it ran*. A rider who leaves Home open
+  /// through 23:59, or backgrounds the app on it and picks the phone up at six,
+  /// is looking at a route filtered against a day that has ended.
+  ///
+  /// Two triggers, because a phone gives no single reliable one — a timer to
+  /// the next local midnight for the app left in the foreground, and resume for
+  /// every other case. Both land in [_rolloverCheck], which is idempotent.
+  /// The same arrangement `ActivityPage` uses, for the same reason.
+  void _armRollover() {
+    _rollover?.cancel();
+    _rollover = Timer(_day.untilNextDay, _rolloverCheck);
+  }
+
+  /// Turns Home over when the service day has moved on.
+  ///
+  /// Yesterday's stops are cleared **before** the refetch, not after it. A new
+  /// day starts empty even with no signal, because the alternative is a rider
+  /// in a dead spot at six in the morning reading yesterday's route as today's
+  /// assignment — the exact failure this exists to stop. Anything that really
+  /// is the new day's comes straight back from the fetch.
+  void _rolloverCheck() {
+    if (!mounted) return;
+    _armRollover();
+    if (!_day.rollIfNeeded()) return;
+    setState(() {
+      _allTripStops = <Map<String, dynamic>>[];
+      _ordersMap = <String, Map<String, dynamic>>{};
+      _orderIds = <String>[];
+      _selectedOrders = <String, bool>{};
+      _selectedStopIds = <String>{};
+      _acceptedStops = <Map<String, dynamic>>[];
+      isAllSelected = false;
+      // The fetch short-circuits on an unchanged payload, and the payload has
+      // not changed — only the day it is read against has. Clearing the key is
+      // what lets the new day's answer through.
+      _lastQueuesJson = '';
+    });
+    _fetchQueues();
+  }
+
   /// See [HomepageArrivalPrecedence]. Kept as a one-line forwarder so the call
   /// site reads the same as it did while the rule itself is reachable from a
   /// test — a precedence contract that can only be exercised by building the
@@ -1388,14 +1523,21 @@ class _HomepageState extends State<Homepage>
         ...await getSkippedOrderIds(),
       };
 
-      final activeOrders = itemsV2.whereType<Map<String, dynamic>>().where((
-        booking,
-      ) {
-        final status = (booking['orderstatus']?.toString().toLowerCase() ?? '')
-            .trim();
-        if (status != 'active') return false;
-        return !closedIds.contains((booking['orderid'] ?? '').toString());
-      }).toList();
+      // ── Through the same day filter as the queue ──
+      //
+      // These are merged into the trip by [_tripStops], and a row this call
+      // carries that the queue does not is **appended** — so an unfinished
+      // stop still reporting `active` from a shift two days ago walked past
+      // [_todayOnly] and back onto Home through the side door, wearing a LIVE
+      // mark. One day, one rule, however the row arrived.
+      final activeOrders = _todayOnly(
+        itemsV2.whereType<Map<String, dynamic>>().where((booking) {
+          final status =
+              (booking['orderstatus']?.toString().toLowerCase() ?? '').trim();
+          if (status != 'active') return false;
+          return !closedIds.contains((booking['orderid'] ?? '').toString());
+        }).toList(),
+      );
 
       if (mounted) {
         setState(() {
@@ -2048,7 +2190,7 @@ class _HomepageState extends State<Homepage>
       stage: rung,
       placeName: place,
       count: ids.length,
-      lines: BagManifest.forGroup(batch),
+      lines: OrderManifest.forGroup(batch),
       onConfirm: (outcome) async {
         setState(() => _busyStopIds.addAll(ids));
         try {
@@ -2069,9 +2211,9 @@ class _HomepageState extends State<Homepage>
           }
           if (refusal != null) return refusal;
           if (rung == StopStatus.arrived) {
-            await saveBagLabels({
-              for (final line in BagManifest.forGroup(loaded))
-                line.orderId: line.bag,
+            await saveOrderLabels({
+              for (final line in OrderManifest.forGroup(loaded))
+                line.orderId: line.label,
             });
           }
           if (missing.isNotEmpty) {
@@ -2230,8 +2372,8 @@ class _HomepageState extends State<Homepage>
       count: ids.length,
       // Named, with the bag each one travels in — this is the list he checks
       // against the shelf in front of him. One order, one bag; see
-      // [BagManifest].
-      lines: BagManifest.forGroup(stops),
+      // [OrderManifest].
+      lines: OrderManifest.forGroup(stops),
       onConfirm: (outcome) async {
         setState(() => _busyStopIds.addAll(ids));
         try {
@@ -2259,11 +2401,11 @@ class _HomepageState extends State<Homepage>
           // Joe is Bag 1 of the five that left this counter. Deriving that
           // later from whatever list is on screen breaks it the moment one is
           // delivered, so it is written down at the one moment it is true and
-          // read back unchanged for the rest of the round. See [BagManifest].
+          // read back unchanged for the rest of the round. See [OrderManifest].
           if (action == SelectionAction.pickUp) {
-            await saveBagLabels({
-              for (final line in BagManifest.forGroup(loaded))
-                line.orderId: line.bag,
+            await saveOrderLabels({
+              for (final line in OrderManifest.forGroup(loaded))
+                line.orderId: line.label,
             });
           }
           if (missing.isNotEmpty) {
@@ -3738,6 +3880,9 @@ class _HomepageState extends State<Homepage>
                             // Trip 1 must not be counted by the bar while Trip 2
                             // is on screen. See [_selectedPendingIds].
                             onSelect: (index) {
+                              // His choice from here on, even if it is an empty
+                              // slot — see [_settleTripTab].
+                              _tripTabChosen = true;
                               if (index == _selectedTripIndex) return;
                               setState(() {
                                 _selectedTripIndex = index;
diff --git a/lib/views/Dashboard/home/pickup_preview_sheet.dart b/lib/views/Dashboard/home/pickup_preview_sheet.dart
index de591d3..c5099d6 100644
--- a/lib/views/Dashboard/home/pickup_preview_sheet.dart
+++ b/lib/views/Dashboard/home/pickup_preview_sheet.dart
@@ -3,7 +3,8 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:latlong2/latlong.dart' show LatLng;
 
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/stop_area.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/views/helpers/constants/miler_surface.dart';
 import 'package:miler/views/Dashboard/pickups/route_metrics.dart';
 import 'package:miler/views/Dashboard/pickups/stop_type.dart';
@@ -53,7 +54,7 @@ import 'package:miler/views/helpers/widgets/miler_sheet_kit.dart';
 ///   [ ➤ Start navigation ]        [ 📞 ]
 /// ```
 ///
-/// The manifest is read straight off [BagManifest] — the same source as the
+/// The manifest is read straight off [OrderManifest] — the same source as the
 /// card, the confirmation sheet and the row, so the number he checks against the
 /// shelf cannot differ between the screen he decided on and the screen he
 /// confirms on. **One order is one bag**, here as everywhere.
@@ -63,7 +64,7 @@ class PickupPreviewSheet extends StatelessWidget {
   final String placeName;
 
   /// Every order the rider collects here, in route order.
-  final List<BagLine> lines;
+  final List<ManifestLine> lines;
 
   /// Straight-line metres from the rider to the place. Null when unknown —
   /// nothing is invented, exactly as on the card.
@@ -100,7 +101,7 @@ class PickupPreviewSheet extends StatelessWidget {
   static Future<void> show(
     BuildContext context, {
     required String placeName,
-    required List<BagLine> lines,
+    required List<ManifestLine> lines,
     required double? meters,
     required Duration ride,
     double? riderLat,
@@ -147,20 +148,13 @@ class PickupPreviewSheet extends StatelessWidget {
   /// every order here shares one counter, so they share one address, and
   /// taking both from the same row means the pin and the words can never
   /// describe different places.
-  String get _address {
-    if (lines.isEmpty) return '';
-    final stop = lines.first.stop;
-    for (final key in const [
-      'pickupaddress',
-      'PickupAddress',
-      'pickup_address',
-      'address',
-    ]) {
-      final raw = (stop[key] ?? '').toString().trim();
-      if (raw.isNotEmpty && raw.toLowerCase() != 'null') return raw;
-    }
-    return '';
-  }
+  ///
+  /// The four key names it reads live in [pickupAddressOf] now, shared with the
+  /// route card behind this sheet — the card had no address at all while this
+  /// one did, and a counter that is named on the sheet and anonymous on the
+  /// card is the same payload answering two different questions.
+  String get _address =>
+      lines.isEmpty ? '' : pickupAddressOf(lines.first.stop);
 
   static double _d(dynamic v) {
     if (v == null) return 0;
@@ -438,32 +432,37 @@ class PickupPreviewSheet extends StatelessWidget {
                               ),
                             ),
                           ),
-                          SizedBox(width: 10.w),
-                          // Ranked under the name, exactly as on the route
+                          // The counter's own printed label, where there is
+                          // one. Ranked under the name, exactly as on the route
                           // timeline: w700 slate against a w500 mid-tone name
-                          // made a column of shelf references the first thing
-                          // read on a manifest of people.
-                          Container(
-                            padding: EdgeInsets.symmetric(
-                              horizontal: 7.w,
-                              vertical: 3.h,
-                            ),
-                            decoration: BoxDecoration(
-                              color: MilerSurface.canvas,
-                              borderRadius: BorderRadius.circular(
-                                DesignConstants.radiusLg,
+                          // made a column of references the first thing read on
+                          // a manifest of people. Absent on a route whose
+                          // counters print nothing, which is most of them — the
+                          // row is then the person, which is what it is for.
+                          if (line.label.isNotEmpty) ...[
+                            SizedBox(width: 10.w),
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                horizontal: 7.w,
+                                vertical: 3.h,
+                              ),
+                              decoration: BoxDecoration(
+                                color: MilerSurface.canvas,
+                                borderRadius: BorderRadius.circular(
+                                  DesignConstants.radiusLg,
+                                ),
+                              ),
+                              child: Text(
+                                line.label,
+                                maxLines: 1,
+                                style: MilerType.label.copyWith(
+                                  fontSize: 12.sp,
+                                  fontWeight: FontWeight.w600,
+                                  color: ColorConstants.secondaryText,
+                                ),
                               ),
                             ),
-                            child: Text(
-                              line.bag,
-                              maxLines: 1,
-                              style: MilerType.label.copyWith(
-                                fontSize: 12.sp,
-                                fontWeight: FontWeight.w600,
-                                color: ColorConstants.secondaryText,
-                              ),
-                            ),
-                          ),
+                          ],
                         ],
                       ),
                     ),
@@ -474,7 +473,7 @@ class PickupPreviewSheet extends StatelessWidget {
         ),
         SizedBox(height: 8.h),
         Text(
-          BagManifest.countLabel(lines.length),
+          OrderManifest.countLabel(lines.length),
           style: MilerType.micro.copyWith(
             fontSize: 12.5.sp,
             fontWeight: FontWeight.w600,
diff --git a/lib/views/Dashboard/home/route_timeline.dart b/lib/views/Dashboard/home/route_timeline.dart
index a2be9fe..25defe3 100644
--- a/lib/views/Dashboard/home/route_timeline.dart
+++ b/lib/views/Dashboard/home/route_timeline.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/views/helpers/constants/miler_surface.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/data/stop_area.dart';
@@ -87,7 +87,7 @@ import 'package:miler/views/helpers/constants/miler_type.dart';
 /// One pickup place and every order the rider collects there.
 ///
 /// Built by the page from the trip's own stops — this holds no state of its
-/// own and derives no counts. The bag lines come from [BagManifest.forGroup],
+/// own and derives no counts. The bag lines come from [OrderManifest.forGroup],
 /// which is the single source for "how many bags" and "which bag": the count is
 /// `orders.length` because a bag is what an order arrives in, and the identity
 /// is the printed label or the order's position **in this group**. The timeline
@@ -101,6 +101,26 @@ class RouteGroup {
   /// which case the group is drawn flat (see [RouteTimeline]).
   final String name;
 
+  /// The street the counter is on — where [name] actually is.
+  ///
+  /// ── Why a name was not enough ──
+  ///
+  /// The card gave the place a name, a load and a distance, and then expected
+  /// the rider to know where "Vidhya Kitchen" is. He often does; on his first
+  /// week, or on a kitchen the hub added yesterday, he does not — and the only
+  /// way to the address was to tap through to the preview sheet, which is a
+  /// sheet and a dismiss to answer *where am I going*, the plainest question
+  /// the card exists for.
+  ///
+  /// It sits directly above the load, so the header reads as one descending
+  /// statement: **what this place is, where it is, what is waiting there**.
+  /// Put below the load it would have separated the counts from the journey
+  /// figures they are read against.
+  ///
+  /// Empty is normal and prints nothing — a payload without an address, or a
+  /// flat stop whose own name already *is* the address.
+  final String location;
+
   /// The orders still shown on Home, in route order.
   final List<Map<String, dynamic>> stops;
 
@@ -112,7 +132,7 @@ class RouteGroup {
   /// the rider has collected Bag 1 and it leaves Home, numbering the four that
   /// remain from the visible list would renumber Bag 2 as Bag 1 — and he would
   /// be reading a different number off the phone from the one printed on the
-  /// shelf. See [BagManifest].
+  /// shelf. See [OrderManifest].
   final List<Map<String, dynamic>> allStops;
 
   /// The trip index of the first stop, for travel time and for numbering.
@@ -207,6 +227,7 @@ class RouteGroup {
   const RouteGroup({
     required this.key,
     required this.name,
+    this.location = '',
     required this.stops,
     required this.allStops,
     required this.firstIndex,
@@ -256,17 +277,17 @@ class RouteGroup {
   /// The manifest is built from [allStops] and then filtered, never built from
   /// [stops]: the count and the identity both come from the pickup group the
   /// rider was handed, not from whatever is left of it.
-  List<BagLine> get manifest {
+  List<ManifestLine> get manifest {
     final shown = {for (final s in stops) (s['orderid'] ?? '').toString()};
     return [
-      for (final line in BagManifest.forGroup(allStops))
+      for (final line in OrderManifest.forGroup(allStops))
         if (shown.contains(line.orderId)) line,
     ];
   }
 
   /// `5 orders · 5 bags`. The two halves of the rule, side by side, so the
   /// rider can check the shelf against the phone without doing arithmetic.
-  String get countLabel => BagManifest.countLabel(stops.length);
+  String get countLabel => OrderManifest.countLabel(stops.length);
 
   /// Orders off this counter the rider has not taken on yet.
   int get pendingCount =>
@@ -1200,7 +1221,7 @@ class PickupTimelineGroup extends StatelessWidget {
     }
     if (group.isSettled) {
       final n = group.allStops.length;
-      return '$n ${n == 1 ? 'bag' : 'bags'} collected';
+      return n == 1 ? '1 collected' : '$n collected';
     }
     return <String>[
       // ── A flat node is a stop, and a stop has a position ──
@@ -1210,12 +1231,24 @@ class PickupTimelineGroup extends StatelessWidget {
       // in the run — the trip's own index, which does **not** renumber as stops
       // finish, so a stop is never renamed mid-shift.
       if (group.flat) 'Stop ${group.firstIndex + 1}' else group.countLabel,
-      // How much of this counter is not his yet. A group can hold one accepted
-      // order and one still pending, and the count above cannot say so alone.
       if (!group.flat &&
           group.pendingCount > 0 &&
           group.pendingCount < group.stops.length)
         '${group.pendingCount} to accept',
+      // ── How much of this counter is still waiting on him ──
+      //
+      // The chip beside it states the group's **own rung** with a fraction —
+      // `Pending 8/8` on an untouched counter, `Accepted 1/2` on one he has
+      // started. That answers the all-pending case, which used to say nothing
+      // at all: a fresh morning where the card read `Pending` and `10 bags` and
+      // left the rider to join them into *ten decisions are waiting on me*.
+      //
+      // It cannot answer the **mixed** case, and that is what this clause is
+      // for. A group holding one accepted order and one pending one is on the
+      // accepted rung, so the chip says `Accepted 1/2` — true, and silent about
+      // the one still to decide. The two never overlap: this appears only when
+      // some but not all of the counter is pending, which is precisely when the
+      // chip is showing a different rung.
       // ── The selection count is not stated here ──
       //
       // It used to append `· 5 selected`, which made this the **third** place
@@ -1253,6 +1286,10 @@ class PickupTimelineGroup extends StatelessWidget {
     final journey = rejected || group.isSettled ? '' : group.journeyLabel;
     final showJourney = journey.isNotEmpty && twoColumn;
 
+    // Suppressed on a place the rider has finished with and on one he declined:
+    // the address is wayfinding, and there is nowhere left to go.
+    final location = rejected || group.isSettled ? '' : group.location;
+
     final load = [
       _loadLine(chosen),
       if (journey.isNotEmpty && !twoColumn) journey,
@@ -1361,7 +1398,12 @@ class PickupTimelineGroup extends StatelessWidget {
                 // rider needs them: where, how much, how far. Unaffected by
                 // the two-column break — a reader hears the same three facts
                 // either way.
-                label: [group.name, load, if (showJourney) journey].join(', '),
+                label: [
+                  group.name,
+                  if (location.isNotEmpty) location,
+                  load,
+                  if (showJourney) journey,
+                ].join(', '),
                 // The non-flat hint said "Opens the pickup preview" — a
                 // sentence about a tap this header stopped owning when the
                 // preview moved to the utility circle. A wrong hint is worse
@@ -1472,6 +1514,49 @@ class PickupTimelineGroup extends StatelessWidget {
                             // that row was already spending on a `Spacer`. Same
                             // reading order — identity, load, state — and the
                             // geometry is now identical in every state.
+                            // ── Where the counter is, above what is on it ──
+                            //
+                            // Between the name and the load, because that is
+                            // the order the questions arrive in: which place,
+                            // where is it, how much is waiting. A pin rather
+                            // than a label — "Pickup location" would be a word
+                            // spent saying what the glyph and the position
+                            // already say.
+                            //
+                            // Two lines, matching the name above it: real
+                            // Coimbatore addresses are long, and an address cut
+                            // to `Gandhipuram Main…` answers nothing a blank
+                            // line would not have answered. Set in the page's
+                            // quiet grey — it is orientation, not a figure the
+                            // rider acts on.
+                            if (location.isNotEmpty) ...[
+                              SizedBox(height: 3.h),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Padding(
+                                    padding: EdgeInsets.only(top: 1.h),
+                                    child: Icon(
+                                      LucideIcons.mapPin,
+                                      size: 12.sp,
+                                      color: ColorConstants.secondaryText,
+                                    ),
+                                  ),
+                                  SizedBox(width: 5.w),
+                                  Flexible(
+                                    child: Text(
+                                      location,
+                                      maxLines: 2,
+                                      overflow: TextOverflow.ellipsis,
+                                      style: MilerType.micro.copyWith(
+                                        fontSize: 12.5.sp,
+                                        color: ColorConstants.secondaryText,
+                                      ),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ],
                             SizedBox(height: 4.h),
                             Row(
                               children: [
@@ -1620,23 +1705,38 @@ class PickupTimelineGroup extends StatelessWidget {
     // silence was worse than the repetition: a rider scanning a run had to
     // infer "not mine yet" from the *absence* of a word, which is the one thing
     // a glance cannot do.
-    // ── Pending is neutral, because nothing has gone wrong ──
+    // ── Pending has its own amber, and it is not the warning one ──
     //
-    // It was amber, on the argument that undecided work "wants something" and
-    // should therefore be visible. The argument is right about visibility and
-    // wrong about the colour: amber is this app's exception hue — a skipped
-    // stop, a late run, a bag that never arrived — and on a fresh morning every
-    // kitchen is pending, so the whole screen opened in warning.
+    // It was grey, and before that it was [ColorConstants.warning]. Both were
+    // half right. Grey said "nothing has gone wrong", which is true; warning
+    // said "this wants something from you", which is also true — and warning
+    // is the hue this app spends on a skip, a short payment, a bag that never
+    // came, so a morning where every kitchen is pending opened the whole screen
+    // in exception and taught the rider to stop reading the colour.
     //
-    // A state that is true of *all* the work is not an exception; it is the
-    // starting condition. Spending the attention colour on it leaves nothing
-    // to say with when a stop genuinely does go wrong, and a rider who sees
-    // amber on every group learns to stop reading it. Neutral, and the reason
-    // it is still readable is that it sits on its own metadata line rather
-    // than competing with the kitchen name.
-    StopState.pending => const _StateWord(
-      label: 'Pending',
-      color: ColorConstants.secondaryText,
+    // [ColorConstants.pendingAmber] is the third answer: a gold that reads as
+    // *waiting* rather than as *wrong*, far enough from the burnt orange of
+    // warning that Pending and Skipped are two distinct marks down a run. The
+    // words differ too; this is what makes them differ at a glance.
+    // ── And it says how many ──
+    //
+    // A bare `Pending` made the rider join two facts to get the one he wants.
+    // The card said `Pending` and, twenty points above, `10 orders · 10 bags`;
+    // *ten decisions are waiting on me* was the arithmetic between them, and on
+    // a fresh morning — every group pending, nothing accepted — that was the
+    // whole screen asking him to do it.
+    //
+    // Stated as a fraction because that is what Accepted has always done here,
+    // and the two must read as one vocabulary: `Pending 10/10` on a counter
+    // untouched, `Pending 2/4` on one half-taken, `Accepted 2/4` from the other
+    // side of the same decision. The bare word survives where a fraction would
+    // be noise — a flat parcel stop is one order, and `Pending 1/1` says
+    // nothing `Pending` does not.
+    StopState.pending => _StateWord(
+      label: group.groupSize > 1
+          ? 'Pending ${group.pendingCount}/${group.groupSize}'
+          : 'Pending',
+      color: ColorConstants.pendingAmber,
     ),
     // ── "Accepted" alone does not say how much of the counter he took ──
     //
@@ -1649,19 +1749,25 @@ class PickupTimelineGroup extends StatelessWidget {
     // Only where there is more than one order to be a fraction of — a parcel
     // route is one order per place, and `Accepted (1 of 1)` is noise.
     StopState.accepted => _StateWord(
-      // Brand only on the group he is riding to; slate on the ones he has taken
-      // but is not working. Red marks the mission, not the commitment — and it
-      // is now the only thing on the card that can be confused with amber, so
-      // the two states read apart at a glance.
+      // ── Accepted is green ──
+      //
+      // It was brand red on the group being ridden to and slate on the rest,
+      // which made the word carry two facts at once — *taken on* and *this is
+      // the one you are working* — and the second was the louder of them. A
+      // rider glancing down a run read the red as the state.
+      //
+      // Green says the one thing the word is for: this is yours, it is settled,
+      // nothing here needs deciding. Which one he is *on* is already said three
+      // ways that do not need a hue — the lit node, the larger title, and the
+      // Navigate button that only the current place carries.
+      //
       // `Accepted (2 of 4)` truncated to `Accepted (2 o…` the moment the row
       // also carried Navigate, Call and the "i" — which is every accepted
       // group. A state that ellipsises has lost the number it exists to state.
       label: group.groupSize > 1
           ? 'Accepted ${group.onRungCount}/${group.groupSize}'
           : 'Accepted',
-      color: isCurrent
-          ? ColorConstants.primary
-          : ColorConstants.onSurfaceVariant,
+      color: ColorConstants.acceptGreen,
     ),
     // ── The one the rider must not miss ──
     //
@@ -1674,9 +1780,19 @@ class PickupTimelineGroup extends StatelessWidget {
     // fact is *this is the one he is on* — and each says which rung it is.
     StopState.arrived => const LiveMark(label: 'Arrived'),
     StopState.active => const LiveMark(),
+    // ── Picked is blue, now that green means accepted ──
+    //
+    // It was green, back when green was free. It cannot stay green beside an
+    // accepted state that is also green: the two rungs a rider most needs to
+    // tell apart on one counter — *taken on* and *in my hands* — would be one
+    // colour and two words.
+    //
+    // Blue is not an arbitrary third: it is [ColorConstants.deliveryAccent],
+    // what this app already paints the delivery leg in, and a picked bag has
+    // become exactly that. The colour says where the work went.
     StopState.collected || StopState.done => const _StateWord(
       label: 'Collected',
-      color: ColorConstants.acceptGreen,
+      color: ColorConstants.pickedBlue,
     ),
     // ── The two ends of "not going to happen here" ──
     //
@@ -1715,7 +1831,7 @@ class PickupTimelineGroup extends StatelessWidget {
 
   // ── The body: the journey, the selection helper, then the milestones ─────
 
-  Widget _body(BuildContext context, List<BagLine> manifest, int chosen) {
+  Widget _body(BuildContext context, List<ManifestLine> manifest, int chosen) {
     final ids = _choosableIds;
     final selectable = _isChoosable(group.state) && onToggleSelect != null;
 
@@ -1864,7 +1980,7 @@ class PickupTimelineGroup extends StatelessWidget {
 /// bag* — the two facts he matches against a shelf — and everything else is one
 /// tap away in the sheet that already exists.
 class PickupTimelineStep extends StatelessWidget {
-  final BagLine line;
+  final ManifestLine line;
 
   /// 1-based position **within its own pickup group**, which is also its bag
   /// position when the kitchen printed no label. Never route-global.
@@ -2013,9 +2129,7 @@ class PickupTimelineStep extends StatelessWidget {
                         child: Semantics(
                           button: true,
                           checked: selectable ? selected : null,
-                          label: selectable
-                              ? 'Select $customer, ${line.bag}'
-                              : '$customer, ${line.bag}',
+                          label: selectable ? 'Select $customer' : customer,
                           excludeSemantics: true,
                           child: InkWell(
                             onTap: selectable && !busy
@@ -2070,7 +2184,11 @@ class PickupTimelineStep extends StatelessWidget {
                         ),
                       ),
                       _OrderOpenBlock(
-                        bag: rejected ? 'Rejected' : line.bag,
+                        // The counter's own printed label when there is one,
+                        // and the word `Rejected` where the row has been
+                        // declined. Never an invented number — see
+                        // [OrderManifest.labelFor].
+                        label: rejected ? 'Rejected' : line.label,
                         orderId: line.orderId,
                         selected: selected,
                         onTap: canOpen ? onOpen : null,
@@ -2087,23 +2205,34 @@ class PickupTimelineStep extends StatelessWidget {
   }
 }
 
-/// `Bag 1 ›` over the order's own id — the step's way into its detail sheet.
+/// The step's way into its detail sheet: the counter's printed label, when
+/// there is one, and the chevron that opens the order.
 ///
-/// One block rather than three loose elements, because they answer one
-/// question between them: *which order is this, and show me it*. The chevron is
-/// the affordance; the bag and the id are what it is about.
+/// ── It used to manufacture a reference ──
+///
+/// The tag read `Bag 1 … Bag n`, falling back to the order's position in its
+/// group whenever the payload printed nothing — so on the common route, where
+/// no counter prints labels, every row carried a shelf reference the shelf had
+/// never heard of. It was the app numbering its own list and drawing the result
+/// as a physical fact, two columns from a rail that numbers the same rows.
+///
+/// What the counter really printed is a fact about an object in the rider's
+/// hands, so that still shows, verbatim. Where nothing was printed the corner
+/// carries the chevron alone, which is the affordance the block existed for.
 /// The neighbourhood a stop is in. One implementation, shared with the
 /// Deliveries queue — see [areaOf].
 String _areaOf(Map<String, dynamic> stop) => areaOf(stop);
 
 class _OrderOpenBlock extends StatelessWidget {
-  final String bag;
+  /// The counter's own printed label, or `''` when it printed none.
+  final String label;
+
   final String orderId;
   final bool selected;
   final VoidCallback? onTap;
 
   const _OrderOpenBlock({
-    required this.bag,
+    required this.label,
     required this.orderId,
     required this.selected,
     required this.onTap,
@@ -2115,7 +2244,10 @@ class _OrderOpenBlock extends StatelessWidget {
 
     return Semantics(
       button: onTap != null,
-      label: id.isEmpty ? bag : '$bag, order $id',
+      label: [
+        if (label.isNotEmpty) label,
+        if (id.isNotEmpty) 'order $id',
+      ].join(', '),
       hint: onTap == null ? null : 'Opens order details',
       excludeSemantics: true,
       child: InkWell(
@@ -2128,99 +2260,73 @@ class _OrderOpenBlock extends StatelessWidget {
             child: Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-                ConstrainedBox(
-                  // Capped so a kitchen's own long printed label (`DG-100042-A`)
-                  // cannot take the customer's name with it.
-                  //
-                  // ── And the column stops growing before the name does ──
-                  //
-                  // `Bag 1` is a shelf reference: it is *compared*, not read as
-                  // prose, so it does not need to keep pace with a rider's text
-                  // size. Left to scale it took ~150pt of a 320pt row at 2×, and
-                  // the thing that yielded was the customer's name — which is
-                  // the one item on the row the brief says must yield last.
-                  //
-                  // Clamped at 1.25×, which keeps it comfortably legible against
-                  // a physical shelf while handing the rest of the row back to
-                  // the name and the area.
-                  constraints: BoxConstraints(maxWidth: 104.w),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      // ── One order, one bag ──
-                      //
-                      // Read straight off [BagManifest]: never a quantity, never a
-                      // route-global number. Right-aligned on every row so a
-                      // column of them lines up against a shelf being counted.
+                if (label.isNotEmpty)
+                  ConstrainedBox(
+                    // Capped so a kitchen's own long printed label
+                    // (`DG-100042-A`) cannot take the customer's name with it.
+                    //
+                    // ── And the column stops growing before the name does ──
+                    //
+                    // A printed label is *compared*, not read as prose, so it
+                    // does not need to keep pace with a rider's text size. Left
+                    // to scale it took ~150pt of a 320pt row at 2×, and the
+                    // thing that yielded was the customer's name — the one item
+                    // on the row the brief says must yield last.
+                    //
+                    // Clamped at 1.25×, which keeps it legible against a
+                    // physical shelf while handing the rest of the row back to
+                    // the name and the area.
+                    constraints: BoxConstraints(maxWidth: 104.w),
+                    child: Container(
+                      padding: EdgeInsets.symmetric(
+                        horizontal: 7.w,
+                        vertical: 3.h,
+                      ),
+                      decoration: BoxDecoration(
+                        // White, because these rows live inside the canvas
+                        // well: layer-1-on-canvas, the same 1.29 step the rest
+                        // of the system stands on. (Canvas-on-canvas was
+                        // invisible the moment the well returned.)
+                        color: selected
+                            ? ColorConstants.primary.withValues(alpha: 0.10)
+                            : MilerSurface.working,
+                        borderRadius: BorderRadius.circular(
+                          DesignConstants.radiusLg,
+                        ),
+                      ),
                       // ── It ranks under the name, not over it ──
                       //
                       // Drawn at w700 in full slate this sat *above* the
                       // customer, who is w500 in the mid-tone until he is
-                      // ticked. So on a fresh route — every row undecided,
-                      // which is how the screen opens — the boldest thing on
-                      // every line was a shelf number, and the eye read a
-                      // column of bags before it read a single person.
-                      //
-                      // The reference still needs to be scannable against a
-                      // physical shelf, so it keeps a weight of its own: it
-                      // steps to w600 in the mid-tone, one rung under the
-                      // undecided name, and follows the row up to slate the
-                      // moment the row is taken. The bag never leads; it
-                      // travels with whatever the row currently is.
-                      // ── And it is a tag, because it is a label ──
-                      //
-                      // A bag number is a physical reference — the sticker on
-                      // the shelf — not a sentence, and every delivery app the
-                      // rider carries sets that kind of fact as a small tag.
-                      // The fill is the page's canvas tone, the only grey that
-                      // measurably stands on this white panel (1.29:1), so the
-                      // tag reads as an object without borrowing a border. It
-                      // still ranks under the name: quiet ink at rest, brand
-                      // tint the moment the row is ticked.
-                      Container(
-                        padding: EdgeInsets.symmetric(
-                          horizontal: 7.w,
-                          vertical: 3.h,
-                        ),
-                        decoration: BoxDecoration(
-                          // White, because these rows live inside the canvas
-                          // well: layer-1-on-canvas, the same 1.29 step the
-                          // rest of the system stands on. (Canvas-on-canvas
-                          // was invisible the moment the well returned.)
+                      // ticked — so on a fresh route the boldest thing on every
+                      // line was a shelf reference, and the eye read a column of
+                      // them before it read a single person. It steps to w600 in
+                      // the mid-tone instead, one rung under the undecided name,
+                      // and follows the row up to slate the moment it is taken.
+                      child: Text(
+                        label,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: MilerType.label.copyWith(
+                          fontSize: 12.sp,
+                          fontWeight: selected
+                              ? FontWeight.w700
+                              : FontWeight.w600,
                           color: selected
-                              ? ColorConstants.primary.withValues(alpha: 0.10)
-                              : MilerSurface.working,
-                          borderRadius: BorderRadius.circular(
-                            DesignConstants.radiusLg,
-                          ),
-                        ),
-                        child: Text(
-                          bag,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: MilerType.label.copyWith(
-                            fontSize: 12.sp,
-                            fontWeight: selected
-                                ? FontWeight.w700
-                                : FontWeight.w600,
-                            color: selected
-                                ? ColorConstants.primary
-                                : ColorConstants.secondaryText,
-                          ),
+                              ? ColorConstants.primary
+                              : ColorConstants.secondaryText,
                         ),
                       ),
-                      // ── The reference is not on the row any more ──
-                      //
-                      // It is what the office reads down a phone once, when
-                      // something has gone wrong. The line it occupied now
-                      // carries the drop area, which is what the rider is
-                      // deciding on every time he looks at the list. The id is on
-                      // the detail sheet this block opens, and on the Activity
-                      // record — both places the rare question is actually asked.
-                    ],
+                    ),
                   ),
-                ),
+                // ── The order id is not on the row ──
+                //
+                // It is what the office reads down a phone once, when something
+                // has gone wrong. The line it occupied carries the drop area,
+                // which is what the rider is deciding on every time he looks at
+                // the list. The id is on the detail sheet this block opens, and
+                // on the Activity record — both places the rare question is
+                // actually asked.
                 if (onTap != null)
                   Icon(
                     LucideIcons.chevronRight,
@@ -2629,7 +2735,7 @@ class _StepNode extends StatelessWidget {
     //
     // It keeps its **number**. The numeral is the order's bag identity, matched
     // against a printed label on a shelf, and it must not change or disappear
-    // because the rider accepted it — see [BagManifest]. So accepted is a
+    // because the rider accepted it — see [OrderManifest]. So accepted is a
     // filled disc with a white numeral, not a tick: a tick would claim work
     // that has not happened.
     final filled = selected || done || accepted;
diff --git a/lib/views/Dashboard/home/stop_action_sheet.dart b/lib/views/Dashboard/home/stop_action_sheet.dart
index 3ff82a8..a2cc3b8 100644
--- a/lib/views/Dashboard/home/stop_action_sheet.dart
+++ b/lib/views/Dashboard/home/stop_action_sheet.dart
@@ -7,7 +7,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:miler/Models/stop_status.dart';
 import 'package:miler/views/helpers/constants/miler_surface.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/helpers/constants/Colorconstants.dart';
 import 'package:miler/views/helpers/constants/design_constants.dart';
@@ -94,7 +94,7 @@ class StopActionSheet extends StatefulWidget {
   ///
   /// Empty renders the sheet as it was — a heading, a count and the slide —
   /// which is correct for a rung that covers a single anonymous stop.
-  final List<BagLine> lines;
+  final List<ManifestLine> lines;
 
   /// Runs the write, given what the rider actually confirmed. Returns null on
   /// success, or a message to show without closing — the sheet stays open so he
@@ -117,7 +117,7 @@ class StopActionSheet extends StatefulWidget {
     required String placeName,
     required int count,
     required Future<String?> Function(RungOutcome) onConfirm,
-    List<BagLine> lines = const [],
+    List<ManifestLine> lines = const [],
   }) async {
     // Through the kit — which also gives this sheet the app's entrance curve.
     // It was the one sheet still on Flutter's default 250ms decelerate: the
@@ -188,11 +188,11 @@ class _StopActionSheetState extends State<StopActionSheet> {
   }
 
   /// `5 orders · 5 bags` — the rule, stated where he can check it against the
-  /// shelf. See [BagManifest]. Once he reports a shortfall it counts what he is
+  /// shelf. See [OrderManifest]. Once he reports a shortfall it counts what he is
   /// actually leaving with, and names the gap rather than quietly shrinking.
   String get _subtitle => _missing.isEmpty
-      ? BagManifest.countLabel(widget.count)
-      : '${BagManifest.countLabel(_loaded)} · ${_missing.length} missing';
+      ? OrderManifest.countLabel(widget.count)
+      : '${OrderManifest.countLabel(_loaded)} · ${_missing.length} missing';
 
   /// What the slide will actually change, in the rider's words. "Slide to
   /// update" said nothing a rider could be wrong about; these name the claim —
@@ -223,7 +223,7 @@ class _StopActionSheetState extends State<StopActionSheet> {
     }
     if (_missing.isEmpty) {
       return (
-        'Make sure all ${widget.count} bags are loaded before continuing.',
+        'Make sure all ${widget.count} orders are loaded before continuing.',
         false,
       );
     }
@@ -426,7 +426,7 @@ class _StopActionSheetState extends State<StopActionSheet> {
             color: ColorConstants.errorRed,
           ),
           label: Text(
-            'Report missing bag',
+            'Report a missing order',
             style: TextStyle(
               fontSize: 14.sp,
               fontWeight: FontWeight.w700,
@@ -443,7 +443,7 @@ class _StopActionSheetState extends State<StopActionSheet> {
         Expanded(
           child: Text(
             _missing.isEmpty
-                ? 'Tap any bag the counter could not supply'
+                ? 'Tap any order the counter could not supply'
                 : '${_missing.length} marked missing',
             style: TextStyle(
               fontSize: 13.5.sp,
@@ -588,9 +588,16 @@ class _StopActionSheetState extends State<StopActionSheet> {
                 SizedBox(width: 10.w),
                 // The same tag the route rows wear — one language for one
                 // fact, from Home to the sheet it opens. White stands on the
-                // manifest's tinted panel; a missing bag keeps the error ink
+                // manifest's tinted panel; a missing order keeps the error ink
                 // in the same body so the exception is the colour, not the
                 // shape.
+                //
+                // Drawn whenever there is something to say: the counter's own
+                // printed label, or `Missing` once the rider has reported a
+                // shortfall. A route whose counters print nothing shows the tag
+                // only on the exception, which is the one time it carries a
+                // fact the row does not already state.
+                if (gone || line.label.isNotEmpty)
                 Container(
                   padding: EdgeInsets.symmetric(horizontal: 7.w, vertical: 3.h),
                   decoration: BoxDecoration(
@@ -602,7 +609,7 @@ class _StopActionSheetState extends State<StopActionSheet> {
                     ),
                   ),
                   child: Text(
-                    gone ? 'Missing' : line.bag,
+                    gone ? 'Missing' : line.label,
                     maxLines: 1,
                     style: TextStyle(
                       fontSize: 12.5.sp,
diff --git a/lib/views/Dashboard/home/stop_card.dart b/lib/views/Dashboard/home/stop_card.dart
index f21f8d4..28c970c 100644
--- a/lib/views/Dashboard/home/stop_card.dart
+++ b/lib/views/Dashboard/home/stop_card.dart
@@ -66,10 +66,10 @@ class StopCard extends StatelessWidget {
   /// Time at the door, shown in the card's header.
   final Duration service;
 
-  /// Which bag this order travels in — `Bag 3`, or the label the kitchen
-  /// printed. One order, one bag; the count is never a separate figure. See
-  /// [BagManifest].
-  final String bag;
+  /// Which label this order travels in — `Bag 3`, or the label the kitchen
+  /// printed. One order, one label; the count is never a separate figure. See
+  /// [OrderManifest].
+  final String label;
 
   /// True when this card sits under a heading that already names its pickup
   /// location.
@@ -122,7 +122,7 @@ class StopCard extends StatelessWidget {
     required this.state,
     required this.address,
     required this.service,
-    this.bag = '',
+    this.label = '',
     this.groupedUnderSource = false,
     this.selected = false,
     this.busy = false,
@@ -256,7 +256,7 @@ class StopCard extends StatelessWidget {
             SizedBox(height: 12.h),
             _factsRow(
               kind,
-              bagShownAbove: twoLeg && !grouped && bag.isNotEmpty,
+              labelShownAbove: twoLeg && !grouped && label.isNotEmpty,
             ),
             if (action != null) ...[SizedBox(height: 16.h), action],
           ],
@@ -318,7 +318,7 @@ class StopCard extends StatelessWidget {
   /// `→ Joe · Bag 1` — the far end, in one line.
   ///
   /// Everything the second leg used to spend a whole block on: who it is for,
-  /// and which bag it is. The address is one tap away in the detail sheet,
+  /// and which label it is. The address is one tap away in the detail sheet,
   /// where a rider going to a *kitchen* has no use for it yet.
   Widget _dropLine(String customer) {
     return Row(
@@ -343,7 +343,10 @@ class StopCard extends StatelessWidget {
             ),
           ),
         ),
-        if (bag.isNotEmpty) ...[SizedBox(width: 10.w), _BagChip(label: bag)],
+        if (label.isNotEmpty) ...[
+          SizedBox(width: 10.w),
+          _LabelChip(label: label),
+        ],
       ],
     );
   }
@@ -352,7 +355,7 @@ class StopCard extends StatelessWidget {
   ///
   /// This is the line a rider re-reads at a red light, so nothing on it is
   /// under 14sp and none of it is in a box.
-  Widget _factsRow(StopKind kind, {required bool bagShownAbove}) {
+  Widget _factsRow(StopKind kind, {required bool labelShownAbove}) {
     final due = DateTime.tryParse(
       (stop['expected_pickup_time'] ?? stop['eta'] ?? '').toString().trim(),
     );
@@ -393,33 +396,33 @@ class StopCard extends StatelessWidget {
             ),
           ],
         ),
-        // What is in it, and which bag it is. The bag appears here whenever the
-        // drop line above is not already carrying it — a card must never be
-        // silent about which box this order is, and it must never say it twice.
+        // What is in it, and the counter's own label where there is one. It
+        // appears here whenever the drop line above is not already carrying it:
+        // a card must never say the same thing twice.
         Builder(
           builder: (_) {
-            final label = bag.isNotEmpty ? bag : stopBagLabel(stop);
+            final printed = label.isNotEmpty ? label : stopPrintedLabel(stop);
             final meta = _MetaLine(
               deliver: kind.hasDelivery ? _qty(deliveryParcelCount(stop)) : 0,
               collect: kind.hasPickup ? _qty(pickupParcelCount(stop)) : 0,
               cash: cash,
               muted: _rejected || state == StopState.done,
-              // On a meal run the parcel counts are the one-bag rule restated
+              // On a meal run the parcel counts are the one-label rule restated
               // as an item count, which is exactly the second number this app
               // does not allow. Only the money survives.
               countsHidden: ServiceProfile.active.deliversToCustomer,
             );
-            final showBag = !bagShownAbove && label.isNotEmpty;
-            if (!showBag && meta.isEmpty) return const SizedBox.shrink();
+            final showLabel = !labelShownAbove && printed.isNotEmpty;
+            if (!showLabel && meta.isEmpty) return const SizedBox.shrink();
 
             return Padding(
               padding: EdgeInsets.only(top: 8.h),
               child: Row(
                 children: [
                   if (!meta.isEmpty) Flexible(child: meta),
-                  if (showBag) ...[
+                  if (showLabel) ...[
                     if (!meta.isEmpty) SizedBox(width: 10.w),
-                    _BagChip(label: label),
+                    _LabelChip(label: printed),
                   ],
                 ],
               ),
@@ -441,7 +444,7 @@ class StopCard extends StatelessWidget {
   /// journey and the bar offers the claim, and neither duplicates the other.
   ///
   /// A stop that is already *arrived* is the one exception: the single-order
-  /// case ("one bag, one counter") would otherwise make him tick a card he is
+  /// case ("one label, one counter") would otherwise make him tick a card he is
   /// looking at to reach a control that talks about "the selection". That
   /// button opens the same slide sheet the bar does, over the same batch.
   Widget? _primaryAction() {
@@ -598,16 +601,19 @@ class _IconAction extends StatelessWidget {
 /// the card has exactly one colour to spend. It is a chip rather than plain
 /// text because it is read *against an object* — a bordered word is findable on
 /// a card at arm's length in a way a run of grey text is not.
-class _BagChip extends StatelessWidget {
+class _LabelChip extends StatelessWidget {
   final String label;
-  const _BagChip({required this.label});
+  const _LabelChip({required this.label});
 
-  /// Backend labels are codes — `DG-1042`, `BAG-1` — and derived ones already
-  /// read `Bag 3`. The word belongs on both, and the test for "already has it"
-  /// is the *word*, not the prefix: `BAG-1` starts with those three letters and
-  /// is still a code, so it becomes `Bag BAG-1` exactly as it always read.
-  String get _text =>
-      label.toLowerCase().startsWith('bag ') ? label : 'Bag $label';
+  /// ── The word is gone; the code is not ──
+  ///
+  /// This prefixed everything with `Bag ` — so a counter's own code rendered
+  /// as `Bag DG-1042`, and a number the app had derived rendered as `Bag 3`
+  /// and read like something stencilled on an object nobody had stencilled.
+  ///
+  /// What a counter prints is printed on it already. It is shown exactly as it
+  /// was sent, and nothing is shown at all where nothing was sent.
+  String get _text => label;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/views/Dashboard/home/stop_detail_sheet.dart b/lib/views/Dashboard/home/stop_detail_sheet.dart
index ea9336d..723ad03 100644
--- a/lib/views/Dashboard/home/stop_detail_sheet.dart
+++ b/lib/views/Dashboard/home/stop_detail_sheet.dart
@@ -51,10 +51,10 @@ class StopDetailSheet extends StatelessWidget {
   final double? riderLat;
   final double? riderLng;
 
-  /// The bag this order travels in, as the caller's store recorded it at the
+  /// The label this order travels in, as the caller's store recorded it at the
   /// counter. Empty falls back to the payload's own `baglabel`, and a line
   /// with neither simply has no Bag row — nothing is invented.
-  final String bag;
+  final String label;
 
   /// Orders the rider is carrying — what turns a raw `pickup` row into the
   /// delivery leg. Empty (Home's caller) leaves the raw kind in charge.
@@ -91,7 +91,7 @@ class StopDetailSheet extends StatelessWidget {
     this.stopCount = 0,
     this.riderLat,
     this.riderLng,
-    this.bag = '',
+    this.label = '',
     this.collectedIds = const {},
     this.ofOrder = false,
   });
@@ -102,7 +102,7 @@ class StopDetailSheet extends StatelessWidget {
     required Map<String, dynamic> stop,
     required int stopNumber,
     int stopCount = 0,
-    String bag = '',
+    String label = '',
     Set<String> collectedIds = const {},
     double? riderLat,
     double? riderLng,
@@ -119,7 +119,7 @@ class StopDetailSheet extends StatelessWidget {
         stop: stop,
         stopNumber: stopNumber,
         stopCount: stopCount,
-        bag: bag,
+        label: label,
         collectedIds: collectedIds,
         riderLat: riderLat,
         riderLng: riderLng,
@@ -721,15 +721,18 @@ class StopDetailSheet extends StatelessWidget {
 
   Widget _detailGrid() {
     final rows = <MapEntry<String, String>>[
-      // Whose counter the bag came off — the fact the delivery card carries
+      // Whose counter the label came off — the fact the delivery card carries
       // ("PICKED UP FROM …") and this sheet used to drop. Only on the drop
       // leg: on a pickup the header IS the source context. One reader,
       // [stopSourceName], as the project rule demands.
       MapEntry('From', _isDropLeg ? stopSourceName(stop) : ''),
-      // The bag is what a rider matches against a shelf, so it outranks the
-      // reference. Stored pairing first ([bag], written at the counter), the
+      // The label is what a rider matches against a shelf, so it outranks the
+      // reference. Stored pairing first ([label], written at the counter), the
       // kitchen-printed label as fallback, absent on a line with no load.
-      MapEntry('Bag', bag.isNotEmpty ? bag : _s(['baglabel', 'BagLabel'])),
+      MapEntry(
+        'Label',
+        label.isNotEmpty ? label : _s(['baglabel', 'BagLabel']),
+      ),
       MapEntry('Order', _s(['orderid', 'OrderId'])),
       MapEntry('Product', _s(['description', 'productname', 'product'])),
       MapEntry('Weight', () {
diff --git a/lib/views/Dashboard/home/trip.dart b/lib/views/Dashboard/home/trip.dart
index de45bba..0f80c28 100644
--- a/lib/views/Dashboard/home/trip.dart
+++ b/lib/views/Dashboard/home/trip.dart
@@ -254,8 +254,17 @@ class Trip {
   ///
   /// Returns `this` unchanged when nothing has been collected yet, so the
   /// common case allocates nothing.
+  /// ── Declined work is not outstanding work ──
+  ///
+  /// [rejectedIds] is the set the rider's own decision writes, and it has to be
+  /// passed in because a decline is **local first**: the stop stays in the
+  /// payload reading `assigned` until the backend catches up, so
+  /// `stopStatusOf` cannot see it and the figures counted a stop the rider had
+  /// refused. He declined four of eight and the card still measured the
+  /// kilometres to all eight.
   Trip outstanding({
     Set<String> collectedIds = const <String>{},
+    Set<String> rejectedIds = const <String>{},
     double? originLat,
     double? originLng,
   }) {
@@ -263,7 +272,9 @@ class Trip {
       for (final s in stops)
         if (!WorkBoundary.pickupComplete(s, collectedIds: collectedIds) &&
             !stopStatusOf(s).isCancelled &&
-            !stopStatusOf(s).isSkipped)
+            !stopStatusOf(s).isSkipped &&
+            !stopStatusOf(s).isRejected &&
+            !rejectedIds.contains((s['orderid'] ?? '').toString()))
           s,
     ];
     if (left.length == stops.length) return this;
@@ -300,6 +311,35 @@ class Trip {
         '${RouteMetricsHelper.formatClock(e)}';
   }
 
+  /// The slot as a **clock range**, or `''` when it has none.
+  ///
+  /// ── Why a day part is not printed at clock position ──
+  ///
+  /// [slotLabel] answers "what is this trip called" and names a whole day part
+  /// as *Morning* / *Afternoon* / *Evening*, which is right for a heading.
+  /// It is wrong wherever the app is printing a live figure.
+  ///
+  /// Two things happen when it lands there. The word is a **label pretending to
+  /// be data**: it sits where "3h 10m left" sits, in the corner a rider checks
+  /// for how much time he has, and answers with a noun he cannot act on. And it
+  /// is redundant twice over — the trip is already numbered `Trip 1`, and the
+  /// number *is* the day part, so `Trip 1 · Morning` says one thing twice.
+  ///
+  /// This became visible when trips started being placed by day part at all:
+  /// before that they carried no window, [slotLabel] fell through to "Today's
+  /// route", and the same call sites printed nothing. So the fix is not to undo
+  /// the placement — it is to stop reading a heading as a measurement.
+  ///
+  /// Returns a range only when the hub sent a real one: `10:00 AM – 1:00 PM`.
+  String get slotClockLabel {
+    final s = slotStart;
+    final e = slotEnd;
+    if (s == null || e == null) return '';
+    if (DayPart.spans(s, e)) return '';
+    return '${RouteMetricsHelper.formatClock(s)} – '
+        '${RouteMetricsHelper.formatClock(e)}';
+  }
+
   /// True when the slot window has already closed.
   bool isExpired([DateTime? now]) {
     final e = slotEnd;
@@ -410,15 +450,47 @@ class Trip {
   DateTime? get _earliestDue {
     DateTime? best;
     for (final s in stops) {
-      final due = _parseTimestamp(
-        s['expected_pickup_time'] ?? s['expectedpickuptime'] ?? s['eta'],
-      );
+      final due = dayPartTimeOf(s);
       if (due == null) continue;
       if (best == null || due.isBefore(best)) best = due;
     }
     return best;
   }
 
+  /// The clock that decides which part of the day a stop belongs to.
+  ///
+  /// ── Due time first, assignment time second ──
+  ///
+  /// The right answer is when the work is *due*: an order to be collected at
+  /// 10am is morning work whenever the hub happened to raise it. That is
+  /// `expected_pickup_time`, and where the backend sends it nothing here
+  /// changes.
+  ///
+  /// Where it does not — which is the live Doormile contract today — the day
+  /// part had nothing to read at all, and every stop fell into the undated
+  /// `day:` bucket. One trip, no day part, and [TripSlots.slots] put it in the
+  /// first free slot: **everything was Trip 1, all day**. A rider given an
+  /// evening run opened Home to find it filed under the morning.
+  ///
+  /// So the fallback is when the work reached him — `assignedat`, merged onto
+  /// the row by [WorkRepository] from the assignment ledger. It is the hub's
+  /// own act as the phone observed it, and it is what dispatch means on the
+  /// telephone: work handed over in the morning is the morning run. Approximate
+  /// where a due time would be exact, and exactly right for the common case,
+  /// which is a slot assigned at the top of the slot it is for.
+  ///
+  /// `eta` is read last and usually answers nothing — on the v1 adapter it is
+  /// a duration, not a clock, and [_parseTimestamp] rejects it rather than
+  /// inventing a 15th of the month out of "15 min".
+  static DateTime? dayPartTimeOf(Map<String, dynamic> stop) =>
+      _parseTimestamp(
+        stop['expected_pickup_time'] ??
+            stop['expectedpickuptime'] ??
+            stop['assignedat'] ??
+            stop['assignedon'] ??
+            stop['eta'],
+      );
+
   /// Address components every stop on this trip shares — city, state,
   /// pincode and so on. Cached per build by the caller.
   List<String> get sharedAddressTail => commonAddressTail([
@@ -663,11 +735,11 @@ class Trip {
         from = slotFrom;
         to = slotTo;
       } else {
-        final due = _parseTimestamp(
-          stop['expected_pickup_time'] ??
-              stop['expectedpickuptime'] ??
-              stop['eta'],
-        );
+        // Due time where the hub sends one, and the moment the work reached
+        // the rider where it does not — see [Trip.dayPartTimeOf]. Without the
+        // second half every stop landed in the undated bucket below and the
+        // whole day rendered as Trip 1.
+        final due = dayPartTimeOf(stop);
         if (due != null) {
           // Morning, afternoon or evening — see [DayPart]. Not a rolling
           // window: two stops due an hour apart are on the same run, and the
diff --git a/lib/views/Dashboard/home/trip_brief_strip.dart b/lib/views/Dashboard/home/trip_brief_strip.dart
index 851a722..d0f92ae 100644
--- a/lib/views/Dashboard/home/trip_brief_strip.dart
+++ b/lib/views/Dashboard/home/trip_brief_strip.dart
@@ -418,65 +418,30 @@ class _TripBriefStripState extends State<TripBriefStrip> {
             // matching the one above the bar, so the bar sits evenly between
             // the two things it separates.
             SizedBox(height: 8.h),
-            Row(
-              children: [
-                // ── The journey leads the line now ──
-                //
-                // It used to be the *fallback* — shown only when there was no
-                // shift and no slot, because the clock had the row. With the
-                // ratio gone there is space for both, and how long and how far
-                // is the pair a rider is actually planning against. It yields
-                // while the grid below is open so nothing prints twice.
-                Flexible(
-                  child: _open ? const SizedBox.shrink() : _journeyGlance(),
-                ),
-                const Spacer(),
-                // The clock keeps its own colour rules — the one line here
-                // allowed to carry bad news; see [_timeLeftLine]. It prints
-                // nothing at all when the hub has set neither a shift nor a
-                // slot, which is when the journey has the row to itself.
-                Flexible(child: _timeLeftLine()),
-              ],
-            ),
+            // ── The journey glance is gone from the collapsed head ──
+            //
+            // It printed `≈50 min · 2.4 km` under the bar, and it was the third
+            // place the same estimate appeared: the grid one tap below states
+            // Duration and Distance as two of its four figures, and every group
+            // on the route under it carries its own leg in the right-hand
+            // column the rider scans down.
+            //
+            // Collapsed is a *summary* state, and what a summary is for is the
+            // one fact the card is answering with — how much is left, and the
+            // bar that measures it. An estimate repeated at 12.5pt beside it
+            // added a number to read without adding anything to know, and it is
+            // the number a rider trusts least: a straight-line distance at an
+            // average speed, printed where it reads like a promise.
+            //
+            // Nothing is lost. Open the card and both figures are there, stated
+            // properly, with the parcels and the cash beside them.
+            Row(children: [const Spacer(), Flexible(child: _timeLeftLine())]),
           ],
         ),
       ),
     );
   }
 
-  /// The collapsed panel's journey, in one quiet line: `≈4h · 38.9 km`.
-  ///
-  /// Only the figures that exist — a route with no coordinates prints no
-  /// kilometres rather than a zero — and never a colour: this is context, and
-  /// the headline beside it is the thing being contextualised.
-  Widget _journeyGlance() {
-    final duration = roundTripDuration(_trip.totalDuration);
-    final parts = <String>[
-      if (duration > Duration.zero) '\u2248${formatTripDuration(duration)}',
-      if (_trip.routeMeters > 0)
-        RouteMetricsHelper.formatDistance(_trip.routeMeters),
-    ];
-    if (parts.isEmpty) return const SizedBox.shrink();
-    // Scale-down, never ellipsis: this line is nothing but figures, and
-    // `10.3 …` is the unit cut off the number it qualifies — seen the first
-    // time it shared a row with the headline, both flexible.
-    return FittedBox(
-      fit: BoxFit.scaleDown,
-      alignment: Alignment.centerLeft,
-      child: Text(
-        parts.join(' \u00b7 '),
-        maxLines: 1,
-        style: TextStyle(
-          fontSize: 12.5.sp,
-          fontWeight: FontWeight.w600,
-          fontFeatures: const [FontFeature.tabularFigures()],
-          color: ColorConstants.secondaryText,
-          fontFamily: FontConstants.fontFamily,
-        ),
-      ),
-    );
-  }
-
   /// The one line on this widget that can carry bad news, so it is the one line
   /// that is allowed to change colour.
   Widget _timeLeftLine() {
@@ -490,13 +455,19 @@ class _TripBriefStripState extends State<TripBriefStrip> {
       // inventing a state — see the note on [ShiftBanner] for why an absent
       // shift is not the rider's problem to solve.
       //
-      // And when the trip has no slot either, say nothing AT ALL:
-      // `slotLabel`'s fallback is the words "Today's route", which set at
-      // clock position read as a fact the rider should be able to act on. A
+      // And when the trip has no clock window either, say nothing AT ALL. A
       // headline row carries a live figure or it carries silence — a label
-      // pretending to be data is worse than the gap it fills.
-      if (_trip.slotStart == null) return const SizedBox.shrink();
-      text = _trip.slotLabel;
+      // pretending to be data is worse than the gap it fills, and `slotLabel`
+      // has two fallbacks that are exactly that: the words "Today's route", and
+      // the day part's name. **Morning** where "3h 10m left" belongs is a noun
+      // in the corner a rider checks for how much time he has; the trip tab
+      // above already says which part of the day this is, in a number.
+      //
+      // See [Trip.slotClockLabel], which is empty unless the hub sent a real
+      // range.
+      final window = _trip.slotClockLabel;
+      if (window.isEmpty) return const SizedBox.shrink();
+      text = window;
       color = ColorConstants.secondaryText;
     } else if (left == Duration.zero) {
       text = 'Shift ended';
diff --git a/lib/views/Dashboard/home/trip_card.dart b/lib/views/Dashboard/home/trip_card.dart
index b270aa7..dae55b7 100644
--- a/lib/views/Dashboard/home/trip_card.dart
+++ b/lib/views/Dashboard/home/trip_card.dart
@@ -16,7 +16,8 @@ import 'package:miler/views/helpers/constants/design_constants.dart';
 import 'package:miler/views/helpers/constants/miler_type.dart';
 import 'package:miler/views/helpers/constants/Font_constant.dart';
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
+import 'package:miler/data/stop_area.dart';
 import 'package:miler/data/milk_run.dart';
 import 'package:miler/data/service_profile.dart';
 
@@ -258,6 +259,10 @@ class TripCard extends StatelessWidget {
     // on the same footing. See [Trip.outstanding].
     remaining: trip.outstanding(
       collectedIds: collectedIds,
+      // Work he has declined is not work in front of him — see the note on
+      // [Trip.outstanding]. Without this the Distance cell measured a route
+      // through stops the rider had refused.
+      rejectedIds: rejectedIds,
       originLat: riderLat,
       originLng: riderLng,
     ),
@@ -311,7 +316,7 @@ class TripCard extends StatelessWidget {
       for (var i = 0; i < trip.stops.length; i++) {
         if (_stateOf(trip.stops[i]) != rung) continue;
         final stop = trip.stops[i];
-        final key = MilkRun.sourceKeyOf(stop);
+        final key = MilkRun.sourceKeyOf(stop, within: trip.stops);
         final grouped = ServiceProfile.active.sourceIsKitchen && key.isNotEmpty;
         final stops = grouped
             ? [
@@ -430,13 +435,22 @@ class TripCard extends StatelessWidget {
     // the screen. See [RouteGroup.allStops].
     for (var i = 0; i < trip.stops.length; i++) {
       final stop = trip.stops[i];
-      // Key on the id where there is one, falling back to the name: the id is
-      // what the hub controls, but a payload that only carries a name still has
-      // to group rather than collapsing every stop into one nameless pile.
+      // ── One reader for "which counter is this", not two ──
+      //
+      // This built its own key — `stopSourceId`, falling back to
+      // `stopSourceName` — while [MilkRun.sourceKeyOf] is the function that
+      // exists to answer exactly this, and is what the bulk collect, the
+      // per-kitchen gate and `sameSourceAs` all key on.
+      //
+      // They did not agree. `stopSourceId` reads `kitchenid` and `sourceid`;
+      // `sourceKeyOf` reads those **and `pickuplocationid`** — so a row
+      // identified only by its location id was one place according to the
+      // collect and a different one according to the card that offers it. That
+      // is the same two-readers-one-question failure `sourceNameOf` documents,
+      // repeated on the id, and it splits a kitchen's orders across two groups
+      // on the screen while the collect still treats them as one.
       final key = grouped
-          ? (stopSourceId(stop).isNotEmpty
-                ? stopSourceId(stop)
-                : stopSourceName(stop))
+          ? MilkRun.sourceKeyOf(stop, within: trip.stops)
           : 'stop:${_idOf(stop)}';
       if (!buckets.containsKey(key)) {
         buckets[key] = <int>[];
@@ -473,17 +487,56 @@ class TripCard extends StatelessWidget {
       groups.add(() {
         final stops = visible;
         final first = all.first;
+
+        // ── An unnamed counter is named by where it is ──
+        //
+        // A grouped place with no source name fell through to
+        // `MilkRun.navigationLabel`, which answers with the **customer** — so
+        // the heading over a dropdown read as one more order rather than as the
+        // place the orders under it are collected from.
+        //
+        // The address is what names a place the payload did not name, and it is
+        // what the rider wants off that line anyway: he is deciding where to
+        // ride, not who to hand a bag to.
+        final place = compactAddress(pickupAddressOf(first));
+
+        // ── When a lone stop is a *place*, and when it is the stop ──
+        //
+        // `flat` means the header **is** the stop: no counter above it worth
+        // naming, so the card is titled with the customer and opens the detail
+        // sheet instead of a list. That is always right on a parcel route,
+        // where the rider goes to one door for one consignment.
+        //
+        // On a kitchen line it was reached by a different route and gave the
+        // wrong answer. A lone stop was flat whenever the payload carried **no
+        // source name** — and a missing name is a gap in the data, not evidence
+        // that there is no counter. So an order whose row lost its kitchen name
+        // was drawn as a bare header with the customer's name on it, sitting
+        // above the dropdown its seven siblings were in: seven bags in a list
+        // and one stranded over it, off the same shelf.
+        //
+        // [MilkRun.sourceKeyOf] now groups such a row back in by its address,
+        // which fixes that case at the root. This is the same correction one
+        // level down, for a place that genuinely does hold a single order: on a
+        // kitchen line a lone stop is only flat when there is **nothing at all**
+        // to name its place with — no counter name and no address. With an
+        // address it is a place holding one order, headed by where it is, with
+        // the order in the list under it.
         final flat =
-            all.length == 1 && (!grouped || stopSourceName(first).isEmpty);
-        // A grouped place is named by its counter. A flat one *is* the stop, so
-        // it is named by the customer — `MilkRun.navigationLabel` answers
-        // "pickup" for a parcel that has not been collected yet, which is a
-        // description of the leg rather than a name the rider can read off a
-        // gate.
+            all.length == 1 &&
+            (!grouped || (stopSourceName(first).isEmpty && place.isEmpty));
+
+        // A grouped place is named by its counter, or failing that by where it
+        // is. A flat one *is* the stop, so it is named by the customer —
+        // `MilkRun.navigationLabel` answers "pickup" for a parcel that has not
+        // been collected yet, which is a description of the leg rather than a
+        // name the rider can read off a gate.
         final name = flat
-            ? BagManifest.customerOf(first)
+            ? OrderManifest.customerOf(first)
             : (grouped
-                  ? stopSourceName(first)
+                  ? (stopSourceName(first).trim().isNotEmpty
+                        ? stopSourceName(first)
+                        : place)
                   : MilkRun.navigationLabel(first));
         return RouteGroup(
           key: key,
@@ -493,6 +546,20 @@ class TripCard extends StatelessWidget {
           name: name.trim().isEmpty
               ? MilkRun.navigationLabel(first)
               : name.trim(),
+          // ── The counter's street, under its name ──
+          //
+          // Grouped places only. A flat node *is* the stop and is already named
+          // by its customer or its own address, so an address line under it
+          // would print the same place twice; a kitchen is a name the rider has
+          // to convert into a location, and until now the only thing that could
+          // do that conversion was the preview sheet.
+          //
+          // Trimmed through [compactAddress] — the geocoder appends
+          // `Tamil Nadu, 641002, India` to every row, which is three
+          // components that are identical on every stop of every route and
+          // would push the part that names the street off the end of the line.
+          // Not repeated when it is already the heading — see [name] above.
+          location: flat || name.trim() == place ? '' : place,
           stops: stops,
           allStops: all,
           firstIndex: indices.first,
@@ -706,13 +773,12 @@ class TripCard extends StatelessWidget {
 
     for (var i = 0; i < trip.stops.length; i++) {
       if (!_showsOnHome(_stateOf(trip.stops[i]))) continue;
-      // Key on the id where there is one, falling back to the name: the id is
-      // what the hub controls, but a payload that only carries a name still has
-      // to group rather than collapsing every stop into one nameless pile.
+      // [MilkRun.sourceKeyOf], the same reader [routeGroups] uses and the same
+      // one the bulk collect keys on. This had its own id-then-name expression,
+      // which misses `pickuplocationid` and therefore split a kitchen the
+      // collect still treats as one — see the note in [routeGroups].
       final stop = trip.stops[i];
-      final key = stopSourceId(stop).isNotEmpty
-          ? stopSourceId(stop)
-          : stopSourceName(stop);
+      final key = MilkRun.sourceKeyOf(stop);
       if (!groups.containsKey(key)) {
         groups[key] = <int>[];
         order.add(key);
@@ -804,11 +870,11 @@ class TripCard extends StatelessWidget {
                 // him comparing "5 meals" on the phone against a shelf of bags.
                 // The count he can *check* is orders against bags, and under
                 // this workflow they are the same number by definition. See
-                // [BagManifest].
+                // [OrderManifest].
                 Text(
                   pending > 0
-                      ? '${BagManifest.countLabel(indices.length)} · $pending to accept'
-                      : BagManifest.countLabel(indices.length),
+                      ? '${OrderManifest.countLabel(indices.length)} · $pending to accept'
+                      : OrderManifest.countLabel(indices.length),
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(
@@ -1204,7 +1270,7 @@ class TripCard extends StatelessWidget {
       state: state,
       address: address,
       service: roundTripDuration(Trip.serviceTimeFor(stop)),
-      bag: _bagOf(stop),
+      label: _labelOf(stop),
       // The kitchen heading above already names where this came from.
       groupedUnderSource: ServiceProfile.active.sourceIsKitchen,
       selected: selectedIds.contains(id),
@@ -1258,21 +1324,19 @@ class TripCard extends StatelessWidget {
   // `_tag` is gone — it built the tinted Deliver / Collect / ₹ chips. See
   // [_MetaLine], which says the same three things on one uncoloured line.
 
-  /// Which bag this order travels in.
+  /// The label the counter printed on this order, or `''`.
   ///
-  /// Derived from its position in **its own pickup group**, not from the whole
-  /// route: the rider counts bags off one counter at a time, so the third order
-  /// from Kitchen 2 is *its* Bag 3 and not the route's ninth. A label the
-  /// kitchen actually printed always wins — see [BagManifest].
-  String _bagOf(Map<String, dynamic> stop) {
-    if (!ServiceProfile.active.sourceIsKitchen) return stopBagLabel(stop);
-    final key = MilkRun.sourceKeyOf(stop);
-    final group = [
-      for (final s in trip.stops)
-        if (MilkRun.sourceKeyOf(s) == key) s,
-    ];
-    return BagManifest.bagFor(stop, group);
-  }
+  /// ── It used to be derived, and that was the problem ──
+  ///
+  /// This computed the order's position in its own pickup group and returned
+  /// `Bag 3` — the app numbering a list it had built and presenting the result
+  /// as something stencilled on an object. On a route where no counter prints
+  /// labels that was every row, and it sat two columns from a rail numbering
+  /// the same rows.
+  ///
+  /// Only what the payload actually carries survives. See
+  /// [OrderManifest.labelFor].
+  String _labelOf(Map<String, dynamic> stop) => OrderManifest.labelFor(stop);
 
   // ── Footer: accept remaining, or go work the trip ──────────────────────
   Widget _footerBar(List<String> pendingIds) {
diff --git a/lib/views/Dashboard/pickups/card.dart b/lib/views/Dashboard/pickups/card.dart
index 83512ea..8f1be94 100644
--- a/lib/views/Dashboard/pickups/card.dart
+++ b/lib/views/Dashboard/pickups/card.dart
@@ -36,23 +36,23 @@ class PickupCard extends StatelessWidget {
   final bool enabled;
   final bool isSkipped;
 
-  /// The bag this order travels in, as recorded at the counter. Empty on a
-  /// parcel route, where there is no load to match against. See [BagManifest].
-  final String bag;
+  /// The label this order travels in, as recorded at the counter. Empty on a
+  /// parcel route, where there is no load to match against. See [OrderManifest].
+  final String label;
 
   /// Orders the rider is carrying.
   ///
   /// Needed because "picked up" is not a *status* on this screen — the accepted
   /// store normalises these rows to `accepted`, and what actually records the
   /// hand-over is the collected set. Without it, [MilkRun.workingKind] reads a
-  /// bag already in the rider's box as still needing collection, and the button
+  /// label already in the rider's box as still needing collection, and the button
   /// says **Start Pickup** for a delivery.
   final Set<String> collectedIds;
 
   /// Orders whose delivery leg the rider has actually started.
   ///
   /// Distinct from [collectedIds] on purpose, and the distinction is the whole
-  /// point of the chip: a bag in his box is **PICKED**, a round he has set off
+  /// point of the chip: a label in his box is **PICKED**, a round he has set off
   /// on is **ACTIVE**. The backend cannot answer this — `pickup-complete`
   /// stamps a hyperlocal consignment `Out_for_Delivery` at the counter — so the
   /// rung is resolved through [MilkRun.stageOf] against this set rather than
@@ -67,7 +67,7 @@ class PickupCard extends StatelessWidget {
     this.riderSpeedMps,
     this.enabled = true,
     this.isSkipped = false,
-    this.bag = '',
+    this.label = '',
     this.collectedIds = const {},
     this.outForDeliveryIds = const {},
   });
@@ -97,7 +97,7 @@ class PickupCard extends StatelessWidget {
     //
     // The booking adapter stamps `type: pickup` on every row it builds, so a
     // milk-run order the rider has already collected still described itself as
-    // a pickup — and this card offered **Start Pickup** for a bag sitting in
+    // a pickup — and this card offered **Start Pickup** for a label sitting in
     // his box. See [MilkRun.workingKind].
     final StopKind kind = MilkRun.workingKind(item, collectedIds: collectedIds);
 
@@ -201,7 +201,7 @@ class PickupCard extends StatelessWidget {
                 // ── Identity left, state and journey right ──
                 //
                 // The distance and ETA had a full-width row of their own under
-                // the bag — a fifth storey on a card the rider reads at a red
+                // the label — a fifth storey on a card the rider reads at a red
                 // light. Home's group node and this queue's own UP NEXT tile
                 // already carry the journey as a narrow right-hand column at
                 // the headline's shoulder; the live card was the one surface
@@ -272,7 +272,7 @@ class PickupCard extends StatelessWidget {
 
                           // ── The pairing, as one object ──
                           //
-                          // `Bag 1 · Joe`, not a bag chip in one place and a
+                          // `Bag 1 · Joe`, not a label chip in one place and a
                           // name in another. The join between them is the
                           // entire operational risk on a meal run, and making
                           // the rider do it himself at a gate is where the
@@ -280,10 +280,10 @@ class PickupCard extends StatelessWidget {
                           // the headline above, so the pair is spatial here;
                           // the written form earns its place further down the
                           // queue — see [_LaterRow] — and on the manifest.)
-                          if (bag.isNotEmpty) ...[
+                          if (label.isNotEmpty) ...[
                             SizedBox(height: 14.h),
-                            _BagPair(
-                              bag: bag,
+                            _LabelPair(
+                              label: label,
                               customer: '',
                               muted: !enabled,
                               size: 15.5,
@@ -371,7 +371,7 @@ class PickupCard extends StatelessWidget {
                 //
                 // Once the food is in the box the pickup is history — but it is
                 // still what establishes custody, and on a run with two kitchens
-                // it is how he knows which shelf this bag came off. So it stays,
+                // it is how he knows which shelf this label came off. So it stays,
                 // one line, under a hairline, at half the weight of the name
                 // above.
                 if (dropLeads && pickupName.isNotEmpty) ...[
@@ -534,7 +534,7 @@ class PickupCard extends StatelessWidget {
     // because this method opens the map screen directly rather than through
     // `startPickup`, and a stop that reached it in the pickup phase would put
     // the rider through a map, an I'VE ARRIVED and a confirmation sheet for a
-    // bag he is supposed to collect at the counter with the rest of them. See
+    // label he is supposed to collect at the counter with the rest of them. See
     // [MilkRun.worksOnOwnScreen].
     if (!MilkRun.worksOnOwnScreen(item, collectedIds: collectedIds)) {
       AppFeedback.info(
@@ -919,7 +919,7 @@ class _SquareIconButton extends StatelessWidget {
 /// ```
 ///   NOW        one task card, full weight, one big action
 ///   UP NEXT    who and where, quietly — no action
-///   LATER      one line each: bag, name, distance
+///   LATER      one line each: label, name, distance
 ///   SKIPPED    the reason, and the way back in
 /// ```
 ///
@@ -963,8 +963,8 @@ class _QueueRow {
   final QueueDensity density;
   final int displayStep;
 
-  /// The bag this order travels in, as recorded at the counter.
-  final String bag;
+  /// The label this order travels in, as recorded at the counter.
+  final String label;
 
   /// Why a skipped stop was skipped. Read from the skip cache rather than the
   /// stop, because the stop is refetched from the API every three seconds and
@@ -975,14 +975,14 @@ class _QueueRow {
     : stop = null,
       density = QueueDensity.later,
       displayStep = 0,
-      bag = '',
+      label = '',
       reason = '';
 
   const _QueueRow.stop({
     required this.stop,
     required this.density,
     required this.displayStep,
-    required this.bag,
+    required this.label,
     this.reason = '',
   }) : heading = null,
        count = 0;
@@ -1079,33 +1079,38 @@ class _QueueHeading extends StatelessWidget {
 ///
 /// ── Why they are one line and not two facts ──
 ///
-/// The rider is holding a bag and looking for a door. Printing the bag in one
+/// The rider is holding a label and looking for a door. Printing the label in one
 /// place and the customer in another makes him do the join himself, on a phone,
 /// at a gate — and that join is the entire operational risk on a meal run: five
 /// near-identical lunch bags, one confident rider, the wrong door.
 ///
 /// So they are written the way he thinks them.
-class _BagPair extends StatelessWidget {
-  final String bag;
+class _LabelPair extends StatelessWidget {
+  final String label;
   final String customer;
   final bool muted;
 
   /// Bigger on the live card, quieter down the queue.
   final double size;
 
-  const _BagPair({
-    required this.bag,
+  const _LabelPair({
+    required this.label,
     required this.customer,
     this.muted = false,
     this.size = 15,
   });
 
-  String get _bagText =>
-      bag.toLowerCase().startsWith('bag ') ? bag : 'Bag $bag';
+  /// ── The word is gone; the code is not ──
+  ///
+  /// This prefixed everything with `Bag `, so a counter's own code rendered as
+  /// `Bag DG-1042` and an app-derived number rendered as `Bag 3` — a reference
+  /// to an object nobody had labelled. What a counter prints is shown exactly
+  /// as it was sent, and nothing is shown where nothing was sent.
+  String get _labelText => label;
 
   @override
   Widget build(BuildContext context) {
-    if (bag.isEmpty) return const SizedBox.shrink();
+    if (label.isEmpty) return const SizedBox.shrink();
 
     return Row(
       mainAxisSize: MainAxisSize.min,
@@ -1119,7 +1124,7 @@ class _BagPair extends StatelessWidget {
             borderRadius: BorderRadius.circular(DesignConstants.radiusLg),
           ),
           child: Text(
-            _bagText,
+            _labelText,
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
             style: TextStyle(
@@ -1223,14 +1228,14 @@ class _TaskChip extends StatelessWidget {
 /// notes, no money. Preparing is a glance; acting is the card above.
 class _NextCard extends StatelessWidget {
   final Map<String, dynamic> item;
-  final String bag;
+  final String label;
   final double? distanceMeters;
   final double? riderSpeedMps;
   final VoidCallback onOpen;
 
   const _NextCard({
     required this.item,
-    required this.bag,
+    required this.label,
     required this.distanceMeters,
     required this.riderSpeedMps,
     required this.onOpen,
@@ -1293,9 +1298,9 @@ class _NextCard extends StatelessWidget {
                 ),
               ),
             ],
-            if (bag.isNotEmpty) ...[
+            if (label.isNotEmpty) ...[
               SizedBox(height: 10.h),
-              _BagPair(bag: bag, customer: '', muted: true, size: 14),
+              _LabelPair(label: label, customer: '', muted: true, size: 14),
             ],
           ],
         ),
@@ -1312,13 +1317,13 @@ class _NextCard extends StatelessWidget {
 /// take in at once.
 class _LaterRow extends StatelessWidget {
   final Map<String, dynamic> item;
-  final String bag;
+  final String label;
   final double? distanceMeters;
   final VoidCallback onOpen;
 
   const _LaterRow({
     required this.item,
-    required this.bag,
+    required this.label,
     required this.distanceMeters,
     required this.onOpen,
   });
@@ -1333,8 +1338,8 @@ class _LaterRow extends StatelessWidget {
         padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 12.h),
         child: Row(
           children: [
-            if (bag.isNotEmpty) ...[
-              _BagPair(bag: bag, customer: '', muted: true, size: 13),
+            if (label.isNotEmpty) ...[
+              _LabelPair(label: label, customer: '', muted: true, size: 13),
               SizedBox(width: 12.w),
             ],
             Expanded(
@@ -1375,14 +1380,14 @@ class _LaterRow extends StatelessWidget {
 /// and nothing else.
 class _SkippedRow extends StatelessWidget {
   final Map<String, dynamic> item;
-  final String bag;
+  final String label;
   final String reason;
   final VoidCallback onResume;
   final VoidCallback onOpen;
 
   const _SkippedRow({
     required this.item,
-    required this.bag,
+    required this.label,
     required this.reason,
     required this.onResume,
     required this.onOpen,
@@ -1441,8 +1446,8 @@ class _SkippedRow extends StatelessWidget {
             SizedBox(height: 12.h),
             Row(
               children: [
-                if (bag.isNotEmpty) ...[
-                  _BagPair(bag: bag, customer: '', muted: true, size: 13.5),
+                if (label.isNotEmpty) ...[
+                  _LabelPair(label: label, customer: '', muted: true, size: 13.5),
                   SizedBox(width: 12.w),
                 ],
                 Expanded(
diff --git a/lib/views/Dashboard/pickups/collect_payment.dart b/lib/views/Dashboard/pickups/collect_payment.dart
index 989bfba..5ad501d 100644
--- a/lib/views/Dashboard/pickups/collect_payment.dart
+++ b/lib/views/Dashboard/pickups/collect_payment.dart
@@ -116,7 +116,7 @@ extension _MethodUi on _Method {
   String get label => this == _Method.cash ? 'Cash' : 'UPI / QR';
 
   String get blurb => this == _Method.cash
-      ? 'Notes and coins, into your bag'
+      ? 'Notes and coins, kept on you'
       : 'Customer scans and pays';
 
   IconData get icon =>
diff --git a/lib/views/Dashboard/pickups/delivery_actions.dart b/lib/views/Dashboard/pickups/delivery_actions.dart
index be53055..21d80cf 100644
--- a/lib/views/Dashboard/pickups/delivery_actions.dart
+++ b/lib/views/Dashboard/pickups/delivery_actions.dart
@@ -227,7 +227,11 @@ Future<String> resolveConsignmentId(Map<String, dynamic> stop) async {
 ///     rider can retry this until his battery dies.
 ///   • **At a hub.** A cross-city parcel is `Inwarded_at_Hub` and will be
 ///     delivered by somebody else. There is nothing here for him to start.
-///   • **Refused.** The server gave a reason and it was thrown away.
+///   • **Refused.** The server gave a reason and it was thrown away. It is
+///     read now — and *translated*, because the reason arrives as a state
+///     machine talking to itself (`consignment is Inwarded_At_Hub, not
+///     Collected_By_Miler`) and that is not a sentence for a rider. See
+///     [_refusalSentence].
 ///   • **Unreachable.** The only one where "check your connection" is true.
 ///
 /// Telling a rider to check a working connection, about a parcel that is not
@@ -318,10 +322,10 @@ Future<bool> releaseForDelivery(Map<String, dynamic> stop) async {
   // account for, and one 400 carrying the backend's own sentence is worth more
   // than a client-side refusal that invents one. A hyperlocal consignment the
   // pivot has not finished releasing is let through; a hub-routed one is
-  // refused by the server, and the rider is told what the server said.
+  // refused by the server, and the rider is told what the server *meant* —
+  // translated out of the state machine's vocabulary, see [_refusalSentence].
   // A hold that cannot exist on this line is a bad read, not a fact about the
   // stop. See [_handoffHoldIsPossible].
-  final heldElsewhere = state.awaitsHub && _handoffHoldIsPossible;
   if (state.awaitsHub && !_handoffHoldIsPossible) {
     debugPrint(
       '[MILKRUN] $consignmentId read as ${state.name} on a line with no '
@@ -333,11 +337,16 @@ Future<bool> releaseForDelivery(Map<String, dynamic> stop) async {
       !(state.awaitsHub && !_handoffHoldIsPossible) &&
       state != ConsignmentState.unknown) {
     debugPrint('[MILKRUN] $consignmentId is ${state.name} — not releasable');
-    lastReleaseFailure = heldElsewhere
-        // The honest answer for a cross-city parcel: it is not his round, and
-        // saying so without naming a building he has never been to.
-        ? "This one has already been handed on — it's not yours to deliver."
-        : 'This parcel cannot be started yet. Ask your office to check it.';
+    // One sentence per state, written once — see
+    // [ConsignmentStateX.startRefusalSentence]. This branch and the refusal
+    // below are the same answer arrived at from two directions (a state the
+    // app read, and a state the server named), and they used to word it
+    // differently: a cross-city parcel blocked here said "it's not yours to
+    // deliver" while the identical parcel blocked one request later read out
+    // a database enum.
+    lastReleaseFailure =
+        state.startRefusalSentence ??
+        'This parcel cannot be started yet. Ask your office to check it.';
     return false;
   }
 
@@ -361,16 +370,63 @@ Future<bool> releaseForDelivery(Map<String, dynamic> stop) async {
   final after = await ConsignmentGate.stateOf(consignmentId);
   if (after.isDeliverable || after.isDelivered) return true;
 
-  // `status: 0` is the request never leaving; anything else is the server
-  // answering, and its own words beat a guess about the network.
+  // `status: 0` is the request never leaving, and it is the one failure that
+  // is really about the connection.
   lastReleaseFailure = res.status == 0
       ? 'Could not reach your office. Check your connection and slide again.'
-      : (res.message.trim().isNotEmpty
-            ? res.message.trim()
-            : 'Your office would not start this delivery.');
+      : _refusalSentence(res, after);
   return false;
 }
 
+/// The rider's version of a refused **Start ride**.
+///
+/// ── What the rider was actually reading ──
+///
+/// The server's own words were passed straight to the screen, on the argument
+/// that one refusal carrying the backend's reason beats a client-side guess
+/// that invents one. That argument holds for *whose* answer it is. It does not
+/// hold for what the answer turned out to be: `start-delivery` refuses with an
+/// assertion about its own model — **"consignment is Inwarded_At_Hub, not
+/// Collected_By_Miler"** — and that is what a rider saw on the slider, in
+/// database vocabulary, with no way to tell it from a crash.
+///
+/// The reason is worth keeping; the wording was never the server's to write.
+/// So the state is what travels, and [ConsignmentStateX.startRefusalSentence]
+/// says it once, in one place, in words that answer the only two questions he
+/// has: is this mine, and will sliding again help.
+///
+/// ── Three sources for that state, best first ──
+///
+///  1. **A fresh read** — [after], asked immediately after the refusal, which
+///     is the newest thing anyone knows about the consignment.
+///  2. **The refusal itself.** The read can fail — the row need not carry a
+///     status and the detail route 404s on older deployments — and when it
+///     does the refusal is the only thing left that knows. See
+///     [consignmentStateNamedInRefusal] for why reading it is safe.
+///  3. **The failure code.** `INVALID_STATE` alone still says the one useful
+///     thing: the consignment has moved on from the rung this press acts at,
+///     so sliding again is not the answer.
+///
+/// Prose from the server is still preferred over a generic sentence — some
+/// routes really do answer in words meant for a person. What is filtered out
+/// is the wire vocabulary. See [namesWireState].
+String _refusalSentence(ApiResult res, ConsignmentState after) {
+  final state = after != ConsignmentState.unknown
+      ? after
+      : consignmentStateNamedInRefusal(res.message);
+
+  final fromState = state.startRefusalSentence;
+  if (fromState != null) return fromState;
+
+  final said = res.message.trim();
+  if (said.isNotEmpty && !namesWireState(said)) return said;
+
+  return res.isInvalidState
+      ? 'Your office has already moved this parcel on, so it cannot be '
+            'started from here. Ask them to check it.'
+      : 'Your office would not start this delivery.';
+}
+
 /// Brings this device into line with a delivery the server already has.
 ///
 /// The same local bookkeeping a successful `deliver` performs — the order
diff --git a/lib/views/Dashboard/pickups/pickups.dart b/lib/views/Dashboard/pickups/pickups.dart
index 203987b..5f46089 100644
--- a/lib/views/Dashboard/pickups/pickups.dart
+++ b/lib/views/Dashboard/pickups/pickups.dart
@@ -77,6 +77,7 @@ import 'package:miler/data/order_events.dart';
 import 'package:miler/data/route_order.dart';
 import 'package:miler/data/stop_area.dart';
 import 'package:miler/data/stop_contact.dart';
+import 'package:miler/data/service_day.dart';
 import 'package:miler/data/work_domain.dart';
 import 'package:miler/data/work_repository.dart';
 import 'package:miler/data/miler_api.dart';
@@ -291,6 +292,28 @@ class MyPickups extends StatefulWidget {
   }
 }
 
+/// True when [stop] is part of the route the rider actually rode.
+///
+/// The completed store is not a list of finished deliveries — it is where every
+/// order that left the rider's hands is filed, whatever ended it. A stop he
+/// **declined** on Home is in there (`terminalStatus: 'rejected'`) and so is
+/// one the office **cancelled**. Neither was ever ridden to, so neither belongs
+/// on a progress rail: they inflate its count and they are drawn in states that
+/// assert something false — `rejected` reads as work still ahead of him,
+/// `cancelled` reads as green, completed work.
+///
+/// A **skip** is not in that group and is deliberately kept. It is a door he
+/// went to and could not finish, which is unfinished business, and the rail has
+/// an amber node for exactly that.
+///
+/// Top-level rather than a method so [_railStops]' rule can be exercised
+/// without building the screen — the arithmetic it protects is four lines and
+/// took a rider's whole rail with it when it was wrong.
+bool wasRiddenTo(Map<String, dynamic> stop) {
+  final status = stopStatusOf(stop);
+  return !status.isRejected && !status.isCancelled;
+}
+
 class _MyPickupsState extends State<MyPickups>
     with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
   final PickupProvider _provider = PickupProvider();
@@ -428,6 +451,65 @@ class _MyPickupsState extends State<MyPickups>
   /// Refreshed with every fetch. See [_railStops] for why the rail needs them.
   List<Map<String, dynamic>> _completedToday = <Map<String, dynamic>>[];
 
+  /// Notices when the day underneath the queue has moved on.
+  ///
+  /// [_fetchPicked] filters against the service day *as read when it ran*, so
+  /// the queue on screen is only ever as fresh as the last fetch. See
+  /// [_rolloverCheck].
+  final ServiceDayRollover _day = ServiceDayRollover();
+
+  /// Fires at the next local midnight. See [_armRollover].
+  Timer? _rollover;
+
+  /// This queue's stops, for today and no other day.
+  ///
+  /// ── Why Deliveries needed the same filter Home just got ──
+  ///
+  /// The two screens read the same call. `GET /miler/bookings` returns the
+  /// rider's whole **open** set, so a stop he picked up on Tuesday and never
+  /// closed came back on Wednesday, went through [WorkBoundary.deliveryQueue]
+  /// as perfectly workable — it *is* collected and it *is* unclosed — and sat
+  /// in this morning's round. Worse than a stale row: the bar at the foot of
+  /// this screen offers to start the whole round, so yesterday's leftovers
+  /// were work the rider could be sent out on.
+  ///
+  /// The rule and every part of its reasoning is [ServiceDay.onlyToday],
+  /// shared with Home so the two screens cannot disagree about which day it
+  /// is. What is local is only *which* day — the one this screen is showing.
+  ///
+  /// The completed store is not put through it: [getCompletedBookings] already
+  /// prunes itself to today on read.
+  List<Map<String, dynamic>> _todayOnly(List<Map<String, dynamic>> stops) {
+    _day.rollIfNeeded();
+    return ServiceDay.onlyToday(stops, now: _day.day, where: 'MYPICKUPS');
+  }
+
+  /// ── The day ending under a queue that is already open ──
+  ///
+  /// [ServiceDay] answers "which day is this row" at read time, which is right
+  /// for the data and not sufficient for the screen: the filter runs at fetch
+  /// time. A rider who leaves this tab open through 23:59, or backgrounds the
+  /// app on it and picks the phone up at six, is looking at a queue filtered
+  /// against a day that has ended.
+  ///
+  /// A timer to the next local midnight for the app left in the foreground,
+  /// and resume for every other case — both platforms suspend timers in the
+  /// background. Both land in [_rolloverCheck], which is idempotent. The same
+  /// arrangement Home and Activity use.
+  void _armRollover() {
+    _rollover?.cancel();
+    _rollover = Timer(_day.untilNextDay, _rolloverCheck);
+  }
+
+  /// Turns the queue over when the service day has moved on.
+  void _rolloverCheck() {
+    if (!mounted) return;
+    _armRollover();
+    if (!_day.rollIfNeeded()) return;
+    debugPrint('[MYPICKUPS] the day rolled over to ${_day.day} — refetching');
+    _fetchPicked(force: true);
+  }
+
   // ══════════════════════════════════════════════════════════════════════
   // THE MILK RUN'S ROUND
   //
@@ -467,20 +549,59 @@ class _MyPickupsState extends State<MyPickups>
   /// The completed stops come from the same store the Activity tab reads, so
   /// the two agree about what was finished, and they lead because they were
   /// done first. The open ones follow in the hub's order.
+  ///
+  /// ── Why the rail was counting stops the rider never rode ──
+  ///
+  /// The completed store is not a list of finished *deliveries*. It is where
+  /// every order that left the rider's hands is filed, whatever ended it — and
+  /// **a declined stop is filed there too** (`addCompletedBookings(...,
+  /// terminalStatus: 'rejected')`, from Home's decline). That was invisible for
+  /// as long as nothing read the store as a route.
+  ///
+  /// This reads it as a route, and the arithmetic was plainly wrong: a rider
+  /// who took one order out of five and declined the other four got a rail of
+  /// **five** nodes. Worse than the count, each wore the wrong colour —
+  /// `rejected` maps to [StopProgress.pending], so four stops he had refused
+  /// were drawn ahead of him as work still to come, and a `cancelled` one is
+  /// [StopStatusX.isWorkComplete] and draws **green**, claiming a delivery that
+  /// never happened.
+  ///
+  /// So the rail draws what he actually rode. A skip stays — it is unfinished
+  /// business and the rail has an amber node to say so, which is the whole
+  /// reason that colour exists. A stop he declined and a stop the office called
+  /// off are not on his route at all.
+  ///
+  /// ── And it draws the trip it is labelled with ──
+  ///
+  /// The strip is headed `Trip 2 · 10:00 AM – 1:00 PM` — see [_buildTripRail] —
+  /// while the store it reads holds the **whole day**, so on a second run the
+  /// heading named one trip and the nodes counted two. Completed stops are kept
+  /// to the trip in front of the rider whenever both numbers are known;
+  /// anything unplaced is kept, because dropping a stop for want of a trip
+  /// number would understate a day the rider really did work.
+  ///
+  /// With no open stops there is no current trip and nothing is scoped away:
+  /// a rider who has just closed his last stop still sees the full green rail,
+  /// which is the case this getter was written for.
   List<Map<String, dynamic>> get _railStops {
     final open = _visibleStops;
     if (_completedToday.isEmpty) return open;
 
     final openKeys = open.map(_getOrderKey).toSet();
-    final done = _completedToday
-        .where((o) => !openKeys.contains(_getOrderKey(o)))
-        .toList()
-        .reversed // the store hands them back newest first
-        .toList();
+    final trip = _currentTripNumber;
+
+    final done = <Map<String, dynamic>>[
+      // The store hands them back newest first; the rail reads in route order.
+      for (final o in _completedToday.reversed)
+        if (!openKeys.contains(_getOrderKey(o)) && wasRiddenTo(o))
+          if (trip == null || (_tripNumberOf(o) ?? trip) == trip) o,
+    ];
 
     return [...done, ...open];
   }
 
+
+
   /// Progress state for every stop on the accepted trip, in the admin's fixed
   /// order — what drives the red→green rail at the top of Bookings.
   ///
@@ -545,9 +666,28 @@ class _MyPickupsState extends State<MyPickups>
       hubLng: _currentLocation?.longitude,
     );
 
+    // ── The number is the slot, not the position in the list ──
+    //
+    // This read `i + 1` over the trips themselves, and it agreed with Home only
+    // by accident: while nothing could place a trip by day part, every run fell
+    // into one undated bucket and position and slot were the same number.
+    //
+    // They are not any more. [Trip.dayPartTimeOf] places a run in the part of
+    // the day it was assigned in, so a rider whose whole day is an afternoon
+    // run has one trip — at **slot 1**, which Home's tabs and the hub both call
+    // Trip 2, and which this method would have called Trip 1. That is precisely
+    // the failure the doc above says it exists to prevent, arriving through the
+    // arithmetic rather than through the input.
+    //
+    // [TripSlots.slots] is the same laying-out Home's tab bar uses, including
+    // its fallback to arrival order when the day parts cannot place every trip
+    // — so the two screens cannot produce different numbers for one stop
+    // without the tabs themselves being wrong.
+    final slots = trips.slots;
     return <String, int>{
-      for (var i = 0; i < trips.length; i++)
-        for (final id in trips[i].orderIds) id: i + 1,
+      for (var i = 0; i < slots.length; i++)
+        if (slots[i] != null)
+          for (final id in slots[i]!.orderIds) id: i + 1,
     };
   }
 
@@ -629,12 +769,12 @@ class _MyPickupsState extends State<MyPickups>
   ///
   /// Read once per refresh rather than per card: it is one preferences hit, and
   /// a `FutureBuilder` per row would blink a bagless card in on every rebuild.
-  Map<String, String> _bagLabels = const {};
+  Map<String, String> _orderLabels = const {};
 
-  Future<void> _loadBagLabels() async {
-    final labels = await getBagLabels();
+  Future<void> _loadOrderLabels() async {
+    final labels = await getOrderLabels();
     if (!mounted) return;
-    setState(() => _bagLabels = labels);
+    setState(() => _orderLabels = labels);
   }
 
   /// ── The queue, in the order it will be worked ──
@@ -722,7 +862,7 @@ class _MyPickupsState extends State<MyPickups>
             _visibleStops,
             _visibleStops.indexOf(stop),
           ),
-          bag: _bagLabels[(stop['orderid'] ?? '').toString()] ?? '',
+          label: _orderLabels[(stop['orderid'] ?? '').toString()] ?? '',
           reason: _skippedOrdersCache[_getOrderKey(stop)] ?? '',
         ),
       );
@@ -870,7 +1010,11 @@ class _MyPickupsState extends State<MyPickups>
     // The number leads and the window follows it, because the number is the
     // shared name and the window is the detail: "Trip 2 · 10:00 AM – 1:00 PM".
     final tripNo = _currentTripNumber;
-    final window = trip.slotStart != null ? trip.slotLabel : null;
+    // A clock range only. The day part's name would print `Trip 1 · Morning`,
+    // which is the same fact twice — the number *is* the day part. See
+    // [Trip.slotClockLabel].
+    final clock = trip.slotClockLabel;
+    final window = clock.isEmpty ? null : clock;
     final label = tripNo == null
         ? (window ?? 'Your route')
         : window == null
@@ -1023,12 +1167,14 @@ class _MyPickupsState extends State<MyPickups>
     BottomPage.currentTab.addListener(_onTabChanged);
 
     // Run these in parallel
+    _armRollover();
+
     _restoreSkips();
     _restoreClosedToday();
     _restoreActivePickup();
     _initializeLocation(); // Don't block
     _fetchPicked();
-    _loadBagLabels();
+    _loadOrderLabels();
     _startPollingStream();
   }
 
@@ -1178,6 +1324,11 @@ class _MyPickupsState extends State<MyPickups>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     super.didChangeAppLifecycleState(state);
+    // Before the early return below: a resume that does not change the
+    // foreground flag still has to notice a midnight that passed while the
+    // phone was in the rider's pocket, which is the case the timer cannot
+    // cover — both platforms suspend timers in the background.
+    if (state == AppLifecycleState.resumed) _rolloverCheck();
     final bool foreground = state == AppLifecycleState.resumed;
     if (foreground == _pollForeground) return;
     _pollForeground = foreground;
@@ -1280,6 +1431,7 @@ class _MyPickupsState extends State<MyPickups>
     WidgetsBinding.instance.removeObserver(this);
     BottomPage.currentTab.removeListener(_onTabChanged);
     _pollerSubscription?.cancel();
+    _rollover?.cancel();
     for (final timer in _pickupTimers.values) {
       timer.cancel();
     }
@@ -1376,114 +1528,8 @@ class _MyPickupsState extends State<MyPickups>
   ];
 
   // ══════════════════════════════════════════════════════════════════════
-  // START DELIVERY — the load leaves the counter
-  //
-  // ── Why this is a press and not a side effect of the pickup ──
-  //
-  // The release used to ride along with `pickup-complete`, back on Home: the
-  // rider slid to confirm five bags at a kitchen and the same gesture posted
-  // all five consignments `Out_for_Delivery`. The hub's board then showed five
-  // *active* deliveries for food still on the shelf in front of him, and there
-  // was no moment left in the day that meant "I have set off" — picked and
-  // out-for-delivery had been collapsed into one claim.
-  //
-  // They are two different claims about where the load is, made minutes or an
-  // hour apart, and only the rider can make the second one. So it is his press,
-  // on the tab that holds the load.
-  //
-  // ── Why one bar for the whole load ──
-  //
-  // `POST /miler/deliveries/start` takes a batch because the gesture is one
-  // press after the last counter. Releasing per card would be five presses for
-  // one act and would leave the round half-open — some rows deliverable, some
-  // refused at the door by a server the rider cannot argue with.
-  // ══════════════════════════════════════════════════════════════════════
-
-  /// Orders in the rider's hands that he has not yet declared himself riding.
-  ///
-  /// The bar's subject, and the reason it appears at all: an empty answer means
-  /// the whole load is already on the road and there is nothing left to press.
-  ///
-  /// Empty on every line but the milk run, and deliberately: a logistics parcel
-  /// is collected *for the hub* and delivered by somebody else, so its rider
-  /// has no round to start and must never be shown a control that says he has.
-  /// [MilkRun.navigatesToCustomer] asks the same question one stop at a time.
-  List<Map<String, dynamic>> get _unreleased => !_isMilkRun
-      ? const []
-      : [
-          for (final s in _visibleStops)
-            // The same three exclusions the queue itself applies, so the bar
-            // can never count a row the rider cannot see: work he has already
-            // closed, work he has put down, and work already on the road.
-            if (!stopStatusOf(s).isWorkComplete &&
-                !stopStatusOf(s).isCancelled &&
-                !stopStatusOf(s).isSkipped &&
-                !_completedOrderKeys.contains(_getOrderKey(s)) &&
-                _needsRelease(s))
-              s,
-        ];
-
-  /// Whether this stop is still waiting on the rider's **Start delivery**.
-  ///
-  /// ── Read from the consignment, not from a flag in this app ──
-  ///
-  /// Two backend behaviours are live at once and the app must not care which
-  /// it is talking to. `pickup-complete` either leaves a hyperlocal
-  /// consignment `Out_for_Delivery` (as it does today) or stops it at
-  /// `Collected_By_Miler` and waits for `start-delivery` — a server-side
-  /// setting, not something this app is told about.
-  ///
-  /// So the row is asked. `consignmentstatus` ships on every
-  /// `GET /miler/bookings` row, and it answers the question exactly: needing
-  /// release means needing release, and already out for delivery means the bar
-  /// has nothing to offer. **No feature flag is mirrored here**, because a
-  /// mirrored flag is a second source of truth that can be wrong.
-  ///
-  /// ── The rider's press decides this, not the server's rung ──
-  ///
-  /// This read the consignment state first and only fell back to the local
-  /// sets when the row carried none. That is the right instinct — a local flag
-  /// must never outrank a server fact — and it produced the wrong answer for
-  /// the case that is live on production today.
-  ///
-  /// Two backend behaviours ship at once. With `MILER_COLLECTED_STATE_ENABLED`
-  /// **on**, `pickup-complete` stops at `Collected_By_Miler` and this method's
-  /// old reading is exactly right. With it **off** — compatibility mode, which
-  /// is the default and what the app meets in production — `pickup-complete`
-  /// releases the consignment itself, so a stop arrives on this tab already
-  /// `Out_for_Delivery`, `needsRelease` answers false, and the round starts
-  /// itself. The rider never sees PICKED and **Start delivery** never appears:
-  /// he collects at the kitchen and the app has him on the road before he has
-  /// left the counter.
-  ///
-  /// So the two questions are separated, because they were never the same one:
-  ///
-  /// ```
-  ///   may this be delivered?   →  the consignment.  ConsignmentGate, deliver
-  ///   has he set off?          →  the rider.        this method
-  /// ```
-  ///
-  /// Nothing here contradicts the server. A stop the app holds at PICKED is
-  /// still `Out_for_Delivery` on the wire, `deliver` is still gated on the
-  /// consignment's own state, and pressing **Start delivery** on a consignment
-  /// that is already released costs no request at all — `releaseForDelivery`
-  /// returns true on sight of a deliverable state. What changes is only which
-  /// of the two facts the rider's card is showing him, and the answer is the
-  /// one he can act on.
-  ///
-  /// The consignment state stays the fallback for a stop this device has no
-  /// record of — collected on another handset, or after a reinstall.
-  bool _needsRelease(Map<String, dynamic> stop) {
-    final id = MilkRun.idOf(stop);
-    // He pressed it. Nothing outranks that.
-    if (_outForDeliveryIds.contains(id)) return false;
-    // He collected it here and has not pressed it.
-    if (_collectedIds.contains(id)) return true;
-    return consignmentStateFromRaw(stop['consignmentstatus']).needsRelease;
-  }
-
-  /// True while the round is being marked started, so the bar cannot be
-  /// double-pressed.
+  /// True while a round is being marked started, so [startRound] cannot run
+  /// twice over the same stop.
   bool _starting = false;
 
   /// Sets off: releases each collected consignment for delivery, server first.
@@ -1508,28 +1554,48 @@ class _MyPickupsState extends State<MyPickups>
   ///
   /// **The local set is written only for what the server released.** A stop
   /// whose consignment could not be reached or was refused keeps its PICKED
-  /// word and stays on the bar, because the alternative — showing ACTIVE for
-  /// a consignment the hub still calls collected — is the fiction that made
-  /// `deliver` fail at the door with nothing on screen to explain why.
+  /// word, because the alternative — showing ACTIVE for a consignment the hub
+  /// still calls collected — is the fiction that made `deliver` fail at the
+  /// door with nothing on screen to explain why.
   ///
-  /// Returns the number of orders actually released.
+  /// ── The bar that used to call this is gone ──
+  ///
+  /// There was a **Start delivery** bar pinned above the nav on this screen:
+  /// `5 orders in hand`, one press, release the lot. It was removed at the
+  /// rider's request, and the argument for it does not survive contact with how
+  /// the round is actually ridden.
+  ///
+  /// It existed because "I have set off" is a claim only the rider can make,
+  /// and that is still true — but he already makes it, once per stop, when he
+  /// slides **Start ride** on the map. That slider calls straight into this
+  /// method (see `map.dart`), so the release was never exclusive to the bar:
+  /// the bar was a second way to make the same claim, earlier, in bulk, for
+  /// stops he had not set off for yet.
+  ///
+  /// Which is what made it worth removing rather than merely redundant. A
+  /// batch release says the whole load is on the road at a moment when at most
+  /// one bag is, so the hub's board read *active* for four stops still in the
+  /// rider's box — the exact failure the bar was introduced to fix, moved one
+  /// step later in the day. Releasing per stop, at the moment he rides to it,
+  /// is the honest version of the same act.
+  ///
+  /// Nothing is stranded: a consignment that needs releasing is released when
+  /// he sets off for it, and one already released costs no request at all —
+  /// `releaseForDelivery` returns true on sight of a deliverable state.
+  ///
+  /// Still takes a list, because the caller passes one and a batch of one is
+  /// the common case. Returns the number of orders actually released.
   Future<int> startRound(List<Map<String, dynamic>> stops) async {
     if (_starting || stops.isEmpty) return 0;
     setState(() => _starting = true);
     try {
       final released = <String>[];
-      var unreachable = 0;
 
       for (final stop in stops) {
         final orderId = MilkRun.idOf(stop);
         if (orderId.isEmpty) continue;
-        if (await releaseForDelivery(stop)) {
-          released.add(orderId);
-        } else {
-          unreachable++;
-        }
+        if (await releaseForDelivery(stop)) released.add(orderId);
       }
-      _unreleasedFailures = unreachable;
       if (released.isEmpty) return 0;
 
       await addOutForDeliveryOrderIds(released);
@@ -1548,52 +1614,16 @@ class _MyPickupsState extends State<MyPickups>
     }
   }
 
-  /// How many stops the last [startRound] could not release. Read once by
-  /// [_startWholeRound] to word the message honestly.
-  int _unreleasedFailures = 0;
-
   /// Scroll extent to reserve under the queue for whatever floats over it.
   ///
-  /// Reads the same two conditions the slot itself reads, so the floor and the
-  /// surface can never disagree about which one is on screen.
+  /// Reads the same condition the slot itself reads, so the floor and the
+  /// surface can never disagree about what is on screen.
   double _bottomReservation(BuildContext context) => bottomReservationFor(
     inset: BottomPage.bottomInset(context),
     live: _liveOnThisScreen.isNotEmpty,
-    unreleased: _unreleased.isNotEmpty,
     idle: 8.h,
   );
 
-  Future<void> _startWholeRound() async {
-    final stops = _unreleased;
-    final n = await startRound(stops);
-    if (!mounted) return;
-
-    final held = _unreleasedFailures;
-    if (n == 0) {
-      // One stop, one reason: say it. `releaseForDelivery` knows whether the
-      // parcel is at a hub, missing its reference, refused, or genuinely
-      // unreachable — see [lastReleaseFailure] — and "check your connection"
-      // is true for only the last of those.
-      //
-      // A whole round that failed keeps the general wording: with several
-      // stops there is no single reason to give, and the per-stop detail is in
-      // the log.
-      AppFeedback.errorGlobal(
-        held == 1
-            ? (lastReleaseFailure ??
-                  'Could not start that delivery. Check your connection and '
-                      'try again.')
-            : 'Could not start the round. Check your connection and try again.',
-      );
-      return;
-    }
-    AppFeedback.successGlobal(
-      held > 0
-          ? '$n started · $held could not be started'
-          : (n == 1 ? 'Delivery started' : '$n deliveries started'),
-    );
-  }
-
   /// Marks a stop as finished (picked up or cancelled) in local state right
   /// away, so the UI unblocks without waiting for the backend/poll to catch up:
   /// it leaves the active banner, drops out of the top list, and no longer
@@ -1874,7 +1904,7 @@ class _MyPickupsState extends State<MyPickups>
     // The bag each order is in, re-read with the list it labels: a pickup that
     // happened on Home a moment ago must show its bags here without the rider
     // pulling to refresh.
-    unawaited(_loadBagLabels());
+    unawaited(_loadOrderLabels());
     try {
       final prefs = await SharedPreferences.getInstance();
       final userId = prefs.getInt('userId') ?? prefs.getInt('userid') ?? 0;
@@ -1934,7 +1964,7 @@ class _MyPickupsState extends State<MyPickups>
         }
       }
 
-      final items = mergedOrders.values.toList();
+      var items = mergedOrders.values.toList();
       debugPrint('[MYPICKUPS] Merged items count: ${items.length}');
 
       // Today's finished stops, for the rail. Read on every fetch rather than
@@ -1957,6 +1987,21 @@ class _MyPickupsState extends State<MyPickups>
         debugPrint('[MYPICKUPS] Merged $added accepted bookings from Home');
       }
 
+      // ── Today's, and only today's ──
+      //
+      // Applied here, once, on the merged day: after both endpoints and the
+      // accepted store, and before anything is derived from it. Everything
+      // below reads this list — the trip numbering, the milk run's whole-day
+      // set, the delivery queue, the rail — so filtering at one boundary is
+      // what stops a count above the queue from totalling a different set of
+      // days than the queue under it.
+      //
+      // `_completedToday` is deliberately not put through it: the completed
+      // store prunes itself to today on read, and it was already correct.
+      //
+      // See [_todayOnly], and [ServiceDay.onlyToday] for the rule Home shares.
+      items = _todayOnly(items);
+
       // ── The day's shape, before any of this screen's filtering ──
       //
       // Everything today: what is assigned, what he took, what he finished.
@@ -3206,7 +3251,7 @@ class _MyPickupsState extends State<MyPickups>
                                                 // The pairing recorded at the
                                                 // counter — same store as the
                                                 // card, so the two agree.
-                                                bag: row.bag,
+                                                label: row.label,
                                                 // The carried set — what turns
                                                 // a raw pickup row into the
                                                 // delivery leg the sheet must
@@ -3236,14 +3281,14 @@ class _MyPickupsState extends State<MyPickups>
                                                       distanceMeters,
                                                   riderSpeedMps:
                                                       _currentLocation?.speed,
-                                                  bag: row.bag,
+                                                  label: row.label,
                                                   collectedIds: _collectedIds,
                                                   outForDeliveryIds:
                                                       _outForDeliveryIds,
                                                 ),
                                                 QueueDensity.next => _NextCard(
                                                   item: item,
-                                                  bag: row.bag,
+                                                  label: row.label,
                                                   distanceMeters:
                                                       distanceMeters,
                                                   riderSpeedMps:
@@ -3252,7 +3297,7 @@ class _MyPickupsState extends State<MyPickups>
                                                 ),
                                                 QueueDensity.later => _LaterRow(
                                                   item: item,
-                                                  bag: row.bag,
+                                                  label: row.label,
                                                   distanceMeters:
                                                       distanceMeters,
                                                   onOpen: open,
@@ -3260,7 +3305,7 @@ class _MyPickupsState extends State<MyPickups>
                                                 QueueDensity.skipped =>
                                                   _SkippedRow(
                                                     item: item,
-                                                    bag: row.bag,
+                                                    label: row.label,
                                                     reason: row.reason,
                                                     onOpen: open,
                                                     onResume: () =>
@@ -3347,13 +3392,6 @@ class _MyPickupsState extends State<MyPickups>
                               }
                             },
                           )
-                        : _unreleased.isNotEmpty
-                        ? StartRoundBar(
-                            key: const ValueKey('start-round'),
-                            count: _unreleased.length,
-                            busy: _starting,
-                            onPressed: _startWholeRound,
-                          )
                         : const SizedBox.shrink(key: ValueKey('none')),
                   ),
                 ),
@@ -3366,113 +3404,27 @@ class _MyPickupsState extends State<MyPickups>
   }
 }
 
-/// ─────────────────────────────────────────────────────────────────────────
-/// START DELIVERY — one press, the whole load
-///
-/// The bar the rider hits after the last counter. It states what it is about to
-/// act on — `5 orders in hand` — because the press releases every one of them,
-/// and a control acting on a set the rider cannot see is one he learns not to
-/// trust.
-///
-/// ── Not a slide ──
-///
-/// Slides are reserved for the writes a resting thumb must not be able to make:
-/// "picked" is the rider asserting he is holding somebody's lunch, "delivered"
-/// that he has handed it over. Setting off is neither irreversible nor a claim
-/// about somebody else's property — pressing it early costs a hub board that
-/// reads *active* a few minutes early — so it is a button, at the size of every
-/// other primary action in the app.
-///
-/// It sits above the floating nav bar rather than under it: [BottomPage] owns
-/// that inset, and using it here is what keeps the button clear of the tab
-/// strip on a tall phone.
 /// How much scroll extent the queue must leave under itself.
 ///
 /// ── Why this is a function and not a number ──
 ///
-/// It was two branches and a magic constant: the unreleased case was built
-/// from its bar's own pieces, and the live case was a flat `80.h` that forgot
-/// the device inset entirely — so on a gesture-navigation phone the last row of
-/// the run sat behind the banner *and* behind the navigation, with its controls
-/// unreachable and no way to scroll to them.
+/// It was two branches and a magic constant, and the live case was a flat
+/// `80.h` that forgot the device inset entirely — so on a gesture-navigation
+/// phone the last row of the run sat behind the banner *and* behind the
+/// navigation, with its controls unreachable and no way to scroll to them.
 ///
-/// One rule, reading the same two conditions the slot itself reads, so the
-/// floor and the surface can never disagree about which one is on screen. Each
-/// surface states its own height, because the thing that overlays a list is the
-/// only thing that knows how much of the list it covers.
+/// One rule, reading the same condition the slot itself reads, so the floor and
+/// the surface can never disagree about what is on screen. The surface states
+/// its own height, because the thing that overlays a list is the only thing
+/// that knows how much of the list it covers.
+///
+/// ── One surface, where there were two ──
+///
+/// The other was the **Start delivery** bar, and it is gone with the control —
+/// see the note above `startRound`. Nothing floats over this
+/// list now except the live strip.
 double bottomReservationFor({
   required double inset,
   required bool live,
-  required bool unreleased,
   double idle = 8,
-}) {
-  if (live) return inset + ActivePickupBanner.maxHeight;
-  if (unreleased) return inset + StartRoundBar.maxHeight;
-  return inset + idle;
-}
-
-class StartRoundBar extends StatelessWidget {
-  /// The tallest this bar gets, excluding the device inset. See
-  /// [ActivePickupBanner.maxHeight] for why the surface declares its own.
-  static double get maxHeight => ButtonSizes.primary + 54.h;
-
-  final int count;
-  final bool busy;
-  final VoidCallback onPressed;
-
-  const StartRoundBar({
-    super.key,
-    required this.count,
-    required this.busy,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.fromLTRB(
-        16.w,
-        12.h,
-        16.w,
-        BottomPage.bottomInset(context) + 10.h,
-      ),
-      decoration: BoxDecoration(
-        color: ColorConstants.pureSurface,
-        boxShadow: [
-          // The list scrolls under this, so the edge has to read as an edge — a
-          // shadow rather than a rule, for the same reason the route cards have
-          // one: a hairline is not there on a scratched screen in sun, and a
-          // rule across a scrolling list reads as a divider between two rows.
-          BoxShadow(
-            color: ColorConstants.slateText.withValues(alpha: 0.10),
-            blurRadius: 18,
-            offset: const Offset(0, -4),
-          ),
-        ],
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            '$count ${count == 1 ? 'order' : 'orders'} in hand',
-            style: TextStyle(
-              fontSize: 13.sp,
-              fontWeight: FontWeight.w600,
-              color: ColorConstants.secondaryText,
-              fontFamily: FontConstants.fontFamily,
-            ),
-          ),
-          SizedBox(height: 8.h),
-          MilerButton(
-            label: 'Start delivery',
-            icon: LucideIcons.truck,
-            color: ColorConstants.primary,
-            loading: busy,
-            onPressed: busy ? null : onPressed,
-          ),
-        ],
-      ),
-    );
-  }
-}
+}) => live ? inset + ActivePickupBanner.maxHeight : inset + idle;
diff --git a/lib/views/Dashboard/pickups/sheet.dart b/lib/views/Dashboard/pickups/sheet.dart
index dbd321b..0d6b564 100644
--- a/lib/views/Dashboard/pickups/sheet.dart
+++ b/lib/views/Dashboard/pickups/sheet.dart
@@ -1237,12 +1237,12 @@ class _StopBrief extends StatelessWidget {
   /// `Bag 5 · Vidhya Kitchen`, whichever halves exist; the trimmed booking
   /// reference only as a last resort.
   String _subtitle(String orderId) {
-    final bag = (pickup['baglabel'] ?? pickup['BagLabel'] ?? '')
+    final printed = (pickup['baglabel'] ?? pickup['BagLabel'] ?? '')
         .toString()
         .trim();
     final source = stopSourceName(pickup);
     final line = [
-      if (bag.isNotEmpty) bag,
+      if (printed.isNotEmpty) printed,
       if (source.isNotEmpty) source,
     ].join(' \u00b7 ');
     if (line.isNotEmpty) return line;
diff --git a/lib/views/Dashboard/pickups/stop_type.dart b/lib/views/Dashboard/pickups/stop_type.dart
index 10d43f1..70b4c3d 100644
--- a/lib/views/Dashboard/pickups/stop_type.dart
+++ b/lib/views/Dashboard/pickups/stop_type.dart
@@ -169,12 +169,18 @@ String stopSourceId(Map<String, dynamic> item) =>
         .toString()
         .trim();
 
-/// The label physically on the bag, matched at the kitchen and read at the door.
+/// The label the counter physically printed on an order, matched at the kitchen
+/// and read at the door. Empty when it printed none.
 ///
-/// Ten near-identical lunch bags is where mis-delivery comes from, and no OTP or
+/// Ten near-identical lunches is where mis-delivery comes from, and no OTP or
 /// photo catches it — the rider is confident, he is just at the wrong door with
-/// the wrong bag. A printed label on the card is the cheapest thing that does.
-String stopBagLabel(Map<String, dynamic> item) =>
+/// the wrong one. A printed label on the card is the cheapest thing that does.
+///
+/// The key names are the wire's and stay as the wire spells them; what the app
+/// does with the value is its own business. Nothing is derived here — a counter
+/// that prints nothing yields `''`, and every screen then shows no tag rather
+/// than a number the app made up. See [OrderManifest.labelFor].
+String stopPrintedLabel(Map<String, dynamic> item) =>
     (item['baglabel'] ??
             item['BagLabel'] ??
             item['bagid'] ??
diff --git a/lib/views/helpers/constants/Colorconstants.dart b/lib/views/helpers/constants/Colorconstants.dart
index 99873ee..8c24d09 100644
--- a/lib/views/helpers/constants/Colorconstants.dart
+++ b/lib/views/helpers/constants/Colorconstants.dart
@@ -107,6 +107,44 @@ class ColorConstants {
   static const Color onWarning = Color(0xFFFFFFFF);
   static const Color warningContainer = Color(0xFFFEF3C7);
 
+  /// **Waiting on the rider** — the state word on a stop he has not decided yet.
+  ///
+  /// ── Why a fourth amber, and not one of the three above ──
+  ///
+  /// Pending was neutral grey, on a real argument: on a fresh morning *every*
+  /// stop is pending, so painting them all in the exception hue opens the whole
+  /// screen in warning and leaves nothing to say with when something actually
+  /// goes wrong. That argument is still right about [warning], which is this
+  /// app's word for *something has gone off plan* — a skipped stop, a short
+  /// payment, a bag that never arrived.
+  ///
+  /// What it got wrong is that "nobody has done anything about this yet" is
+  /// itself worth a colour. A rider scanning a run had to infer it from the
+  /// *absence* of one, which is the single thing a glance cannot do, and
+  /// undecided work is precisely the work the screen exists to move.
+  ///
+  /// So it gets its own: a gold that reads as "waiting" rather than as
+  /// "wrong", far enough round the wheel from the burnt orange of [warning]
+  /// that a pending stop and a skipped one are two different marks — and dark
+  /// enough to be *text*, which no honest yellow on a light ground can be
+  /// without going most of the way to brown. 5.54:1 on white, 4.83:1 on the
+  /// canvas, 4.81:1 on [cardSurface]: AA at the 13.5sp these words are set at,
+  /// on every surface Home draws them on.
+  static const Color pendingAmber = Color(0xFF8A6100);
+
+  /// **In the rider's hands** — collected from the counter, not yet delivered.
+  ///
+  /// Green is the wrong end of the story for it. [acceptGreen] now marks the
+  /// moment the rider *takes a stop on*, and green everywhere else in this app
+  /// means finished — so a bag that has been picked up but not delivered would
+  /// have worn either "already decided" or "already done", and it is neither.
+  ///
+  /// This is the app's own delivery hue, which is exactly what a picked bag has
+  /// become: work that has left the pickup leg and belongs to the round. Same
+  /// value as [deliveryAccent], named separately so the two can part company if
+  /// the route map ever needs its own.
+  static const Color pickedBlue = deliveryAccent;
+
   // Extended Color Palette for Professional UI
   /// Captions, labels and secondary body text — the second most-used colour in
   /// the app after [slateText], on 89 call sites across every screen.
diff --git a/lib/views/helpers/widgets/app_widgets.dart b/lib/views/helpers/widgets/app_widgets.dart
index 4032eb6..2a02b1f 100644
--- a/lib/views/helpers/widgets/app_widgets.dart
+++ b/lib/views/helpers/widgets/app_widgets.dart
@@ -1989,7 +1989,7 @@ class ErrorRetry extends StatelessWidget {
 /// ─────────────────────────────────────────────────────────────────────────
 class StopSourceLine extends StatelessWidget {
   final String source;
-  final String bagLabel;
+  final String printedLabel;
 
   /// Dims both when the stop is not actionable, matching the card around it.
   final bool muted;
@@ -2001,12 +2001,12 @@ class StopSourceLine extends StatelessWidget {
   const StopSourceLine({
     super.key,
     required this.source,
-    required this.bagLabel,
+    required this.printedLabel,
     this.muted = false,
     this.topGap = 6,
   });
 
-  bool get _isEmpty => source.isEmpty && bagLabel.isEmpty;
+  bool get _isEmpty => source.isEmpty && printedLabel.isEmpty;
 
   @override
   Widget build(BuildContext context) {
@@ -2053,12 +2053,12 @@ class StopSourceLine extends StatelessWidget {
                 ),
               ),
             ),
-          if (source.isNotEmpty && bagLabel.isNotEmpty)
+          if (source.isNotEmpty && printedLabel.isNotEmpty)
             const SizedBox(width: 8),
-          if (bagLabel.isNotEmpty)
+          if (printedLabel.isNotEmpty)
             Flexible(
               child: Text(
-                'Bag $bagLabel',
+                printedLabel,
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(
diff --git a/test/card_density_test.dart b/test/card_density_test.dart
index d674b5a..d4d8a7e 100644
--- a/test/card_density_test.dart
+++ b/test/card_density_test.dart
@@ -1199,7 +1199,7 @@ void main() {
       );
       expect(find.textContaining('0 m'), findsNothing);
       // The load still reads, so the node degrades rather than emptying.
-      expect(find.text('5 bags'), findsOneWidget);
+      expect(find.text('5 orders'), findsOneWidget);
     });
 
     // ── The destination never truncates first ──
diff --git a/test/deliveries_queue_test.dart b/test/deliveries_queue_test.dart
index d4a6d58..9bff2df 100644
--- a/test/deliveries_queue_test.dart
+++ b/test/deliveries_queue_test.dart
@@ -6,7 +6,6 @@ import 'package:miler/data/service_profile.dart';
 import 'package:miler/data/stop_area.dart';
 import 'package:miler/views/Dashboard/home/homepage_banner.dart';
 import 'package:miler/views/Dashboard/pickups/pickups.dart';
-import 'package:miler/views/helpers/constants/Colorconstants.dart';
 
 /// ─────────────────────────────────────────────────────────────────────────
 /// THE WORK QUEUE, NOT A LIST OF CARDS
@@ -96,22 +95,19 @@ void main() {
       await ready(tester);
       const inset = 34.0;
 
-      // Live stop: the banner is up, and the floor clears the banner.
+      // ── One surface, where there were two ──
+      //
+      // This case used to be a three-way check, because a **Start delivery**
+      // bar shared this corner with the live strip. That bar is gone — the
+      // release it made now happens per stop, when the rider slides Start ride
+      // on the map, which is the moment he actually sets off. See `startRound`.
+      //
+      // What the rule protects is unchanged: the floor reserves exactly what is
+      // floating over the list, plus the device inset.
       expect(
-        bottomReservationFor(inset: inset, live: true, unreleased: true),
+        bottomReservationFor(inset: inset, live: true),
         inset + ActivePickupBanner.maxHeight,
       );
-      // A live stop suppresses the start bar, so the banner wins even when
-      // there is unreleased work — the two never stack.
-      expect(
-        bottomReservationFor(inset: inset, live: true, unreleased: false),
-        inset + ActivePickupBanner.maxHeight,
-      );
-      // Nothing running, load in hand: the start bar.
-      expect(
-        bottomReservationFor(inset: inset, live: false, unreleased: true),
-        inset + StartRoundBar.maxHeight,
-      );
     });
 
     testWidgets('the device inset is always counted', (tester) async {
@@ -120,16 +116,8 @@ void main() {
       // inset, so on a gesture-navigation phone the last row of the run sat
       // behind the banner *and* behind the navigation.
       for (final live in const [true, false]) {
-        final withInset = bottomReservationFor(
-          inset: 34,
-          live: live,
-          unreleased: true,
-        );
-        final without = bottomReservationFor(
-          inset: 0,
-          live: live,
-          unreleased: true,
-        );
+        final withInset = bottomReservationFor(inset: 34, live: live);
+        final without = bottomReservationFor(inset: 0, live: live);
         expect(withInset - without, 34);
       }
     });
@@ -137,98 +125,29 @@ void main() {
     testWidgets('an idle queue reserves almost nothing', (tester) async {
       await ready(tester);
       expect(
-        bottomReservationFor(inset: 0, live: false, unreleased: false),
-        lessThan(StartRoundBar.maxHeight),
+        bottomReservationFor(inset: 0, live: false),
+        lessThan(ActivePickupBanner.maxHeight),
       );
     });
 
-    testWidgets('both surfaces declare a real height', (tester) async {
+    testWidgets('the floating surface declares a real height', (tester) async {
       await ready(tester);
-      // Measured, not guessed. Each is the only thing that knows how much of
-      // the list it covers.
+      // Measured, not guessed. It is the only thing that knows how much of the
+      // list it covers.
       expect(ActivePickupBanner.maxHeight, greaterThan(48));
-      expect(StartRoundBar.maxHeight, greaterThan(48));
     });
   });
 
-  group('the command surface', () {
-    Future<void> pumpBar(
-      WidgetTester tester, {
-      double width = 390,
-      double textScale = 1.0,
-      int count = 5,
-    }) async {
-      ServiceProfile.setActive(ServiceProfile.milkMan);
-      tester.view.physicalSize = Size(width * 3, 844 * 3);
-      tester.view.devicePixelRatio = 3.0;
-      addTearDown(tester.view.reset);
-
-      await tester.pumpWidget(
-        ScreenUtilInit(
-          designSize: const Size(390, 844),
-          builder: (_, _) => MaterialApp(
-            builder: (context, child) => MediaQuery(
-              data: MediaQuery.of(
-                context,
-              ).copyWith(textScaler: TextScaler.linear(textScale)),
-              child: child!,
-            ),
-            home: Scaffold(
-              backgroundColor: ColorConstants.daylightSurface,
-              body: Align(
-                alignment: Alignment.bottomCenter,
-                child: StartRoundBar(
-                  count: count,
-                  busy: false,
-                  onPressed: () {},
-                ),
-              ),
-            ),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-    }
-
-    testWidgets('it says what is in hand and what the press does', (
-      tester,
-    ) async {
-      await pumpBar(tester);
-      // Setting off is reversible and operational, so it is a press — unlike
-      // Picked and Delivered, which are assertions about custody.
-      expect(find.textContaining('Start'), findsOneWidget);
-    });
-
-    for (final (width, scale) in const [
-      (390.0, 1.0),
-      (390.0, 1.3),
-      (390.0, 2.0),
-      (375.0, 2.0),
-      (320.0, 1.0),
-      (320.0, 2.0),
-    ]) {
-      testWidgets('${width.toInt()}px @ ${scale}x lays out clean', (
-        tester,
-      ) async {
-        await pumpBar(tester, width: width, textScale: scale, count: 12);
-        expect(tester.takeException(), isNull);
-      });
-    }
-
-    testWidgets('it never wraps itself in a second SafeArea', (tester) async {
-      await pumpBar(tester);
-      // `BottomPage.bottomInset` is the one owner of the device inset on this
-      // screen. A `SafeArea` here would count it twice and float the bar a
-      // navigation bar's height off the bottom of the screen.
-      expect(
-        find.descendant(
-          of: find.byType(StartRoundBar),
-          matching: find.byType(SafeArea),
-        ),
-        findsNothing,
-      );
-    });
-  });
+  // ── The "command surface" group is gone with its control ──
+  //
+  // It covered the **Start delivery** bar: what it said, how it laid out at six
+  // widths and text scales, and that it never double-counted the device inset.
+  // The bar was removed at the rider's request — the release it made is made
+  // per stop now, by the Start ride slider on the map, at the moment he
+  // actually sets off. See `startRound` for the whole argument.
+  //
+  // Nothing replaced it in that corner, so there is nothing here to test. The
+  // reservation rule above still pins the geometry the corner has to keep.
 }
 
 /// Real addresses from the live tenant, added after seeing them render on a
diff --git a/test/deliveries_shots_test.dart b/test/deliveries_shots_test.dart
index 134fc44..fdf21cb 100644
--- a/test/deliveries_shots_test.dart
+++ b/test/deliveries_shots_test.dart
@@ -48,7 +48,7 @@ void main() {
     String id,
     String customer, {
     String status = 'picked',
-    String bag = '',
+    String label = '',
   }) => {
     'orderid': id,
     'tripid': 'T1',
@@ -64,7 +64,7 @@ void main() {
     'orderstatus': status,
     'pickupcontactno': '9787698259',
     'deliverycontactno': '9787698259',
-    if (bag.isNotEmpty) 'baglabel': bag,
+    if (label.isNotEmpty) 'baglabel': label,
     'Quantity': 1,
     'pickuplat': 11.0168,
     'pickuplon': 76.9558,
@@ -191,10 +191,10 @@ void main() {
         tester,
         'card_picked',
         PickupCard(
-          item: drop('D1', 'Joe Mathew', bag: 'Bag 8'),
+          item: drop('D1', 'Joe Mathew', label: 'DG-8'),
           displayStep: 7,
           distanceMeters: 1100,
-          bag: 'Bag 8',
+          label: 'DG-8',
           collectedIds: const {'D1'},
         ),
         height: 320,
@@ -206,10 +206,10 @@ void main() {
         tester,
         'card_active',
         PickupCard(
-          item: drop('D1', 'Joe Mathew', bag: 'Bag 8'),
+          item: drop('D1', 'Joe Mathew', label: 'DG-8'),
           displayStep: 7,
           distanceMeters: 1100,
-          bag: 'Bag 8',
+          label: 'DG-8',
           collectedIds: const {'D1'},
           outForDeliveryIds: const {'D1'},
         ),
diff --git a/test/delivery_queue_test.dart b/test/delivery_queue_test.dart
index a395ce8..8a4477b 100644
--- a/test/delivery_queue_test.dart
+++ b/test/delivery_queue_test.dart
@@ -2,25 +2,35 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:miler/data/accepted_store.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 
 /// ─────────────────────────────────────────────────────────────────────────
-/// THE DELIVERY QUEUE, AND THE BAG THAT SURVIVES IT
+/// THE DELIVERY QUEUE, AND THE LABEL THAT SURVIVES IT
 ///
 /// Two promises are made at a kitchen counter and both have to hold all the way
 /// to a doorstep:
 ///
 ///  1. **Five orders picked is five deliveries** — no order goes missing in the
 ///     hand-off, and nothing appears that was not collected.
-///  2. **Joe is Bag 1 and stays Bag 1** — even after Joe is delivered and the
-///     list underneath him shrinks.
+///  2. **A label recorded at the counter is the label at the door** — even
+///     after the first order is delivered and the list underneath it shrinks,
+///     and even after a second counter loads on top of it.
 ///
-/// The second one is the subtle one, and it is why bag identity is *stored* at
-/// pickup rather than recomputed from whatever is on screen. A position-derived
-/// bag number silently renames every remaining order the moment one leaves the
-/// list, which sends the rider looking for a bag that is already in somebody's
+/// The second is the subtle one, and it is why the label is *stored* at pickup
+/// rather than recomputed from whatever is on screen. Anything derived from a
+/// position silently renames every remaining order the moment one leaves the
+/// list, which sends the rider looking for something already in somebody's
 /// hallway.
+///
+/// ── The derived numbering is gone, and these tests changed with it ──
+///
+/// They used to assert `Bag 1 … Bag 5`, manufactured from each order's position
+/// when the payload printed nothing — the app numbering its own list and
+/// presenting the result as a physical fact. Only a label a counter actually
+/// printed is stored now, so the fixtures carry real codes and a counter that
+/// prints nothing stores nothing. The store's contract is unchanged and is
+/// still what is pinned here.
 /// ─────────────────────────────────────────────────────────────────────────
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -28,47 +38,50 @@ void main() {
   setUp(() => SharedPreferences.setMockInitialValues({}));
   tearDown(() => ServiceProfile.setActive(ServiceProfile.parcel));
 
-  Map<String, dynamic> order(String id, String customer) => {
+  /// [printed] is what the counter stuck on the order. Omitted, the counter
+  /// printed nothing — which is the common route, and stores nothing.
+  Map<String, dynamic> order(String id, String customer, {String? printed}) => {
     'orderid': id,
     'pickupcustomer': customer,
     'kitchenname': 'Vidhya Kitchen',
     'kitchenid': 'K1',
     'quantity': 3,
+    if (printed != null) 'baglabel': printed,
   };
 
   final five = [
-    order('1', 'Joe'),
-    order('2', 'Arun'),
-    order('3', 'Priya'),
-    order('4', 'Kumar'),
-    order('5', 'Ravi'),
+    order('1', 'Joe', printed: 'DG-1001'),
+    order('2', 'Arun', printed: 'DG-1002'),
+    order('3', 'Priya', printed: 'DG-1003'),
+    order('4', 'Kumar', printed: 'DG-1004'),
+    order('5', 'Ravi', printed: 'DG-1005'),
   ];
 
   group('the hand-off', () {
     test(
-      'five picked orders become five deliveries, each with its bag',
+      'five picked orders become five deliveries, each with its label',
       () async {
         ServiceProfile.setActive(ServiceProfile.meals);
 
         // What the pickup confirmation writes when the slide lands.
-        final manifest = BagManifest.forGroup(five);
+        final manifest = OrderManifest.forGroup(five);
         await addCollectedOrderIds([for (final l in manifest) l.orderId]);
-        await saveBagLabels({for (final l in manifest) l.orderId: l.bag});
+        await saveOrderLabels({for (final l in manifest) l.orderId: l.label});
 
         final carrying = await getCollectedOrderIds();
-        final bags = await getBagLabels();
+        final labels = await getOrderLabels();
 
         expect(carrying.length, 5, reason: 'five picked is five to deliver');
-        expect(bags.length, 5, reason: 'and five bags, one each');
-        expect(bags['1'], 'Bag 1');
-        expect(bags['5'], 'Bag 5');
-        // No aggregate anywhere: the count of deliveries and the count of bags
-        // are the same set, not two numbers that can drift.
-        expect(bags.keys.toSet(), carrying);
+        expect(labels.length, 5, reason: 'and five labels, one each');
+        expect(labels['1'], 'DG-1001');
+        expect(labels['5'], 'DG-1005');
+        // No aggregate anywhere: the count of deliveries and the count of
+        // labels are the same set, not two numbers that can drift.
+        expect(labels.keys.toSet(), carrying);
       },
     );
 
-    test('a bag the counter could not supply never becomes a delivery', () async {
+    test('an order the counter could not supply never becomes a delivery', () async {
       ServiceProfile.setActive(ServiceProfile.meals);
 
       // Four handed over, one short — the shortfall path the pickup sheet owns.
@@ -76,8 +89,8 @@ void main() {
       await addCollectedOrderIds([
         for (final o in loaded) o['orderid'] as String,
       ]);
-      await saveBagLabels({
-        for (final l in BagManifest.forGroup(loaded)) l.orderId: l.bag,
+      await saveOrderLabels({
+        for (final l in OrderManifest.forGroup(loaded)) l.orderId: l.label,
       });
       await addNotLoadedOrderIds(['3']);
 
@@ -86,16 +99,16 @@ void main() {
       // A short pick is its own record. It is not a skip: nobody was visited
       // and the customer did nothing.
       expect(await getSkippedOrderIds(), isEmpty);
-      // And it is not carrying a bag, because it was never in the box.
-      expect((await getBagLabels()).containsKey('3'), isFalse);
+      // And it carries no label, because it was never handed over.
+      expect((await getOrderLabels()).containsKey('3'), isFalse);
     });
   });
 
-  group('bag identity outlives the queue', () {
-    test('delivering the first does not renumber the rest', () async {
+  group('label identity outlives the queue', () {
+    test('delivering the first does not disturb the rest', () async {
       ServiceProfile.setActive(ServiceProfile.meals);
-      await saveBagLabels({
-        for (final l in BagManifest.forGroup(five)) l.orderId: l.bag,
+      await saveOrderLabels({
+        for (final l in OrderManifest.forGroup(five)) l.orderId: l.label,
       });
 
       // Joe is delivered and leaves the carrying set.
@@ -104,38 +117,42 @@ void main() {
       ]);
       await removeCollectedOrderIds(['1']);
 
-      final bags = await getBagLabels();
+      final labels = await getOrderLabels();
       expect(await getCollectedOrderIds(), {'2', '3', '4', '5'});
-      // Arun does *not* become Bag 1 because the list in front of him shrank.
-      expect(bags['2'], 'Bag 2');
-      expect(bags['3'], 'Bag 3');
-      expect(bags['5'], 'Bag 5');
+      // Arun keeps the code the counter stuck on his order. Nothing is read
+      // off a position, so a list that shrinks under him changes nothing.
+      expect(labels['2'], 'DG-1002');
+      expect(labels['3'], 'DG-1003');
+      expect(labels['5'], 'DG-1005');
     });
 
     test('a second kitchen adds to the map rather than replacing it', () async {
       ServiceProfile.setActive(ServiceProfile.meals);
-      await saveBagLabels({
-        for (final l in BagManifest.forGroup(five.take(2).toList()))
-          l.orderId: l.bag,
+      await saveOrderLabels({
+        for (final l in OrderManifest.forGroup(five.take(2).toList()))
+          l.orderId: l.label,
       });
 
-      // A different counter, its own Bag 1 and Bag 2.
-      final second = [order('9', 'Meena'), order('10', 'Sai')];
-      await saveBagLabels({
-        for (final l in BagManifest.forGroup(second)) l.orderId: l.bag,
+      // A different counter, printing its own codes.
+      final second = [
+        order('9', 'Meena', printed: 'AM-2001'),
+        order('10', 'Sai', printed: 'AM-2002'),
+      ];
+      await saveOrderLabels({
+        for (final l in OrderManifest.forGroup(second)) l.orderId: l.label,
       });
 
-      final bags = await getBagLabels();
-      expect(bags.length, 4, reason: 'the first load must survive the second');
-      expect(bags['1'], 'Bag 1');
-      expect(bags['9'], 'Bag 1', reason: 'each counter counts its own shelf');
-      expect(bags['10'], 'Bag 2');
+      final labels = await getOrderLabels();
+      expect(labels.length, 4, reason: 'the first load must survive the second');
+      expect(labels['1'], 'DG-1001');
+      expect(labels['9'], 'AM-2001');
+      expect(labels['10'], 'AM-2002');
     });
 
-    test('a skipped delivery keeps its bag so it can be resumed', () async {
+    test('a skipped delivery keeps its label so it can be resumed', () async {
       ServiceProfile.setActive(ServiceProfile.meals);
-      await saveBagLabels({
-        for (final l in BagManifest.forGroup(five)) l.orderId: l.bag,
+      await saveOrderLabels({
+        for (final l in OrderManifest.forGroup(five)) l.orderId: l.label,
       });
       await addSkippedBooking(five[2], reason: 'Customer unavailable');
 
@@ -149,13 +166,13 @@ void main() {
       );
       // He is still carrying Priya's lunch — the bag identity is exactly what
       // he needs when he comes back to it.
-      expect((await getBagLabels())['3'], 'Bag 3');
+      expect((await getOrderLabels())['3'], 'DG-1003');
     });
 
     test("a day's run is wiped so bags never leak into tomorrow", () async {
-      await saveBagLabels({'1': 'Bag 1'});
+      await saveOrderLabels({'1': 'Bag 1'});
       await clearServiceRunState();
-      expect(await getBagLabels(), isEmpty);
+      expect(await getOrderLabels(), isEmpty);
     });
   });
 
@@ -164,10 +181,10 @@ void main() {
     // bag map is keyed by order id, so it is swept by the same rule — a stored
     // pairing is trusted later *because* it is stored, and a stale one is worse
     // than none.
-    await saveBagLabels({'MOCK-M-1001': 'Bag 1', '77': 'Bag 2'});
+    await saveOrderLabels({'MOCK-M-1001': 'Bag 1', '77': 'Bag 2'});
     await purgeDemoRecords();
 
-    final bags = await getBagLabels();
+    final bags = await getOrderLabels();
     expect(bags.containsKey('MOCK-M-1001'), isFalse);
     expect(bags['77'], 'Bag 2', reason: 'real work is untouched');
   });
diff --git a/test/device_telemetry_test.dart b/test/device_telemetry_test.dart
new file mode 100644
index 0000000..a8eb07a
--- /dev/null
+++ b/test/device_telemetry_test.dart
@@ -0,0 +1,100 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:miler/data/device_telemetry.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// THE CONSOLE'S DEVICE PANEL WAS READING AN EMPTY FIELD
+///
+/// ── What the dispatcher saw ──
+///
+/// Battery —, Connection —, GPS Accuracy —, Location Service —, Current
+/// Order —. Every column on the panel that answers *why has this rider gone
+/// quiet* was blank, on riders whose phones were reporting all of it.
+///
+/// ── Why ──
+///
+/// Not because nothing was measured. The heartbeat read the battery, the
+/// charging state, the connection type and the location-service status on every
+/// tick — and published them to **MQTT only**, in a block that ran *after* the
+/// rider log had already been posted. `POST /miler/logs` has a named field for
+/// each one and carried none of them.
+///
+/// Two lanes for one fact, and the lane the console reads was the empty one.
+/// On top of that, `location_service` was dropped a second time further down:
+/// the provider forwarded every other device field to [MilerApi.postLog] and
+/// silently skipped that one, so it could not have arrived even if the caller
+/// had sent it.
+///
+/// These pin the shape of the payload, which is the part a wrong refactor would
+/// break silently — a missing key renders as an em dash, which is exactly what
+/// it looked like before anyone noticed.
+/// ─────────────────────────────────────────────────────────────────────────
+void main() {
+  group('the payload carries what the console reads', () {
+    test('every field the contract names is emitted under its own name', () {
+      const t = DeviceTelemetry(
+        battery: 72,
+        isCharging: false,
+        connection: '4G',
+        locationService: 'enabled',
+      );
+
+      // The names are the wire's, from `POST /miler/logs`. A rename here is a
+      // column that goes blank on the console with nothing else failing.
+      expect(t.toPayload(), {
+        'battery': '72',
+        'is_charging': false,
+        'connection': '4G',
+        'location_service': 'enabled',
+      });
+    });
+
+    test('numbers go as strings, as every other numeric field does', () {
+      // Documented at the top of `MilerApi`: real numbers fail to parse
+      // server-side on `/logs` and `/consignments/logs`.
+      const t = DeviceTelemetry(battery: 5);
+      expect(t.toPayload()['battery'], isA<String>());
+      expect(t.toPayload()['battery'], '5');
+    });
+
+    test('is_charging stays a bool, because the contract says so', () {
+      const t = DeviceTelemetry(isCharging: true);
+      expect(t.toPayload()['is_charging'], isTrue);
+      expect(t.toPayload()['is_charging'], isA<bool>());
+    });
+  });
+
+  group('unknown is absent, never a plausible number', () {
+    test('a reading that failed emits no key at all', () {
+      // The whole panel is read by somebody deciding whether to call a rider.
+      // A `0` battery standing in for "could not ask" is a fact they would act
+      // on; an absent key draws the em dash it already drew, which is true.
+      const t = DeviceTelemetry();
+      expect(t.toPayload(), isEmpty);
+    });
+
+    test('a partial reading sends the half it has', () {
+      // The reads are guarded individually, so a platform that will not answer
+      // about the battery must not cost the connection its column too.
+      const t = DeviceTelemetry(connection: 'wifi');
+      expect(t.toPayload(), {'connection': 'wifi'});
+    });
+
+    test('an empty string is treated as no answer', () {
+      const t = DeviceTelemetry(connection: '', locationService: '');
+      expect(t.toPayload(), isEmpty);
+    });
+
+    test('a zero battery is a real reading and is sent', () {
+      // The one number that must survive the "absent, never plausible" rule:
+      // 0% is not a missing measurement, it is a rider about to disappear.
+      const t = DeviceTelemetry(battery: 0);
+      expect(t.toPayload()['battery'], '0');
+    });
+
+    test('not charging is a real reading and is sent', () {
+      const t = DeviceTelemetry(isCharging: false);
+      expect(t.toPayload().containsKey('is_charging'), isTrue);
+    });
+  });
+}
diff --git a/test/home_grid_test.dart b/test/home_grid_test.dart
index 02f5dbf..b38841f 100644
--- a/test/home_grid_test.dart
+++ b/test/home_grid_test.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -99,11 +100,24 @@ void main() {
       }
     });
 
-    testWidgets('every Bag ends on one axis', (tester) async {
+    testWidgets('every order row ends on one axis', (tester) async {
+      // ── What this used to measure ──
+      //
+      // The right edge of `Bag 1 … Bag 4`, which was a tag the app derived from
+      // each row's position. That numbering is gone — it was the app's own
+      // arithmetic drawn as a physical reference, beside a rail already
+      // numbering the same rows — so the column it formed is gone with it.
+      //
+      // The rule it existed to protect is not: whatever closes a step row, the
+      // rows close together. A ragged right edge down a list of people is what
+      // makes a route unscannable, and it is now the chevrons that hold that
+      // edge.
       await pumpHome(tester, orders: 4);
-      final rights = [
-        for (var i = 1; i <= 4; i++) tester.getRect(find.text('Bag $i')).right,
-      ];
+      final rights = tester
+          .widgetList<Icon>(find.byIcon(LucideIcons.chevronRight))
+          .map((i) => tester.getRect(find.byWidget(i)).right)
+          .toList();
+      expect(rights.length, greaterThanOrEqualTo(4));
       for (final r in rights) {
         expect(r, closeTo(rights.first, 0.5));
       }
@@ -117,27 +131,21 @@ void main() {
       // This pinned the label to the *name* axis, when the control headed its
       // list from the left. Inside a group it is a control over a list rather
       // than a heading for one, so it sits on the edge a list's own controls
-      // use — the same right edge the bag labels and the chevrons below it
-      // already keep. What must not happen is that it floats between the two.
+      // use — the same right edge the chevrons below it already keep. What must
+      // not happen is that it floats between the two.
       final label = tester.getRect(find.text('Select all 3')).right;
       final list = tester.getRect(find.byType(RouteTimeline)).right;
-      final bag = tester.getRect(find.text('Bag 1')).right;
       expect(
         label,
         closeTo(list, 4),
         reason: 'the select-all ends at $label, the list at $list',
       );
-      expect(
-        label,
-        greaterThan(bag),
-        reason: 'and it closes past the bag column rather than inside it',
-      );
     });
 
     testWidgets('the kitchen and its state share one axis', (tester) async {
       await pumpHome(tester);
       expect(
-        tester.getRect(find.text('Pending')).left,
+        tester.getRect(find.textContaining('Pending')).left,
         closeTo(tester.getRect(find.text('Vidhya Kitchen')).left, 0.5),
       );
     });
diff --git a/test/home_structure_test.dart b/test/home_structure_test.dart
index 1784f4b..106dac4 100644
--- a/test/home_structure_test.dart
+++ b/test/home_structure_test.dart
@@ -27,8 +27,14 @@ import 'package:miler/views/helpers/constants/Colorconstants.dart';
 void main() {
   tearDown(() => ServiceProfile.setActive(ServiceProfile.parcel));
 
-  Map<String, dynamic> meal(String id, String who, {int step = 1}) => {
+  Map<String, dynamic> meal(
+    String id,
+    String who, {
+    int step = 1,
+    String? printed,
+  }) => {
     'orderid': id,
+    if (printed != null) 'baglabel': printed,
     'type': 'delivery',
     'step': step,
     'pickupcustomer': who,
@@ -48,6 +54,10 @@ void main() {
     void Function(String)? onToggleSelect,
     double width = 390,
     double textScale = 1.0,
+
+    /// What each counter printed on an order, by id. Empty by default: most
+    /// counters print nothing, and the app invents nothing for them.
+    Map<String, String> printedLabels = const {},
   }) async {
     ServiceProfile.setActive(ServiceProfile.milkMan);
     tester.view.physicalSize = Size(width * 3, 2600 * 3);
@@ -57,9 +67,9 @@ void main() {
     final trip = Trip.fromStops(
       id: 'run',
       stops: [
-        meal('1', 'Joe Mathew', step: 1),
-        meal('2', 'Arun Prakash', step: 2),
-        meal('3', 'Ravi Kumar', step: 3),
+        meal('1', 'Joe Mathew', step: 1, printed: printedLabels['1']),
+        meal('2', 'Arun Prakash', step: 2, printed: printedLabels['2']),
+        meal('3', 'Ravi Kumar', step: 3, printed: printedLabels['3']),
       ],
     );
 
@@ -276,35 +286,72 @@ void main() {
       expect(opened, isEmpty);
     });
 
-    testWidgets('the bag block opens details, and does not select', (
+    testWidgets('the corner block opens details, and does not select', (
       tester,
     ) async {
       final selected = <String>[];
-      await pumpHome(tester, onToggleSelect: selected.add);
+      // The tag is the counter's printed label now — the derived `Bag 1` is
+      // gone — so the block is tapped by the label the kitchen really stuck on.
+      await pumpHome(
+        tester,
+        onToggleSelect: selected.add,
+        printedLabels: const {'1': 'DG-1042'},
+      );
       await openKitchen(tester);
 
       // Siblings, never nested: two recognisers over the same pixels resolve
       // to neither, which is how the chevron was once dead for a whole build.
-      await tester.tap(find.text('Bag 1'));
+      await tester.tap(find.text('DG-1042'));
       await tester.pumpAndSettle();
       expect(
         selected,
         isEmpty,
-        reason: 'the bag corner is the way in, not a second tick',
+        reason: 'the corner is the way in, not a second tick',
       );
     });
   });
 
   group('the metadata is metadata', () {
-    testWidgets('Pending is neutral, not a warning', (tester) async {
+    testWidgets('Pending is its own amber, and never the warning one', (
+      tester,
+    ) async {
       await pumpHome(tester);
 
-      // Amber is this app's exception hue. On a fresh morning every kitchen is
-      // pending, so spending it here opens the whole screen in warning and
-      // leaves nothing to say with when a stop genuinely goes wrong.
-      final word = tester.widget<Text>(find.text('Pending'));
-      expect(word.style!.color, ColorConstants.secondaryText);
+      // ── What this test used to assert, and what survives of it ──
+      //
+      // It demanded neutral grey, on the argument that amber is this app's
+      // exception hue and every kitchen is pending on a fresh morning — so
+      // spending it here opens the whole screen in warning.
+      //
+      // Half of that argument is still load-bearing and is still checked: the
+      // word must not be [ColorConstants.warning]. The other half was wrong —
+      // "waiting on you" is worth a colour of its own, and grey made the rider
+      // read undecided work by the *absence* of a mark. Pending has its own
+      // gold now; the thing that must never happen is it colliding with the
+      // hue reserved for a skip or a short payment.
+      // `Pending 3/3` — the word carries the count now, the same way Accepted
+      // states its share of a counter. See the chip in `route_timeline.dart`.
+      final word = tester.widget<Text>(find.textContaining('Pending'));
+      expect(word.data, 'Pending 3/3');
+      expect(word.style!.color, ColorConstants.pendingAmber);
       expect(word.style!.color, isNot(ColorConstants.warning));
+      expect(word.style!.color, isNot(ColorConstants.primary));
+    });
+
+    testWidgets('Accepted is green and Collected is not', (tester) async {
+      // The two rungs a rider most needs to tell apart on one counter. They
+      // were both green once — accepted took the brand red only on the group
+      // being ridden to, and collected took [ColorConstants.acceptGreen] — so
+      // the pair could render as one hue and two words.
+      await pumpHome(tester, accepted: const {'1', '2', '3'});
+
+      final accepted = tester.widget<Text>(find.textContaining('Accepted'));
+      expect(accepted.style!.color, ColorConstants.acceptGreen);
+      expect(
+        ColorConstants.pickedBlue,
+        isNot(ColorConstants.acceptGreen),
+        reason: 'in-hand and taken-on must not share a colour',
+      );
     });
 
     testWidgets('a partly accepted kitchen says so as a fraction', (
@@ -333,9 +380,9 @@ void main() {
       // plus its padding. A page surface is not. Filtering by width keeps the
       // original claim — the state is set, not stamped — and makes it immune
       // to whatever the page is standing on.
-      final word = tester.getRect(find.text('Pending'));
+      final word = tester.getRect(find.textContaining('Pending'));
       final chip = find.ancestor(
-        of: find.text('Pending'),
+        of: find.textContaining('Pending'),
         matching: find.byType(DecoratedBox),
       );
       for (final e in chip.evaluate()) {
@@ -366,44 +413,40 @@ void main() {
       expect(find.text('Peelamedu'), findsWidgets);
     });
 
-    testWidgets('one order, one bag — and the column is stable', (
-      tester,
-    ) async {
+    testWidgets('a counter that prints nothing shows no tag', (tester) async {
+      // ── What this file used to assert here ──
+      //
+      // That every step carried `Bag 1 … Bag 3`, right-aligned on one axis so
+      // the phone could be read against a shelf. The numbering was the app's
+      // own — derived from each row's position whenever the payload printed
+      // nothing, which on this fixture is every row — and it sat two columns
+      // from a rail already numbering the same steps.
+      //
+      // Only what a counter actually printed survives. The fixture prints
+      // nothing, so the rows carry the person and the chevron and no tag at
+      // all.
       await pumpHome(tester);
       await openKitchen(tester);
 
-      for (final bag in const ['Bag 1', 'Bag 2', 'Bag 3']) {
-        expect(find.text(bag), findsOneWidget);
-      }
-
-      // Right-aligned on one axis, so the phone can be read against a shelf.
-      final rights = [
-        for (final bag in const ['Bag 1', 'Bag 2', 'Bag 3'])
-          tester.getRect(find.text(bag)).right,
-      ];
-      for (final r in rights) {
-        expect(r, closeTo(rights.first, 0.5));
+      for (final label in const ['Bag 1', 'Bag 2', 'Bag 3']) {
+        expect(find.text(label), findsNothing);
       }
+      // The people are still there, one row each.
+      expect(find.text('Joe Mathew'), findsOneWidget);
     });
 
-    testWidgets('the name outranks the bag, and the bag yields first', (
+    testWidgets('a printed label is shown exactly as it was sent', (
       tester,
     ) async {
-      await pumpHome(tester, textScale: 2.0, width: 320);
+      // A code the kitchen stuck on the order is a fact about an object in the
+      // rider's hands, so it travels verbatim — never prefixed, never renamed.
+      await pumpHome(tester, printedLabels: const {'1': 'DG-1042'});
       await openKitchen(tester);
 
-      // `Bag 1` is compared against a shelf, not read as prose, so it stops
-      // scaling before the customer's name does. Left uncapped it took half a
-      // 320pt row at 2× and the name — the one item that must yield last —
-      // was what ellipsised.
-      final bag = tester.getRect(find.text('Bag 1'));
-      expect(
-        bag.width,
-        lessThan(120),
-        reason: 'the bag column does not grow into the name',
-      );
-      expect(tester.takeException(), isNull, reason: 'and nothing overflows');
+      expect(find.text('DG-1042'), findsOneWidget);
+      expect(find.textContaining('Bag'), findsNothing);
     });
+
   });
 
   group('the offer states its own number', () {
diff --git a/test/home_today_only_test.dart b/test/home_today_only_test.dart
new file mode 100644
index 0000000..06cded5
--- /dev/null
+++ b/test/home_today_only_test.dart
@@ -0,0 +1,305 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:miler/data/api_config.dart';
+import 'package:miler/data/service_day.dart';
+import 'package:miler/views/Dashboard/home/trip.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// HOME IS TODAY, AND TODAY IS THREE TRIPS
+///
+/// Two bugs with one cause, and this is the file that holds the cause down.
+///
+/// ── What the rider saw ──
+///
+///  1. **Yesterday's assignments were on Home.** `GET /miler/bookings` returns
+///     his whole *open* set, not his day, so a booking raised on Tuesday and
+///     never closed came back on Wednesday and on Thursday — inside the kitchen
+///     dropdown, and inside every count above it.
+///  2. **Every run was Trip 1.** The hub assigns morning, afternoon and evening
+///     slots and the tabs are those slots, but an evening run opened filed
+///     under the morning.
+///
+/// ── The one cause ──
+///
+/// `ApiConfig.pickupFromBooking` builds a **fixed map**: a field it does not
+/// name is a field no screen can ever see. Every timestamp on the booking was
+/// unnamed, so it was thrown away at the adapter — and both features downstream
+/// are clocks. [ServiceDay] asked "which day is this" in field names the
+/// adapted row no longer spoke and got `''`; [Trip] asked "which part of the
+/// day" and got the same silence, dropped every stop into one undated bucket,
+/// and that bucket landed in the first free slot.
+///
+/// So the fix is at the adapter, and these tests start there. The two features
+/// are then checked on the shapes the wire really produces.
+/// ─────────────────────────────────────────────────────────────────────────
+void main() {
+  /// A booking as `GET /miler/bookings` returns it — the new shape, which is
+  /// the one that goes through the translation.
+  Map<String, dynamic> booking({
+    required String id,
+    String status = 'Miler_Assigned',
+    Map<String, dynamic> extra = const {},
+  }) => <String, dynamic>{
+    'bookingid': id,
+    'bookingreference': 'DM-$id',
+    'status': status,
+    'customername': 'Joe Mathew',
+    'pickupaddress': '12 SNS Colony, Peelamedu, Coimbatore',
+    ...extra,
+  };
+
+  group('the adapter keeps the clocks', () {
+    test('a booking that carries a timestamp still carries it afterwards', () {
+      final row = ApiConfig.pickupFromBooking(
+        booking(
+          id: '1',
+          extra: const {
+            'createdat': '2026-08-27T09:14:00',
+            'updatedon': '2026-08-27T11:02:00',
+          },
+        ),
+      );
+
+      // The whole failure was here: these came back and went nowhere.
+      expect(row['createdat'], '2026-08-27T09:14:00');
+      expect(row['updatedon'], '2026-08-27T11:02:00');
+      expect(ServiceDay.of(row), '2026-08-27');
+    });
+
+    test('every name ServiceDay reads survives the translation', () {
+      // A regression net for the shape of the bug rather than one instance of
+      // it: the adapter and the day filter must agree on the vocabulary, or a
+      // key added to one and not the other silently un-dates the row again.
+      for (final key in ServiceDay.timeKeys) {
+        // Written by the local stores, never by the wire.
+        if (key == 'completedat' || key == 'skippedat') continue;
+        final row = ApiConfig.pickupFromBooking(
+          booking(id: 'x', extra: {key: '2026-08-27T10:00:00'}),
+        );
+        expect(
+          ServiceDay.of(row),
+          '2026-08-27',
+          reason: '$key was dropped at the adapter',
+        );
+      }
+    });
+
+    test('an absent timestamp is not invented', () {
+      final row = ApiConfig.pickupFromBooking(booking(id: '2'));
+      expect(row.containsKey('pickedtime'), isFalse);
+      expect(ServiceDay.of(row), '');
+    });
+  });
+
+  group("yesterday's assignment is not today's work", () {
+    const today = '2026-08-27';
+
+    test('a booking still open from yesterday does not belong to today', () {
+      final row = ApiConfig.pickupFromBooking(
+        booking(id: '3', extra: const {'createdat': '2026-08-26T18:40:00'}),
+      );
+      expect(ServiceDay.belongsToToday(row, now: today), isFalse);
+    });
+
+    test('the same booking, raised this morning, does', () {
+      final row = ApiConfig.pickupFromBooking(
+        booking(id: '4', extra: const {'createdat': '2026-08-27T07:05:00'}),
+      );
+      expect(ServiceDay.belongsToToday(row, now: today), isTrue);
+    });
+
+    test('tomorrow is not today either', () {
+      // A pre-assigned booking is real work and it is not this shift's. It
+      // reappears on its own morning, when the same predicate admits it.
+      final row = ApiConfig.pickupFromBooking(
+        booking(id: '5', extra: const {'createdat': '2026-08-28T06:00:00'}),
+      );
+      expect(ServiceDay.belongsToToday(row, now: today), isFalse);
+    });
+
+    test('the local assignment stamp dates a row the backend does not', () {
+      // The live contract sends no clock the app can trust as an assignment
+      // time, so [WorkRepository] writes when the booking first reached this
+      // rider. It is the weakest key on the list and it is the one that
+      // actually fires on Doormile.
+      final row = ApiConfig.pickupFromBooking(booking(id: '6'))
+        ..['assignedat'] = '2026-08-26T09:00:00';
+      expect(ServiceDay.of(row), '2026-08-26');
+      expect(ServiceDay.belongsToToday(row, now: today), isFalse);
+    });
+
+    test('a clock the backend sends outranks the local guess', () {
+      // The rider's phone met this booking on the 27th; the hub finished it on
+      // the 26th. The hub is right — the app's first sighting says only when
+      // the app was open.
+      final row = ApiConfig.pickupFromBooking(
+        booking(
+          id: '7',
+          status: 'Picked',
+          extra: const {'pickedtime': '2026-08-26T20:10:00'},
+        ),
+      )..['assignedat'] = '2026-08-27T08:00:00';
+      expect(ServiceDay.of(row), '2026-08-26');
+    });
+  });
+
+  group('the work screens filter one day, by one rule', () {
+    const today = '2026-08-27';
+
+    Map<String, dynamic> dated(String id, String at) =>
+        ApiConfig.pickupFromBooking(booking(id: id))..['assignedat'] = at;
+
+    test("yesterday's leftovers are dropped and today's kept", () {
+      final kept = ServiceDay.onlyToday([
+        dated('old', '2026-08-26T09:00:00'),
+        dated('new', '2026-08-27T09:00:00'),
+      ], now: today);
+
+      expect(kept.map((s) => s['orderid']), ['DM-new']);
+    });
+
+    test('an undated row among dated ones is dropped', () {
+      // The burden of proof is on the row — the same rule Activity applies.
+      final kept = ServiceDay.onlyToday([
+        dated('a', '2026-08-27T09:00:00'),
+        ApiConfig.pickupFromBooking(booking(id: 'nodate')),
+      ], now: today);
+
+      expect(kept.map((s) => s['orderid']), ['DM-a']);
+    });
+
+    test('a day where NOTHING can be dated is kept whole', () {
+      // The narrow safety net. Not a stale queue — a build that has lost the
+      // ability to date anything — and blanking a rider's screen would hide
+      // that behind something that reads like good news.
+      final rows = [
+        ApiConfig.pickupFromBooking(booking(id: 'a')),
+        ApiConfig.pickupFromBooking(booking(id: 'b')),
+      ];
+      expect(ServiceDay.onlyToday(rows, now: today).length, 2);
+    });
+
+    test('an empty day stays empty', () {
+      expect(ServiceDay.onlyToday(const [], now: today), isEmpty);
+    });
+
+    test('a picked stop finished today stays — the rail needs it', () {
+      // Deliveries and Home both count finished work into the day's figures.
+      // Dropping it would empty the progress ring every time a rider succeeds.
+      final done = ApiConfig.pickupFromBooking(
+        booking(
+          id: 'p',
+          status: 'Picked',
+          extra: const {'pickedtime': '2026-08-27T11:20:00'},
+        ),
+      );
+      expect(ServiceDay.onlyToday([done], now: today).length, 1);
+    });
+  });
+
+  group('the slot a stop lands in is the part of the day', () {
+    /// The adapted shape plus the stamp the repository merges on.
+    Map<String, dynamic> assigned(String id, DateTime at) =>
+        ApiConfig.pickupFromBooking(booking(id: id))
+          ..['assignedat'] = at.toIso8601String();
+
+    test('assigned in the morning is Trip 1', () {
+      final trips = Trip.groupIntoTrips([
+        assigned('a', DateTime(2026, 8, 27, 8, 30)),
+      ]);
+      expect(trips.single.dayPart, DayPart.morning);
+      expect(trips.single.tripNumber, 1);
+      expect(trips.slots.indexOf(trips.single), 0);
+    });
+
+    test('assigned in the afternoon is Trip 2, on a day with no morning', () {
+      // The point of the whole slot model. A rider with only afternoon work
+      // used to see it as Trip 1, so his "Trip 2" and the hub's were different
+      // runs — and dispatch rings him about the hub's.
+      final trips = Trip.groupIntoTrips([
+        assigned('b', DateTime(2026, 8, 27, 14, 5)),
+      ]);
+      expect(trips.single.tripNumber, 2);
+      final slots = trips.slots;
+      expect(slots[0], isNull);
+      expect(slots[1], isNotNull);
+    });
+
+    test('assigned in the evening is Trip 3', () {
+      final trips = Trip.groupIntoTrips([
+        assigned('c', DateTime(2026, 8, 27, 19, 0)),
+      ]);
+      expect(trips.single.tripNumber, 3);
+      expect(trips.slots[2], isNotNull);
+    });
+
+    test('a full day fills all three slots in order', () {
+      final trips = Trip.groupIntoTrips([
+        assigned('m', DateTime(2026, 8, 27, 9, 0)),
+        assigned('a', DateTime(2026, 8, 27, 13, 0)),
+        assigned('e', DateTime(2026, 8, 27, 18, 0)),
+      ]);
+      expect(trips.length, 3);
+      expect([for (final t in trips) t.tripNumber], [1, 2, 3]);
+      // `orderid` is the booking *reference* after translation — the id the
+      // rider reads, not the row's primary key.
+      expect(trips.slots.map((t) => t?.stops.single['orderid']), [
+        'DM-m',
+        'DM-a',
+        'DM-e',
+      ]);
+    });
+
+    test('two runs in one part stay one trip', () {
+      // A day part is not a rolling window: two stops handed over an hour apart
+      // in the same morning are the same run, and which trip a stop is on must
+      // never depend on what else is in the day.
+      final trips = Trip.groupIntoTrips([
+        assigned('a', DateTime(2026, 8, 27, 7, 30)),
+        assigned('b', DateTime(2026, 8, 27, 11, 45)),
+      ]);
+      expect(trips.length, 1);
+      expect(trips.single.stops.length, 2);
+      expect(trips.single.tripNumber, 1);
+    });
+
+    test('a real due time still outranks the assignment clock', () {
+      // Handed over at eight in the morning, due at three in the afternoon. The
+      // work is the afternoon's; the handover time was only ever a stand-in for
+      // a field the backend does not send.
+      final stop = assigned('d', DateTime(2026, 8, 27, 8, 0));
+      stop['expected_pickup_time'] = DateTime(
+        2026,
+        8,
+        27,
+        15,
+        0,
+      ).toIso8601String();
+
+      expect(Trip.groupIntoTrips([stop]).single.tripNumber, 2);
+    });
+
+    test('an explicit backend slot window still wins outright', () {
+      // If the console ever grows real slots, they are the answer and none of
+      // the inference above runs.
+      final stop = assigned('s', DateTime(2026, 8, 27, 19, 30))
+        ..['slotstarttime'] = DateTime(2026, 8, 27, 10).toIso8601String()
+        ..['slotendtime'] = DateTime(2026, 8, 27, 13).toIso8601String();
+
+      final trip = Trip.groupIntoTrips([stop]).single;
+      expect(trip.slotLabel, '10:00 AM – 1:00 PM');
+      expect(trip.tripNumber, 1);
+    });
+
+    test('a stop with no clock at all keeps its arrival order', () {
+      // Unchanged behaviour, stated so it stays deliberate: a trip that cannot
+      // be placed by day part must not be guessed at from the wall clock, or it
+      // would move between tabs as the afternoon wore on.
+      final trips = Trip.groupIntoTrips([
+        ApiConfig.pickupFromBooking(booking(id: 'z')),
+      ]);
+      expect(trips.single.dayPart, isNull);
+      expect(trips.slots[0], isNotNull);
+    });
+  });
+}
diff --git a/test/kitchen_group_test.dart b/test/kitchen_group_test.dart
index ad378c7..3588cc1 100644
--- a/test/kitchen_group_test.dart
+++ b/test/kitchen_group_test.dart
@@ -14,7 +14,7 @@ import 'package:miler/views/Dashboard/home/trip_card.dart';
 /// under it, ticked in batches and advanced with one gesture:
 ///
 /// ```
-///   Vidhya Kitchen · 4 bags · 2 to accept                  ˅
+///   Vidhya Kitchen · 4 orders · 2 to accept                  ˅
 ///     ◉ Joe    Gandhipuram                          Bag 1
 ///     ◉ Priya  RS Puram                             Bag 2
 /// ```
@@ -153,7 +153,9 @@ void main() {
       // the detail sheet and the Activity record.
       expect(find.text('Gandhipuram'), findsOneWidget);
       expect(find.textContaining('1001'), findsNothing);
-      expect(find.text('Bag 1'), findsOneWidget);
+      // And no invented shelf reference beside it: this counter printed
+      // nothing, so the row carries the person and the area and stops there.
+      expect(find.text('Bag 1'), findsNothing);
     });
 
     // Updated when `areaOf` was corrected against real Coimbatore addresses
@@ -181,19 +183,25 @@ void main() {
       expect(find.text(''), findsNothing);
     });
 
-    testWidgets('one order is one bag, counted off the orders', (tester) async {
+    testWidgets('the load is stated once, and counted off the orders', (
+      tester,
+    ) async {
       await pump(tester, [
         order('1001', 'Joe', 'Gandhipuram, Coimbatore'),
         order('1002', 'Priya', 'RS Puram, Coimbatore'),
         order('1003', 'Arun', 'Peelamedu, Coimbatore'),
       ]);
-      // The header states the load once, in the unit the rider carries; the
-      // check that orders and bags agree is the manifest itself, one named
-      // bag per order. `N orders · N bags` was the same number twice and it
-      // cost the header its `to accept` clause on a real route.
-      expect(find.textContaining('3 bags'), findsWidgets);
-      for (final bag in const ['Bag 1', 'Bag 2', 'Bag 3']) {
-        expect(find.text(bag), findsOneWidget);
+      // The header states the load once. `N orders · N bags` was the same
+      // number twice and it cost the header its `to accept` clause on a real
+      // route; the derived per-row numbering that made up the second half is
+      // gone entirely.
+      expect(find.textContaining('3 orders'), findsWidgets);
+      for (final invented in const ['Bag 1', 'Bag 2', 'Bag 3']) {
+        expect(find.text(invented), findsNothing);
+      }
+      // One row per order, named by the person it is for.
+      for (final who in const ['Joe', 'Priya', 'Arun']) {
+        expect(find.textContaining(who), findsWidgets);
       }
     });
   });
@@ -213,7 +221,7 @@ void main() {
 
       // The rider is mid-decision at one counter; the count of what is still
       // undecided is the whole content of that state.
-      expect(find.textContaining('4 bags'), findsWidgets);
+      expect(find.textContaining('4 orders'), findsWidgets);
       expect(find.textContaining('to accept'), findsWidgets);
     });
   });
diff --git a/test/meal_run_mock_test.dart b/test/meal_run_mock_test.dart
index 7c1f7c9..cef1e6d 100644
--- a/test/meal_run_mock_test.dart
+++ b/test/meal_run_mock_test.dart
@@ -110,7 +110,7 @@ void main() {
     test('every stop is a drop, with a bag the rider can read off a box', () {
       for (final s in MealRunMock.stops()) {
         expect(stopKindOf(s).isDelivery, isTrue);
-        expect(stopBagLabel(s), isNotEmpty);
+        expect(stopPrintedLabel(s), isNotEmpty);
         expect((s['pickupcustomer'] as String), isNotEmpty);
         expect((s['pickupaddress'] as String), contains('Coimbatore'));
       }
diff --git a/test/milk_man_flow_test.dart b/test/milk_man_flow_test.dart
index 0fd83c0..1f07d73 100644
--- a/test/milk_man_flow_test.dart
+++ b/test/milk_man_flow_test.dart
@@ -402,17 +402,73 @@ void main() {
       expect(s['dropaddress'], 'Flat 3, Anna Nagar');
     });
 
-    test('a booking without source fields does not invent one', () {
-      // BACKEND DEPENDENCY: sourceid/sourcename are not deployed. Until they
-      // are, every order groups under one unnamed bucket — visibly wrong, and
-      // deliberately not papered over with a guessed kitchen name.
+    test('a booking without source fields is never given a name', () {
+      // BACKEND DEPENDENCY: sourceid/sourcename are not deployed everywhere.
+      // The rule that matters is unchanged and is what this asserts: the app
+      // does not paper over a missing counter with a guessed kitchen name.
       final s = ApiConfig.pickupFromBooking({
         'bookingid': 43,
         'bookingreference': 'DM-43',
         'pickupaddress': '9 Mettupalayam Road',
       });
       expect(MilkRun.sourceNameOf(s), '');
-      expect(MilkRun.sourceKeyOf(s), 'none');
+    });
+
+    test('...but it still groups by the address it does carry', () {
+      // ── What changed, and why it is not "inventing" one ──
+      //
+      // This used to demand `'none'`, which put every source-less order in one
+      // bucket regardless of where it was collected. On a real morning that
+      // failed in the other direction: eight orders off one kitchen, seven
+      // carrying its id and one not, and the eighth could not join them — it
+      // fell out of the dropdown into a flat header of its own titled with the
+      // customer's name.
+      //
+      // Keying on the address invents nothing. It is the weakest *true*
+      // statement on the row — these are collected from the same address — and
+      // it is only reached when the id and the name are both absent. The name
+      // is still empty, which is what the test above pins.
+      Map<String, dynamic> at(String address) =>
+          ApiConfig.pickupFromBooking({
+            'bookingid': address.hashCode,
+            'bookingreference': 'DM-$address',
+            'pickupaddress': address,
+          });
+
+      // Same counter, spelled as two different rows would spell it.
+      expect(
+        MilkRun.sourceKeyOf(at('9 Mettupalayam Road')),
+        MilkRun.sourceKeyOf(at('9, METTUPALAYAM ROAD ')),
+      );
+      // A different place stays a different group.
+      expect(
+        MilkRun.sourceKeyOf(at('9 Mettupalayam Road')),
+        isNot(MilkRun.sourceKeyOf(at('12 SNS Colony'))),
+      );
+      // Nothing to group on at all is still its own bucket, never a guess.
+      expect(
+        MilkRun.sourceKeyOf(
+          ApiConfig.pickupFromBooking({
+            'bookingid': 44,
+            'bookingreference': 'DM-44',
+          }),
+        ),
+        'none',
+      );
+    });
+
+    test('an identified counter still outranks the address', () {
+      // Order of trust: the hub's id, then the name it reads by, then where it
+      // is. Two kitchens at one address must not merge because a row lost its
+      // id; two rows with the same id must not split because someone retyped
+      // the address.
+      final byId = ApiConfig.pickupFromBooking({
+        'bookingid': 45,
+        'bookingreference': 'DM-45',
+        'sourceid': 'K1',
+        'pickupaddress': '9 Mettupalayam Road',
+      });
+      expect(MilkRun.sourceKeyOf(byId), 'id:K1');
     });
   });
 }
diff --git a/test/one_bag_per_order_test.dart b/test/one_bag_per_order_test.dart
index 7a02b95..c0c1ed0 100644
--- a/test/one_bag_per_order_test.dart
+++ b/test/one_bag_per_order_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/Dashboard/home/stop_action_sheet.dart';
 import 'package:miler/views/Dashboard/home/trip.dart';
@@ -63,22 +63,21 @@ void main() {
   ];
 
   group('the rule itself', () {
-    test('bags are counted from orders, never stored', () {
-      expect(BagManifest.countLabel(5), '5 bags');
-      expect(BagManifest.countLabel(1), '1 bag');
+    test('the load is counted from the orders, never stored', () {
+      expect(OrderManifest.countLabel(5), '5 orders');
+      expect(OrderManifest.countLabel(1), '1 order');
     });
 
-    test('every order gets exactly one bag, in group order', () {
-      final lines = BagManifest.forGroup(fiveOrders);
+    test('every order gets exactly one line, in group order', () {
+      // ── The derived numbering is gone ──
+      //
+      // This demanded `Bag 1 … Bag 5` — the app numbering a list it had built
+      // and drawing the result as a physical reference. What it was really
+      // protecting is the pairing, and that is unchanged: one line per order,
+      // in the counter's order, each carrying its own customer.
+      final lines = OrderManifest.forGroup(fiveOrders);
 
       expect(lines.length, 5, reason: 'five orders is five manifest lines');
-      expect(lines.map((l) => l.bag).toList(), [
-        'Bag 1',
-        'Bag 2',
-        'Bag 3',
-        'Bag 4',
-        'Bag 5',
-      ]);
       expect(lines.map((l) => l.customer).toList(), [
         'Joe',
         'Arun',
@@ -86,41 +85,53 @@ void main() {
         'Kumar',
         'Ravi',
       ]);
-      // Order 1 → Bag 1 → Joe, and it stays that way.
       expect(lines.first.orderId, '1');
       expect(
-        lines.map((l) => l.bag).toSet().length,
+        lines.map((l) => l.orderId).toSet().length,
         5,
-        reason: 'two orders may never claim the same bag',
+        reason: 'two lines may never claim the same order',
       );
+      // A counter that printed nothing yields no labels at all.
+      expect(lines.every((l) => l.label.isEmpty), isTrue);
     });
 
-    test('a label the kitchen actually printed wins over the position', () {
-      final lines = BagManifest.forGroup([
+    test('a label the kitchen printed travels verbatim, and only that', () {
+      final lines = OrderManifest.forGroup([
         order('1', customer: 'Joe', printedBag: 'DG-1042'),
         order('2', customer: 'Arun'),
       ]);
-      expect(lines[0].bag, 'DG-1042', reason: 'what is on the physical bag');
-      expect(lines[1].bag, 'Bag 2');
+      // Exactly as it was sent — never prefixed, never renamed.
+      expect(lines[0].label, 'DG-1042');
+      // And nothing is manufactured for the order beside it.
+      expect(lines[1].label, '');
     });
 
-    test('the item quantity is never read as a bag count', () {
+    test('the item quantity is never read as a count of handovers', () {
       // Each of these orders carries `quantity: 4`. Four is an item count; the
-      // bag count is one, per order, always.
-      final lines = BagManifest.forGroup(fiveOrders);
+      // count of handovers is one, per order, always.
+      final lines = OrderManifest.forGroup(fiveOrders);
       expect(lines.length, 5);
-      expect(BagManifest.countLabel(lines.length), '5 bags');
+      expect(OrderManifest.countLabel(lines.length), '5 orders');
     });
 
-    test('a bag belongs to its own counter, not the whole route', () {
-      // Third order from the second kitchen is *its* Bag 3, not the route's
-      // eighth — the rider counts one shelf at a time.
-      final kitchenTwo = [
-        order('6', customer: 'Meena', kitchen: 'Anna Kitchen', kitchenId: 'K2'),
-        order('7', customer: 'Sai', kitchen: 'Anna Kitchen', kitchenId: 'K2'),
-        order('8', customer: 'Devi', kitchen: 'Anna Kitchen', kitchenId: 'K2'),
-      ];
-      expect(BagManifest.bagFor(kitchenTwo[2], kitchenTwo), 'Bag 3');
+    test('nothing is invented for a counter that prints nothing', () {
+      // ── What this test used to assert ──
+      //
+      // That the third order from the second kitchen was *its* `Bag 3` and not
+      // the route's eighth — the app numbering a list it had built and drawing
+      // the result as a shelf reference.
+      //
+      // The numbering is gone. It was the app's own arithmetic presented as a
+      // physical fact, on rows that already carry a rail numbering them two
+      // columns to the left. What a counter really printed still travels
+      // verbatim; where it printed nothing, nothing shows.
+      final unlabelled = order(
+        '6',
+        customer: 'Meena',
+        kitchen: 'Anna Kitchen',
+        kitchenId: 'K2',
+      );
+      expect(OrderManifest.labelFor(unlabelled), '');
     });
   });
 
@@ -158,7 +169,7 @@ void main() {
         ).buildStops(),
       );
 
-      expect(find.text('5 bags'), findsOneWidget);
+      expect(find.text('5 orders'), findsOneWidget);
       // Nothing anywhere offers a second, contradictable count.
       expect(find.textContaining('meals'), findsNothing);
       expect(find.textContaining('Quantity'), findsNothing);
@@ -191,7 +202,7 @@ void main() {
       );
 
       expect(find.text('Vidhya Kitchen'), findsOneWidget);
-      expect(find.text('5 bags'), findsOneWidget);
+      expect(find.text('5 orders'), findsOneWidget);
       // One obvious next action on the whole screen, and it is the journey.
       expect(find.bySemanticsLabel('Navigate to this pickup'), findsOneWidget);
     });
@@ -218,10 +229,10 @@ void main() {
       // node still names the kitchen and its load, so nothing is hidden.
       expect(find.bySemanticsLabel('Navigate to this pickup'), findsNothing);
       expect(find.text('Vidhya Kitchen'), findsOneWidget);
-      expect(find.text('5 bags'), findsOneWidget);
+      expect(find.text('5 orders'), findsOneWidget);
     });
 
-    testWidgets('the confirmation names every order and its bag', (
+    testWidgets('the confirmation names every order it covers', (
       tester,
     ) async {
       ServiceProfile.setActive(ServiceProfile.meals);
@@ -231,24 +242,23 @@ void main() {
           stage: StopStatus.accepted,
           placeName: 'Vidhya Kitchen',
           count: fiveOrders.length,
-          lines: BagManifest.forGroup(fiveOrders),
+          lines: OrderManifest.forGroup(fiveOrders),
           onConfirm: (_) async => null,
         ),
       );
 
       expect(find.text('Arrived at Vidhya Kitchen'), findsOneWidget);
-      expect(find.text('5 bags'), findsOneWidget);
+      expect(find.text('5 orders'), findsOneWidget);
 
-      // The list he checks against the shelf: five names, five bags, paired.
-      for (final pair in const [
-        ('Joe', 'Bag 1'),
-        ('Arun', 'Bag 2'),
-        ('Priya', 'Bag 3'),
-        ('Kumar', 'Bag 4'),
-        ('Ravi', 'Bag 5'),
-      ]) {
-        expect(find.text(pair.$1), findsOneWidget);
-        expect(find.text(pair.$2), findsOneWidget);
+      // The list he checks against the shelf: five people, one line each. The
+      // derived `Bag 1 … Bag 5` that used to sit beside them was the app's own
+      // numbering of a list it had built, and it is gone; a label a counter
+      // really printed still appears, and this fixture prints none.
+      for (final who in const ['Joe', 'Arun', 'Priya', 'Kumar', 'Ravi']) {
+        expect(find.text(who), findsOneWidget);
+      }
+      for (final invented in const ['Bag 1', 'Bag 2', 'Bag 5']) {
+        expect(find.text(invented), findsNothing);
       }
     });
 
@@ -262,36 +272,46 @@ void main() {
           stage: StopStatus.arrived,
           placeName: 'Vidhya Kitchen',
           count: fiveOrders.length,
-          lines: BagManifest.forGroup(fiveOrders),
+          lines: OrderManifest.forGroup(fiveOrders),
           onConfirm: (_) async => null,
         ),
       );
 
       expect(find.text('Picked up from Vidhya Kitchen'), findsOneWidget);
       expect(
-        find.text('Make sure all 5 bags are loaded before continuing.'),
+        find.text('Make sure all 5 orders are loaded before continuing.'),
         findsOneWidget,
       );
       // Both rungs are the same interaction, named for what they claim.
       expect(find.textContaining('Slide to confirm'), findsOneWidget);
     });
 
-    testWidgets('a card says which bag it is carrying', (tester) async {
+    testWidgets('a card carries the label its counter printed', (tester) async {
       ServiceProfile.setActive(ServiceProfile.meals);
+      // A counter that really prints labels. Five near-identical lunches is
+      // where mis-delivery comes from, and a printed code is the cheapest thing
+      // that catches it — so where one exists it must reach the card, verbatim.
+      final printed = [
+        order('1', customer: 'Joe', printedBag: 'DG-1001'),
+        order('2', customer: 'Arun', printedBag: 'DG-1002'),
+        order('3', customer: 'Priya', printedBag: 'DG-1003'),
+        order('4', customer: 'Kumar', printedBag: 'DG-1004'),
+        order('5', customer: 'Ravi', printedBag: 'DG-1005'),
+      ];
       await pump(
         tester,
         () => TripCard(
-          trip: Trip.fromStops(id: 't', stops: fiveOrders),
+          trip: Trip.fromStops(id: 't', stops: printed),
           acceptedIds: const {'1', '2', '3', '4', '5'},
           onToggleSelect: (_) {},
         ).buildStops(),
       );
 
-      // Five near-identical lunch bags is where mis-delivery comes from, so
-      // every card names the one it is for.
-      expect(find.text('Bag 1'), findsOneWidget);
-      expect(find.text('Bag 5'), findsOneWidget);
+      expect(find.text('DG-1001'), findsOneWidget);
+      expect(find.text('DG-1005'), findsOneWidget);
       expect(find.text('Ravi'), findsWidgets);
+      // Shown as the counter wrote it — never dressed up with a word.
+      expect(find.textContaining('Bag'), findsNothing);
     });
   });
 }
diff --git a/test/one_counter_one_dropdown_test.dart b/test/one_counter_one_dropdown_test.dart
new file mode 100644
index 0000000..6b7e80b
--- /dev/null
+++ b/test/one_counter_one_dropdown_test.dart
@@ -0,0 +1,248 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:get/get.dart';
+
+import 'package:miler/data/milk_run.dart';
+import 'package:miler/data/service_profile.dart';
+import 'package:miler/views/Dashboard/home/route_timeline.dart';
+import 'package:miler/views/Dashboard/home/trip.dart';
+import 'package:miler/views/Dashboard/home/trip_card.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// EIGHT ORDERS OFF ONE COUNTER MAKE ONE DROPDOWN OF EIGHT
+///
+/// ── What the rider saw ──
+///
+/// The hub assigned eight orders from one kitchen. Home drew a dropdown holding
+/// **seven**, and the eighth sat above it as a bare header titled with the
+/// customer's name — reading as a second place he had to ride to, off the same
+/// shelf as the other seven.
+///
+/// ── Two causes, one level apart ──
+///
+/// **The grouping key.** `routeGroups` built its own — `stopSourceId`, falling
+/// back to `stopSourceName` — while [MilkRun.sourceKeyOf] is the function that
+/// exists to answer *which counter is this*, and is what the bulk collect keys
+/// on. They disagreed: `sourceKeyOf` reads `pickuplocationid` and the card's
+/// own expression did not. A row identified only by its location id was one
+/// place according to the collect and another according to the card offering
+/// it. And a row carrying no source identity at all got its own bucket, with
+/// nothing consulted about *where it is collected from* — which is on every
+/// row, as the pickup address.
+///
+/// **The `flat` flag.** A lone stop was drawn as a bare header — the header
+/// *is* the stop — whenever the payload carried no source name. A missing name
+/// is a gap in the data, not evidence that there is no counter, so the one
+/// order that lost its kitchen name was demoted from a place to a row.
+///
+/// Both now answer from the same fact: a place is identified by its id, then
+/// its name, then **where it is**.
+/// ─────────────────────────────────────────────────────────────────────────
+void main() {
+  tearDown(() {
+    Get.reset();
+    ServiceProfile.setActive(ServiceProfile.parcel);
+  });
+
+  const kitchen = '9 Mettupalayam Road, RS Puram, Coimbatore 641002';
+
+  /// One order off the kitchen. [sourceId] and [sourceName] are omitted on the
+  /// row that lost them, which is the case the whole file is about.
+  Map<String, dynamic> order(
+    int id, {
+    String? sourceId = 'K1',
+    String? sourceName = 'Vidhya Kitchen',
+    String address = kitchen,
+    String status = 'assigned',
+  }) => <String, dynamic>{
+    'orderid': 'M-$id',
+    'pickupid': id,
+    'step': id,
+    if (sourceId != null) 'sourceid': sourceId,
+    if (sourceName != null) 'kitchenname': sourceName,
+    'pickupcustomer': 'Customer $id',
+    'pickupaddress': address,
+    'dropaddress': 'Door $id, Peelamedu, Coimbatore',
+    'orderstatus': status,
+    'type': 'delivery',
+    'pickuplat': 11.01,
+    'pickuplon': 76.95,
+  };
+
+  List<RouteGroup> groupsFor(List<Map<String, dynamic>> stops) {
+    ServiceProfile.setActive(ServiceProfile.milkMan);
+    return TripCard(trip: Trip.fromStops(id: 'T1', stops: stops)).routeGroups();
+  }
+
+  group('the reported case: eight assigned, seven in the list', () {
+    test('the odd row out joins its siblings', () {
+      // Seven carry the kitchen's id; the eighth lost both id and name and has
+      // only the address it shares with them.
+      final stops = [
+        for (var i = 1; i <= 7; i++) order(i),
+        order(8, sourceId: null, sourceName: null),
+      ];
+
+      final groups = groupsFor(stops);
+      expect(groups.length, 1, reason: 'one counter, one dropdown');
+      expect(groups.single.stops.length, 8);
+      expect(groups.single.flat, isFalse);
+    });
+
+    test('the count the rider reads says eight', () {
+      final stops = [
+        for (var i = 1; i <= 7; i++) order(i),
+        order(8, sourceId: null, sourceName: null),
+      ];
+      final group = groupsFor(stops).single;
+
+      // The load line and the list under it are the same eight.
+      expect(group.countLabel, '8 orders');
+      expect(group.manifest.length, 8);
+      expect(group.pendingCount, 8);
+    });
+
+    test('a row from a genuinely different place still splits', () {
+      // The fix must not merge two counters. Grouping by address is the weakest
+      // true statement available, not a licence to collapse the route.
+      final stops = [
+        for (var i = 1; i <= 7; i++) order(i),
+        order(
+          8,
+          sourceId: null,
+          sourceName: null,
+          address: '12 SNS Colony, Peelamedu, Coimbatore 641004',
+        ),
+      ];
+      expect(groupsFor(stops).length, 2);
+    });
+  });
+
+  group('the heading names the place, never an order', () {
+    test('a counter with no name is headed by its address', () {
+      final stops = [
+        for (var i = 1; i <= 3; i++)
+          order(i, sourceId: null, sourceName: null),
+      ];
+      final group = groupsFor(stops).single;
+
+      // It used to fall through to `MilkRun.navigationLabel`, which answers
+      // with the customer — so the heading read as one more order.
+      expect(group.name, isNot(contains('Customer')));
+      expect(group.name, contains('Mettupalayam'));
+    });
+
+    test('a named counter still leads with its name, address beneath', () {
+      final group = groupsFor([for (var i = 1; i <= 3; i++) order(i)]).single;
+      expect(group.name, 'Vidhya Kitchen');
+      expect(group.location, contains('Mettupalayam'));
+    });
+
+    test('the address is not printed twice when it is the heading', () {
+      final stops = [
+        for (var i = 1; i <= 3; i++)
+          order(i, sourceId: null, sourceName: null),
+      ];
+      final group = groupsFor(stops).single;
+      expect(group.name, isNotEmpty);
+      expect(
+        group.location,
+        isEmpty,
+        reason: 'the heading already says where it is',
+      );
+    });
+  });
+
+  group('a lone stop is a place when it has one', () {
+    test('one order off an unnamed counter still opens as a list', () {
+      // The same demotion, one level down: a single order whose row lost its
+      // kitchen name was drawn as a bare customer header rather than as a place
+      // holding one order.
+      final group = groupsFor([
+        order(1, sourceId: null, sourceName: null),
+      ]).single;
+
+      expect(group.flat, isFalse, reason: 'it has an address to be a place by');
+      expect(group.name, contains('Mettupalayam'));
+      expect(group.manifest.length, 1);
+    });
+
+    test('with nothing at all to name a place by, it is the stop', () {
+      // Unchanged, and deliberately: no counter, no name, no address means
+      // there is no place above the order worth drawing, so the header is the
+      // stop and opens its detail sheet.
+      final group = groupsFor([
+        order(1, sourceId: null, sourceName: null, address: ''),
+      ]).single;
+
+      expect(group.flat, isTrue);
+    });
+
+    test('a parcel route is always flat, whatever the address says', () {
+      // Every stop is its own group there — the rider really does ride to each
+      // customer for one consignment, and a header plus a single child would
+      // print the same name twice.
+      ServiceProfile.setActive(ServiceProfile.parcel);
+      final groups = TripCard(
+        trip: Trip.fromStops(
+          id: 'T1',
+          stops: [for (var i = 1; i <= 3; i++) order(i)],
+        ),
+      ).routeGroups();
+
+      expect(groups.length, 3);
+      expect(groups.every((g) => g.flat), isTrue);
+    });
+  });
+
+  group('adopting a counter, and the limits on it', () {
+    test('an identified stop never consults the day', () {
+      // Adoption only ever fills a gap. A stop carrying its own id keeps it,
+      // so two counters that happen to share a street cannot merge and a row
+      // cannot be pulled off the id the hub gave it.
+      final mine = <String, dynamic>{
+        'orderid': 'M-1',
+        'sourceid': 'K1',
+        'pickupaddress': kitchen,
+      };
+      final neighbour = <String, dynamic>{
+        'orderid': 'M-2',
+        'sourceid': 'K2',
+        'pickupaddress': kitchen,
+      };
+      expect(MilkRun.sourceKeyOf(mine, within: [mine, neighbour]), 'id:K1');
+      expect(MilkRun.sourceKeyOf(neighbour, within: [mine, neighbour]), 'id:K2');
+    });
+
+    test('with no day to consult it falls back to the address', () {
+      final orphan = <String, dynamic>{
+        'orderid': 'M-3',
+        'pickupaddress': kitchen,
+      };
+      expect(MilkRun.sourceKeyOf(orphan), startsWith('at:'));
+    });
+
+    test('the bulk collect gathers the adopted order too', () {
+      // The collect must not leave behind the order the card has just learned
+      // to group in — that is the two-readers failure in a new place.
+      final day = [
+        for (var i = 1; i <= 7; i++) order(i),
+        order(8, sourceId: null, sourceName: null),
+      ];
+      expect(MilkRun.sameSourceAs(day.first, day).length, 8);
+      expect(MilkRun.sameSourceAs(day.last, day).length, 8);
+    });
+  });
+
+  group('one reader for which counter this is', () {
+    test('the card groups on the same key the bulk collect does', () {
+      // The two disagreed, so a kitchen could be split on screen while the
+      // collect still treated it as one operation.
+      final byLocationId = <String, dynamic>{
+        'orderid': 'M-9',
+        'pickuplocationid': 'L7',
+        'pickupaddress': kitchen,
+      };
+      expect(MilkRun.sourceKeyOf(byLocationId), 'id:L7');
+    });
+  });
+}
diff --git a/test/order_detail_leg_test.dart b/test/order_detail_leg_test.dart
index ffbf786..e96e414 100644
--- a/test/order_detail_leg_test.dart
+++ b/test/order_detail_leg_test.dart
@@ -10,7 +10,7 @@ import 'package:miler/views/Dashboard/home/pickup_preview_sheet.dart';
 import 'package:miler/views/Dashboard/home/stop_detail_sheet.dart';
 import 'package:miler/views/Dashboard/home/trip.dart';
 import 'package:miler/views/Dashboard/home/trip_card.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/views/helpers/widgets/miler_sheet_kit.dart';
 
 /// ─────────────────────────────────────────────────────────────────────────
@@ -189,17 +189,17 @@ void main() {
           c,
           placeName: 'Vidhya Kitchen',
           lines: [
-            BagLine(
+            ManifestLine(
               stop: order(),
               orderId: 'D1',
               customer: 'Joe Mathew',
-              bag: 'Bag 1',
+              label: 'Bag 1',
             ),
-            BagLine(
+            ManifestLine(
               stop: order(),
               orderId: 'D2',
               customer: 'Priya Nair',
-              bag: 'Bag 2',
+              label: 'Bag 2',
             ),
           ],
           meters: 3100,
@@ -311,7 +311,7 @@ void main() {
           stop: long,
           stopNumber: 7,
           ofOrder: true,
-          bag: 'Bag 1',
+          label: 'Bag 1',
         ),
       );
 
diff --git a/test/rail_counts_the_route_test.dart b/test/rail_counts_the_route_test.dart
new file mode 100644
index 0000000..5b3aa3d
--- /dev/null
+++ b/test/rail_counts_the_route_test.dart
@@ -0,0 +1,133 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:miler/Models/stop_status.dart';
+import 'package:miler/data/service_profile.dart';
+import 'package:miler/views/Dashboard/home/trip.dart';
+import 'package:miler/views/Dashboard/pickups/pickups.dart';
+
+/// ─────────────────────────────────────────────────────────────────────────
+/// THE RAIL COUNTS THE ROUTE, NOT THE RECORD
+///
+/// ── What the rider saw ──
+///
+/// He accepted one order out of five, picked it up, and the progress rail at
+/// the top of Deliveries drew **five nodes**. One of them was his.
+///
+/// ── Where the other four came from ──
+///
+/// The rail reads the completed store, and that store is not a list of
+/// finished deliveries. It is where every order that leaves the rider's hands
+/// is filed, whatever ended it — and Home files a **declined** stop there too,
+/// with `terminalStatus: 'rejected'`, so the decision survives on Activity.
+/// That was harmless for as long as nothing read the store as a route. The rail
+/// reads it as a route.
+///
+/// The count was the visible half. The colours were worse, and this is what
+/// these tests really pin:
+///
+///   `rejected`   → [StopProgress.pending] — four stops he had **refused**,
+///                  drawn on the rail ahead of him as work still to come.
+///   `cancelled`  → [StopStatusX.isWorkComplete] → [StopProgress.done] —
+///                  drawn **green**, claiming a delivery that never happened.
+///
+/// A skip is the case that must survive the fix: it is a door he went to and
+/// could not finish, the rail has an amber node for precisely that, and losing
+/// it would hide work he still owes.
+/// ─────────────────────────────────────────────────────────────────────────
+void main() {
+  tearDown(() => ServiceProfile.setActive(ServiceProfile.parcel));
+
+  /// A row as the completed store hands it back — `orderstatus` stamped with
+  /// whatever ended it. See `addCompletedBookings`.
+  Map<String, dynamic> filed(String id, String terminalStatus) => {
+    'orderid': id,
+    'orderstatus': terminalStatus,
+    'completedday': '2026-08-27',
+    'completedat': '2026-08-27T10:00:00',
+  };
+
+  group('what belongs on a progress rail', () {
+    test('a declined stop does not', () {
+      // The four that made the rail read five. He said no to these.
+      expect(wasRiddenTo(filed('r', 'rejected')), isFalse);
+    });
+
+    test('a cancelled stop does not', () {
+      // The office called it off. It was never a door he stood at, and on a
+      // milk run it would have drawn green.
+      expect(wasRiddenTo(filed('c', 'cancelled')), isFalse);
+    });
+
+    test('a skipped stop does', () {
+      // Unfinished business, and the one state the rail has an amber node for.
+      // Dropping it with the others would hide a door he still owes a visit.
+      expect(wasRiddenTo(filed('s', 'skipped')), isTrue);
+    });
+
+    test('a delivered stop does', () {
+      expect(wasRiddenTo(filed('d', 'delivered')), isTrue);
+    });
+
+    test('a picked stop does', () {
+      expect(wasRiddenTo(filed('p', 'picked')), isTrue);
+    });
+  });
+
+  group('the states the excluded rows would have been drawn in', () {
+    test('a declined stop reads as work still ahead', () {
+      // Not a subtle wrong colour — [StopProgress.pending] is the same node a
+      // stop he has yet to ride to gets. This is why exclusion is the fix and
+      // recolouring is not: it is not on his route at all.
+      expect(
+        stopProgressFor(stopStatusFromRaw('rejected')),
+        StopProgress.pending,
+      );
+    });
+
+    test('a cancelled stop reads as done', () {
+      ServiceProfile.setActive(ServiceProfile.milkMan);
+      expect(stopStatusFromRaw('cancelled').isWorkComplete, isTrue);
+      expect(
+        stopProgressFor(stopStatusFromRaw('cancelled')),
+        StopProgress.done,
+      );
+    });
+
+    test('a skipped stop reads as skipped, on either line', () {
+      for (final profile in [ServiceProfile.parcel, ServiceProfile.milkMan]) {
+        ServiceProfile.setActive(profile);
+        expect(
+          stopProgressFor(stopStatusFromRaw('skipped')),
+          StopProgress.skipped,
+          reason: 'the amber node is the whole reason a skip stays',
+        );
+      }
+    });
+  });
+
+  group("the rider's own case: one of five", () {
+    test('four declined and one picked leaves a rail of one', () {
+      // The report, as arithmetic. The store holds all five because Home files
+      // a decline; only one of them is a place he rode to.
+      final store = [
+        filed('1', 'picked'),
+        filed('2', 'rejected'),
+        filed('3', 'rejected'),
+        filed('4', 'rejected'),
+        filed('5', 'rejected'),
+      ];
+
+      expect(store.length, 5);
+      expect(store.where(wasRiddenTo).length, 1);
+    });
+
+    test('a day genuinely worked is not trimmed', () {
+      // The fix must not cost a rider his progress. Four real completions and
+      // one in hand is still a five-node rail, four of them green.
+      final store = [
+        for (final id in ['1', '2', '3', '4']) filed(id, 'delivered'),
+      ];
+      expect(store.where(wasRiddenTo).length, 4);
+    });
+  });
+}
diff --git a/test/service_card_test.dart b/test/service_card_test.dart
index ab1996a..d89d4ed 100644
--- a/test/service_card_test.dart
+++ b/test/service_card_test.dart
@@ -87,27 +87,27 @@ void main() {
       expect(stopSourceName({'kitchenname': 'Kitchen 1'}), 'Kitchen 1');
       expect(stopSourceName({'SourceName': ' Anna Nagar '}), 'Anna Nagar');
       expect(stopSourceId({'kitchenid': 'K-77'}), 'K-77');
-      expect(stopBagLabel({'baglabel': 'DG-1042'}), 'DG-1042');
-      expect(stopBagLabel({'labelcode': 'DG-9'}), 'DG-9');
+      expect(stopPrintedLabel({'baglabel': 'DG-1042'}), 'DG-1042');
+      expect(stopPrintedLabel({'labelcode': 'DG-9'}), 'DG-9');
     });
 
     test(
       'absent on a parcel stop rather than empty-stringed onto the card',
       () {
         expect(stopSourceName({'orderid': '7'}), '');
-        expect(stopBagLabel({'orderid': '7'}), '');
+        expect(stopPrintedLabel({'orderid': '7'}), '');
       },
     );
   });
 
   group('StopSourceLine', () {
-    Future<void> pump(WidgetTester tester, String source, String bag) async {
+    Future<void> pump(WidgetTester tester, String source, String label) async {
       await tester.pumpWidget(
         ScreenUtilInit(
           designSize: const Size(390, 844),
           builder: (_, _) => MaterialApp(
             home: Scaffold(
-              body: StopSourceLine(source: source, bagLabel: bag),
+              body: StopSourceLine(source: source, printedLabel: label),
             ),
           ),
         ),
@@ -126,12 +126,17 @@ void main() {
     testWidgets('shows both when the stop carries both', (tester) async {
       await pump(tester, 'Kitchen 1', 'DG-1042');
       expect(find.text('Kitchen 1'), findsOneWidget);
-      expect(find.text('Bag DG-1042'), findsOneWidget);
+      // The counter's code, exactly as it was sent. It used to be prefixed
+      // `Bag DG-1042` — a word bolted onto a reference that already names
+      // itself.
+      expect(find.text('DG-1042'), findsOneWidget);
     });
 
-    testWidgets('shows the bag alone when there is no source', (tester) async {
+    testWidgets('shows the label alone when there is no source', (
+      tester,
+    ) async {
       await pump(tester, '', 'DG-1042');
-      expect(find.text('Bag DG-1042'), findsOneWidget);
+      expect(find.text('DG-1042'), findsOneWidget);
       expect(
         tester.getSize(find.byType(StopSourceLine)).height,
         greaterThan(0),
@@ -206,12 +211,12 @@ void main() {
 
       // Named once, by the place — not again on every order under it.
       expect(find.text('Kitchen 1'), findsOneWidget);
-      // The label the kitchen printed, straight from [BagManifest]. The `Bag `
+      // The label the kitchen printed, straight from [OrderManifest]. The `Bag `
       // prefix belonged to the card's chip and went with it, which stopped a
       // printed `DG-1042` reading as `Bag DG-1042`.
       expect(find.text('DG-1042'), findsOneWidget);
       // The count the rider checks the shelf against.
-      expect(find.text('1 bag'), findsOneWidget);
+      expect(find.text('1 order'), findsOneWidget);
     });
 
     testWidgets('a parcel route keeps a bare pending row', (tester) async {
diff --git a/test/service_flow_test.dart b/test/service_flow_test.dart
index dbc41c6..24a8cb0 100644
--- a/test/service_flow_test.dart
+++ b/test/service_flow_test.dart
@@ -9,7 +9,7 @@ import 'package:miler/data/accepted_store.dart';
 import 'package:miler/data/service_profile.dart';
 
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/views/Dashboard/home/stop_action_sheet.dart';
 import 'package:miler/views/Dashboard/home/trip.dart';
 import 'package:miler/views/Dashboard/home/selection_bar.dart';
@@ -196,9 +196,9 @@ void main() {
       // orders for the bar, and the bar is the only thing that commits.
       expect(find.textContaining('Collect '), findsNothing);
       // One order, one bag — the two numbers the rider checks against the
-      // shelf, and they are the same number by definition. See [BagManifest].
-      expect(find.text('2 bags'), findsOneWidget);
-      expect(find.text('1 bag'), findsOneWidget);
+      // shelf, and they are the same number by definition. See [OrderManifest].
+      expect(find.text('2 orders'), findsOneWidget);
+      expect(find.text('1 order'), findsOneWidget);
     });
 
     testWidgets('a heading gathers one rung, never a mixed batch', (
@@ -246,7 +246,7 @@ void main() {
       await tester.pumpAndSettle();
 
       // The header still says how much of the counter is not his yet.
-      expect(find.text('2 bags · 1 to accept'), findsOneWidget);
+      expect(find.text('2 orders · 1 to accept'), findsOneWidget);
 
       // And its tick gathers only the orders on one rung. He cannot be handed
       // food for an order he has not taken on, so a heading that swept both
@@ -295,7 +295,7 @@ void main() {
                 stage: StopStatus.arrived,
                 placeName: 'Kitchen 1',
                 count: stops.length,
-                lines: BagManifest.forGroup(stops),
+                lines: OrderManifest.forGroup(stops),
                 onConfirm: (outcome) async {
                   seen = outcome;
                   return null;
@@ -308,7 +308,7 @@ void main() {
       await tester.pumpAndSettle();
 
       if (markMissing.isNotEmpty) {
-        await tester.tap(find.text('Report missing bag'));
+        await tester.tap(find.text('Report a missing order'));
         await tester.pumpAndSettle();
         for (final name in markMissing) {
           await tester.tap(find.text(name));
@@ -326,11 +326,11 @@ void main() {
       // A screen that makes him tick three boxes to record "nothing was wrong"
       // is a screen he learns to dismiss without reading. So the common case is
       // a list he reads, and the shortfall is one tap away.
-      expect(find.text('3 bags'), findsOneWidget);
-      expect(find.text('Report missing bag'), findsOneWidget);
+      expect(find.text('3 orders'), findsOneWidget);
+      expect(find.text('Report a missing order'), findsOneWidget);
       expect(find.text('Missing'), findsNothing);
       expect(
-        find.text('Make sure all 3 bags are loaded before continuing.'),
+        find.text('Make sure all 3 orders are loaded before continuing.'),
         findsOneWidget,
       );
     });
@@ -340,7 +340,7 @@ void main() {
     ) async {
       await open(tester, 3, markMissing: ['Customer 2']);
 
-      expect(find.text('2 bags · 1 missing'), findsOneWidget);
+      expect(find.text('2 orders · 1 missing'), findsOneWidget);
       expect(find.text('Missing'), findsOneWidget);
       expect(
         find.text('1 of 3 not supplied — they will leave your route.'),
@@ -391,7 +391,7 @@ void main() {
         stage: StopStatus.arrived,
         placeName: 'Kitchen 1',
         count: stops.length,
-        lines: BagManifest.forGroup(stops),
+        lines: OrderManifest.forGroup(stops),
         onConfirm: (outcome) async {
           captured = outcome;
           return null;
@@ -406,7 +406,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      await tester.tap(find.text('Report missing bag'));
+      await tester.tap(find.text('Report a missing order'));
       await tester.pumpAndSettle();
       await tester.tap(find.text('Customer 2'));
       await tester.pumpAndSettle();
diff --git a/test/sheet_kit_test.dart b/test/sheet_kit_test.dart
index be87ce1..829cc22 100644
--- a/test/sheet_kit_test.dart
+++ b/test/sheet_kit_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/Dashboard/home/duty_sheet.dart';
 import 'package:miler/views/Dashboard/home/stop_action_sheet.dart';
@@ -123,8 +123,8 @@ void main() {
           placeName: 'Vidhya Kitchen',
           count: 2,
           lines: const [
-            BagLine(stop: {}, orderId: 'A', customer: 'Joe', bag: 'Bag 1'),
-            BagLine(stop: {}, orderId: 'B', customer: 'Arun', bag: 'Bag 2'),
+            ManifestLine(stop: {}, orderId: 'A', customer: 'Joe', label: 'Bag 1'),
+            ManifestLine(stop: {}, orderId: 'B', customer: 'Arun', label: 'Bag 2'),
           ],
           onConfirm: (_) async => null,
         ),
diff --git a/test/sheet_layout_test.dart b/test/sheet_layout_test.dart
index 0329e42..f7cc991 100644
--- a/test/sheet_layout_test.dart
+++ b/test/sheet_layout_test.dart
@@ -9,7 +9,7 @@ import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/Dashboard/home/duty_sheet.dart';
 import 'package:miler/views/Dashboard/home/pickup_preview_sheet.dart';
@@ -49,14 +49,14 @@ void main() {
   const textScales = [1.0, 1.3, 2.0];
 
   const lines = [
-    BagLine(
+    ManifestLine(
       stop: {},
       orderId: 'D1',
       customer: 'Venkataraman Subramanian',
-      bag: 'Bag 1',
+      label: 'Bag 1',
     ),
-    BagLine(stop: {}, orderId: 'D2', customer: 'Arun Prakash', bag: 'Bag 2'),
-    BagLine(stop: {}, orderId: 'D3', customer: 'Priya Nair', bag: 'Bag 3'),
+    ManifestLine(stop: {}, orderId: 'D2', customer: 'Arun Prakash', label: 'Bag 2'),
+    ManifestLine(stop: {}, orderId: 'D3', customer: 'Priya Nair', label: 'Bag 3'),
   ];
 
   Map<String, dynamic> stop() => {
@@ -181,7 +181,7 @@ void main() {
             c,
             stop: stop(),
             stopNumber: 7,
-            bag: 'Bag 1',
+            label: 'Bag 1',
             riderLat: 11.0168,
             riderLng: 76.9558,
           ),
diff --git a/test/sheet_shots_test.dart b/test/sheet_shots_test.dart
index 7e85b39..02b1d28 100644
--- a/test/sheet_shots_test.dart
+++ b/test/sheet_shots_test.dart
@@ -14,7 +14,7 @@ import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:miler/Models/stop_status.dart';
-import 'package:miler/data/bag_manifest.dart';
+import 'package:miler/data/order_manifest.dart';
 import 'package:miler/data/service_profile.dart';
 import 'package:miler/views/Dashboard/home/duty_sheet.dart';
 import 'package:miler/views/Dashboard/home/pickup_preview_sheet.dart';
@@ -52,11 +52,11 @@ void main() {
   });
 
   const lines = [
-    BagLine(stop: {}, orderId: 'D1', customer: 'Joe Mathew', bag: 'Bag 1'),
-    BagLine(stop: {}, orderId: 'D2', customer: 'Arun Prakash', bag: 'Bag 2'),
-    BagLine(stop: {}, orderId: 'D3', customer: 'Priya Nair', bag: 'Bag 3'),
-    BagLine(stop: {}, orderId: 'D4', customer: 'Ravi Kumar', bag: 'Bag 4'),
-    BagLine(stop: {}, orderId: 'D5', customer: 'Kumar S', bag: 'Bag 5'),
+    ManifestLine(stop: {}, orderId: 'D1', customer: 'Joe Mathew', label: 'Bag 1'),
+    ManifestLine(stop: {}, orderId: 'D2', customer: 'Arun Prakash', label: 'Bag 2'),
+    ManifestLine(stop: {}, orderId: 'D3', customer: 'Priya Nair', label: 'Bag 3'),
+    ManifestLine(stop: {}, orderId: 'D4', customer: 'Ravi Kumar', label: 'Bag 4'),
+    ManifestLine(stop: {}, orderId: 'D5', customer: 'Kumar S', label: 'Bag 5'),
   ];
 
   Map<String, dynamic> stop() => {
@@ -253,7 +253,7 @@ void main() {
           'notes': 'Gate code 4411, leave with security if unreachable.',
         },
         stopNumber: 7,
-        bag: 'Bag 1',
+        label: 'Bag 1',
         riderLat: 11.0168,
         riderLng: 76.9558,
       ),
diff --git a/test/shots/deliveries_card_active.png b/test/shots/deliveries_card_active.png
index 84e9b53..ae478b7 100644
Binary files a/test/shots/deliveries_card_active.png and b/test/shots/deliveries_card_active.png differ
diff --git a/test/shots/deliveries_card_picked.png b/test/shots/deliveries_card_picked.png
index 761bd0f..e9fe3fc 100644
Binary files a/test/shots/deliveries_card_picked.png and b/test/shots/deliveries_card_picked.png differ
diff --git a/test/shots/home_accepted.png b/test/shots/home_accepted.png
index 3459e90..202fe4e 100644
Binary files a/test/shots/home_accepted.png and b/test/shots/home_accepted.png differ
diff --git a/test/shots/home_all_selected.png b/test/shots/home_all_selected.png
index e532e35..0e25130 100644
Binary files a/test/shots/home_all_selected.png and b/test/shots/home_all_selected.png differ
diff --git a/test/shots/home_arrived.png b/test/shots/home_arrived.png
index 95896aa..583c6d8 100644
Binary files a/test/shots/home_arrived.png and b/test/shots/home_arrived.png differ
diff --git a/test/shots/home_brief_open.png b/test/shots/home_brief_open.png
index 969cf77..15fc19c 100644
Binary files a/test/shots/home_brief_open.png and b/test/shots/home_brief_open.png differ
diff --git a/test/shots/home_group_done.png b/test/shots/home_group_done.png
index 7c72549..06f8a08 100644
Binary files a/test/shots/home_group_done.png and b/test/shots/home_group_done.png differ
diff --git a/test/shots/home_long_text.png b/test/shots/home_long_text.png
index 32bdb47..5dcf58a 100644
Binary files a/test/shots/home_long_text.png and b/test/shots/home_long_text.png differ
diff --git a/test/shots/home_offline.png b/test/shots/home_offline.png
index 7251c7b..16cfe2f 100644
Binary files a/test/shots/home_offline.png and b/test/shots/home_offline.png differ
diff --git a/test/shots/home_one_kitchen.png b/test/shots/home_one_kitchen.png
index cb4f710..8aae106 100644
Binary files a/test/shots/home_one_kitchen.png and b/test/shots/home_one_kitchen.png differ
diff --git a/test/shots/home_parcel.png b/test/shots/home_parcel.png
index 6e41b7d..34e9e65 100644
Binary files a/test/shots/home_parcel.png and b/test/shots/home_parcel.png differ
diff --git a/test/shots/home_pending.png b/test/shots/home_pending.png
index 068f960..16561eb 100644
Binary files a/test/shots/home_pending.png and b/test/shots/home_pending.png differ
diff --git a/test/shots/home_run_complete.png b/test/shots/home_run_complete.png
index c0781b4..ec3da05 100644
Binary files a/test/shots/home_run_complete.png and b/test/shots/home_run_complete.png differ
diff --git a/test/shots/home_scale_1_3x.png b/test/shots/home_scale_1_3x.png
index 8c34038..3eafbdd 100644
Binary files a/test/shots/home_scale_1_3x.png and b/test/shots/home_scale_1_3x.png differ
diff --git a/test/shots/home_scale_2x.png b/test/shots/home_scale_2x.png
index 8f399e8..187fecf 100644
Binary files a/test/shots/home_scale_2x.png and b/test/shots/home_scale_2x.png differ
diff --git a/test/shots/home_selected.png b/test/shots/home_selected.png
index 2111996..407c76c 100644
Binary files a/test/shots/home_selected.png and b/test/shots/home_selected.png differ
diff --git a/test/shots/home_three_kitchens.png b/test/shots/home_three_kitchens.png
index 0c11aec..d5db9f9 100644
Binary files a/test/shots/home_three_kitchens.png and b/test/shots/home_three_kitchens.png differ
diff --git a/test/shots/home_two_kitchens.png b/test/shots/home_two_kitchens.png
index 068f960..16561eb 100644
Binary files a/test/shots/home_two_kitchens.png and b/test/shots/home_two_kitchens.png differ
diff --git a/test/shots/sheet_action_arrive.png b/test/shots/sheet_action_arrive.png
index 1d35161..4d6799f 100644
Binary files a/test/shots/sheet_action_arrive.png and b/test/shots/sheet_action_arrive.png differ
diff --git a/test/shots/sheet_action_arrive_small.png b/test/shots/sheet_action_arrive_small.png
index 5afd234..0056e0d 100644
Binary files a/test/shots/sheet_action_arrive_small.png and b/test/shots/sheet_action_arrive_small.png differ
diff --git a/test/shots/sheet_action_picked.png b/test/shots/sheet_action_picked.png
index e2fa016..a569185 100644
Binary files a/test/shots/sheet_action_picked.png and b/test/shots/sheet_action_picked.png differ
diff --git a/test/shots/sheet_detail.png b/test/shots/sheet_detail.png
index 94825c3..881dc30 100644
Binary files a/test/shots/sheet_detail.png and b/test/shots/sheet_detail.png differ
diff --git a/test/shots/sheet_detail_long.png b/test/shots/sheet_detail_long.png
index d23cb2f..791393b 100644
Binary files a/test/shots/sheet_detail_long.png and b/test/shots/sheet_detail_long.png differ
diff --git a/test/shots/sheet_preview.png b/test/shots/sheet_preview.png
index d10ef98..092b013 100644
Binary files a/test/shots/sheet_preview.png and b/test/shots/sheet_preview.png differ
diff --git a/test/tenant_mode_test.dart b/test/tenant_mode_test.dart
index f432905..0ca239a 100644
--- a/test/tenant_mode_test.dart
+++ b/test/tenant_mode_test.dart
@@ -234,10 +234,10 @@ void main() {
       // normalising to `doormile` matched the Logistics list, won on
       // name-first, and the id was never consulted.
       //
-      // On Logistics `MyPickups._unreleased` is empty by design, so the
-      // **Start round** bar does not render. With
-      // `MILER_COLLECTED_STATE_ENABLED` on, that rider's collected parcels
-      // strand at `Collected_By_Miler` with no control to release them.
+      // On Logistics a rider has no customer round — he carries what he
+      // collects to the hub — so nothing in the app calls `start-delivery` for
+      // him. With `MILER_COLLECTED_STATE_ENABLED` on, that rider's collected
+      // orders strand at `Collected_By_Miler` with nothing to release them.
       for (final name in const ['Doormile', 'doormile', 'DOOR-MILE']) {
         final p = await resolveWith({'tenantname': name, 'tenantid': 13});
         expect(
diff --git a/test/two_lines_test.dart b/test/two_lines_test.dart
index 3bd7d89..fd22125 100644
--- a/test/two_lines_test.dart
+++ b/test/two_lines_test.dart
@@ -124,7 +124,7 @@ void main() {
       expect(find.text('Kitchen 1'), findsOneWidget);
       expect(find.text('Kitchen 2'), findsOneWidget);
       // And the bag, which is what he checks against the box in his hand.
-      // The label the kitchen printed, as [BagManifest] hands it over — the
+      // The label the kitchen printed, as [OrderManifest] hands it over — the
       // `Bag ` prefix belonged to the card's chip and went with it, which
       // stopped a printed `BAG-1` reading as `Bag BAG-1`.
       expect(find.text('BAG-1'), findsOneWidget);