@fleetbase/fleetops-engine 0.6.69 → 0.6.71

package/server/src/Http/Controllers/Internal/v1/VehicleController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\Attributes\SkipAuthorizationCheck;
 use Fleetbase\FleetOps\Exceptions\DeviceAlreadyAttachedException;
 use Fleetbase\FleetOps\Exports\VehicleExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
@@ -25,6 +26,20 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class VehicleController extends FleetOpsController
 {
+    /**
+     * Permissions for methods AuthorizationGuard cannot map to a schema action (see FleetOpsController).
+     *
+     * @var array<string, string|string[]>
+     */
+    protected array $methodPermissions = [
+        'unassignDriver'  => 'assign-driver-for vehicle',
+        'unassignOrders'  => 'update vehicle',
+        'attachDevice'    => 'update vehicle',
+        'detachDevice'    => 'update vehicle',
+        'attachEquipment' => 'update vehicle',
+        'detachEquipment' => 'update vehicle',
+    ];
+
     /**
      * The resource to query.
      *
@@ -111,6 +126,7 @@ class VehicleController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function unassignDriver(string $id): JsonResponse
     {
         $vehicle = $this->findVehicle($id);
@@ -143,6 +159,7 @@ class VehicleController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function unassignOrders(Request $request, string $id): JsonResponse
     {
         $request->validate([
@@ -179,6 +196,7 @@ class VehicleController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function attachDevice(Request $request, string $id): JsonResponse
     {
         $request->validate(['device' => 'required|string']);
@@ -219,6 +237,7 @@ class VehicleController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function detachDevice(Request $request, string $id): JsonResponse
     {
         $request->validate(['device' => 'required|string']);
@@ -265,6 +284,7 @@ class VehicleController extends FleetOpsController
      * Attach equipment to the vehicle. Equipment can only be equipped to one asset at a
      * time, so attaching moves it from any previous vehicle or trailer.
      */
+    #[SkipAuthorizationCheck]
     public function attachEquipment(Request $request, string $id): JsonResponse
     {
         $request->validate(['equipment' => 'required|string']);
@@ -292,6 +312,7 @@ class VehicleController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function detachEquipment(Request $request, string $id): JsonResponse
     {
         $request->validate(['equipment' => 'required|string']);

package/server/src/Http/Controllers/Internal/v1/VendorController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\Attributes\SkipAuthorizationCheck;
 use Fleetbase\FleetOps\Exports\VendorExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Http\Resources\v1\Contact as ContactResource;
@@ -19,6 +20,18 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class VendorController extends FleetOpsController
 {
+    /**
+     * Permissions for methods AuthorizationGuard cannot map to a schema action (see FleetOpsController).
+     *
+     * @var array<string, string|string[]>
+     */
+    protected array $methodPermissions = [
+        'assignDriver'          => 'update vendor',
+        'removeDriver'          => 'update vendor',
+        'addVendorPersonnel'    => 'update vendor',
+        'removeVendorPersonnel' => 'update vendor',
+    ];
+
     /**
      * The resource to query.
      *
@@ -128,6 +141,7 @@ class VendorController extends FleetOpsController
      *
      * @return \Illuminate\Http\Response
      */
+    #[SkipAuthorizationCheck]
     public function assignDriver(string $id, Request $request)
     {
         // Validate only param
@@ -160,6 +174,7 @@ class VendorController extends FleetOpsController
      *
      * @return \Illuminate\Http\Response
      */
+    #[SkipAuthorizationCheck]
     public function removeDriver(string $id, Request $request)
     {
         // Validate only param
@@ -197,6 +212,7 @@ class VendorController extends FleetOpsController
         return response()->json(['personnels' => $personnels->values()]);
     }
 
+    #[SkipAuthorizationCheck]
     public function addVendorPersonnel(Request $request, string $vendorId)
     {
         $vendor  = $this->findVendorByIdOrFail($vendorId);
@@ -220,6 +236,7 @@ class VendorController extends FleetOpsController
         ]);
     }
 
+    #[SkipAuthorizationCheck]
     public function removeVendorPersonnel(string $vendorId, string $contactId)
     {
         $vendor  = $this->findVendorByIdOrFail($vendorId);

package/server/src/Http/Controllers/Internal/v1/WorkOrderController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\Attributes\SkipAuthorizationCheck;
 use Fleetbase\FleetOps\Exports\WorkOrderExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\WorkOrderImport;
@@ -16,6 +17,15 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class WorkOrderController extends FleetOpsController
 {
+    /**
+     * Permissions for methods AuthorizationGuard cannot map to a schema action (see FleetOpsController).
+     *
+     * @var array<string, string|string[]>
+     */
+    protected array $methodPermissions = [
+        'sendEmail' => 'update work-order',
+    ];
+
     /**
      * The resource to query.
      *
@@ -80,6 +90,7 @@ class WorkOrderController extends FleetOpsController
      * Send a work order email to the assigned vendor.
      * POST /work-orders/{id}/send.
      */
+    #[SkipAuthorizationCheck]
     public function sendEmail(string $id): JsonResponse
     {
         $workOrder = $this->workOrderForEmail($id);

package/server/src/Jobs/DispatchTelematicsRetentionJobs.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Support\Telematics\Telemetry\Queue;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Fan out system-wide cleanup in small pages, without a session or membership scope.
+ * Each company has its own bounded prune job so one large backlog cannot prevent
+ * other organizations from being processed within a shared worker timeout.
+ */
+class DispatchTelematicsRetentionJobs implements ShouldQueue, ShouldBeUnique
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public const PAGE_SIZE = 100;
+
+    public int $uniqueFor = 900;
+    public int $tries     = 3;
+    public int $timeout   = 60;
+
+    public function __construct(public int $afterCompanyId = 0, public int $maxBatches = 200)
+    {
+        $this->onQueue(config('telematics.telemetry.ingestion_queue', 'default'));
+    }
+
+    public function uniqueId(): string
+    {
+        return 'after-company:' . $this->afterCompanyId;
+    }
+
+    public function handle(): void
+    {
+        $companies = $this->companies();
+        foreach ($companies as $company) {
+            $this->queueJob(new PruneTelematicsDataJob($company->uuid, $this->maxBatches));
+        }
+
+        if ($companies->count() === self::PAGE_SIZE) {
+            $this->queueJob(new self((int) $companies->last()->id, $this->maxBatches));
+
+            return;
+        }
+
+        $this->queueJob(new PruneTelematicsDataJob(null, $this->maxBatches, true));
+    }
+
+    protected function companies(): Collection
+    {
+        return DB::table('companies')
+            ->where('id', '>', $this->afterCompanyId)
+            ->orderBy('id')
+            ->limit(self::PAGE_SIZE)
+            ->get(['id', 'uuid']);
+    }
+
+    protected function queueJob(ShouldBeUnique $job): void
+    {
+        Queue::dispatch($job);
+    }
+}

package/server/src/Jobs/PruneTelematicsDataJob.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Console\Commands\PruneTelematicsData;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+/**
+ * Runs a bounded telematics prune for one company or orphaned data.
+ *
+ * The command is executed directly rather than through the console kernel so a
+ * worker started before this package version can still run it.
+ */
+class PruneTelematicsDataJob implements ShouldQueue, ShouldBeUnique
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public int $uniqueFor      = 900;
+    public int $tries          = 1;
+    // Finish or fail before Laravel's baseline Redis retry_after of 90 seconds.
+    public int $timeout        = 80;
+    public bool $failOnTimeout = true;
+    public bool $orphansOnly   = false;
+
+    public function __construct(public ?string $companyUuid = null, public int $maxBatches = 200, bool $orphansOnly = false)
+    {
+        $this->orphansOnly = $orphansOnly;
+        $this->onQueue(config('telematics.telemetry.ingestion_queue', 'default'));
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->orphansOnly ? 'orphans' : ($this->companyUuid ?? 'all');
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function parameters(): array
+    {
+        $parameters = ['--no-lock' => true, '--max-batches' => $this->maxBatches];
+        if ($this->companyUuid) {
+            $parameters['--company'] = $this->companyUuid;
+        }
+        if ($this->orphansOnly) {
+            $parameters['--orphans-only'] = true;
+        }
+
+        return $parameters;
+    }
+
+    public function handle(): void
+    {
+        $command = $this->command();
+        $command->setLaravel(app());
+        $exitCode = $command->run(new ArrayInput($this->parameters()), new BufferedOutput());
+        if ($exitCode !== PruneTelematicsData::SUCCESS) {
+            throw new \RuntimeException('Telematics cleanup failed with exit code ' . $exitCode . '.');
+        }
+    }
+
+    protected function command(): PruneTelematicsData
+    {
+        return app(PruneTelematicsData::class);
+    }
+}

package/server/src/Listeners/NotifyDriverOnShiftChange.php

@@ -48,7 +48,7 @@ class NotifyDriverOnShiftChange implements ShouldQueue
         }
 
         // Check the company-level scheduling setting
-        $settings     = $this->getSchedulingSettings();
+        $settings     = $this->getSchedulingSettings($schedule->company_uuid);
         $shouldNotify = (bool) data_get($settings, 'notify_drivers_on_shift_change', false);
         if (!$shouldNotify) {
             return;
@@ -66,9 +66,9 @@ class NotifyDriverOnShiftChange implements ShouldQueue
         return $scheduleItem->schedule()->with('subject')->first();
     }
 
-    protected function getSchedulingSettings(): array
+    protected function getSchedulingSettings(?string $companyUuid): array
     {
-        return Setting::lookupFromCompany('fleet-ops.scheduling-settings', []);
+        return Setting::lookupForCompany($companyUuid, 'fleet-ops.scheduling-settings', []);
     }
 
     protected function isCreatedEvent(object $event): bool

package/server/src/Mail/CustomerCredentialsMail.php

@@ -72,7 +72,7 @@ class CustomerCredentialsMail extends Mailable
      */
     private function getCustomerPortalAccessUrl(): string
     {
-        $customerPortalConfig = Setting::lookupFromCompany('customer-portal-config');
+        $customerPortalConfig = Setting::lookupForCompany($this->customer->company_uuid, 'customer-portal-config');
         $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug', 'customer-portal');
 
         return Utils::consoleUrl($accessUrlSlug ?: 'customer-portal');

package/server/src/Models/Order.php

@@ -1346,10 +1346,11 @@ class Order extends Model
      */
     public function cancel()
     {
-        $this->status = 'canceled';
-
+        // The canceled activity comes from the order config, which may define its own code.
         $this->loadMissing('orderConfig');
-        $canceledActivity = $this->orderConfig->getCanceledActivity();
+        $orderConfig      = $this->orderConfig ?? $this->config();
+        $canceledActivity = $orderConfig->getCanceledActivity();
+        $this->status     = $canceledActivity->code ?? 'canceled';
         $this->updateActivity($canceledActivity);
 
         if ($this->isIntegratedVendorOrder()) {
@@ -1783,6 +1784,37 @@ class Order extends Model
         return (int) Utils::get($this, 'adhoc_distance', Utils::get($this, 'company.options.fleetops.adhoc_distance', 6000));
     }
 
+    /**
+     * Returns the initial tracking status for a newly created order.
+     *
+     * Used by the tracking number on creation. Orders whose config defines its own
+     * lifecycle start at the configured initial activity instead of `created`.
+     *
+     * @return array|null ['code', 'status', 'details'] or null to use the default created status
+     */
+    public function getInitialTrackingStatus(): ?array
+    {
+        if (!$this->order_config_uuid) {
+            return null;
+        }
+
+        $orderConfig = OrderConfig::where('uuid', $this->order_config_uuid)->first();
+        if (!$orderConfig || !$orderConfig->hasConfiguredLifecycle()) {
+            return null;
+        }
+
+        $activity = $orderConfig->getInitialActivity();
+        if (!$activity) {
+            return null;
+        }
+
+        return [
+            'code'    => $activity->code,
+            'status'  => $this->resolveActivityTemplateString((string) $activity->get('status', '')),
+            'details' => $this->resolveActivityTemplateString((string) $activity->get('details', '')),
+        ];
+    }
+
     /**
      * Retrieves the OrderConfig associated with this order.
      *

package/server/src/Models/OrderConfig.php

@@ -380,6 +380,125 @@ class OrderConfig extends Model
         return $this->activities()->firstWhere('code', $code);
     }
 
+    /**
+     * Returns the configured lifecycle semantics stored under `meta.lifecycle`.
+     *
+     * A configured lifecycle is opt-in. When absent the default dispatch lifecycle
+     * (created -> dispatched -> ... -> completed / canceled) applies unchanged.
+     *
+     * Supported keys:
+     * - `initial` (string)            activity code new orders start at
+     * - `completed` (string)          activity code that completes an order
+     * - `canceled` (string)           activity code used when an order is canceled
+     * - `terminal` (string[])         activity codes after which no transition is allowed
+     * - `dispatch` (bool)             false disables dispatch for orders using this config
+     * - `strict_transitions` (bool)   true only allows moving to a configured child activity
+     */
+    public function lifecycle(): array
+    {
+        $lifecycle = data_get($this->meta, 'lifecycle');
+
+        return is_array($lifecycle) ? $lifecycle : [];
+    }
+
+    /**
+     * Determines if this config defines its own lifecycle semantics.
+     */
+    public function hasConfiguredLifecycle(): bool
+    {
+        return !empty($this->lifecycle());
+    }
+
+    /**
+     * Returns the activity new orders using this config start at.
+     *
+     * Without a configured lifecycle this is the `created` activity, if present in the flow.
+     */
+    public function getInitialActivity(): ?Activity
+    {
+        $initialCode = data_get($this->lifecycle(), 'initial');
+        if ($initialCode) {
+            return $this->getActivityByCode($initialCode);
+        }
+
+        return $this->getCreatedActivity();
+    }
+
+    /**
+     * Returns the status code new orders using this config start at.
+     */
+    public function getInitialStatusCode(): string
+    {
+        return data_get($this->lifecycle(), 'initial') ?: 'created';
+    }
+
+    /**
+     * Determines if orders using this config may be dispatched.
+     */
+    public function allowsDispatch(): bool
+    {
+        $dispatch = data_get($this->lifecycle(), 'dispatch', true);
+
+        return !in_array($dispatch, [false, 'false', 0, '0'], true);
+    }
+
+    /**
+     * Determines if activity updates must follow the configured flow graph.
+     */
+    public function hasStrictTransitions(): bool
+    {
+        return (bool) data_get($this->lifecycle(), 'strict_transitions', false);
+    }
+
+    /**
+     * Returns the terminal activity codes of this config.
+     */
+    public function getTerminalActivityCodes(): array
+    {
+        if (!$this->hasConfiguredLifecycle()) {
+            return ['completed', 'canceled'];
+        }
+
+        $terminal = data_get($this->lifecycle(), 'terminal', []);
+        $terminal = is_array($terminal) ? $terminal : [];
+        foreach (['completed', 'canceled'] as $semantic) {
+            $code = data_get($this->lifecycle(), $semantic);
+            if ($code) {
+                $terminal[] = $code;
+            }
+        }
+
+        return array_values(array_unique($terminal));
+    }
+
+    /**
+     * Determines if the given activity code is terminal for this config.
+     */
+    public function isTerminalActivityCode(?string $code): bool
+    {
+        return $code !== null && in_array($code, $this->getTerminalActivityCodes(), true);
+    }
+
+    /**
+     * Determines if the configured flow permits moving from one activity code to another.
+     *
+     * Only the configured graph is consulted: the target must be listed as a child of the
+     * source activity, and terminal activities permit no further transition.
+     */
+    public function canTransition(?string $fromCode, string $toCode): bool
+    {
+        if ($fromCode === null || $this->isTerminalActivityCode($fromCode)) {
+            return false;
+        }
+
+        $from = $this->getActivityByCode($fromCode);
+        if (!$from) {
+            return false;
+        }
+
+        return $from->children()->contains(fn ($activity) => $activity->code === $toCode);
+    }
+
     /**
      * Creates an Activity instance representing a canceled order.
      *
@@ -391,6 +510,11 @@ class OrderConfig extends Model
      */
     public function getCanceledActivity()
     {
+        $configuredCode = data_get($this->lifecycle(), 'canceled');
+        if ($configuredCode && ($configuredActivity = $this->getActivityByCode($configuredCode))) {
+            return $configuredActivity;
+        }
+
         $canceledActivity = $this->activities()->firstWhere('code', 'canceled');
         if ($canceledActivity) {
             return $canceledActivity;
@@ -416,6 +540,11 @@ class OrderConfig extends Model
      */
     public function getCompletedActivity()
     {
+        $configuredCode = data_get($this->lifecycle(), 'completed');
+        if ($configuredCode && ($configuredActivity = $this->getActivityByCode($configuredCode))) {
+            return $configuredActivity;
+        }
+
         $completedActivity = $this->activities()->firstWhere('code', 'completed');
         if ($completedActivity) {
             return $completedActivity;

package/server/src/Models/TrackingNumber.php

@@ -291,13 +291,17 @@ class TrackingNumber extends Model
 
         $ownerTypeName = class_basename($values['owner_type']);
 
+        // owners may define their own initial status (e.g. orders with a configured lifecycle)
+        $initialStatus = $owner && method_exists($owner, 'getInitialTrackingStatus') ? $owner->getInitialTrackingStatus() : null;
+        $initialCode   = is_array($initialStatus) && !empty($initialStatus['code']) ? $initialStatus['code'] : null;
+
         // create initial status
         $trackingStatusId = static::createInitialTrackingStatus([
             'tracking_number_uuid' => $uuid,
-            'status'               => Str::title($ownerTypeName . ' created'),
-            'details'              => 'New ' . Str::lower($ownerTypeName) . ' created.',
+            'status'               => $initialCode ? $initialStatus['status'] : Str::title($ownerTypeName . ' created'),
+            'details'              => $initialCode ? $initialStatus['details'] : 'New ' . Str::lower($ownerTypeName) . ' created.',
             'location'             => $values['location'] ?? Utils::parsePointToWkt(new Point(0, 0)),
-            'code'                 => 'CREATED',
+            'code'                 => $initialCode ? TrackingStatus::prepareCode($initialCode) : 'CREATED',
         ]);
 
         // update status of tracking number
@@ -309,7 +313,7 @@ class TrackingNumber extends Model
             // $model->update([ 'status' => 'created' ]);
 
             // silent update
-            static::updateOwnerStatusColumn($owner, 'created');
+            static::updateOwnerStatusColumn($owner, $initialCode ?? 'created');
         }
 
         return $uuid;

package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php

@@ -37,6 +37,12 @@ use Illuminate\Support\Facades\Log;
  */
 class VroomOrchestrationEngine implements OrchestrationEngineInterface
 {
+    /**
+     * The company whose VROOM settings apply to the current allocation run.
+     * Resolved from the orders so queued runs work without a company session.
+     */
+    protected ?string $companyUuid = null;
+
     public function getName(): string
     {
         return 'VROOM';
@@ -59,6 +65,8 @@ class VroomOrchestrationEngine implements OrchestrationEngineInterface
      */
     public function allocate(Collection $orders, Collection $vehicles, array $options = []): array
     {
+        $this->companyUuid = data_get($orders->first(), 'company_uuid');
+
         if (($options['allocation_strategy'] ?? null) === 'capacity_only') {
             return $this->allocateCapacityOnly($orders, $vehicles, $options);
         }
@@ -520,7 +528,7 @@ class VroomOrchestrationEngine implements OrchestrationEngineInterface
     protected function resolveVroomSetting(string $key, $default = null)
     {
         try {
-            $organizationValue = data_get(Setting::lookupCompany('vroom', []), $key);
+            $organizationValue = data_get(Setting::lookupForCompany($this->companyUuid ?? session('company'), 'vroom', []), $key);
             if ($this->hasConfiguredValue($organizationValue)) {
                 return $organizationValue;
             }

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -77,6 +77,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\ProcessOperationalAlerts::class,
         \Fleetbase\FleetOps\Console\Commands\SyncTelematics::class,
         \Fleetbase\FleetOps\Console\Commands\DrainTelematicInbox::class,
+        \Fleetbase\FleetOps\Console\Commands\PruneTelematicsData::class,
     ];
 
     /**
@@ -153,6 +154,8 @@ class FleetOpsServiceProvider extends CoreServiceProvider
             // leave the default 24-hour overlap lease blocking telemetry recovery.
             $schedule->command('fleetops:sync-telematics')->everyMinute()->withoutOverlapping(2)->storeOutputInDb();
             $schedule->command('fleetops:drain-telematic-inbox')->everyMinute()->withoutOverlapping(2);
+            // Bounded batches per company and table; a capped run simply continues on the next tick.
+            $schedule->command('fleetops:prune-telematics-data')->everyFifteenMinutes()->withoutOverlapping(14)->storeOutputInDb();
         });
         $this->registerNotifications();
         $this->registerAiCapabilities();

package/server/src/Support/Analytics/LiveFleet.php

@@ -2,10 +2,13 @@
 
 namespace Fleetbase\FleetOps\Support\Analytics;
 
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Driver as DriverIndexResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Vehicle as VehicleIndexResource;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Metrics\OrdersInProgressMetric;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
  * Real-time fleet snapshot used as the initial-state payload for Live Fleet Map.
@@ -23,7 +26,8 @@ class LiveFleet extends AbstractAnalytics
 
         // Driver.name is a virtual attribute backed by users.name — eager-load the
         // user so the accessor resolves cleanly without a per-record query.
-        $drivers = Driver::with(['user:uuid,name,avatar_uuid'])
+        // The user and vehicle also feed each marker's card (see card()).
+        $drivers = Driver::with(['user', 'vehicle'])
             ->where('drivers.company_uuid', $companyUuid)
             ->whereNotNull('drivers.location')
             ->where(function ($q) {
@@ -33,7 +37,8 @@ class LiveFleet extends AbstractAnalytics
 
         // Vehicles tracked independently of drivers (telematics-connected rigs may
         // report position without an active driver session).
-        $vehicles = Vehicle::where('company_uuid', $companyUuid)
+        $vehicles = Vehicle::with(['devices', 'driver', 'currentTrailers'])
+            ->where('company_uuid', $companyUuid)
             ->whereNotNull('location')
             ->get();
 
@@ -79,6 +84,7 @@ class LiveFleet extends AbstractAnalytics
             'lat'                => $lat,
             'lng'                => $lng,
             'updated_at'         => $d->last_location_update_at,
+            'card'               => $this->card(new DriverIndexResource($d)),
         ];
     }
 
@@ -98,9 +104,19 @@ class LiveFleet extends AbstractAnalytics
             'heading'      => (float) ($v->heading ?? 0),
             'lat'          => $lat,
             'lng'          => $lng,
+            'card'         => $this->card(new VehicleIndexResource($v)),
         ];
     }
 
+    /**
+     * What the operational live map shows in a marker's popup and tooltip: the same index
+     * resource its live endpoints return, so the dashboard widget renders identical cards.
+     */
+    private function card(JsonResource $resource): array
+    {
+        return $resource->resolve(request());
+    }
+
     /**
      * Pull [lat, lng] out of whatever shape the spatial accessor handed us.
      * Supports Point objects, [lat, lng] arrays, and {lat, lng} hashes.