From 78d8800fd20f4a87c9d9ac39ca2c97bc98fe480c Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Mon, 29 Jun 2026 17:23:09 +0800
Subject: [PATCH 01/19] Reapply "Add Fleet-Ops AI operational query
 capabilities"

This reverts commit 1a4d1e5e1b6679fbbc5583576102618b547fefc6.
---
 addon/components/ai/create-order-preview.hbs  | 190 +++++++
 addon/components/ai/create-order-preview.js   | 220 ++++++++
 app/components/ai/create-order-preview.js     |   1 +
 .../src/Providers/FleetOpsServiceProvider.php |  26 +
 .../AbstractFleetOpsAICapability.php          |  88 ++++
 .../Ai/Capabilities/AssetStatusCapability.php | 108 ++++
 .../ConsoleNavigationCapability.php           |  55 ++
 .../CreateOrderPreviewCapability.php          | 470 ++++++++++++++++++
 .../Ai/Capabilities/DocsHelpCapability.php    |  49 ++
 .../ImportOrdersPreviewCapability.php         |  66 +++
 .../OperationalQueryCapability.php            | 282 +++++++++++
 .../OptimizeOrderRouteCapability.php          | 240 +++++++++
 .../Capabilities/OrderInsightsCapability.php  | 112 +++++
 .../SearchResourcesCapability.php             | 195 ++++++++
 .../Support/Ai/FleetOpsAiQueryResources.php   | 150 ++++++
 .../AiCreateOrderPreviewCapabilityTest.php    |  87 ++++
 .../AiOperationalQueryCapabilityTest.php      |  53 ++
 17 files changed, 2392 insertions(+)
 create mode 100644 addon/components/ai/create-order-preview.hbs
 create mode 100644 addon/components/ai/create-order-preview.js
 create mode 100644 app/components/ai/create-order-preview.js
 create mode 100644 server/src/Support/Ai/Capabilities/AbstractFleetOpsAICapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/AssetStatusCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/ConsoleNavigationCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/DocsHelpCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/ImportOrdersPreviewCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
 create mode 100644 server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
 create mode 100644 server/src/Support/Ai/FleetOpsAiQueryResources.php
 create mode 100644 server/tests/AiCreateOrderPreviewCapabilityTest.php
 create mode 100644 server/tests/AiOperationalQueryCapabilityTest.php

diff --git a/addon/components/ai/create-order-preview.hbs b/addon/components/ai/create-order-preview.hbs
new file mode 100644
index 00000000..4a984c9d
--- /dev/null
+++ b/addon/components/ai/create-order-preview.hbs
@@ -0,0 +1,190 @@
+<div class="fleetbase-ai-response-region fleetbase-ai-create-order-preview" {{did-update this.updatePreview @preview}}>
+    <div class="fleetbase-ai-create-order-preview__header">
+        <div>
+            <div class="fleetbase-ai-action-title">{{this.preview.label}}</div>
+            <div class="fleetbase-ai-action-message">{{this.preview.message}}</div>
+        </div>
+        <span class="fleetbase-ai-action-status">{{if this.isCancelled "Cancelled" (if this.preview.ready "Ready" "Needs info")}}</span>
+    </div>
+
+    {{#if this.isCancelled}}
+        <div class="fleetbase-ai-create-order-preview__cancelled">
+            <FaIcon @icon="circle-xmark" />
+            <span>{{this.cancelledMessage}}</span>
+        </div>
+    {{else}}
+        <div class="fleetbase-ai-create-order-preview__map">
+            {{#if this.canShowMap}}
+                <LeafletMap
+                    class="fleetbase-ai-create-order-preview__leaflet"
+                    @lat={{this.mapCenter.latitude}}
+                    @lng={{this.mapCenter.longitude}}
+                    @zoom={{12}}
+                    @zoomControl={{false}}
+                    as |layers|
+                >
+                    <layers.tile @url="https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png" />
+                    <layers.polyline @locations={{this.routeLineCoordinates}} @color="#3b82f6" @weight={{4}} @opacity={{0.82}} />
+                    {{#each this.coordinates as |stop index|}}
+                        <layers.marker @location={{stop.coordinates}} @title={{stop.address}} as |marker|>
+                            <marker.tooltip @permanent={{false}} @sticky={{true}}>{{add index 1}}. {{stop.label}}</marker.tooltip>
+                        </layers.marker>
+                    {{/each}}
+                </LeafletMap>
+            {{else}}
+                <div class="fleetbase-ai-create-order-preview__empty-map">
+                    <FaIcon @icon="route" />
+                    <span>Select pickup and dropoff with coordinates to preview the route.</span>
+                </div>
+            {{/if}}
+        </div>
+        <div class="fleetbase-ai-create-order-preview__route-list">
+            {{#each this.routeStops as |stop index|}}
+                <div class="fleetbase-ai-create-order-preview__stop">
+                    <span>{{add index 1}}</span>
+                    <div>
+                        <strong>{{stop.label}}</strong>
+                        <small>{{or stop.address "No address resolved"}}</small>
+                    </div>
+                </div>
+            {{/each}}
+        </div>
+
+    <div class="fleetbase-ai-create-order-preview__grid">
+        <InputGroup @name="Order type" @wrapperClass="fleetbase-ai-create-order-preview__field">
+            <ModelSelect
+                @modelName="order-config"
+                @selectedModel={{this.draft.order_config_uuid}}
+                @placeholder="Select order type"
+                @triggerClass="form-select form-input form-input-sm"
+                @infiniteScroll={{false}}
+                @renderInPlace={{true}}
+                @onChange={{this.setOrderConfig}}
+                as |model|
+            >
+                {{or model.name model.key}}
+            </ModelSelect>
+        </InputGroup>
+
+        <InputGroup @name="Pickup" @wrapperClass="fleetbase-ai-create-order-preview__field">
+            <ModelSelect
+                @modelName="place"
+                @selectedModel={{this.payload.pickup}}
+                @placeholder="Pickup address"
+                @triggerClass="form-select form-input form-input-sm"
+                @customSearchEndpoint="places/search"
+                @query={{hash geo=true}}
+                @infiniteScroll={{false}}
+                @renderInPlace={{true}}
+                @onChange={{fn this.setPayloadPlace "pickup"}}
+                as |place|
+            >
+                <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
+            </ModelSelect>
+        </InputGroup>
+
+        <InputGroup @name="Dropoff" @wrapperClass="fleetbase-ai-create-order-preview__field">
+            <ModelSelect
+                @modelName="place"
+                @selectedModel={{this.payload.dropoff}}
+                @placeholder="Dropoff address"
+                @triggerClass="form-select form-input form-input-sm"
+                @customSearchEndpoint="places/search"
+                @query={{hash geo=true}}
+                @infiniteScroll={{false}}
+                @renderInPlace={{true}}
+                @onChange={{fn this.setPayloadPlace "dropoff"}}
+                as |place|
+            >
+                <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
+            </ModelSelect>
+        </InputGroup>
+
+        <InputGroup @name="Driver" @wrapperClass="fleetbase-ai-create-order-preview__field">
+            <ModelSelect
+                @modelName="driver"
+                @placeholder="Assign driver"
+                @triggerClass="form-select form-input form-input-sm"
+                @allowClear={{true}}
+                @infiniteScroll={{false}}
+                @renderInPlace={{true}}
+                @onChange={{this.setDriver}}
+                as |driver|
+            >
+                {{driver.name}}
+            </ModelSelect>
+        </InputGroup>
+
+        <InputGroup @name="Vehicle" @wrapperClass="fleetbase-ai-create-order-preview__field">
+            <ModelSelect
+                @modelName="vehicle"
+                @placeholder="Assign vehicle"
+                @triggerClass="form-select form-input form-input-sm"
+                @allowClear={{true}}
+                @infiniteScroll={{false}}
+                @renderInPlace={{true}}
+                @onChange={{this.setVehicle}}
+                as |vehicle|
+            >
+                {{or vehicle.display_name vehicle.name vehicle.plate_number}}
+            </ModelSelect>
+        </InputGroup>
+
+        <InputGroup @name="Proof" @wrapperClass="fleetbase-ai-create-order-preview__field fleetbase-ai-create-order-preview__field--inline">
+            <Toggle @isToggled={{this.draft.pod_required}} @onToggle={{this.setPodRequired}} @label="Require POD" />
+            {{#if this.draft.pod_required}}
+                <Select
+                    @options={{this.podMethods}}
+                    @value={{this.draft.pod_method}}
+                    @onSelect={{this.setPodMethod}}
+                    @placeholder="POD method"
+                    class="form-input-sm"
+                />
+            {{/if}}
+        </InputGroup>
+
+        <InputGroup @name="Dispatch" @wrapperClass="fleetbase-ai-create-order-preview__field fleetbase-ai-create-order-preview__field--inline">
+            <Toggle @isToggled={{this.draft.dispatched}} @onToggle={{this.setDispatched}} @label="Dispatch after create" />
+        </InputGroup>
+    </div>
+
+    <InputGroup @name="Notes" @wrapperClass="fleetbase-ai-create-order-preview__field">
+        <Textarea @value={{this.draft.notes}} class="form-input form-input-sm w-full" rows={{2}} placeholder="Add order notes" {{on "change" this.setNotes}} />
+    </InputGroup>
+
+    {{#if this.hasMissingFields}}
+        <div class="fleetbase-ai-action-list">
+            <div class="fleetbase-ai-action-list-title">Required before apply</div>
+            <ul>
+                {{#each this.missingFields as |field|}}
+                    <li>{{field}}</li>
+                {{/each}}
+            </ul>
+        </div>
+    {{/if}}
+
+    {{#if this.preview.result}}
+        <div class="fleetbase-ai-action-result">{{this.preview.result.message}}</div>
+    {{/if}}
+
+    {{#if this.preview.error}}
+        <div class="fleetbase-ai-action-error">{{this.preview.error.message}}</div>
+    {{/if}}
+
+        <div class="fleetbase-ai-create-order-preview__controls">
+            <Button
+                @type="primary"
+                @size="sm"
+                @icon="check"
+                @text="Create order"
+                @disabled={{this.isApplyDisabled}}
+                @isLoading={{@isApplying}}
+                @onClick={{this.apply}}
+            />
+            <Button @size="sm" @icon="xmark" @text="Cancel" @disabled={{@isCancelling}} @onClick={{this.cancel}} />
+            {{#if this.refreshPreview.isRunning}}
+                <span class="fleetbase-ai-create-order-preview__refreshing">Updating preview...</span>
+            {{/if}}
+        </div>
+    {{/if}}
+</div>
diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
new file mode 100644
index 00000000..58596631
--- /dev/null
+++ b/addon/components/ai/create-order-preview.js
@@ -0,0 +1,220 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action, get } from '@ember/object';
+import { task, timeout } from 'ember-concurrency';
+
+export default class AiCreateOrderPreviewComponent extends Component {
+    @tracked draft = this.clone(this.args.preview?.draft ?? {});
+    @tracked preview = this.args.preview;
+
+    get payload() {
+        return this.draft.payload ?? {};
+    }
+
+    get routeStops() {
+        return this.preview?.route_preview?.stops ?? [];
+    }
+
+    get coordinates() {
+        return this.routeStops.filter(
+            (stop) =>
+                stop.latitude !== null &&
+                stop.latitude !== undefined &&
+                stop.longitude !== null &&
+                stop.longitude !== undefined &&
+                Number.isFinite(Number(stop.latitude)) &&
+                Number.isFinite(Number(stop.longitude))
+        );
+    }
+
+    get mapCenter() {
+        const stop = this.coordinates[0];
+
+        return {
+            latitude: Number(stop?.latitude ?? 1.3521),
+            longitude: Number(stop?.longitude ?? 103.8198),
+        };
+    }
+
+    get canShowMap() {
+        return this.coordinates.length >= 2;
+    }
+
+    get routeLineCoordinates() {
+        return this.coordinates.map((stop) => stop.coordinates);
+    }
+
+    get podMethods() {
+        return this.preview?.options?.pod_methods ?? ['scan', 'signature', 'photo'];
+    }
+
+    get isReady() {
+        return this.preview?.ready === true && !this.preview?.result && !this.isCancelled;
+    }
+
+    get isCancelled() {
+        return this.args.task?.status === 'cancelled' || this.preview?.error?.type === 'cancelled';
+    }
+
+    get cancelledMessage() {
+        return this.preview?.error?.message ?? 'This order creation preview was cancelled.';
+    }
+
+    get missingFields() {
+        return this.preview?.missing_fields ?? [];
+    }
+
+    get hasMissingFields() {
+        return this.missingFields.length > 0;
+    }
+
+    get isApplyDisabled() {
+        return !this.isReady || this.args.isApplying || this.refreshPreview.isRunning;
+    }
+
+    addressLabel(place) {
+        if (!place) {
+            return null;
+        }
+
+        const values = [place.address, place.street1, place.name, place.query, place.city, place.postal_code, place.country]
+            .map((value) => (value === null || value === undefined ? null : String(value).trim()))
+            .filter((value) => value && !['undefined', 'null'].includes(value.toLowerCase()));
+
+        return [...new Set(values)].slice(0, 3).join(' - ');
+    }
+
+    clone(value) {
+        return JSON.parse(JSON.stringify(value ?? {}));
+    }
+
+    modelValue(model, key) {
+        if (!model) {
+            return null;
+        }
+
+        if (typeof model.get === 'function') {
+            return model.get(key);
+        }
+
+        return get(model, key) ?? model[key];
+    }
+
+    serializeModel(model, fallback = {}) {
+        if (!model) {
+            return null;
+        }
+
+        if (typeof model.toJSON === 'function') {
+            return {
+                ...model.toJSON(),
+                id: this.modelValue(model, 'id'),
+                uuid: this.modelValue(model, 'uuid') ?? this.modelValue(model, 'id'),
+                public_id: this.modelValue(model, 'public_id'),
+                name: this.modelValue(model, 'name'),
+                address: this.addressLabel(model) ?? this.modelValue(model, 'address'),
+                street1: this.modelValue(model, 'street1'),
+                city: this.modelValue(model, 'city'),
+                postal_code: this.modelValue(model, 'postal_code'),
+                country: this.modelValue(model, 'country'),
+                latitude: this.modelValue(model, 'latitude'),
+                longitude: this.modelValue(model, 'longitude'),
+                ...fallback,
+            };
+        }
+
+        return { ...model, ...fallback };
+    }
+
+    mergeDraft(updates = {}) {
+        this.draft = {
+            ...this.draft,
+            ...updates,
+            payload: {
+                ...(this.draft.payload ?? {}),
+                ...(updates.payload ?? {}),
+            },
+        };
+        this.refreshPreview.perform();
+    }
+
+    @task *refreshPreview() {
+        yield timeout(180);
+        const refreshed = yield this.args.onRefresh?.(this.args.task, this.preview, { draft: this.draft });
+        if (refreshed) {
+            this.preview = refreshed;
+            this.draft = this.clone(refreshed.draft ?? this.draft);
+        }
+    }
+
+    @action setPayloadPlace(role, place) {
+        const serialized = this.serializeModel(place);
+        const payload = { ...(this.draft.payload ?? {}) };
+
+        payload[role] = serialized;
+        payload[`${role}_query`] = this.addressLabel(serialized) ?? serialized?.address ?? serialized?.name ?? null;
+
+        if (serialized?.uuid) {
+            payload[`${role}_uuid`] = serialized.uuid;
+        } else {
+            delete payload[`${role}_uuid`];
+        }
+
+        this.mergeDraft({ payload });
+    }
+
+    @action setOrderConfig(orderConfig) {
+        this.mergeDraft({
+            order_config_uuid: this.modelValue(orderConfig, 'uuid') ?? this.modelValue(orderConfig, 'id'),
+            type: this.modelValue(orderConfig, 'key'),
+        });
+    }
+
+    @action setDriver(driver) {
+        this.mergeDraft({
+            driver: this.modelValue(driver, 'uuid') ?? this.modelValue(driver, 'id'),
+            driver_query: this.modelValue(driver, 'name') ?? this.modelValue(driver, 'public_id'),
+        });
+    }
+
+    @action setVehicle(vehicle) {
+        this.mergeDraft({
+            vehicle_assigned_uuid: this.modelValue(vehicle, 'uuid') ?? this.modelValue(vehicle, 'id'),
+            vehicle_query: this.modelValue(vehicle, 'display_name') ?? this.modelValue(vehicle, 'name') ?? this.modelValue(vehicle, 'plate_number'),
+        });
+    }
+
+    @action setPodRequired(value) {
+        this.mergeDraft({
+            pod_required: value,
+            pod_method: value ? (this.draft.pod_method ?? 'scan') : null,
+        });
+    }
+
+    @action setPodMethod(value) {
+        this.mergeDraft({ pod_method: value });
+    }
+
+    @action setDispatched(value) {
+        this.mergeDraft({ dispatched: value });
+    }
+
+    @action setNotes(event) {
+        this.mergeDraft({ notes: event.target.value });
+    }
+
+    @action apply() {
+        return this.args.onApply?.(this.args.task, this.preview, { draft: this.draft });
+    }
+
+    @action cancel() {
+        return this.args.onCancel?.(this.args.task);
+    }
+
+    @action updatePreview(preview) {
+        this.preview = preview;
+        if (preview?.draft) {
+            this.draft = this.clone(preview.draft);
+        }
+    }
+}
diff --git a/app/components/ai/create-order-preview.js b/app/components/ai/create-order-preview.js
new file mode 100644
index 00000000..b9054567
--- /dev/null
+++ b/app/components/ai/create-order-preview.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/ai/create-order-preview';
diff --git a/server/src/Providers/FleetOpsServiceProvider.php b/server/src/Providers/FleetOpsServiceProvider.php
index 653952fa..e8e53035 100644
--- a/server/src/Providers/FleetOpsServiceProvider.php
+++ b/server/src/Providers/FleetOpsServiceProvider.php
@@ -145,6 +145,7 @@ public function boot()
             $schedule->command('fleetops:sync-telematics')->everyMinute()->withoutOverlapping()->storeOutputInDb();
         });
         $this->registerNotifications();
+        $this->registerAiCapabilities();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');
 
         // Register built-in orchestration engines.
@@ -234,4 +235,29 @@ public function registerNotifications()
             'dynamic:facilitator',
         ]);
     }
+
+    protected function registerAiCapabilities(): void
+    {
+        if (!Utils::classExists(\Fleetbase\Ai\Support\AiCapabilityRegistry::class)) {
+            return;
+        }
+
+        if (Utils::classExists(\Fleetbase\Ai\Support\AiQueryRegistry::class)) {
+            $this->callAfterResolving(\Fleetbase\Ai\Support\AiQueryRegistry::class, function (\Fleetbase\Ai\Support\AiQueryRegistry $registry) {
+                \Fleetbase\FleetOps\Support\Ai\FleetOpsAiQueryResources::register($registry);
+            });
+        }
+
+        $this->callAfterResolving(\Fleetbase\Ai\Support\AiCapabilityRegistry::class, function (\Fleetbase\Ai\Support\AiCapabilityRegistry $registry) {
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\SearchResourcesCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\OperationalQueryCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\OrderInsightsCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\AssetStatusCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\DocsHelpCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\ConsoleNavigationCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\CreateOrderPreviewCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\OptimizeOrderRouteCapability());
+            $registry->register(new \Fleetbase\FleetOps\Support\Ai\Capabilities\ImportOrdersPreviewCapability());
+        });
+    }
 }
diff --git a/server/src/Support/Ai/Capabilities/AbstractFleetOpsAICapability.php b/server/src/Support/Ai/Capabilities/AbstractFleetOpsAICapability.php
new file mode 100644
index 00000000..a070a7f7
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/AbstractFleetOpsAICapability.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Contracts\AIContextCapabilityInterface;
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\Ai\Support\Capabilities\AbstractAICapability;
+use Fleetbase\Support\Auth;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Str;
+
+abstract class AbstractFleetOpsAICapability extends AbstractAICapability implements AIContextCapabilityInterface
+{
+    public function module(): string
+    {
+        return 'fleet-ops';
+    }
+
+    public function shouldResolve(AiTask $task): bool
+    {
+        return $this->matchesPrompt($this->prompt($task));
+    }
+
+    abstract protected function matchesPrompt(string $prompt): bool;
+
+    protected function prompt(AiTask $task): string
+    {
+        return Str::lower(trim((string) $task->prompt));
+    }
+
+    protected function containsAny(string $prompt, array $terms): bool
+    {
+        foreach ($terms as $term) {
+            if (str_contains($prompt, Str::lower($term))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected function can(string $permission): bool
+    {
+        $user = Auth::getUserFromSession();
+
+        if ($user?->isAdmin()) {
+            return true;
+        }
+
+        return Auth::can($permission);
+    }
+
+    protected function canAll(array $permissions): bool
+    {
+        foreach ($permissions as $permission) {
+            if (!$this->can($permission)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected function searchTerms(string $prompt): array
+    {
+        preg_match_all('/[A-Z]{2,}[-_][A-Z0-9-_]+|[A-Za-z0-9][A-Za-z0-9-_]{2,}/', (string) $prompt, $matches);
+
+        $terms = collect($matches[0] ?? [])
+            ->reject(fn ($term) => in_array(Str::lower($term), ['find', 'show', 'open', 'order', 'orders', 'vehicle', 'vehicles', 'driver', 'drivers', 'work', 'status', 'about', 'fleet', 'ops'], true))
+            ->unique()
+            ->take(6)
+            ->values()
+            ->all();
+
+        return empty($terms) ? [trim((string) $prompt)] : $terms;
+    }
+
+    protected function whereLikeAny(Builder $builder, array $columns, array $terms): void
+    {
+        $builder->where(function (Builder $query) use ($columns, $terms) {
+            foreach ($columns as $column) {
+                foreach ($terms as $term) {
+                    $query->orWhere($column, 'like', '%' . $term . '%');
+                }
+            }
+        });
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/AssetStatusCapability.php b/server/src/Support/Ai/Capabilities/AssetStatusCapability.php
new file mode 100644
index 00000000..5a6d8e04
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/AssetStatusCapability.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\FleetOps\Models\Device;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Sensor;
+use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Models\Vehicle;
+
+class AssetStatusCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.asset_status';
+    }
+
+    public function label(): string
+    {
+        return 'Fleet-Ops asset status';
+    }
+
+    public function description(): string
+    {
+        return 'Summarizes Fleet-Ops vehicle, device, sensor, and telematic status counts.';
+    }
+
+    public function permissions(): array
+    {
+        return ['fleet-ops see vehicle', 'fleet-ops see device', 'fleet-ops see sensor', 'fleet-ops see telematic'];
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        return [
+            'drivers'    => $this->driverStatus(),
+            'vehicles'   => $this->statusCounts(Vehicle::class, 'fleet-ops see vehicle'),
+            'devices'    => $this->deviceStatus(),
+            'sensors'    => $this->statusCounts(Sensor::class, 'fleet-ops see sensor'),
+            'telematics' => $this->statusCounts(Telematic::class, 'fleet-ops see telematic'),
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->containsAny($prompt, ['offline', 'online', 'asset status', 'driver status', 'vehicle status', 'device status', 'sensor status', 'telematic status', 'drivers down', 'devices down', 'vehicles down']);
+    }
+
+    protected function statusCounts(string $modelClass, string $permission): array
+    {
+        if (!$this->can($permission)) {
+            return ['authorized' => false];
+        }
+
+        return [
+            'authorized'       => true,
+            'total'            => $modelClass::where('company_uuid', session('company'))->count(),
+            'counts_by_status' => $modelClass::where('company_uuid', session('company'))
+                ->selectRaw('status, count(*) as aggregate')
+                ->groupBy('status')
+                ->pluck('aggregate', 'status')
+                ->all(),
+        ];
+    }
+
+    protected function deviceStatus(): array
+    {
+        if (!$this->can('fleet-ops see device')) {
+            return ['authorized' => false];
+        }
+
+        return [
+            'authorized'       => true,
+            'total'            => Device::where('company_uuid', session('company'))->count(),
+            'online'           => Device::where('company_uuid', session('company'))->where('online', true)->count(),
+            'offline'          => Device::where('company_uuid', session('company'))->where(function ($query) {
+                $query->where('online', false)->orWhereNull('online');
+            })->count(),
+            'counts_by_status' => Device::where('company_uuid', session('company'))
+                ->selectRaw('status, count(*) as aggregate')
+                ->groupBy('status')
+                ->pluck('aggregate', 'status')
+                ->all(),
+        ];
+    }
+
+    protected function driverStatus(): array
+    {
+        if (!$this->can('fleet-ops see driver')) {
+            return ['authorized' => false];
+        }
+
+        return [
+            'authorized'       => true,
+            'total'            => Driver::where('company_uuid', session('company'))->count(),
+            'online'           => Driver::where('company_uuid', session('company'))->where('online', true)->count(),
+            'offline'          => Driver::where('company_uuid', session('company'))->where(function ($query) {
+                $query->where('online', false)->orWhereNull('online');
+            })->count(),
+            'counts_by_status' => Driver::where('company_uuid', session('company'))
+                ->selectRaw('status, count(*) as aggregate')
+                ->groupBy('status')
+                ->pluck('aggregate', 'status')
+                ->all(),
+        ];
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/ConsoleNavigationCapability.php b/server/src/Support/Ai/Capabilities/ConsoleNavigationCapability.php
new file mode 100644
index 00000000..44934a27
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/ConsoleNavigationCapability.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+
+class ConsoleNavigationCapability extends SearchResourcesCapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.console_navigation';
+    }
+
+    public function label(): string
+    {
+        return 'Fleet-Ops console navigation preview';
+    }
+
+    public function description(): string
+    {
+        return 'Returns preview-only console route suggestions for Fleet-Ops resources.';
+    }
+
+    public function type(): string
+    {
+        return 'ui';
+    }
+
+    public function mode(): string
+    {
+        return 'navigation_preview';
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        $search = parent::resolve($task);
+        $items  = collect(data_get($search, 'results', []))
+            ->flatten(1)
+            ->filter(fn ($result) => is_array($result) && isset($result['route']))
+            ->take(5)
+            ->values()
+            ->all();
+
+        return [
+            'preview_only' => true,
+            'message'      => 'Fleetbase AI can suggest where to navigate, but this pilot does not directly open panels yet.',
+            'suggestions'  => $items,
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->containsAny($prompt, ['open', 'show me', 'go to', 'navigate', 'take me to']) && parent::matchesPrompt($prompt);
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
new file mode 100644
index 00000000..4597f365
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
@@ -0,0 +1,470 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Contracts\AIActionCapabilityInterface;
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\OrderConfig;
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Support\PlaceSearch;
+use Fleetbase\FleetOps\Support\Utils;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
+class CreateOrderPreviewCapability extends AbstractFleetOpsAICapability implements AIActionCapabilityInterface
+{
+    public function key(): string
+    {
+        return 'fleet-ops.create_order';
+    }
+
+    public function label(): string
+    {
+        return 'Create Fleet-Ops order preview';
+    }
+
+    public function description(): string
+    {
+        return 'Builds and applies confirmed Fleet-Ops order creation drafts.';
+    }
+
+    public function type(): string
+    {
+        return 'action';
+    }
+
+    public function mode(): string
+    {
+        return 'confirmation_required';
+    }
+
+    public function permissions(): array
+    {
+        return ['fleet-ops create order'];
+    }
+
+    public function previewOnly(): bool
+    {
+        return false;
+    }
+
+    public function executable(): bool
+    {
+        return true;
+    }
+
+    public function inputSchema(): array
+    {
+        return [
+            'order_config_uuid' => 'Fleet-Ops order config UUID. Defaults to the company transport config when available.',
+            'payload.pickup_uuid' => 'Existing Fleet-Ops place UUID for pickup.',
+            'payload.dropoff_uuid' => 'Existing Fleet-Ops place UUID for dropoff.',
+            'payload.waypoints' => 'Optional ordered waypoint place UUIDs.',
+            'customer' => 'Optional contact/vendor UUID.',
+            'dispatched' => 'Optional boolean. Defaults to false for AI-created drafts.',
+        ];
+    }
+
+    public function shouldPreview(AiTask $task): bool
+    {
+        return $this->matchesPrompt($this->prompt($task));
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        return $this->preview($task);
+    }
+
+    public function preview(AiTask $task, array $input = []): array
+    {
+        $authorized  = $this->canAll($this->permissions());
+        $draft       = $this->buildDraft($task, $input);
+        $orderConfig = $this->resolveOrderConfig($draft);
+        $pickup      = data_get($draft, 'payload.pickup') ?: data_get($draft, 'payload.pickup_query');
+        $dropoff     = data_get($draft, 'payload.dropoff') ?: data_get($draft, 'payload.dropoff_query');
+        $driver      = $this->resolveDriver($draft);
+        $vehicle     = $this->resolveVehicle($draft);
+
+        if ($orderConfig) {
+            $draft['order_config_uuid'] = $orderConfig->uuid;
+            $draft['type']              = $orderConfig->key;
+        }
+
+        if ($driver) {
+            $draft['driver'] = $driver->uuid;
+            $draft['driver_assigned_uuid'] = $driver->uuid;
+        }
+
+        if ($vehicle) {
+            $draft['vehicle_assigned_uuid'] = $vehicle->uuid;
+        }
+
+        $missing = array_values(array_filter([
+            $authorized ? null : 'permission to create Fleet-Ops orders',
+            $orderConfig ? null : 'order configuration',
+            $pickup ? null : 'pickup address or place',
+            $dropoff ? null : 'dropoff address or place',
+        ]));
+
+        return [
+            'action'          => $this->key(),
+            'authorized'      => $authorized,
+            'ready'           => empty($missing),
+            'missing_fields'  => $missing,
+            'message'         => empty($missing) ? 'Fleetbase AI prepared a Fleet-Ops order draft. Review it before applying.' : 'Fleetbase AI can create the order after these required details are resolved.',
+            'apply_label'     => 'Create order',
+            'cancel_label'    => 'Cancel',
+            'draft'           => $draft,
+            'route_preview'   => $this->routePreview($draft),
+            'options'         => [
+                'pod_methods' => $this->podMethods(),
+            ],
+            'fields'          => [
+                ['label' => 'Order config', 'value' => $orderConfig?->name ?? $orderConfig?->key],
+                ['label' => 'Pickup', 'value' => data_get($pickup, 'address') ?? data_get($pickup, 'name')],
+                ['label' => 'Dropoff', 'value' => data_get($dropoff, 'address') ?? data_get($dropoff, 'name')],
+                ['label' => 'Driver', 'value' => $driver?->name],
+                ['label' => 'Vehicle', 'value' => $vehicle?->display_name ?? $vehicle?->name],
+                ['label' => 'Dispatch immediately', 'value' => data_get($draft, 'dispatched') ? 'Yes' : 'No'],
+            ],
+            'risks'           => [
+                'The order will be created only after confirmation.',
+                'AI-created drafts do not dispatch by default.',
+            ],
+        ];
+    }
+
+    public function apply(AiTask $task, array $preview = [], array $input = []): array
+    {
+        if (!$this->canAll($this->permissions())) {
+            throw new \RuntimeException('You do not have permission to create Fleet-Ops orders.');
+        }
+
+        if (!data_get($preview, 'ready')) {
+            throw new \RuntimeException('This order draft is missing required fields and cannot be applied yet.');
+        }
+
+        $draft = array_replace_recursive((array) data_get($preview, 'draft', []), (array) data_get($input, 'draft', $input));
+        Arr::forget($draft, [
+            'payload.pickup_query',
+            'payload.dropoff_query',
+            'driver_query',
+            'vehicle_query',
+        ]);
+
+        /** @var OrderController $controller */
+        $controller = app(OrderController::class);
+        $response   = $controller->createRecord(new Request(['order' => $draft]));
+
+        if ($response instanceof JsonResponse && $response->getStatusCode() >= 400) {
+            throw new \RuntimeException((string) $response->getContent());
+        }
+
+        $order = data_get($response, 'order');
+
+        return [
+            'action'   => $this->key(),
+            'status'   => 'completed',
+            'message'  => 'Fleet-Ops order was created.',
+            'resource' => [
+                'type'  => 'order',
+                'id'    => data_get($order, 'public_id') ?? data_get($order, 'id'),
+                'uuid'  => data_get($order, 'uuid'),
+                'route' => 'console.fleet-ops.operations.orders.index.details',
+                'models' => array_filter([data_get($order, 'public_id') ?? data_get($order, 'uuid')]),
+            ],
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return str_contains($prompt, 'order') && $this->containsAny($prompt, ['create', 'new order', 'make an order', 'book an order']);
+    }
+
+    protected function buildDraft(AiTask $task, array $input = []): array
+    {
+        $existing = (array) data_get($task->metadata, 'action_previews.0.draft', []);
+        $draft    = array_replace_recursive($this->draftFromPrompt((string) $task->prompt), $existing, (array) data_get($input, 'draft', $input));
+
+        $draft['dispatched'] = filter_var(data_get($draft, 'dispatched', false), FILTER_VALIDATE_BOOLEAN);
+        $draft['payload']    = (array) data_get($draft, 'payload', []);
+
+        foreach (['pickup', 'dropoff'] as $role) {
+            $query = data_get($draft, "payload.{$role}_query");
+            $place = data_get($draft, "payload.{$role}");
+
+            if (!$place && $query) {
+                $place = $this->resolvePlace($query);
+            }
+
+            if ($place) {
+                $draft['payload'][$role] = $place;
+                if (!empty($place['uuid'])) {
+                    $draft['payload']["{$role}_uuid"] = $place['uuid'];
+                }
+            } elseif ($query) {
+                $draft['payload'][$role] = $this->provisionalPlace($query);
+                unset($draft['payload']["{$role}_uuid"]);
+            }
+        }
+
+        return $draft;
+    }
+
+    protected function draftFromPrompt(string $prompt): array
+    {
+        $orderConfig = OrderConfig::defaultOrCreate();
+        $draft       = [
+            'order_config_uuid' => $orderConfig?->uuid,
+            'type'              => $orderConfig?->key,
+            'payload'           => [],
+            'dispatched'        => false,
+        ];
+
+        [$pickup, $dropoff] = $this->addressPairFromPrompt($prompt);
+        if ($pickup) {
+            $draft['payload']['pickup_query'] = $pickup;
+            if ($place = $this->resolvePlace($pickup)) {
+                $draft['payload']['pickup'] = $place;
+                if (!empty($place['uuid'])) {
+                    $draft['payload']['pickup_uuid'] = $place['uuid'];
+                }
+            }
+        }
+
+        if ($dropoff) {
+            $draft['payload']['dropoff_query'] = $dropoff;
+            if ($place = $this->resolvePlace($dropoff)) {
+                $draft['payload']['dropoff'] = $place;
+                if (!empty($place['uuid'])) {
+                    $draft['payload']['dropoff_uuid'] = $place['uuid'];
+                }
+            }
+        }
+
+        if (str_contains(Str::lower($prompt), 'dispatch')) {
+            $draft['dispatched'] = true;
+        }
+
+        if (preg_match('/(?:note|notes)[:\s]+(.+)$/i', $prompt, $matches)) {
+            $draft['notes'] = trim($matches[1]);
+        }
+
+        if ($this->containsAny(Str::lower($prompt), ['proof of delivery', 'pod', 'signature', 'photo proof', 'scan proof'])) {
+            $draft['pod_required'] = true;
+            $draft['pod_method']   = str_contains(Str::lower($prompt), 'signature') ? 'signature' : (str_contains(Str::lower($prompt), 'photo') ? 'photo' : 'scan');
+        }
+
+        return $draft;
+    }
+
+    protected function addressPairFromPrompt(string $prompt): array
+    {
+        preg_match_all('/"([^"]+)"|\'([^\']+)\'/', $prompt, $quoted);
+        $quotedValues = collect($quoted[1] ?? [])
+            ->merge($quoted[2] ?? [])
+            ->filter()
+            ->values();
+
+        if ($quotedValues->count() >= 2) {
+            return [$quotedValues->get(0), $quotedValues->get(1)];
+        }
+
+        if (preg_match('/\bfrom\s+(.+?)(?=\s*,?\s+(?:to|towards)\s+)\s*,?\s+(?:to|towards)\s+(.+?)(?=\s+\b(?:with|for|on|using|require|requiring)\b|$)/i', $prompt, $matches)) {
+            return [$this->cleanAddress($matches[1]), $this->cleanAddress($matches[2])];
+        }
+
+        $pickup  = $this->extractLabeledAddress($prompt, ['pickup', 'pick up'], ['dropoff', 'drop off', 'delivery']);
+        $dropoff = $this->extractLabeledAddress($prompt, ['dropoff', 'drop off', 'delivery'], ['return', 'with', 'for', 'on', 'using', 'require', 'requiring']);
+
+        if ($pickup || $dropoff) {
+            return [$pickup, $dropoff];
+        }
+
+        return [null, null];
+    }
+
+    protected function extractLabeledAddress(string $prompt, array $labels, array $nextLabels = []): ?string
+    {
+        $labelPattern = collect($labels)
+            ->map(fn ($label) => preg_quote($label, '/'))
+            ->implode('|');
+        $nextPattern = collect($nextLabels)
+            ->map(fn ($label) => preg_quote($label, '/'))
+            ->implode('|');
+        $lookahead = $nextPattern ? '(?=\s*,?\s*(?:and\s+)?(?:the\s+)?(?:' . $nextPattern . ')(?:\s+(?:at|to|from))?\s+|$)' : '(?=$)';
+
+        if (!preg_match('/\b(?:the\s+)?(?:' . $labelPattern . ')(?:\s+(?:at|to|from))?\s+(.+?)' . $lookahead . '/i', $prompt, $matches)) {
+            return null;
+        }
+
+        return $this->cleanAddress($matches[1]);
+    }
+
+    protected function cleanAddress(?string $address): ?string
+    {
+        $address = trim((string) $address);
+        $address = preg_replace('/^(?:,|\band\b|\s)+/i', '', $address);
+        $address = preg_replace('/(?:,|\band\b|\s)+$/i', '', $address);
+        $address = preg_replace('/\s+/', ' ', $address);
+
+        return $address !== '' ? $address : null;
+    }
+
+    protected function resolvePlace(?string $query): ?array
+    {
+        $query = $this->cleanAddress($query);
+        if (!$query) {
+            return null;
+        }
+
+        $places = PlaceSearch::search(Place::where('company_uuid', session('company')), $query, ['geo' => true, 'limit' => 8]);
+        $place  = $places->first();
+
+        return $place instanceof Place ? $this->serializePlace($place, $query) : null;
+    }
+
+    protected function provisionalPlace(string $query): array
+    {
+        return [
+            'id'        => null,
+            'uuid'      => null,
+            'public_id' => null,
+            'name'      => $query,
+            'address'   => $query,
+            'latitude'  => null,
+            'longitude' => null,
+            'query'     => $query,
+            'source'    => 'unresolved',
+        ];
+    }
+
+    protected function serializePlace(Place $place, ?string $query = null): array
+    {
+        [$latitude, $longitude] = $this->placeCoordinates($place);
+
+        return [
+            'id'          => $place->public_id,
+            'uuid'        => $place->uuid,
+            'public_id'   => $place->public_id,
+            'name'        => $place->name,
+            'street1'     => $place->street1,
+            'street2'     => $place->street2,
+            'city'        => $place->city,
+            'province'    => $place->province,
+            'postal_code' => $place->postal_code,
+            'country'     => $place->country,
+            'address'     => $place->address ?: $place->toAddressString(['name']),
+            'latitude'    => $latitude,
+            'longitude'   => $longitude,
+            'query'       => $query,
+            'source'      => $place->exists ? 'saved' : 'geocoded',
+        ];
+    }
+
+    protected function placeCoordinates(Place $place): array
+    {
+        $latitude  = data_get($place, 'latitude');
+        $longitude = data_get($place, 'longitude');
+
+        if ((!is_numeric($latitude) || !is_numeric($longitude)) && $place->location) {
+            $point = Utils::getPointFromCoordinates($place->location);
+
+            if ($point) {
+                $latitude  = method_exists($point, 'getLat') ? $point->getLat() : data_get($point, 'coordinates.1');
+                $longitude = method_exists($point, 'getLng') ? $point->getLng() : data_get($point, 'coordinates.0');
+            }
+        }
+
+        return [
+            is_numeric($latitude) ? (float) $latitude : null,
+            is_numeric($longitude) ? (float) $longitude : null,
+        ];
+    }
+
+    protected function routePreview(array $draft): array
+    {
+        $rawStops = [
+            ['role' => 'pickup', 'place' => data_get($draft, 'payload.pickup')],
+        ];
+        foreach ((array) data_get($draft, 'payload.waypoints', []) as $index => $waypoint) {
+            $rawStops[] = ['role' => 'waypoint', 'label' => 'Stop ' . ($index + 1), 'place' => data_get($waypoint, 'place') ?: $waypoint];
+        }
+        $rawStops[] = ['role' => 'dropoff', 'place' => data_get($draft, 'payload.dropoff')];
+
+        $stops = collect($rawStops)
+            ->filter(fn ($stop) => is_array($stop['place'] ?? null))
+            ->map(fn ($stop) => [
+                'role'        => $stop['role'],
+                'label'       => $stop['label'] ?? Str::title($stop['role']),
+                'address'     => data_get($stop, 'place.address') ?? data_get($stop, 'place.name'),
+                'latitude'    => data_get($stop, 'place.latitude'),
+                'longitude'   => data_get($stop, 'place.longitude'),
+                'coordinates' => is_numeric(data_get($stop, 'place.latitude')) && is_numeric(data_get($stop, 'place.longitude')) ? [(float) data_get($stop, 'place.latitude'), (float) data_get($stop, 'place.longitude')] : null,
+            ])
+            ->values()
+            ->all();
+
+        return [
+            'stops'       => $stops,
+            'coordinates' => collect($stops)
+                ->filter(fn ($stop) => is_numeric($stop['latitude']) && is_numeric($stop['longitude']))
+                ->map(fn ($stop) => [$stop['latitude'], $stop['longitude']])
+                ->values()
+                ->all(),
+        ];
+    }
+
+    protected function resolveOrderConfig(array $draft): ?OrderConfig
+    {
+        return OrderConfig::resolveFromIdentifier([data_get($draft, 'order_config_uuid'), data_get($draft, 'type')]) ?? OrderConfig::defaultOrCreate();
+    }
+
+    protected function resolveDriver(array $draft): ?Driver
+    {
+        $identifier = data_get($draft, 'driver') ?? data_get($draft, 'driver_assigned_uuid') ?? data_get($draft, 'driver_query');
+        if (!$identifier) {
+            return null;
+        }
+
+        return Driver::where('company_uuid', session('company'))
+            ->where(function ($query) use ($identifier) {
+                $query->where('uuid', $identifier)->orWhere('public_id', $identifier)->orWhereHas('user', fn ($user) => $user->where('name', 'like', '%' . $identifier . '%'));
+            })
+            ->first();
+    }
+
+    protected function resolveVehicle(array $draft): ?Vehicle
+    {
+        $identifier = data_get($draft, 'vehicle') ?? data_get($draft, 'vehicle_assigned_uuid') ?? data_get($draft, 'vehicle_query');
+        if (!$identifier) {
+            return null;
+        }
+
+        return Vehicle::where('company_uuid', session('company'))
+            ->where(function ($query) use ($identifier) {
+                $query->where('uuid', $identifier)->orWhere('public_id', $identifier)->orWhere('plate_number', 'like', '%' . $identifier . '%')->orWhere('name', 'like', '%' . $identifier . '%');
+            })
+            ->first();
+    }
+
+    protected function podMethods(): array
+    {
+        $methods = config('fleetops.pod_methods', ['scan', 'signature', 'photo']);
+        if (is_string($methods)) {
+            $methods = explode(',', $methods);
+        }
+
+        return collect((array) $methods)
+            ->map(fn ($method) => trim((string) $method))
+            ->filter()
+            ->unique()
+            ->values()
+            ->all();
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/DocsHelpCapability.php b/server/src/Support/Ai/Capabilities/DocsHelpCapability.php
new file mode 100644
index 00000000..11544301
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/DocsHelpCapability.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+
+class DocsHelpCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.docs_help';
+    }
+
+    public function label(): string
+    {
+        return 'Fleet-Ops docs help';
+    }
+
+    public function description(): string
+    {
+        return 'Provides curated official Fleetbase documentation references for Fleet-Ops how-to questions.';
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        $prompt = $this->prompt($task);
+
+        return [
+            'references' => array_values(array_filter([
+                $this->reference('Fleet-Ops overview', 'https://fleetbase.io/docs/fleet-ops', 'Fleet-Ops capabilities, concepts, orders, resources, maintenance, connectivity, analytics, and reports.'),
+                $this->containsAny($prompt, ['order', 'dispatch', 'create']) ? $this->reference('Fleet-Ops quickstart', 'https://fleetbase.io/docs/fleet-ops/getting-started/quickstart', 'Create your first order, assign a driver, and dispatch.') : null,
+                $this->containsAny($prompt, ['driver app', 'navigator', 'mobile']) ? $this->reference('Navigator app setup', 'https://fleetbase.io/docs/fleet-ops/getting-started/navigator-app-setup', 'Set up Navigator for drivers.') : null,
+                $this->containsAny($prompt, ['maintenance', 'work order', 'parts']) ? $this->reference('Maintenance overview', 'https://fleetbase.io/docs/fleet-ops/maintenance', 'Maintenance schedules, work orders, equipment, and parts.') : null,
+                $this->containsAny($prompt, ['telematic', 'device', 'sensor', 'connectivity']) ? $this->reference('Connectivity overview', 'https://fleetbase.io/docs/fleet-ops/connectivity', 'Telematics, devices, sensors, and connectivity events.') : null,
+                $this->containsAny($prompt, ['analytics', 'report', 'reports']) ? $this->reference('Analytics overview', 'https://fleetbase.io/docs/fleet-ops/analytics', 'Fleet-Ops analytics and report workflows.') : null,
+            ])),
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->containsAny($prompt, ['how do i', 'how to', 'docs', 'documentation', 'help me', 'where do i', 'guide']);
+    }
+
+    protected function reference(string $title, string $url, string $description): array
+    {
+        return compact('title', 'url', 'description');
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/ImportOrdersPreviewCapability.php b/server/src/Support/Ai/Capabilities/ImportOrdersPreviewCapability.php
new file mode 100644
index 00000000..525a2a16
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/ImportOrdersPreviewCapability.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+
+class ImportOrdersPreviewCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.import_orders_preview';
+    }
+
+    public function label(): string
+    {
+        return 'Import Fleet-Ops orders preview';
+    }
+
+    public function description(): string
+    {
+        return 'Explains and drafts preview-only Fleet-Ops import requirements for order/resource spreadsheets.';
+    }
+
+    public function type(): string
+    {
+        return 'action';
+    }
+
+    public function mode(): string
+    {
+        return 'preview';
+    }
+
+    public function permissions(): array
+    {
+        return ['fleet-ops import order'];
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        return [
+            'preview_only'     => true,
+            'action'           => 'import_orders',
+            'authorized'       => $this->can('fleet-ops import order'),
+            'message'          => 'This pilot can inspect intent and explain import requirements, but it will not process uploaded spreadsheets.',
+            'accepted_sources' => ['xlsx', 'csv'],
+            'minimum_columns'  => [
+                'pickup address or pickup place',
+                'dropoff address or dropoff place',
+                'customer/contact reference',
+                'order type/configuration when required',
+                'item/entity details when required',
+            ],
+            'draft_hints'      => [
+                'Ask the user to upload a spreadsheet through the Fleet-Ops import flow.',
+                'Do not claim rows were imported.',
+                'Offer to summarize expected columns or validation issues once file inspection support exists.',
+            ],
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->containsAny($prompt, ['import', 'spreadsheet', 'excel', 'xlsx', 'csv']) && $this->containsAny($prompt, ['order', 'orders', 'resources', 'vehicles', 'drivers']);
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
new file mode 100644
index 00000000..45e395e3
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
@@ -0,0 +1,282 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\Ai\Services\AiQueryExecutor;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Zone;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class OperationalQueryCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.operational_query';
+    }
+
+    public function label(): string
+    {
+        return 'Fleet-Ops operational query';
+    }
+
+    public function description(): string
+    {
+        return 'Executes safe allowlisted Fleet-Ops operational queries and aggregate summaries.';
+    }
+
+    public function permissions(): array
+    {
+        return [
+            'fleet-ops list driver',
+            'fleet-ops list vehicle',
+            'fleet-ops list device',
+            'fleet-ops list order',
+            'fleet-ops list fleet',
+            'fleet-ops list service-area',
+            'fleet-ops list zone',
+        ];
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        $prompt   = $this->prompt($task);
+        $executor = app(AiQueryExecutor::class);
+        $queries  = [];
+
+        if ($this->mentions($prompt, ['driver', 'drivers'])) {
+            $queries['drivers'] = $this->driverQueries($prompt, $executor);
+        }
+
+        if ($this->mentions($prompt, ['vehicle', 'vehicles'])) {
+            $queries['vehicles'] = $this->onlineResourceQueries('fleet-ops.vehicles', $prompt, $executor);
+        }
+
+        if ($this->mentions($prompt, ['device', 'devices'])) {
+            $queries['devices'] = $this->onlineResourceQueries('fleet-ops.devices', $prompt, $executor);
+        }
+
+        if ($this->mentions($prompt, ['order', 'orders'])) {
+            $queries['orders'] = $this->orderQueries($prompt, $executor);
+        }
+
+        if ($this->mentions($prompt, ['fleet', 'fleets'])) {
+            $queries['fleets'] = [
+                'total' => $executor->count('fleet-ops.fleets'),
+            ];
+        }
+
+        return [
+            'authorized'   => true,
+            'query_engine' => 'fleetbase_ai_allowlisted_operational_query',
+            'instruction'  => 'Answer only from these executed Fleetbase query summaries. If a requested metric is missing or empty, say that Fleetbase did not return enough data for that specific metric.',
+            'queries'      => array_filter($queries),
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->mentions($prompt, ['driver', 'drivers', 'vehicle', 'vehicles', 'device', 'devices', 'order', 'orders', 'fleet', 'fleets'])
+            && $this->mentions($prompt, ['how many', 'count', 'where', 'located', 'location', 'majority', 'online', 'offline', 'without', 'unassigned', 'assigned', 'break down', 'status', 'service area', 'zone']);
+    }
+
+    protected function driverQueries(string $prompt, AiQueryExecutor $executor): array
+    {
+        $queries = [
+            'total'           => $executor->count('fleet-ops.drivers'),
+            'online'          => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => '=', 'value' => true]]),
+            'offline'         => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => 'false_or_null']]),
+            'counts_by_status' => $executor->countsBy('fleet-ops.drivers', 'status'),
+        ];
+
+        if ($this->mentions($prompt, ['without vehicle', 'without vehicles', 'unassigned vehicle', 'no vehicle'])) {
+            $queries['without_vehicle'] = [
+                'count'   => $executor->count('fleet-ops.drivers', [['field' => 'vehicle_uuid', 'operator' => 'null']]),
+                'samples' => $executor->samples('fleet-ops.drivers', [['field' => 'vehicle_uuid', 'operator' => 'null']], 10),
+            ];
+        }
+
+        if ($this->mentions($prompt, ['where', 'located', 'location', 'majority', 'service area', 'zone'])) {
+            $filters = $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : [];
+
+            $queries['location_summary'] = $executor->locationSummary('fleet-ops.drivers', $filters, 250);
+            $queries['service_area_distribution'] = $this->driverGeofenceDistribution($filters);
+        }
+
+        return $queries;
+    }
+
+    protected function onlineResourceQueries(string $resource, string $prompt, AiQueryExecutor $executor): array
+    {
+        $queries = [
+            'total'           => $executor->count($resource),
+            'online'          => $executor->count($resource, [['field' => 'online', 'operator' => '=', 'value' => true]]),
+            'offline'         => $executor->count($resource, [['field' => 'online', 'operator' => 'false_or_null']]),
+            'counts_by_status' => $executor->countsBy($resource, 'status'),
+        ];
+
+        if ($this->mentions($prompt, ['where', 'located', 'location', 'majority']) && $resource === 'fleet-ops.vehicles') {
+            $queries['location_summary'] = $executor->locationSummary($resource, $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : [], 250);
+        }
+
+        return $queries;
+    }
+
+    protected function orderQueries(string $prompt, AiQueryExecutor $executor): array
+    {
+        $filters = $this->orderDateFilters($prompt);
+
+        if ($this->mentions($prompt, ['active'])) {
+            $filters[] = ['field' => 'status', 'operator' => 'not_in', 'value' => ['canceled', 'completed', 'expired']];
+        }
+
+        $queries = [
+            'total'            => $executor->count('fleet-ops.orders', $filters),
+            'counts_by_status' => $executor->countsBy('fleet-ops.orders', 'status', $filters),
+        ];
+
+        if ($this->mentions($prompt, ['without driver', 'unassigned driver', 'no driver'])) {
+            $queries['without_driver'] = $executor->count('fleet-ops.orders', array_merge($filters, [['field' => 'driver_assigned_uuid', 'operator' => 'null']]));
+        }
+
+        if ($this->mentions($prompt, ['assigned driver', 'with driver'])) {
+            $queries['with_driver'] = $executor->count('fleet-ops.orders', array_merge($filters, [['field' => 'driver_assigned_uuid', 'operator' => 'not_null']]));
+        }
+
+        if ($this->mentions($prompt, ['without vehicle', 'unassigned vehicle', 'no vehicle'])) {
+            $queries['without_vehicle'] = $executor->count('fleet-ops.orders', array_merge($filters, [['field' => 'vehicle_assigned_uuid', 'operator' => 'null']]));
+        }
+
+        return $queries;
+    }
+
+    protected function driverGeofenceDistribution(array $filters = []): array
+    {
+        if (!$this->can('fleet-ops list driver')) {
+            return ['authorized' => false, 'resource' => 'fleet-ops.drivers'];
+        }
+
+        $query = Driver::where('company_uuid', session('company'))
+            ->applyDirectivesForPermissions('fleet-ops list driver');
+
+        foreach ($filters as $filter) {
+            if (($filter['field'] ?? null) === 'online') {
+                $query->where('online', (bool) ($filter['value'] ?? false));
+            }
+        }
+
+        $drivers = $this->whereValidDriverLocation($query)
+            ->latest()
+            ->limit(250)
+            ->get(['uuid', 'public_id', 'company_uuid', 'location', 'city', 'country', 'online']);
+
+        if ($drivers->isEmpty()) {
+            return [
+                'authorized'           => true,
+                'valid_location_count' => 0,
+                'service_areas'        => [],
+                'zones'                => [],
+            ];
+        }
+
+        $serviceAreaCounts = [];
+        $zoneCounts        = [];
+
+        foreach ($drivers as $driver) {
+            $point = $driver->location;
+            if (!is_object($point) || !method_exists($point, 'getLat') || !method_exists($point, 'getLng')) {
+                continue;
+            }
+
+            $wkt = sprintf('POINT(%s %s)', $point->getLng(), $point->getLat());
+
+            if ($this->can('fleet-ops list service-area')) {
+                ServiceArea::where('company_uuid', session('company'))
+                    ->whereNotNull('border')
+                    ->whereRaw('MBRContains(`border`, ST_GeomFromText(?))', [$wkt])
+                    ->whereRaw('ST_Contains(`border`, ST_GeomFromText(?))', [$wkt])
+                    ->get(['uuid', 'name', 'public_id'])
+                    ->each(function (ServiceArea $serviceArea) use (&$serviceAreaCounts) {
+                        $key = $serviceArea->uuid;
+                        $serviceAreaCounts[$key] ??= [
+                            'uuid'      => $serviceArea->uuid,
+                            'public_id' => $serviceArea->public_id,
+                            'name'      => $serviceArea->name,
+                            'count'     => 0,
+                        ];
+                        $serviceAreaCounts[$key]['count']++;
+                    });
+            }
+
+            if ($this->can('fleet-ops list zone')) {
+                Zone::where('company_uuid', session('company'))
+                    ->whereNotNull('border')
+                    ->whereRaw('MBRContains(`border`, ST_GeomFromText(?))', [$wkt])
+                    ->whereRaw('ST_Contains(`border`, ST_GeomFromText(?))', [$wkt])
+                    ->get(['uuid', 'name', 'public_id', 'service_area_uuid'])
+                    ->each(function (Zone $zone) use (&$zoneCounts) {
+                        $key = $zone->uuid;
+                        $zoneCounts[$key] ??= [
+                            'uuid'              => $zone->uuid,
+                            'public_id'         => $zone->public_id,
+                            'name'              => $zone->name,
+                            'service_area_uuid' => $zone->service_area_uuid,
+                            'count'             => 0,
+                        ];
+                        $zoneCounts[$key]['count']++;
+                    });
+            }
+        }
+
+        return [
+            'authorized'           => true,
+            'valid_location_count' => $drivers->count(),
+            'service_areas'        => collect($serviceAreaCounts)->sortByDesc('count')->take(10)->values()->all(),
+            'zones'                => collect($zoneCounts)->sortByDesc('count')->take(10)->values()->all(),
+        ];
+    }
+
+    protected function whereValidDriverLocation(Builder $query): Builder
+    {
+        return $query->whereNotNull('location')->whereRaw('
+            ST_Y(location) BETWEEN -90 AND 90
+            AND ST_X(location) BETWEEN -180 AND 180
+            AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+        ');
+    }
+
+    protected function orderDateFilters(string $prompt): array
+    {
+        $now = Carbon::now();
+
+        if (str_contains($prompt, 'this month')) {
+            return [
+                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->startOfMonth()],
+                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->endOfMonth()],
+            ];
+        }
+
+        if (str_contains($prompt, 'last month')) {
+            return [
+                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->subMonthNoOverflow()->startOfMonth()],
+                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->subMonthNoOverflow()->endOfMonth()],
+            ];
+        }
+
+        if (str_contains($prompt, 'last 30 days')) {
+            return [
+                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->subDays(30)->startOfDay()],
+                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->endOfDay()],
+            ];
+        }
+
+        return [];
+    }
+
+    protected function mentions(string $prompt, array $terms): bool
+    {
+        return $this->containsAny($prompt, $terms);
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php b/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
new file mode 100644
index 00000000..c9f4d54d
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Contracts\AIActionCapabilityInterface;
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Place;
+use Illuminate\Support\Facades\DB;
+
+class OptimizeOrderRouteCapability extends AbstractFleetOpsAICapability implements AIActionCapabilityInterface
+{
+    public function key(): string
+    {
+        return 'fleet-ops.optimize_order_route';
+    }
+
+    public function label(): string
+    {
+        return 'Optimize Fleet-Ops order route';
+    }
+
+    public function description(): string
+    {
+        return 'Previews and applies confirmed waypoint resequencing for a Fleet-Ops order route.';
+    }
+
+    public function type(): string
+    {
+        return 'action';
+    }
+
+    public function mode(): string
+    {
+        return 'confirmation_required';
+    }
+
+    public function permissions(): array
+    {
+        return ['fleet-ops optimize order', 'fleet-ops update-route-for order'];
+    }
+
+    public function previewOnly(): bool
+    {
+        return false;
+    }
+
+    public function executable(): bool
+    {
+        return true;
+    }
+
+    public function inputSchema(): array
+    {
+        return [
+            'order' => 'Fleet-Ops order UUID or public ID.',
+            'waypoints' => 'Ordered waypoint place UUIDs generated by the preview.',
+        ];
+    }
+
+    public function shouldPreview(AiTask $task): bool
+    {
+        return $this->matchesPrompt($this->prompt($task));
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        return $this->preview($task);
+    }
+
+    public function preview(AiTask $task, array $input = []): array
+    {
+        $authorized = $this->canAll($this->permissions());
+        $orders     = $this->resolveOrders($task);
+
+        if ($orders->count() > 1) {
+            return [
+                'action'         => $this->key(),
+                'authorized'     => $authorized,
+                'ready'          => false,
+                'preview_only'   => true,
+                'message'        => 'Fleetbase AI found multiple orders. Multi-order route sequencing should use the Fleet-Ops Orchestrator preview before commit.',
+                'apply_label'    => 'Open Orchestrator',
+                'cancel_label'   => 'Cancel',
+                'missing_fields' => ['single order selection for direct route apply'],
+                'fields'         => $orders->map(fn (Order $order) => ['label' => 'Order', 'value' => $order->public_id ?: $order->uuid])->values()->all(),
+                'draft'          => ['orders' => $orders->pluck('public_id')->filter()->values()->all(), 'mode' => 'optimize_routes'],
+                'risks'          => ['Multi-order optimization can affect manifests and should be committed through Orchestrator review.'],
+            ];
+        }
+
+        $order = $orders->first();
+        if (!$order) {
+            return [
+                'action'         => $this->key(),
+                'authorized'     => $authorized,
+                'ready'          => false,
+                'message'        => 'Fleetbase AI needs a specific Fleet-Ops order ID before it can optimize a route.',
+                'apply_label'    => 'Optimize route',
+                'cancel_label'   => 'Cancel',
+                'missing_fields' => ['order UUID or public ID'],
+                'fields'         => [],
+                'draft'          => [],
+            ];
+        }
+
+        $order->loadMissing(['payload.pickup', 'payload.dropoff', 'payload.waypoints.place']);
+        $waypoints = $order->payload?->waypoints?->sortBy('order')->values() ?? collect();
+        $optimized = $this->optimizeWaypoints($order, $waypoints);
+        $changed   = $waypoints->pluck('place_uuid')->values()->all() !== $optimized->pluck('place_uuid')->values()->all();
+        $missing   = array_values(array_filter([
+            $authorized ? null : 'permission to optimize and update Fleet-Ops order routes',
+            $waypoints->count() >= 2 ? null : 'at least two route waypoints',
+            $changed ? null : 'a route with a different optimized waypoint sequence',
+        ]));
+
+        return [
+            'action'         => $this->key(),
+            'authorized'     => $authorized,
+            'ready'          => empty($missing),
+            'message'        => empty($missing) ? 'Fleetbase AI prepared an optimized waypoint sequence. Review it before applying.' : 'Fleetbase AI cannot apply a route optimization until the route has optimizable waypoints.',
+            'apply_label'    => 'Apply route',
+            'cancel_label'   => 'Cancel',
+            'missing_fields' => $missing,
+            'fields'         => [
+                ['label' => 'Order', 'value' => $order->public_id ?: $order->uuid],
+                ['label' => 'Current sequence', 'value' => $this->stopLabels($waypoints)->implode(' -> ')],
+                ['label' => 'Proposed sequence', 'value' => $this->stopLabels($optimized)->implode(' -> ')],
+            ],
+            'draft'          => [
+                'order_uuid' => $order->uuid,
+                'waypoints'  => $optimized->values()->map(fn ($waypoint, int $index) => [
+                    'place_uuid' => $waypoint->place_uuid,
+                    'order'      => $index,
+                    'type'       => $waypoint->type ?: 'dropoff',
+                ])->all(),
+            ],
+            'risks'          => ['Applying this changes the order waypoint sequence only after confirmation.'],
+        ];
+    }
+
+    public function apply(AiTask $task, array $preview = [], array $input = []): array
+    {
+        if (!$this->canAll($this->permissions())) {
+            throw new \RuntimeException('You do not have permission to optimize Fleet-Ops order routes.');
+        }
+
+        if (!data_get($preview, 'ready')) {
+            throw new \RuntimeException('This route optimization preview is not ready to apply.');
+        }
+
+        $order = Order::where('company_uuid', session('company'))
+            ->where('uuid', data_get($preview, 'draft.order_uuid'))
+            ->with(['payload'])
+            ->first();
+
+        if (!$order || !$order->payload) {
+            throw new \RuntimeException('Unable to find the Fleet-Ops order route to update.');
+        }
+
+        $waypoints = array_values((array) data_get($preview, 'draft.waypoints', []));
+        if (count($waypoints) < 2) {
+            throw new \RuntimeException('The route optimization preview does not include enough waypoints to apply.');
+        }
+
+        DB::transaction(function () use ($order, $waypoints) {
+            $order->payload->updateWaypoints($waypoints);
+            $order->is_route_optimized = true;
+            $order->save();
+        });
+
+        return [
+            'action'   => $this->key(),
+            'status'   => 'completed',
+            'message'  => 'Fleet-Ops order route was optimized.',
+            'resource' => [
+                'type'   => 'order',
+                'id'     => $order->public_id,
+                'uuid'   => $order->uuid,
+                'route'  => 'console.fleet-ops.operations.orders.index.details',
+                'models' => array_filter([$order->public_id ?: $order->uuid]),
+            ],
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return str_contains($prompt, 'order') && $this->containsAny($prompt, ['optimize route', 'optimise route', 'route optimization', 'route optimisation', 'optimize the route', 'optimise the route']);
+    }
+
+    protected function resolveOrders(AiTask $task)
+    {
+        $terms = $this->searchTerms((string) $task->prompt);
+
+        return Order::where('company_uuid', session('company'))
+            ->where(function ($query) use ($terms) {
+                $this->whereLikeAny($query, ['uuid', 'public_id', 'internal_id'], $terms);
+            })
+            ->with(['payload.pickup', 'payload.dropoff', 'payload.waypoints.place'])
+            ->limit(10)
+            ->get();
+    }
+
+    protected function optimizeWaypoints(Order $order, $waypoints)
+    {
+        if ($waypoints->count() < 2) {
+            return $waypoints;
+        }
+
+        $remaining = $waypoints->values();
+        $optimized = collect();
+        $cursor    = $order->payload?->pickup;
+
+        while ($remaining->isNotEmpty()) {
+            $nearest = $remaining
+                ->sortBy(fn ($waypoint) => $this->distance($cursor, $waypoint->place))
+                ->first();
+
+            $optimized->push($nearest);
+            $remaining = $remaining->reject(fn ($waypoint) => $waypoint->uuid === $nearest->uuid)->values();
+            $cursor    = $nearest->place;
+        }
+
+        return $optimized;
+    }
+
+    protected function distance(?Place $from, ?Place $to): float
+    {
+        if (!$from || !$to || !is_numeric($from->lat) || !is_numeric($from->lng) || !is_numeric($to->lat) || !is_numeric($to->lng)) {
+            return PHP_FLOAT_MAX;
+        }
+
+        return sqrt((float) (($from->lat - $to->lat) ** 2 + ($from->lng - $to->lng) ** 2));
+    }
+
+    protected function stopLabels($waypoints)
+    {
+        return $waypoints->map(fn ($waypoint) => $waypoint->place?->name ?: $waypoint->place?->public_id ?: $waypoint->place_uuid);
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
new file mode 100644
index 00000000..f2dbb719
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Support\Carbon;
+
+class OrderInsightsCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.order_insights';
+    }
+
+    public function label(): string
+    {
+        return 'Fleet-Ops order insights';
+    }
+
+    public function description(): string
+    {
+        return 'Answers bounded aggregate questions about Fleet-Ops orders, statuses, and order values.';
+    }
+
+    public function permissions(): array
+    {
+        return ['fleet-ops see order'];
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        if (!$this->can('fleet-ops see order')) {
+            return ['authorized' => false, 'message' => 'Current user cannot access Fleet-Ops orders.'];
+        }
+
+        $prompt = $this->prompt($task);
+        $window = $this->dateWindow($prompt);
+        $amount = $this->amountThreshold($prompt);
+        $query  = Order::where('company_uuid', session('company'));
+
+        if ($window) {
+            $query->whereBetween('created_at', [$window['start'], $window['end']]);
+        }
+
+        if ($amount !== null) {
+            $query->whereHas('transaction', fn ($transaction) => $transaction->where('amount', '>', $amount));
+        }
+
+        $total = (clone $query)->count();
+
+        return [
+            'authorized'        => true,
+            'metric'            => 'orders',
+            'date_window'       => $window ? [
+                'label' => $window['label'],
+                'start' => $window['start']->toIso8601String(),
+                'end'   => $window['end']->toIso8601String(),
+            ] : null,
+            'amount_threshold'  => $amount,
+            'count'             => $total,
+            'counts_by_status'  => (clone $query)
+                ->selectRaw('status, count(*) as aggregate')
+                ->groupBy('status')
+                ->pluck('aggregate', 'status')
+                ->all(),
+            'sample_order_ids'  => (clone $query)->latest()->limit(10)->pluck('public_id')->filter()->values()->all(),
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return str_contains($prompt, 'order') && $this->containsAny($prompt, ['how many', 'count', 'report', 'value', 'over', 'status', 'last month', 'this month', 'completed', 'active']);
+    }
+
+    protected function amountThreshold(string $prompt): ?float
+    {
+        if (preg_match('/(?:over|greater than|above)\s+\$?([0-9]+(?:\.[0-9]+)?)/', $prompt, $matches)) {
+            return (float) $matches[1];
+        }
+
+        return null;
+    }
+
+    protected function dateWindow(string $prompt): ?array
+    {
+        $now = Carbon::now();
+
+        if (str_contains($prompt, 'last month')) {
+            $start = $now->copy()->subMonthNoOverflow()->startOfMonth();
+            $end   = $now->copy()->subMonthNoOverflow()->endOfMonth();
+
+            return compact('start', 'end') + ['label' => 'last_month'];
+        }
+
+        if (str_contains($prompt, 'this month')) {
+            $start = $now->copy()->startOfMonth();
+            $end   = $now->copy()->endOfMonth();
+
+            return compact('start', 'end') + ['label' => 'this_month'];
+        }
+
+        if (str_contains($prompt, 'last 30 days')) {
+            $start = $now->copy()->subDays(30)->startOfDay();
+            $end   = $now->copy()->endOfDay();
+
+            return compact('start', 'end') + ['label' => 'last_30_days'];
+        }
+
+        return null;
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php b/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
new file mode 100644
index 00000000..9aa53489
--- /dev/null
+++ b/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
+
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\FleetOps\Models\Device;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Maintenance;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Sensor;
+use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Models\WorkOrder;
+
+class SearchResourcesCapability extends AbstractFleetOpsAICapability
+{
+    public function key(): string
+    {
+        return 'fleet-ops.search_resources';
+    }
+
+    public function label(): string
+    {
+        return 'Search Fleet-Ops resources';
+    }
+
+    public function description(): string
+    {
+        return 'Finds relevant Fleet-Ops orders, vehicles, drivers, work orders, maintenances, devices, sensors, and telematics.';
+    }
+
+    public function permissions(): array
+    {
+        return [
+            'fleet-ops see order',
+            'fleet-ops see vehicle',
+            'fleet-ops see driver',
+            'fleet-ops see work-order',
+            'fleet-ops see maintenance',
+            'fleet-ops see device',
+            'fleet-ops see sensor',
+            'fleet-ops see telematic',
+        ];
+    }
+
+    public function resolve(AiTask $task): array
+    {
+        $prompt = (string) $task->prompt;
+        $terms  = $this->searchTerms($prompt);
+
+        return [
+            'query_terms' => $terms,
+            'results'     => array_filter([
+                'orders'       => $this->orders($terms),
+                'vehicles'     => $this->vehicles($terms),
+                'drivers'      => $this->drivers($terms),
+                'work_orders'  => $this->workOrders($terms),
+                'maintenances' => $this->maintenances($terms),
+                'devices'      => $this->devices($terms),
+                'sensors'      => $this->sensors($terms),
+                'telematics'   => $this->telematics($terms),
+            ]),
+        ];
+    }
+
+    protected function matchesPrompt(string $prompt): bool
+    {
+        return $this->containsAny($prompt, ['find', 'show', 'open', 'look up', 'tell me about', 'status of', 'order', 'vehicle', 'driver', 'work order', 'maintenance', 'device', 'sensor', 'telematic']);
+    }
+
+    protected function orders(array $terms): array
+    {
+        if (!$this->can('fleet-ops see order')) {
+            return [];
+        }
+
+        return Order::with(['transaction', 'trackingNumber'])
+            ->where('company_uuid', session('company'))
+            ->where(function ($query) use ($terms) {
+                $this->whereLikeAny($query, ['public_id', 'internal_id', 'uuid', 'status', 'type'], $terms);
+                $query->orWhereHas('trackingNumber', fn ($tracking) => $this->whereLikeAny($tracking, ['tracking_number', 'barcode'], $terms));
+            })
+            ->limit(5)
+            ->get()
+            ->map(fn (Order $order) => [
+                'id'                  => $order->public_id,
+                'uuid'                => $order->uuid,
+                'tracking'            => $order->tracking,
+                'status'              => $order->status,
+                'type'                => $order->type,
+                'transaction_amount'  => $order->transaction_amount,
+                'transaction_currency' => $order->transaction_currency,
+                'route'               => 'console.fleet-ops.operations.orders.index.details',
+                'models'              => [$order->public_id ?: $order->uuid],
+            ])
+            ->values()
+            ->all();
+    }
+
+    protected function vehicles(array $terms): array
+    {
+        if (!$this->can('fleet-ops see vehicle')) {
+            return [];
+        }
+
+        return Vehicle::where('company_uuid', session('company'))
+            ->where(fn ($query) => $this->whereLikeAny($query, ['name', 'make', 'model', 'plate_number', 'vin', 'public_id', 'internal_id'], $terms))
+            ->limit(5)
+            ->get()
+            ->map(fn (Vehicle $vehicle) => [
+                'id'       => $vehicle->public_id,
+                'uuid'     => $vehicle->uuid,
+                'name'     => $vehicle->display_name ?: $vehicle->name,
+                'plate'    => $vehicle->plate_number,
+                'status'   => $vehicle->status,
+                'route'    => 'console.fleet-ops.management.vehicles.index.details',
+                'models'   => [$vehicle->public_id ?: $vehicle->uuid],
+            ])
+            ->values()
+            ->all();
+    }
+
+    protected function drivers(array $terms): array
+    {
+        if (!$this->can('fleet-ops see driver')) {
+            return [];
+        }
+
+        return Driver::with('user')
+            ->where('company_uuid', session('company'))
+            ->where(function ($query) use ($terms) {
+                $this->whereLikeAny($query, ['public_id', 'uuid', 'drivers_license_number', 'status'], $terms);
+                $query->orWhereHas('user', fn ($user) => $this->whereLikeAny($user, ['name', 'email', 'phone'], $terms));
+            })
+            ->limit(5)
+            ->get()
+            ->map(fn (Driver $driver) => [
+                'id'     => $driver->public_id,
+                'uuid'   => $driver->uuid,
+                'name'   => data_get($driver, 'user.name'),
+                'status' => $driver->status,
+                'route'  => 'console.fleet-ops.management.drivers.index.details',
+                'models' => [$driver->public_id ?: $driver->uuid],
+            ])
+            ->values()
+            ->all();
+    }
+
+    protected function workOrders(array $terms): array
+    {
+        return $this->generic(WorkOrder::class, 'fleet-ops see work-order', ['public_id', 'uuid', 'code', 'subject', 'status', 'priority'], 'console.fleet-ops.maintenance.work-orders.index.details', $terms);
+    }
+
+    protected function maintenances(array $terms): array
+    {
+        return $this->generic(Maintenance::class, 'fleet-ops see maintenance', ['public_id', 'uuid', 'status', 'type', 'summary', 'notes'], 'console.fleet-ops.maintenance.maintenances.index.details', $terms);
+    }
+
+    protected function devices(array $terms): array
+    {
+        return $this->generic(Device::class, 'fleet-ops see device', ['public_id', 'uuid', 'name', 'device_id', 'imei', 'serial_number', 'status'], 'console.fleet-ops.connectivity.devices.index.details', $terms);
+    }
+
+    protected function sensors(array $terms): array
+    {
+        return $this->generic(Sensor::class, 'fleet-ops see sensor', ['public_id', 'uuid', 'name', 'internal_id', 'serial_number', 'imei', 'type', 'sensor_type', 'status'], 'console.fleet-ops.connectivity.sensors.index.details', $terms);
+    }
+
+    protected function telematics(array $terms): array
+    {
+        return $this->generic(Telematic::class, 'fleet-ops see telematic', ['public_id', 'uuid', 'name', 'provider', 'status'], 'console.fleet-ops.connectivity.telematics.details', $terms);
+    }
+
+    protected function generic(string $modelClass, string $permission, array $columns, string $route, array $terms): array
+    {
+        if (!$this->can($permission)) {
+            return [];
+        }
+
+        return $modelClass::where('company_uuid', session('company'))
+            ->where(fn ($query) => $this->whereLikeAny($query, $columns, $terms))
+            ->limit(5)
+            ->get()
+            ->map(fn ($record) => [
+                'id'     => $record->public_id,
+                'uuid'   => $record->uuid,
+                'name'   => $record->name ?? $record->subject ?? $record->summary ?? $record->description ?? null,
+                'status' => $record->status ?? null,
+                'route'  => $route,
+                'models' => [$record->public_id ?: $record->uuid],
+            ])
+            ->values()
+            ->all();
+    }
+}
diff --git a/server/src/Support/Ai/FleetOpsAiQueryResources.php b/server/src/Support/Ai/FleetOpsAiQueryResources.php
new file mode 100644
index 00000000..b528069f
--- /dev/null
+++ b/server/src/Support/Ai/FleetOpsAiQueryResources.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Ai;
+
+use Fleetbase\Ai\Support\AiQueryableResource;
+use Fleetbase\Ai\Support\AiQueryRegistry;
+use Fleetbase\FleetOps\Models\Device;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Fleet;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Models\Zone;
+
+class FleetOpsAiQueryResources
+{
+    public static function register(AiQueryRegistry $registry): void
+    {
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.drivers',
+            label: 'Fleet-Ops drivers',
+            module: 'fleet-ops',
+            modelClass: Driver::class,
+            permission: 'fleet-ops see driver',
+            aliases: ['drivers', 'driver'],
+            fields: [
+                'online'         => ['column' => 'online', 'type' => 'boolean'],
+                'status'         => ['column' => 'status', 'type' => 'string'],
+                'current_status' => ['column' => 'current_status', 'type' => 'string'],
+                'city'           => ['column' => 'city', 'type' => 'string'],
+                'country'        => ['column' => 'country', 'type' => 'string'],
+                'vehicle_uuid'   => ['column' => 'vehicle_uuid', 'type' => 'uuid'],
+                'updated_at'     => ['column' => 'updated_at', 'type' => 'datetime'],
+                'created_at'     => ['column' => 'created_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'name', 'status', 'current_status', 'online', 'city', 'country', 'vehicle_uuid'],
+            locationField: 'location',
+            directivePermission: 'fleet-ops list driver',
+            maxLimit: 500,
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.vehicles',
+            label: 'Fleet-Ops vehicles',
+            module: 'fleet-ops',
+            modelClass: Vehicle::class,
+            permission: 'fleet-ops see vehicle',
+            aliases: ['vehicles', 'vehicle'],
+            fields: [
+                'online'      => ['column' => 'online', 'type' => 'boolean'],
+                'status'      => ['column' => 'status', 'type' => 'string'],
+                'driver_uuid' => ['column' => 'driver_uuid', 'type' => 'uuid'],
+                'city'        => ['column' => 'city', 'type' => 'string'],
+                'country'     => ['column' => 'country', 'type' => 'string'],
+                'updated_at'  => ['column' => 'updated_at', 'type' => 'datetime'],
+                'created_at'  => ['column' => 'created_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'display_name', 'status', 'online', 'city', 'country', 'driver_uuid'],
+            locationField: 'location',
+            directivePermission: 'fleet-ops list vehicle',
+            maxLimit: 500,
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.devices',
+            label: 'Fleet-Ops devices',
+            module: 'fleet-ops',
+            modelClass: Device::class,
+            permission: 'fleet-ops see device',
+            aliases: ['devices', 'device'],
+            fields: [
+                'online'          => ['column' => 'online', 'type' => 'boolean'],
+                'status'          => ['column' => 'status', 'type' => 'string'],
+                'provider'        => ['column' => 'provider', 'type' => 'string'],
+                'telematic_uuid'  => ['column' => 'telematic_uuid', 'type' => 'uuid'],
+                'attachable_uuid' => ['column' => 'attachable_uuid', 'type' => 'uuid'],
+                'last_online_at'  => ['column' => 'last_online_at', 'type' => 'datetime'],
+                'updated_at'      => ['column' => 'updated_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'name', 'status', 'online', 'provider', 'telematic_uuid', 'attachable_uuid'],
+            directivePermission: 'fleet-ops list device',
+            maxLimit: 500,
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.orders',
+            label: 'Fleet-Ops orders',
+            module: 'fleet-ops',
+            modelClass: Order::class,
+            permission: 'fleet-ops see order',
+            aliases: ['orders', 'order'],
+            fields: [
+                'status'               => ['column' => 'status', 'type' => 'string'],
+                'type'                 => ['column' => 'type', 'type' => 'string'],
+                'driver_assigned_uuid' => ['column' => 'driver_assigned_uuid', 'type' => 'uuid'],
+                'vehicle_assigned_uuid' => ['column' => 'vehicle_assigned_uuid', 'type' => 'uuid'],
+                'created_at'           => ['column' => 'created_at', 'type' => 'datetime'],
+                'scheduled_at'         => ['column' => 'scheduled_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'status', 'type', 'driver_assigned_uuid', 'vehicle_assigned_uuid', 'created_at'],
+            directivePermission: 'fleet-ops list order',
+            maxLimit: 500,
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.fleets',
+            label: 'Fleet-Ops fleets',
+            module: 'fleet-ops',
+            modelClass: Fleet::class,
+            permission: 'fleet-ops see fleet',
+            aliases: ['fleets', 'fleet'],
+            fields: [
+                'status'     => ['column' => 'status', 'type' => 'string'],
+                'task'       => ['column' => 'task', 'type' => 'string'],
+                'updated_at' => ['column' => 'updated_at', 'type' => 'datetime'],
+            ],
+            sampleFields: ['public_id', 'name', 'status', 'task'],
+            directivePermission: 'fleet-ops list fleet',
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.service_areas',
+            label: 'Fleet-Ops service areas',
+            module: 'fleet-ops',
+            modelClass: ServiceArea::class,
+            permission: 'fleet-ops see service-area',
+            aliases: ['service areas', 'service area', 'service_areas'],
+            fields: [
+                'status'  => ['column' => 'status', 'type' => 'string'],
+                'country' => ['column' => 'country', 'type' => 'string'],
+                'type'    => ['column' => 'type', 'type' => 'string'],
+            ],
+            sampleFields: ['public_id', 'name', 'status', 'country', 'type'],
+        ));
+
+        $registry->register(new AiQueryableResource(
+            key: 'fleet-ops.zones',
+            label: 'Fleet-Ops zones',
+            module: 'fleet-ops',
+            modelClass: Zone::class,
+            permission: 'fleet-ops see zone',
+            aliases: ['zones', 'zone'],
+            fields: [
+                'status'            => ['column' => 'status', 'type' => 'string'],
+                'service_area_uuid' => ['column' => 'service_area_uuid', 'type' => 'uuid'],
+            ],
+            sampleFields: ['public_id', 'name', 'status', 'service_area_uuid'],
+        ));
+    }
+}
diff --git a/server/tests/AiCreateOrderPreviewCapabilityTest.php b/server/tests/AiCreateOrderPreviewCapabilityTest.php
new file mode 100644
index 00000000..a8c016a8
--- /dev/null
+++ b/server/tests/AiCreateOrderPreviewCapabilityTest.php
@@ -0,0 +1,87 @@
+<?php
+
+use Fleetbase\FleetOps\Support\Ai\Capabilities\CreateOrderPreviewCapability;
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
+
+function fleetopsAiCreateOrderCapability()
+{
+    return (new ReflectionClass(CreateOrderPreviewCapability::class))->newInstanceWithoutConstructor();
+}
+
+function fleetopsAiCreateOrderProtectedMethod(string $method): ReflectionMethod
+{
+    $reflection = new ReflectionClass(CreateOrderPreviewCapability::class);
+    $method     = $reflection->getMethod($method);
+    $method->setAccessible(true);
+
+    return $method;
+}
+
+test('create order preview parser extracts pickup and dropoff labels', function (string $prompt, array $expected) {
+    $capability = fleetopsAiCreateOrderCapability();
+    $method     = fleetopsAiCreateOrderProtectedMethod('addressPairFromPrompt');
+
+    expect($method->invoke($capability, $prompt))->toBe($expected);
+})->with([
+    'pickup comma and dropoff' => [
+        'Create an order with the pickup 16 simon walk singapore, and the dropoff 18 hougang ave',
+        ['16 simon walk singapore', '18 hougang ave'],
+    ],
+    'pickup at and drop off to' => [
+        'Create an order pickup at 16 simon walk singapore and drop off to 18 hougang ave',
+        ['16 simon walk singapore', '18 hougang ave'],
+    ],
+    'from to' => [
+        'Create an order from 16 simon walk singapore to 18 hougang ave',
+        ['16 simon walk singapore', '18 hougang ave'],
+    ],
+]);
+
+test('create order preview keeps unresolved addresses as provisional places', function () {
+    $capability = fleetopsAiCreateOrderCapability();
+    $method     = fleetopsAiCreateOrderProtectedMethod('provisionalPlace');
+
+    expect($method->invoke($capability, '16 simon walk singapore'))->toMatchArray([
+        'uuid'      => null,
+        'name'      => '16 simon walk singapore',
+        'address'   => '16 simon walk singapore',
+        'latitude'  => null,
+        'longitude' => null,
+        'source'    => 'unresolved',
+    ]);
+});
+
+test('create order preview serializes coordinates from place location', function () {
+    $capability = fleetopsAiCreateOrderCapability();
+    $method     = fleetopsAiCreateOrderProtectedMethod('serializePlace');
+    $place      = new Place([
+        'name'        => '16 Simon Walk',
+        'street1'     => '16 Simon Walk',
+        'city'        => 'Singapore',
+        'postal_code' => '545870',
+        'location'    => new SpatialPoint(1.3621663, 103.8845049),
+    ]);
+
+    expect($method->invoke($capability, $place, '16 simon walk singapore'))->toMatchArray([
+        'latitude'  => 1.3621663,
+        'longitude' => 103.8845049,
+    ]);
+});
+
+test('create order preview route preview excludes return stops', function () {
+    $capability = fleetopsAiCreateOrderCapability();
+    $method     = fleetopsAiCreateOrderProtectedMethod('routePreview');
+
+    $preview = $method->invoke($capability, [
+        'payload' => [
+            'pickup'  => ['address' => '16 Simon Walk', 'latitude' => 1.3621663, 'longitude' => 103.8845049],
+            'dropoff' => ['address' => '18 Hougang Avenue 8', 'latitude' => 1.3701, 'longitude' => 103.8912],
+            'return'  => ['address' => 'Ignored return', 'latitude' => 1.3, 'longitude' => 103.8],
+        ],
+    ]);
+
+    expect(collect($preview['stops'])->pluck('role')->all())
+        ->toBe(['pickup', 'dropoff'])
+        ->and($preview['coordinates'])->toHaveCount(2);
+});
diff --git a/server/tests/AiOperationalQueryCapabilityTest.php b/server/tests/AiOperationalQueryCapabilityTest.php
new file mode 100644
index 00000000..29b91a3f
--- /dev/null
+++ b/server/tests/AiOperationalQueryCapabilityTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use Fleetbase\Ai\Support\AiQueryRegistry;
+use Fleetbase\FleetOps\Support\Ai\Capabilities\AssetStatusCapability;
+use Fleetbase\FleetOps\Support\Ai\Capabilities\OperationalQueryCapability;
+use Fleetbase\FleetOps\Support\Ai\FleetOpsAiQueryResources;
+
+function fleetopsAiOperationalCapability()
+{
+    return (new ReflectionClass(OperationalQueryCapability::class))->newInstanceWithoutConstructor();
+}
+
+function fleetopsAiOperationalProtectedMethod(string $method): ReflectionMethod
+{
+    $reflection = new ReflectionClass(OperationalQueryCapability::class);
+    $method     = $reflection->getMethod($method);
+    $method->setAccessible(true);
+
+    return $method;
+}
+
+test('fleet-ops registers safe ai query resources', function () {
+    $registry = new AiQueryRegistry();
+
+    FleetOpsAiQueryResources::register($registry);
+
+    expect($registry->find('drivers')->key)->toBe('fleet-ops.drivers')
+        ->and($registry->find('orders')->hasField('driver_assigned_uuid'))->toBeTrue()
+        ->and($registry->find('devices')->hasField('online'))->toBeTrue()
+        ->and($registry->find('service area')->key)->toBe('fleet-ops.service_areas');
+});
+
+test('operational query capability matches common fleet-ops data questions', function (string $prompt) {
+    $capability = fleetopsAiOperationalCapability();
+    $method     = fleetopsAiOperationalProtectedMethod('matchesPrompt');
+
+    expect($method->invoke($capability, strtolower($prompt)))->toBeTrue();
+})->with([
+    'How many drivers are currently online?',
+    'Where are most of my drivers located?',
+    'Which service area has the most online drivers?',
+    'Show me drivers without vehicles.',
+    'How many active orders have no assigned driver?',
+    'Break down orders by status for this month.',
+]);
+
+test('asset status capability includes driver online prompts', function () {
+    $capability = (new ReflectionClass(AssetStatusCapability::class))->newInstanceWithoutConstructor();
+    $method     = (new ReflectionClass(AssetStatusCapability::class))->getMethod('matchesPrompt');
+    $method->setAccessible(true);
+
+    expect($method->invoke($capability, 'how many drivers are online'))->toBeTrue();
+});

From 71e08fc1e5203d4bdd63874bcc8de85b4c3c313d Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Mon, 29 Jun 2026 17:46:48 +0800
Subject: [PATCH 02/19] v0.6.57

---
 .../map/drawer/device-event-listing.js        |   1 +
 addon/components/map/drawer/driver-listing.js |   1 +
 addon/components/map/drawer/place-listing.js  |   1 +
 .../components/map/drawer/vehicle-listing.js  |   1 +
 addon/components/table/cell/dropdown.hbs      |  28 ---
 addon/components/table/cell/dropdown.js       |  91 ---------
 .../table/cell/dropdown/action-item.hbs       |  31 ---
 .../table/cell/dropdown/action-item.js        |  62 ------
 addon/controllers/settings/map.js             |   4 +
 addon/extension.js                            |   1 +
 addon/services/map-adapter/google.js          |  72 +++++--
 addon/services/map-manager.js                 |  12 ++
 addon/styles/fleetops-engine.css              | 181 ++++++++++++++++++
 addon/utils/map-drawer-dropdown-position.js   |  28 ++-
 app/components/table/cell/dropdown.js         |   1 -
 .../table/cell/dropdown/action-item.js        |   1 -
 composer.json                                 |   2 +-
 extension.json                                |   2 +-
 package.json                                  |   2 +-
 tests/unit/controllers/settings/map-test.js   |   8 +
 .../unit/services/map-adapter/google-test.js  | 169 ++++++++++++++++
 tests/unit/services/map-manager-test.js       |  20 ++
 .../map-drawer-dropdown-position-test.js      |  16 +-
 23 files changed, 479 insertions(+), 256 deletions(-)
 delete mode 100644 addon/components/table/cell/dropdown.hbs
 delete mode 100644 addon/components/table/cell/dropdown.js
 delete mode 100644 addon/components/table/cell/dropdown/action-item.hbs
 delete mode 100644 addon/components/table/cell/dropdown/action-item.js
 delete mode 100644 app/components/table/cell/dropdown.js
 delete mode 100644 app/components/table/cell/dropdown/action-item.js
 create mode 100644 tests/unit/services/map-adapter/google-test.js

diff --git a/addon/components/map/drawer/device-event-listing.js b/addon/components/map/drawer/device-event-listing.js
index c79a0503..ca8ca662 100644
--- a/addon/components/map/drawer/device-event-listing.js
+++ b/addon/components/map/drawer/device-event-listing.js
@@ -116,6 +116,7 @@ export default class MapDrawerDeviceEventListingComponent extends Component {
                 ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.device-event') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
+                renderInPlace: false,
                 calculatePosition: calculateMapDrawerDropdownPosition,
                 width: '10%',
                 actions: [
diff --git a/addon/components/map/drawer/driver-listing.js b/addon/components/map/drawer/driver-listing.js
index cadeef79..42be9e22 100644
--- a/addon/components/map/drawer/driver-listing.js
+++ b/addon/components/map/drawer/driver-listing.js
@@ -72,6 +72,7 @@ export default class MapDrawerDriverListingComponent extends Component {
                 ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.driver') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
+                renderInPlace: false,
                 calculatePosition: calculateMapDrawerDropdownPosition,
                 width: '90px',
                 actions: [
diff --git a/addon/components/map/drawer/place-listing.js b/addon/components/map/drawer/place-listing.js
index 46aac64e..a9391c98 100644
--- a/addon/components/map/drawer/place-listing.js
+++ b/addon/components/map/drawer/place-listing.js
@@ -54,6 +54,7 @@ export default class MapDrawerPlaceListingComponent extends Component {
                 ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.place') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
+                renderInPlace: false,
                 calculatePosition: calculateMapDrawerDropdownPosition,
                 width: '90px',
                 actions: [
diff --git a/addon/components/map/drawer/vehicle-listing.js b/addon/components/map/drawer/vehicle-listing.js
index a7e07d60..e67f749d 100644
--- a/addon/components/map/drawer/vehicle-listing.js
+++ b/addon/components/map/drawer/vehicle-listing.js
@@ -66,6 +66,7 @@ export default class MapDrawerVehicleListingComponent extends Component {
                 ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.vehicle') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
+                renderInPlace: false,
                 calculatePosition: calculateMapDrawerDropdownPosition,
                 width: '90px',
                 actions: [
diff --git a/addon/components/table/cell/dropdown.hbs b/addon/components/table/cell/dropdown.hbs
deleted file mode 100644
index 6c9808f2..00000000
--- a/addon/components/table/cell/dropdown.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="cell-dropdown-button overflow-visible {{@column.wrapperClass}}" {{did-insert this.setupComponent}} ...attributes>
-    <DropdownButton
-        @icon={{@column.ddButtonIcon}}
-        @iconPrefix={{@column.ddButtonIconPrefix}}
-        @text={{this.buttonText}}
-        @size="xs"
-        @horizontalPosition="left"
-        @calculatePosition={{this.calculatePosition}}
-        @renderInPlace={{true}}
-        @onOpen={{this.onOpen}}
-        @onClose={{this.onClose}}
-        as |dd|
-    >
-        <div class="next-dd-menu next-dd-menu-table-dd mt-0i {{@column.ddMenuWrapperClass}}" role="menu" aria-orientation="vertical" aria-labelledby="user-menu">
-            {{#if @column.ddMenuLabel}}
-                <div class="next-dd-menu-label-container px-1">
-                    <div class="next-dd-menu-label {{@column.ddMenuLabelClass}}">
-                        {{@column.ddMenuLabel}}
-                    </div>
-                </div>
-                <div class="next-dd-menu-seperator"></div>
-            {{/if}}
-            {{#each @column.actions as |columnAction|}}
-                <Table::Cell::Dropdown::ActionItem @columnAction={{columnAction}} @row={{@row}} @column={{@column}} @dd={{dd}} />
-            {{/each}}
-        </div>
-    </DropdownButton>
-</div>
diff --git a/addon/components/table/cell/dropdown.js b/addon/components/table/cell/dropdown.js
deleted file mode 100644
index 241867d7..00000000
--- a/addon/components/table/cell/dropdown.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
-
-export default class TableCellDropdownComponent extends Component {
-    @tracked tableCellNode;
-    defaultButtonText = 'Actions';
-
-    @computed('args.column.ddButtonText', 'defaultButtonText') get buttonText() {
-        const { ddButtonText } = this.args.column;
-
-        if (ddButtonText === undefined) {
-            return this.defaultButtonText;
-        }
-
-        if (ddButtonText === false) {
-            return null;
-        }
-
-        return ddButtonText;
-    }
-
-    @action setupComponent(dropdownWrapperNode) {
-        const tableCellNode = this.getOwnerTableCell(dropdownWrapperNode);
-
-        if (tableCellNode) {
-            tableCellNode.style.overflow = 'visible';
-        }
-
-        this.tableCellNode = tableCellNode;
-    }
-
-    @action onOpen() {
-        if (!this.tableCellNode) {
-            return;
-        }
-
-        const currentZIndex = Number.parseInt(this.tableCellNode.style.zIndex, 10) || 0;
-        this.tableCellNode.style.zIndex = currentZIndex + 1;
-    }
-
-    @action onClose() {
-        if (!this.tableCellNode) {
-            return;
-        }
-
-        const currentZIndex = Number.parseInt(this.tableCellNode.style.zIndex, 10) || 1;
-        this.tableCellNode.style.zIndex = currentZIndex - 1;
-    }
-
-    @action getOwnerTableCell(dropdownWrapperNode) {
-        while (dropdownWrapperNode) {
-            dropdownWrapperNode = dropdownWrapperNode.parentNode;
-
-            if (dropdownWrapperNode?.tagName?.toLowerCase() === 'td') {
-                return dropdownWrapperNode;
-            }
-        }
-
-        return undefined;
-    }
-
-    @action onDropdownItemClick(columnAction, row, dd) {
-        if (typeof dd?.actions?.close === 'function') {
-            dd.actions.close();
-        }
-
-        if (typeof columnAction?.fn === 'function') {
-            columnAction.fn(row);
-        }
-    }
-
-    @action calculatePosition(trigger, content) {
-        if (typeof this.args.column?.calculatePosition === 'function') {
-            return this.args.column.calculatePosition(trigger, content);
-        }
-
-        const triggerRect = trigger.getBoundingClientRect();
-        const contentRect = content?.getBoundingClientRect?.();
-        const contentWidth = contentRect?.width || 224;
-
-        const style = {
-            position: 'fixed',
-            marginTop: '0px',
-            left: `${triggerRect.left - contentWidth - 3}px`,
-            top: `${triggerRect.top}px`,
-        };
-
-        return { style };
-    }
-}
diff --git a/addon/components/table/cell/dropdown/action-item.hbs b/addon/components/table/cell/dropdown/action-item.hbs
deleted file mode 100644
index b4840184..00000000
--- a/addon/components/table/cell/dropdown/action-item.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-{{#if this.visible}}
-    {{#if @columnAction.separator}}
-        <div class="next-dd-menu-seperator"></div>
-    {{else}}
-        <div role="group" class="px-1">
-            <a
-                href="javascript:;"
-                role="menuitem"
-                class="next-dd-item {{@columnAction.class}} {{if this.disabled 'disabled'}}"
-                disabled={{this.disabled}}
-                {{on "click" (fn this.onClick @columnAction @row @dd)}}
-            >
-                {{#if @columnAction.icon}}
-                    <div class="w-6">
-                        <FaIcon class={{@columnAction.iconClass}} @icon={{@columnAction.icon}} @prefix={{@columnAction.iconPrefix}} />
-                    </div>
-                {{/if}}
-                {{@columnAction.label}}
-                {{#if this.doesntHavePermissions}}
-                    <Attach::Tooltip @class="clean" @animation="scale" @placement={{or @columnAction.tooltipPlacement "right"}}>
-                        <InputInfo @text={{t "common.unauthorized"}} />
-                    </Attach::Tooltip>
-                {{else if @columnAction.helpText}}
-                    <Attach::Tooltip @class="clean" @animation="scale" @placement={{or @columnAction.tooltipPlacement "right"}}>
-                        <InputInfo @text={{@columnAction.helpText}} @exampleText={{@columnAction.exampleText}} />
-                    </Attach::Tooltip>
-                {{/if}}
-            </a>
-        </div>
-    {{/if}}
-{{/if}}
diff --git a/addon/components/table/cell/dropdown/action-item.js b/addon/components/table/cell/dropdown/action-item.js
deleted file mode 100644
index b43d6792..00000000
--- a/addon/components/table/cell/dropdown/action-item.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { isNone } from '@ember/utils';
-
-export default class TableCellDropdownActionItemComponent extends Component {
-    @service abilities;
-    @tracked permissionRequired;
-    @tracked doesntHavePermissions = false;
-    @tracked disabled = false;
-    @tracked visible = true;
-
-    constructor(owner, { columnAction = {}, row = {}, disabled = false, permission = null }) {
-        super(...arguments);
-        this.permissionRequired = columnAction.permission ?? permission;
-        this.disabled = this.disabledCheck(columnAction, this.permissionRequired, disabled);
-        this.visible = (columnAction.visible ?? true) && this.visibilityCheck(columnAction, row);
-    }
-
-    @action onClick(columnAction, row, dd) {
-        if (this.disabled) {
-            return;
-        }
-
-        if (typeof dd?.actions?.close === 'function') {
-            dd.actions.close();
-        }
-
-        if (typeof columnAction?.fn === 'function') {
-            columnAction.fn(row);
-        }
-    }
-
-    disabledCheck(columnAction, permission, defaultValue = false) {
-        let disabled = columnAction.disabled ?? defaultValue;
-        if (!disabled) {
-            disabled = permission && this.abilities.cannot(permission);
-            this.doesntHavePermissions = disabled;
-        }
-
-        return disabled;
-    }
-
-    visibilityCheck(columnAction, context) {
-        const isVisible = columnAction.isVisible;
-
-        if (isNone(context) || !isVisible) {
-            return true;
-        }
-
-        if (typeof isVisible === 'boolean') {
-            return isVisible;
-        }
-
-        if (typeof isVisible === 'function') {
-            return isVisible(context);
-        }
-
-        return true;
-    }
-}
diff --git a/addon/controllers/settings/map.js b/addon/controllers/settings/map.js
index ec950b61..2ac378e2 100644
--- a/addon/controllers/settings/map.js
+++ b/addon/controllers/settings/map.js
@@ -90,6 +90,10 @@ export default class SettingsMapController extends Controller {
                 this.mapManager.setActiveProvider(this.mapProvider);
             }
 
+            if (this.mapProvider === 'google' && typeof this.mapManager?.applyViewSettingsFromSettings === 'function') {
+                yield this.mapManager.applyViewSettingsFromSettings();
+            }
+
             this.notifications.success(this.intl.t('settings.map.settings-saved'));
         } catch (error) {
             this.notifications.serverError(error);
diff --git a/addon/extension.js b/addon/extension.js
index 1b5b01bd..aefaf225 100644
--- a/addon/extension.js
+++ b/addon/extension.js
@@ -116,6 +116,7 @@ export default {
 
         // Create registries
         this.createRegistries(registryService);
+        registryService.registerRenderableComponent('ai:action-preview:fleet-ops.create_order', new ExtensionComponent('@fleetbase/fleetops-engine', 'ai/create-order-preview'));
 
         // // Register console home guidance
         // this.registerHomeComponents(registryService);
diff --git a/addon/services/map-adapter/google.js b/addon/services/map-adapter/google.js
index a72a1a26..eb78c2a5 100644
--- a/addon/services/map-adapter/google.js
+++ b/addon/services/map-adapter/google.js
@@ -62,6 +62,16 @@ const DEFAULT_GOOGLE_MAP_STYLES = [
     },
 ];
 
+function buildGoogleMapStyles({ showTransitLayer = false, googleOptions = {} } = {}) {
+    const baseStyles = showTransitLayer ? DEFAULT_GOOGLE_MAP_STYLES.filter((style) => style.featureType !== 'transit') : DEFAULT_GOOGLE_MAP_STYLES;
+
+    if (googleOptions.styles === undefined) {
+        return baseStyles;
+    }
+
+    return [...baseStyles, ...googleOptions.styles];
+}
+
 function buildWaypointMarkerContent(label, color) {
     const wrapper = document.createElement('div');
     wrapper.className = 'fleetops-map-marker';
@@ -166,7 +176,10 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         const { AdvancedMarkerElement } = await googleMaps.maps.importLibrary('marker');
         this._advancedMarkerElementClass = AdvancedMarkerElement;
         const mergedGoogleOptions = options.googleOptions ?? {};
-        const mergedMapStyles = mergedGoogleOptions.styles === undefined ? DEFAULT_GOOGLE_MAP_STYLES : [...DEFAULT_GOOGLE_MAP_STYLES, ...mergedGoogleOptions.styles];
+        const mergedMapStyles = buildGoogleMapStyles({
+            showTransitLayer: options.showTransitLayer,
+            googleOptions: mergedGoogleOptions,
+        });
         const mapId = options.mapId ?? mergedGoogleOptions.mapId ?? this.#getConfig()?.googleMaps?.mapId ?? this.#getConfig()?.GOOGLE_MAPS_MAP_ID ?? null;
         this._supportsAdvancedMarkers = Boolean(mapId && mapId !== 'FLEETOPS_MAP');
 
@@ -182,7 +195,7 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
             styles: mergedMapStyles,
         });
 
-        this.#syncGoogleLayers(options);
+        await this.applyViewSettings(options);
         await this.#initDrawingManager();
 
         debug('[GoogleMapsAdapter] Map initialized');
@@ -252,6 +265,47 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         google.maps.event.trigger(this._map, 'resize');
     }
 
+    async applyViewSettings(options = {}) {
+        if (!this._map) return;
+
+        const googleMaps = window.google;
+        const { TrafficLayer, TransitLayer } = await googleMaps.maps.importLibrary('maps');
+        const mapTypeId = options.mapTypeId ?? googleMaps.maps.MapTypeId.ROADMAP;
+        const showTrafficLayer = Boolean(options.showTrafficLayer);
+        const showTransitLayer = Boolean(options.showTransitLayer);
+        const googleOptions = options.googleOptions ?? {};
+
+        this._map.setMapTypeId?.(mapTypeId);
+        this._map.setOptions?.({
+            styles: buildGoogleMapStyles({
+                showTransitLayer,
+                googleOptions,
+            }),
+        });
+
+        if (showTrafficLayer) {
+            if (!this._trafficLayer) {
+                this._trafficLayer = new TrafficLayer();
+            }
+            this._trafficLayer.setMap(this._map);
+        } else if (this._trafficLayer) {
+            this._trafficLayer.setMap(null);
+            this._trafficLayer = null;
+        }
+
+        if (showTransitLayer) {
+            if (!this._transitLayer) {
+                this._transitLayer = new TransitLayer();
+            }
+            this._transitLayer.setMap(this._map);
+        } else if (this._transitLayer) {
+            this._transitLayer.setMap(null);
+            this._transitLayer = null;
+        }
+
+        debug(`[GoogleMapsAdapter] Applied view settings: mapTypeId=${mapTypeId}, traffic=${showTrafficLayer}, transit=${showTransitLayer}`);
+    }
+
     // ─── Viewport ──────────────────────────────────────────────────────────────
 
     setCenter(lat, lng, zoom) {
@@ -1195,20 +1249,6 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         }
     }
 
-    #syncGoogleLayers(options = {}) {
-        if (!this._map) return;
-
-        if (options.showTrafficLayer) {
-            this._trafficLayer = new google.maps.TrafficLayer();
-            this._trafficLayer.setMap(this._map);
-        }
-
-        if (options.showTransitLayer) {
-            this._transitLayer = new google.maps.TransitLayer();
-            this._transitLayer.setMap(this._map);
-        }
-    }
-
     #ensureDrawToolbar() {
         if (this._drawControlEl || !this._map) return;
 
diff --git a/addon/services/map-manager.js b/addon/services/map-manager.js
index 043a9eee..51ab2328 100644
--- a/addon/services/map-manager.js
+++ b/addon/services/map-manager.js
@@ -170,6 +170,18 @@ export default class MapManagerService extends Service {
         this.adapter?.invalidateSize();
     }
 
+    @action applyViewSettingsFromSettings() {
+        if (this.providerName !== 'google' || typeof this.adapter?.applyViewSettings !== 'function') {
+            return;
+        }
+
+        return this.adapter.applyViewSettings({
+            mapTypeId: this.mapSettings.googleMapsMapType,
+            showTrafficLayer: this.mapSettings.showGoogleMapsTrafficLayer,
+            showTransitLayer: this.mapSettings.showGoogleMapsTransitLayer,
+        });
+    }
+
     /**
      * Set the live map component reference.
      *
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index 47d068ee..e06d61cc 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -8049,3 +8049,184 @@ body[data-theme='dark'] .issue-timeline-card time,
 body[data-theme='dark'] .issue-timeline-card p {
     color: #d1d5db;
 }
+
+.fleetbase-ai-create-order-preview {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding: 8px;
+}
+
+.fleetbase-ai-create-order-preview__header {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__map {
+    overflow: hidden;
+    border: 1px solid rgb(148 163 184 / 20%);
+    border-radius: 7px;
+    background: rgb(15 23 42 / 5%);
+}
+
+.fleetbase-ai-create-order-preview__leaflet,
+.fleetbase-ai-create-order-preview__empty-map {
+    width: 100%;
+    height: 118px;
+}
+
+.fleetbase-ai-create-order-preview__empty-map {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    color: #64748b;
+    font-size: 12px;
+}
+
+.fleetbase-ai-create-order-preview__route-list {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 5px;
+}
+
+.fleetbase-ai-create-order-preview__stop {
+    display: flex;
+    min-width: 0;
+    align-items: flex-start;
+    gap: 6px;
+    border: 1px solid rgb(148 163 184 / 18%);
+    border-radius: 6px;
+    background: rgb(255 255 255 / 24%);
+    padding: 5px 6px;
+}
+
+.fleetbase-ai-create-order-preview__stop > span {
+    display: inline-flex;
+    width: 18px;
+    height: 18px;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    border-radius: 999px;
+    background: #2563eb;
+    color: #fff;
+    font-size: 10px;
+    font-weight: 700;
+}
+
+.fleetbase-ai-create-order-preview__stop strong,
+.fleetbase-ai-create-order-preview__stop small {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__stop strong {
+    color: #0f172a;
+    font-size: 12px;
+    line-height: 1.2;
+}
+
+.fleetbase-ai-create-order-preview__stop small {
+    color: #64748b;
+    font-size: 11px;
+    line-height: 1.25;
+}
+
+.fleetbase-ai-create-order-preview__grid {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 6px 8px;
+}
+
+.fleetbase-ai-create-order-preview__field {
+    margin: 0;
+}
+
+.fleetbase-ai-create-order-preview__field label,
+.fleetbase-ai-create-order-preview__field .input-label {
+    margin-bottom: 2px;
+    color: #64748b;
+    font-size: 11px;
+    line-height: 1.2;
+}
+
+.fleetbase-ai-create-order-preview__field .form-input,
+.fleetbase-ai-create-order-preview__field .form-select,
+.fleetbase-ai-create-order-preview__field .ember-power-select-trigger {
+    min-height: 28px;
+    font-size: 12px;
+}
+
+.fleetbase-ai-create-order-preview__field--inline {
+    display: flex;
+    min-height: 28px;
+    align-items: center;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__select-label {
+    overflow: hidden;
+    color: #0f172a;
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 1.25;
+    text-overflow: ellipsis;
+    text-transform: uppercase;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__controls {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__refreshing {
+    color: #64748b;
+    font-size: 11px;
+}
+
+.fleetbase-ai-create-order-preview__cancelled {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    border: 1px solid rgb(239 68 68 / 20%);
+    border-radius: 7px;
+    background: rgb(239 68 68 / 10%);
+    padding: 8px 9px;
+    color: #991b1b;
+    font-size: 12px;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__map,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__stop {
+    border-color: rgb(148 163 184 / 20%);
+    background: rgb(15 23 42 / 30%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__stop strong {
+    color: #f8fafc;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__select-label {
+    color: #f8fafc;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__stop small,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field label,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field .input-label,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__refreshing,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__empty-map {
+    color: #cbd5e1;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__cancelled {
+    border-color: rgb(248 113 113 / 22%);
+    background: rgb(127 29 29 / 22%);
+    color: #fecaca;
+}
diff --git a/addon/utils/map-drawer-dropdown-position.js b/addon/utils/map-drawer-dropdown-position.js
index 6750f4c7..ec892695 100644
--- a/addon/utils/map-drawer-dropdown-position.js
+++ b/addon/utils/map-drawer-dropdown-position.js
@@ -1,17 +1,15 @@
 export default function calculateMapDrawerDropdownPosition(trigger, content) {
-    const dropdownRoot = trigger?.closest?.('.ember-basic-dropdown');
     const drawerPanel = trigger?.closest?.('.next-drawer-panel');
 
-    if (!trigger || !dropdownRoot) {
+    if (!trigger) {
         return { style: {} };
     }
 
     const triggerRect = trigger.getBoundingClientRect();
-    const rootRect = dropdownRoot.getBoundingClientRect();
     const drawerRect = drawerPanel?.getBoundingClientRect?.();
     const contentRect = content?.getBoundingClientRect?.();
     const contentWidth = contentRect?.width || 224;
-    // const contentHeight = contentRect?.height || 240;
+    const contentHeight = contentRect?.height || 240;
     const gap = 6;
 
     const viewportRect = {
@@ -21,23 +19,23 @@ export default function calculateMapDrawerDropdownPosition(trigger, content) {
         left: 0,
     };
     const boundaryRect = drawerRect ?? viewportRect;
-    const minLeft = boundaryRect.left - rootRect.left + gap;
-    const maxLeft = boundaryRect.right - rootRect.left - contentWidth - gap;
-    // const minTop = boundaryRect.top - rootRect.top + gap;
-    // const maxTop = boundaryRect.bottom - rootRect.top - contentHeight - gap;
+    const minLeft = boundaryRect.left + gap;
+    const maxLeft = boundaryRect.right - contentWidth - gap;
+    const minTop = boundaryRect.top + gap;
+    const maxTop = boundaryRect.bottom - contentHeight - gap;
 
-    const preferredLeft = triggerRect.left - rootRect.left - contentWidth - gap;
-    // const preferredTop = triggerRect.top - rootRect.top;
+    const preferredLeft = triggerRect.left - contentWidth - gap;
+    const preferredTop = triggerRect.top;
     const left = clamp(preferredLeft, minLeft, Math.max(minLeft, maxLeft));
-    const top = 0; //clamp(preferredTop, minTop, Math.max(minTop, maxTop));
+    const top = clamp(preferredTop, minTop, Math.max(minTop, maxTop));
 
     return {
         style: {
-            position: 'absolute',
-            left: `${left}px`,
-            top: `${top}px`,
+            position: 'fixed',
+            left,
+            top,
             marginTop: '0px',
-            zIndex: '10000',
+            zIndex: 10000,
         },
     };
 }
diff --git a/app/components/table/cell/dropdown.js b/app/components/table/cell/dropdown.js
deleted file mode 100644
index 30911cf8..00000000
--- a/app/components/table/cell/dropdown.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/table/cell/dropdown';
diff --git a/app/components/table/cell/dropdown/action-item.js b/app/components/table/cell/dropdown/action-item.js
deleted file mode 100644
index 5213cee5..00000000
--- a/app/components/table/cell/dropdown/action-item.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/table/cell/dropdown/action-item';
diff --git a/composer.json b/composer.json
index 31339493..c63b5168 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.56",
+    "version": "0.6.57",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
diff --git a/extension.json b/extension.json
index 851ba124..db713b0a 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.56",
+    "version": "0.6.57",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
index 6b49fb65..33f31835 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.56",
+    "version": "0.6.57",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
diff --git a/tests/unit/controllers/settings/map-test.js b/tests/unit/controllers/settings/map-test.js
index 6c01dba1..82674d89 100644
--- a/tests/unit/controllers/settings/map-test.js
+++ b/tests/unit/controllers/settings/map-test.js
@@ -27,7 +27,13 @@ module('Unit | Controller | settings/map', function (hooks) {
         }
 
         class MapManagerStubService extends Service {
+            appliedViewSettings = false;
+
             setActiveProvider() {}
+
+            applyViewSettingsFromSettings() {
+                this.appliedViewSettings = true;
+            }
         }
 
         class MapSettingsStubService extends Service {
@@ -66,6 +72,7 @@ module('Unit | Controller | settings/map', function (hooks) {
 
         const fetch = this.owner.lookup('service:fetch');
         const mapSettings = this.owner.lookup('service:map-settings');
+        const mapManager = this.owner.lookup('service:map-manager');
 
         assert.strictEqual(fetch.lastPost.url, 'fleet-ops/settings/map');
         assert.deepEqual(fetch.lastPost.payload, {
@@ -77,5 +84,6 @@ module('Unit | Controller | settings/map', function (hooks) {
             },
         });
         assert.deepEqual(mapSettings.appliedSettings, fetch.lastPost.payload.settings);
+        assert.true(mapManager.appliedViewSettings, 'google map view settings are applied after save');
     });
 });
diff --git a/tests/unit/services/map-adapter/google-test.js b/tests/unit/services/map-adapter/google-test.js
new file mode 100644
index 00000000..04cb5aae
--- /dev/null
+++ b/tests/unit/services/map-adapter/google-test.js
@@ -0,0 +1,169 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+function installGoogleMapsStub(context) {
+    class StubMap {
+        constructor(_element, options = {}) {
+            this.options = options;
+            this.mapTypeIds = [options.mapTypeId];
+            this.setOptionsCalls = [];
+            context.map = this;
+        }
+
+        setMapTypeId(mapTypeId) {
+            this.mapTypeIds.push(mapTypeId);
+        }
+
+        setOptions(options = {}) {
+            this.setOptionsCalls.push(options);
+            this.options = {
+                ...this.options,
+                ...options,
+            };
+        }
+    }
+
+    class StubTrafficLayer {
+        constructor() {
+            this.setMapCalls = [];
+            context.trafficLayers.push(this);
+        }
+
+        setMap(map) {
+            this.setMapCalls.push(map);
+        }
+    }
+
+    class StubTransitLayer {
+        constructor() {
+            this.setMapCalls = [];
+            context.transitLayers.push(this);
+        }
+
+        setMap(map) {
+            this.setMapCalls.push(map);
+        }
+    }
+
+    class StubDrawingManager {
+        addListener() {}
+        setMap() {}
+    }
+
+    const googleStub = {
+        maps: {
+            MapTypeId: {
+                ROADMAP: 'roadmap',
+            },
+            drawing: {
+                OverlayType: {
+                    POLYGON: 'polygon',
+                    CIRCLE: 'circle',
+                    RECTANGLE: 'rectangle',
+                    POLYLINE: 'polyline',
+                    MARKER: 'marker',
+                },
+            },
+            event: {
+                trigger() {},
+            },
+            importLibrary(name) {
+                if (name === 'maps') {
+                    return Promise.resolve({
+                        Map: StubMap,
+                        TrafficLayer: StubTrafficLayer,
+                        TransitLayer: StubTransitLayer,
+                    });
+                }
+
+                if (name === 'marker') {
+                    return Promise.resolve({
+                        AdvancedMarkerElement: class AdvancedMarkerElement {},
+                    });
+                }
+
+                if (name === 'drawing') {
+                    return Promise.resolve({
+                        DrawingManager: StubDrawingManager,
+                    });
+                }
+
+                return Promise.resolve({});
+            },
+        },
+    };
+
+    window.google = googleStub;
+    globalThis.google = googleStub;
+}
+
+module('Unit | Service | map-adapter/google', function (hooks) {
+    setupTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.originalGoogle = window.google;
+        this.originalGlobalGoogle = globalThis.google;
+        this.map = null;
+        this.trafficLayers = [];
+        this.transitLayers = [];
+        installGoogleMapsStub(this);
+    });
+
+    hooks.afterEach(function () {
+        const service = this.owner.lookup('service:map-adapter/google');
+        service.destroyMap();
+        window.google = this.originalGoogle;
+        globalThis.google = this.originalGlobalGoogle;
+    });
+
+    test('it applies google traffic and transit layers during initialization', async function (assert) {
+        const service = this.owner.lookup('service:map-adapter/google');
+
+        await service.initializeMap(document.createElement('div'), {
+            mapTypeId: 'satellite',
+            showTrafficLayer: true,
+            showTransitLayer: true,
+        });
+
+        assert.strictEqual(this.map.mapTypeIds[this.map.mapTypeIds.length - 1], 'satellite');
+        assert.strictEqual(this.trafficLayers.length, 1);
+        assert.deepEqual(this.trafficLayers[0].setMapCalls, [this.map]);
+        assert.strictEqual(this.transitLayers.length, 1);
+        assert.deepEqual(this.transitLayers[0].setMapCalls, [this.map]);
+    });
+
+    test('it removes google traffic and transit layers when view settings are disabled', async function (assert) {
+        const service = this.owner.lookup('service:map-adapter/google');
+
+        await service.initializeMap(document.createElement('div'), {
+            mapTypeId: 'roadmap',
+            showTrafficLayer: true,
+            showTransitLayer: true,
+        });
+
+        const trafficLayer = this.trafficLayers[0];
+        const transitLayer = this.transitLayers[0];
+
+        await service.applyViewSettings({
+            mapTypeId: 'terrain',
+            showTrafficLayer: false,
+            showTransitLayer: false,
+        });
+
+        assert.strictEqual(this.map.mapTypeIds[this.map.mapTypeIds.length - 1], 'terrain');
+        assert.deepEqual(trafficLayer.setMapCalls, [this.map, null]);
+        assert.deepEqual(transitLayer.setMapCalls, [this.map, null]);
+    });
+
+    test('it does not include the hidden transit style when transit layer is enabled', async function (assert) {
+        const service = this.owner.lookup('service:map-adapter/google');
+
+        await service.initializeMap(document.createElement('div'), {
+            showTransitLayer: true,
+        });
+
+        const transitStyle = this.map.options.styles.find((style) => style.featureType === 'transit');
+
+        assert.strictEqual(transitStyle, undefined);
+    });
+});
diff --git a/tests/unit/services/map-manager-test.js b/tests/unit/services/map-manager-test.js
index e8cee045..c4a1f9ee 100644
--- a/tests/unit/services/map-manager-test.js
+++ b/tests/unit/services/map-manager-test.js
@@ -48,11 +48,17 @@ module('Unit | Service | map-manager', function (hooks) {
         class GoogleAdapterStubService extends Service {
             lastDrawControlConfig = null;
             lastRoute = null;
+            lastViewSettings = null;
 
             initializeMap(_element, options = {}) {
                 return { provider: 'google', options };
             }
 
+            applyViewSettings(options = {}) {
+                this.lastViewSettings = options;
+                return options;
+            }
+
             destroyMap() {}
 
             addRoutingControl(route, options = {}) {
@@ -119,6 +125,20 @@ module('Unit | Service | map-manager', function (hooks) {
         assert.true(map.options.showTransitLayer);
     });
 
+    test('it applies google view settings to an active adapter', function (assert) {
+        const service = this.owner.lookup('service:map-manager');
+        service.setActiveProvider('google');
+
+        const result = service.applyViewSettingsFromSettings();
+
+        assert.deepEqual(result, {
+            mapTypeId: 'satellite',
+            showTrafficLayer: true,
+            showTransitLayer: true,
+        });
+        assert.deepEqual(service.adapter.lastViewSettings, result);
+    });
+
     test('it delegates draw control config to the active adapter', function (assert) {
         const service = this.owner.lookup('service:map-manager');
         service.setActiveProvider('google');
diff --git a/tests/unit/utils/map-drawer-dropdown-position-test.js b/tests/unit/utils/map-drawer-dropdown-position-test.js
index 37610ba6..9a7c6f9c 100644
--- a/tests/unit/utils/map-drawer-dropdown-position-test.js
+++ b/tests/unit/utils/map-drawer-dropdown-position-test.js
@@ -5,24 +5,24 @@ module('Unit | Utility | map-drawer-dropdown-position', function () {
     test('positions the dropdown to the left of the trigger', function (assert) {
         const result = calculateMapDrawerDropdownPosition(mockTrigger({ left: 500, top: 300, right: 532, bottom: 332 }), mockContent({ width: 220, height: 160 }));
 
-        assert.strictEqual(result.style.left, '274px', 'left edge is trigger left minus menu width and gap');
-        assert.strictEqual(result.style.top, '300px', 'top aligns to trigger top');
-        assert.strictEqual(result.style.zIndex, '10000', 'z-index is returned as a string for the style modifier');
-        assert.strictEqual(typeof result.style.zIndex, 'string', 'z-index value type is compatible with the style modifier');
+        assert.strictEqual(result.style.position, 'fixed', 'dropdown content is positioned in the viewport');
+        assert.strictEqual(result.style.left, 274, 'left edge is trigger left minus menu width and gap');
+        assert.strictEqual(result.style.top, 300, 'top aligns to trigger top');
+        assert.strictEqual(result.style.zIndex, 10000, 'z-index keeps the menu above the drawer');
     });
 
     test('clamps inside the drawer when there is not enough room on the left', function (assert) {
         const result = calculateMapDrawerDropdownPosition(mockTrigger({ left: 80, top: 300, right: 112, bottom: 332 }), mockContent({ width: 220, height: 160 }));
 
-        assert.strictEqual(result.style.left, '6px', 'left edge is clamped to the drawer boundary');
-        assert.strictEqual(result.style.top, '300px', 'top still aligns to trigger top');
+        assert.strictEqual(result.style.left, 6, 'left edge is clamped to the drawer boundary');
+        assert.strictEqual(result.style.top, 300, 'top still aligns to trigger top');
     });
 
     test('clamps vertically without flipping above the trigger', function (assert) {
         const result = calculateMapDrawerDropdownPosition(mockTrigger({ left: 500, top: 560, right: 532, bottom: 592 }), mockContent({ width: 220, height: 160 }));
 
-        assert.strictEqual(result.style.left, '274px', 'left edge remains to the left of the trigger');
-        assert.strictEqual(result.style.top, '434px', 'top is clamped inside the drawer instead of flipped above the trigger');
+        assert.strictEqual(result.style.left, 274, 'left edge remains to the left of the trigger');
+        assert.strictEqual(result.style.top, 434, 'top is clamped inside the drawer instead of flipped above the trigger');
     });
 });
 

From 1eea839274d4a582b46afb1c4b7c228bc776d959 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 14:18:12 +0800
Subject: [PATCH 03/19] Polish Fleet-Ops AI order preview

---
 addon/components/ai/create-order-preview.hbs | 355 ++++++++++-------
 addon/components/ai/create-order-preview.js  | 120 ++++--
 addon/components/ai/route-preview-map.hbs    |  72 ++++
 addon/components/ai/route-preview-map.js     | 397 +++++++++++++++++++
 addon/styles/fleetops-engine.css             | 284 +++++++++++++
 app/components/ai/route-preview-map.js       |   1 +
 6 files changed, 1054 insertions(+), 175 deletions(-)
 create mode 100644 addon/components/ai/route-preview-map.hbs
 create mode 100644 addon/components/ai/route-preview-map.js
 create mode 100644 app/components/ai/route-preview-map.js

diff --git a/addon/components/ai/create-order-preview.hbs b/addon/components/ai/create-order-preview.hbs
index 4a984c9d..dd066eec 100644
--- a/addon/components/ai/create-order-preview.hbs
+++ b/addon/components/ai/create-order-preview.hbs
@@ -13,163 +13,226 @@
             <span>{{this.cancelledMessage}}</span>
         </div>
     {{else}}
-        <div class="fleetbase-ai-create-order-preview__map">
-            {{#if this.canShowMap}}
-                <LeafletMap
-                    class="fleetbase-ai-create-order-preview__leaflet"
-                    @lat={{this.mapCenter.latitude}}
-                    @lng={{this.mapCenter.longitude}}
-                    @zoom={{12}}
-                    @zoomControl={{false}}
-                    as |layers|
-                >
-                    <layers.tile @url="https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png" />
-                    <layers.polyline @locations={{this.routeLineCoordinates}} @color="#3b82f6" @weight={{4}} @opacity={{0.82}} />
-                    {{#each this.coordinates as |stop index|}}
-                        <layers.marker @location={{stop.coordinates}} @title={{stop.address}} as |marker|>
-                            <marker.tooltip @permanent={{false}} @sticky={{true}}>{{add index 1}}. {{stop.label}}</marker.tooltip>
-                        </layers.marker>
-                    {{/each}}
-                </LeafletMap>
-            {{else}}
-                <div class="fleetbase-ai-create-order-preview__empty-map">
-                    <FaIcon @icon="route" />
-                    <span>Select pickup and dropoff with coordinates to preview the route.</span>
-                </div>
-            {{/if}}
-        </div>
-        <div class="fleetbase-ai-create-order-preview__route-list">
-            {{#each this.routeStops as |stop index|}}
-                <div class="fleetbase-ai-create-order-preview__stop">
-                    <span>{{add index 1}}</span>
-                    <div>
-                        <strong>{{stop.label}}</strong>
-                        <small>{{or stop.address "No address resolved"}}</small>
-                    </div>
-                </div>
-            {{/each}}
-        </div>
-
-    <div class="fleetbase-ai-create-order-preview__grid">
-        <InputGroup @name="Order type" @wrapperClass="fleetbase-ai-create-order-preview__field">
-            <ModelSelect
-                @modelName="order-config"
-                @selectedModel={{this.draft.order_config_uuid}}
-                @placeholder="Select order type"
-                @triggerClass="form-select form-input form-input-sm"
-                @infiniteScroll={{false}}
-                @renderInPlace={{true}}
-                @onChange={{this.setOrderConfig}}
-                as |model|
-            >
-                {{or model.name model.key}}
-            </ModelSelect>
-        </InputGroup>
+        <Ai::RoutePreviewMap @payload={{this.payload}} @orderId={{this.orderPreviewId}} @status="created" />
 
-        <InputGroup @name="Pickup" @wrapperClass="fleetbase-ai-create-order-preview__field">
-            <ModelSelect
-                @modelName="place"
-                @selectedModel={{this.payload.pickup}}
-                @placeholder="Pickup address"
-                @triggerClass="form-select form-input form-input-sm"
-                @customSearchEndpoint="places/search"
-                @query={{hash geo=true}}
-                @infiniteScroll={{false}}
-                @renderInPlace={{true}}
-                @onChange={{fn this.setPayloadPlace "pickup"}}
-                as |place|
-            >
-                <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
-            </ModelSelect>
-        </InputGroup>
-
-        <InputGroup @name="Dropoff" @wrapperClass="fleetbase-ai-create-order-preview__field">
-            <ModelSelect
-                @modelName="place"
-                @selectedModel={{this.payload.dropoff}}
-                @placeholder="Dropoff address"
-                @triggerClass="form-select form-input form-input-sm"
-                @customSearchEndpoint="places/search"
-                @query={{hash geo=true}}
-                @infiniteScroll={{false}}
-                @renderInPlace={{true}}
-                @onChange={{fn this.setPayloadPlace "dropoff"}}
-                as |place|
-            >
-                <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
-            </ModelSelect>
-        </InputGroup>
+        <div class="fleetbase-ai-create-order-preview__fields">
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Order type</span>
+                    {{#if this.isEditingOrderType}}
+                        <ModelSelect
+                            @modelName="order-config"
+                            @selectedModel={{this.draft.order_config_uuid}}
+                            @placeholder="Select order type"
+                            @triggerClass="fleetbase-ai-create-order-preview__inline-select"
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{this.setOrderConfig}}
+                            as |model|
+                        >
+                            {{or model.name model.key}}
+                        </ModelSelect>
+                    {{else}}
+                        <strong>{{this.orderTypeLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingOrderType "xmark" "pen"}}
+                    @helpText={{if this.isEditingOrderType "Close editor" "Edit order type"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingOrderType this.closeEditor (fn this.editField "orderType")}}
+                />
+            </div>
 
-        <InputGroup @name="Driver" @wrapperClass="fleetbase-ai-create-order-preview__field">
-            <ModelSelect
-                @modelName="driver"
-                @placeholder="Assign driver"
-                @triggerClass="form-select form-input form-input-sm"
-                @allowClear={{true}}
-                @infiniteScroll={{false}}
-                @renderInPlace={{true}}
-                @onChange={{this.setDriver}}
-                as |driver|
-            >
-                {{driver.name}}
-            </ModelSelect>
-        </InputGroup>
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Pickup</span>
+                    {{#if this.isEditingPickup}}
+                        <ModelSelect
+                            @modelName="place"
+                            @selectedModel={{this.payload.pickup}}
+                            @placeholder="Pickup address"
+                            @triggerClass="fleetbase-ai-create-order-preview__inline-select"
+                            @customSearchEndpoint="places/search"
+                            @query={{hash geo=true}}
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{fn this.setPayloadPlace "pickup"}}
+                            as |place|
+                        >
+                            <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
+                        </ModelSelect>
+                    {{else}}
+                        <strong>{{this.pickupLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingPickup "xmark" "pen"}}
+                    @helpText={{if this.isEditingPickup "Close editor" "Edit pickup"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingPickup this.closeEditor (fn this.editField "pickup")}}
+                />
+            </div>
 
-        <InputGroup @name="Vehicle" @wrapperClass="fleetbase-ai-create-order-preview__field">
-            <ModelSelect
-                @modelName="vehicle"
-                @placeholder="Assign vehicle"
-                @triggerClass="form-select form-input form-input-sm"
-                @allowClear={{true}}
-                @infiniteScroll={{false}}
-                @renderInPlace={{true}}
-                @onChange={{this.setVehicle}}
-                as |vehicle|
-            >
-                {{or vehicle.display_name vehicle.name vehicle.plate_number}}
-            </ModelSelect>
-        </InputGroup>
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Dropoff</span>
+                    {{#if this.isEditingDropoff}}
+                        <ModelSelect
+                            @modelName="place"
+                            @selectedModel={{this.payload.dropoff}}
+                            @placeholder="Dropoff address"
+                            @triggerClass="fleetbase-ai-create-order-preview__inline-select"
+                            @customSearchEndpoint="places/search"
+                            @query={{hash geo=true}}
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{fn this.setPayloadPlace "dropoff"}}
+                            as |place|
+                        >
+                            <div class="fleetbase-ai-create-order-preview__select-label">{{this.addressLabel place}}</div>
+                        </ModelSelect>
+                    {{else}}
+                        <strong>{{this.dropoffLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingDropoff "xmark" "pen"}}
+                    @helpText={{if this.isEditingDropoff "Close editor" "Edit dropoff"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingDropoff this.closeEditor (fn this.editField "dropoff")}}
+                />
+            </div>
 
-        <InputGroup @name="Proof" @wrapperClass="fleetbase-ai-create-order-preview__field fleetbase-ai-create-order-preview__field--inline">
-            <Toggle @isToggled={{this.draft.pod_required}} @onToggle={{this.setPodRequired}} @label="Require POD" />
-            {{#if this.draft.pod_required}}
-                <Select
-                    @options={{this.podMethods}}
-                    @value={{this.draft.pod_method}}
-                    @onSelect={{this.setPodMethod}}
-                    @placeholder="POD method"
-                    class="form-input-sm"
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Driver</span>
+                    {{#if this.isEditingDriver}}
+                        <ModelSelect
+                            @modelName="driver"
+                            @placeholder="Assign driver"
+                            @triggerClass="fleetbase-ai-create-order-preview__inline-select"
+                            @allowClear={{true}}
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{this.setDriver}}
+                            as |driver|
+                        >
+                            {{driver.name}}
+                        </ModelSelect>
+                    {{else}}
+                        <strong>{{this.driverLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingDriver "xmark" "pen"}}
+                    @helpText={{if this.isEditingDriver "Close editor" "Edit driver"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingDriver this.closeEditor (fn this.editField "driver")}}
                 />
-            {{/if}}
-        </InputGroup>
+            </div>
 
-        <InputGroup @name="Dispatch" @wrapperClass="fleetbase-ai-create-order-preview__field fleetbase-ai-create-order-preview__field--inline">
-            <Toggle @isToggled={{this.draft.dispatched}} @onToggle={{this.setDispatched}} @label="Dispatch after create" />
-        </InputGroup>
-    </div>
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Vehicle</span>
+                    {{#if this.isEditingVehicle}}
+                        <ModelSelect
+                            @modelName="vehicle"
+                            @placeholder="Assign vehicle"
+                            @triggerClass="fleetbase-ai-create-order-preview__inline-select"
+                            @allowClear={{true}}
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{this.setVehicle}}
+                            as |vehicle|
+                        >
+                            {{or vehicle.display_name vehicle.name vehicle.plate_number}}
+                        </ModelSelect>
+                    {{else}}
+                        <strong>{{this.vehicleLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingVehicle "xmark" "pen"}}
+                    @helpText={{if this.isEditingVehicle "Close editor" "Edit vehicle"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingVehicle this.closeEditor (fn this.editField "vehicle")}}
+                />
+            </div>
 
-    <InputGroup @name="Notes" @wrapperClass="fleetbase-ai-create-order-preview__field">
-        <Textarea @value={{this.draft.notes}} class="form-input form-input-sm w-full" rows={{2}} placeholder="Add order notes" {{on "change" this.setNotes}} />
-    </InputGroup>
+            <div class="fleetbase-ai-create-order-preview__field-row fleetbase-ai-create-order-preview__field-row--notes">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Notes</span>
+                    {{#if this.isEditingNotes}}
+                        <Textarea
+                            @value={{this.draft.notes}}
+                            class="fleetbase-ai-create-order-preview__inline-textarea"
+                            rows={{2}}
+                            placeholder="Add order notes"
+                            {{on "input" this.setNotes}}
+                        />
+                    {{else}}
+                        <strong>{{this.notesLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingNotes "check" "pen"}}
+                    @helpText={{if this.isEditingNotes "Done" "Edit notes"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingNotes this.closeEditor (fn this.editField "notes")}}
+                />
+            </div>
+        </div>
 
-    {{#if this.hasMissingFields}}
-        <div class="fleetbase-ai-action-list">
-            <div class="fleetbase-ai-action-list-title">Required before apply</div>
-            <ul>
-                {{#each this.missingFields as |field|}}
-                    <li>{{field}}</li>
-                {{/each}}
-            </ul>
+        <div class="fleetbase-ai-create-order-preview__toggles">
+            <div class="fleetbase-ai-create-order-preview__toggle-row">
+                <Toggle @isToggled={{this.draft.pod_required}} @onToggle={{this.setPodRequired}} @label="Require POD" />
+                {{#if this.draft.pod_required}}
+                    {{#if this.isEditingPodMethod}}
+                        <Select
+                            @options={{this.podMethods}}
+                            @value={{this.draft.pod_method}}
+                            @onSelect={{this.setPodMethod}}
+                            @placeholder="POD method"
+                            class="fleetbase-ai-create-order-preview__inline-native-select"
+                        />
+                    {{else}}
+                        <button type="button" class="fleetbase-ai-create-order-preview__inline-pill" {{on "click" (fn this.editField "podMethod")}}>
+                            {{this.podMethodLabel}}
+                            <FaIcon @icon="pen" />
+                        </button>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="fleetbase-ai-create-order-preview__toggle-row">
+                <Toggle @isToggled={{this.draft.dispatched}} @onToggle={{this.setDispatched}} @label="Dispatch after create" />
+            </div>
         </div>
-    {{/if}}
 
-    {{#if this.preview.result}}
-        <div class="fleetbase-ai-action-result">{{this.preview.result.message}}</div>
-    {{/if}}
+        {{#if this.hasMissingFields}}
+            <div class="fleetbase-ai-action-list">
+                <div class="fleetbase-ai-action-list-title">Required before apply</div>
+                <ul>
+                    {{#each this.missingFields as |field|}}
+                        <li>{{field}}</li>
+                    {{/each}}
+                </ul>
+            </div>
+        {{/if}}
 
-    {{#if this.preview.error}}
-        <div class="fleetbase-ai-action-error">{{this.preview.error.message}}</div>
-    {{/if}}
+        {{#if this.preview.result}}
+            <div class="fleetbase-ai-action-result">{{this.preview.result.message}}</div>
+        {{/if}}
+
+        {{#if this.preview.error}}
+            <div class="fleetbase-ai-action-error">{{this.preview.error.message}}</div>
+        {{/if}}
 
         <div class="fleetbase-ai-create-order-preview__controls">
             <Button
diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
index 58596631..11a534c6 100644
--- a/addon/components/ai/create-order-preview.js
+++ b/addon/components/ai/create-order-preview.js
@@ -6,6 +6,7 @@ import { task, timeout } from 'ember-concurrency';
 export default class AiCreateOrderPreviewComponent extends Component {
     @tracked draft = this.clone(this.args.preview?.draft ?? {});
     @tracked preview = this.args.preview;
+    @tracked editingField = null;
 
     get payload() {
         return this.draft.payload ?? {};
@@ -15,35 +16,6 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return this.preview?.route_preview?.stops ?? [];
     }
 
-    get coordinates() {
-        return this.routeStops.filter(
-            (stop) =>
-                stop.latitude !== null &&
-                stop.latitude !== undefined &&
-                stop.longitude !== null &&
-                stop.longitude !== undefined &&
-                Number.isFinite(Number(stop.latitude)) &&
-                Number.isFinite(Number(stop.longitude))
-        );
-    }
-
-    get mapCenter() {
-        const stop = this.coordinates[0];
-
-        return {
-            latitude: Number(stop?.latitude ?? 1.3521),
-            longitude: Number(stop?.longitude ?? 103.8198),
-        };
-    }
-
-    get canShowMap() {
-        return this.coordinates.length >= 2;
-    }
-
-    get routeLineCoordinates() {
-        return this.coordinates.map((stop) => stop.coordinates);
-    }
-
     get podMethods() {
         return this.preview?.options?.pod_methods ?? ['scan', 'signature', 'photo'];
     }
@@ -68,6 +40,66 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return this.missingFields.length > 0;
     }
 
+    get orderPreviewId() {
+        return this.args.task?.uuid ?? this.args.task?.id ?? this.preview?.key ?? 'ai-order-preview';
+    }
+
+    get orderTypeLabel() {
+        return this.titleize(this.draft.type ?? this.draft.order_config_name ?? this.draft.order_config_uuid) ?? 'Select order type';
+    }
+
+    get pickupLabel() {
+        return this.addressLabel(this.payload.pickup) ?? this.payload.pickup_query ?? 'Add pickup';
+    }
+
+    get dropoffLabel() {
+        return this.addressLabel(this.payload.dropoff) ?? this.payload.dropoff_query ?? 'Add dropoff';
+    }
+
+    get driverLabel() {
+        return this.draft.driver_query ?? this.draft.driver_name ?? 'Assign driver';
+    }
+
+    get vehicleLabel() {
+        return this.draft.vehicle_query ?? this.draft.vehicle_name ?? 'Assign vehicle';
+    }
+
+    get notesLabel() {
+        return this.draft.notes?.trim?.() || 'Add order notes';
+    }
+
+    get podMethodLabel() {
+        return this.titleize(this.draft.pod_method ?? 'scan');
+    }
+
+    get isEditingOrderType() {
+        return this.editingField === 'orderType';
+    }
+
+    get isEditingPickup() {
+        return this.editingField === 'pickup';
+    }
+
+    get isEditingDropoff() {
+        return this.editingField === 'dropoff';
+    }
+
+    get isEditingDriver() {
+        return this.editingField === 'driver';
+    }
+
+    get isEditingVehicle() {
+        return this.editingField === 'vehicle';
+    }
+
+    get isEditingPodMethod() {
+        return this.editingField === 'podMethod';
+    }
+
+    get isEditingNotes() {
+        return this.editingField === 'notes';
+    }
+
     get isApplyDisabled() {
         return !this.isReady || this.args.isApplying || this.refreshPreview.isRunning;
     }
@@ -126,6 +158,18 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return { ...model, ...fallback };
     }
 
+    titleize(value) {
+        if (!value) {
+            return null;
+        }
+
+        return String(value)
+            .replace(/[_-]+/g, ' ')
+            .replace(/\s+/g, ' ')
+            .trim()
+            .replace(/\b\w/g, (char) => char.toUpperCase());
+    }
+
     mergeDraft(updates = {}) {
         this.draft = {
             ...this.draft,
@@ -138,6 +182,18 @@ export default class AiCreateOrderPreviewComponent extends Component {
         this.refreshPreview.perform();
     }
 
+    @action editField(field) {
+        if (this.isCancelled) {
+            return;
+        }
+
+        this.editingField = field;
+    }
+
+    @action closeEditor() {
+        this.editingField = null;
+    }
+
     @task *refreshPreview() {
         yield timeout(180);
         const refreshed = yield this.args.onRefresh?.(this.args.task, this.preview, { draft: this.draft });
@@ -161,13 +217,16 @@ export default class AiCreateOrderPreviewComponent extends Component {
         }
 
         this.mergeDraft({ payload });
+        this.closeEditor();
     }
 
     @action setOrderConfig(orderConfig) {
         this.mergeDraft({
             order_config_uuid: this.modelValue(orderConfig, 'uuid') ?? this.modelValue(orderConfig, 'id'),
+            order_config_name: this.modelValue(orderConfig, 'name'),
             type: this.modelValue(orderConfig, 'key'),
         });
+        this.closeEditor();
     }
 
     @action setDriver(driver) {
@@ -175,6 +234,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
             driver: this.modelValue(driver, 'uuid') ?? this.modelValue(driver, 'id'),
             driver_query: this.modelValue(driver, 'name') ?? this.modelValue(driver, 'public_id'),
         });
+        this.closeEditor();
     }
 
     @action setVehicle(vehicle) {
@@ -182,6 +242,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
             vehicle_assigned_uuid: this.modelValue(vehicle, 'uuid') ?? this.modelValue(vehicle, 'id'),
             vehicle_query: this.modelValue(vehicle, 'display_name') ?? this.modelValue(vehicle, 'name') ?? this.modelValue(vehicle, 'plate_number'),
         });
+        this.closeEditor();
     }
 
     @action setPodRequired(value) {
@@ -193,6 +254,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
 
     @action setPodMethod(value) {
         this.mergeDraft({ pod_method: value });
+        this.closeEditor();
     }
 
     @action setDispatched(value) {
diff --git a/addon/components/ai/route-preview-map.hbs b/addon/components/ai/route-preview-map.hbs
new file mode 100644
index 00000000..79bdef29
--- /dev/null
+++ b/addon/components/ai/route-preview-map.hbs
@@ -0,0 +1,72 @@
+<div class="fleetbase-ai-create-order-preview__map">
+    {{#if this.canShowMap}}
+        {{#if this.shouldUseGoogleMaps}}
+            <div
+                class="fleetbase-ai-create-order-preview__google"
+                {{did-insert this.setupGoogleMap}}
+                {{did-update this.syncPreview this.routeSignature this.mapSettings.googleMapsMapType this.mapSettings.showGoogleMapsTrafficLayer this.mapSettings.showGoogleMapsTransitLayer}}
+            ></div>
+        {{else if this.leafletPluginsReady}}
+            <LeafletMap
+                class="fleetbase-ai-create-order-preview__leaflet"
+                @lat={{this.center.lat}}
+                @lng={{this.center.lng}}
+                @zoom={{12}}
+                @zoomControl={{false}}
+                @onLoad={{this.didLoadLeafletMap}}
+                {{did-update this.syncPreview this.routeSignature}}
+                as |layers|
+            >
+                <layers.tile @url={{this.tileUrl}} />
+                {{#each this.routeStyles as |style|}}
+                    <layers.polyline
+                        @locations={{this.routeCoordinates}}
+                        @color={{style.color}}
+                        @weight={{style.weight}}
+                        @opacity={{style.opacity}}
+                        @lineCap={{style.lineCap}}
+                        @lineJoin={{style.lineJoin}}
+                        @dashArray={{style.dashArray}}
+                    />
+                {{/each}}
+                {{#each this.markerStops as |stop|}}
+                    <layers.marker
+                        @location={{stop.location}}
+                        @title={{stop.title}}
+                        @icon={{div-icon
+                            html=(this.waypointIconHtml stop.waypointLabel stop.waypointColor)
+                            className="fleetops-waypoint-marker"
+                            iconSize=(array 32 32)
+                            iconAnchor=(array 16 16)
+                            popupAnchor=(array 0 -20)
+                        }}
+                        @riseOnHover={{true}}
+                        @zIndexOffset={{stop.zIndexOffset}}
+                        as |marker|
+                    >
+                        <marker.tooltip @permanent={{false}} @sticky={{true}} @direction="top">
+                            {{stop.title}}{{#if stop.address}} - {{stop.address}}{{/if}}
+                        </marker.tooltip>
+                    </layers.marker>
+                {{/each}}
+            </LeafletMap>
+        {{else}}
+            <div class="fleetbase-ai-create-order-preview__empty-map">
+                <Spinner />
+                <span>Preparing map preview...</span>
+            </div>
+        {{/if}}
+
+        {{#if this.isLoading}}
+            <div class="fleetbase-ai-create-order-preview__map-status">
+                <Spinner />
+                <span>Rendering route...</span>
+            </div>
+        {{/if}}
+    {{else}}
+        <div class="fleetbase-ai-create-order-preview__empty-map">
+            <FaIcon @icon="route" />
+            <span>{{this.emptyText}}</span>
+        </div>
+    {{/if}}
+</div>
diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
new file mode 100644
index 00000000..0ff8c7c9
--- /dev/null
+++ b/addon/components/ai/route-preview-map.js
@@ -0,0 +1,397 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { isArray } from '@ember/array';
+import { colorForId, routeColorForStatus, routeStyleForStatus, waypointIconHtml } from '../../utils/route-colors';
+import { buildRoutePointMarkerPresentation, buildRoutePointsFromPayload } from '../../utils/route-visualization';
+import ensureLeafletPluginsReady, { hasLeafletPluginsReady } from '../../utils/leaflet-plugin-loader';
+
+const PREVIEW_MAX_ZOOM_TWO_POINTS = 13;
+const PREVIEW_MAX_ZOOM_MULTI_POINTS = 12;
+
+export default class AiRoutePreviewMapComponent extends Component {
+    @service mapSettings;
+    @service routeEngine;
+
+    @tracked route = null;
+    @tracked error = null;
+    @tracked isLoading = false;
+    @tracked leafletPluginsReady = hasLeafletPluginsReady();
+    @tracked googleMap = null;
+
+    leafletMap = null;
+    googleMarkers = [];
+    googlePolylines = [];
+    googleTrafficLayer = null;
+    googleTransitLayer = null;
+    computeToken = 0;
+    googleApiLoadPromise = null;
+
+    constructor() {
+        super(...arguments);
+        this.mapSettings.load();
+
+        if (!this.shouldUseGoogleMaps && !this.leafletPluginsReady) {
+            this.prepareLeafletPlugins();
+        }
+    }
+
+    willDestroy() {
+        super.willDestroy(...arguments);
+        this.clearGoogleRoute();
+        this.googleTrafficLayer?.setMap(null);
+        this.googleTransitLayer?.setMap(null);
+        this.googleMap = null;
+        this.leafletMap = null;
+    }
+
+    get payload() {
+        return this.args.payload ?? {};
+    }
+
+    get routePoints() {
+        return buildRoutePointsFromPayload(this.payload);
+    }
+
+    get coordinates() {
+        return this.routePoints.map(({ place }) => [Number(place.latitude), Number(place.longitude)]).filter(([lat, lng]) => Number.isFinite(lat) && Number.isFinite(lng));
+    }
+
+    get canShowMap() {
+        return this.coordinates.length >= 2;
+    }
+
+    get routeSignature() {
+        return `${this.provider}:${this.coordinates.map((coordinate) => coordinate.join(',')).join('|')}`;
+    }
+
+    get provider() {
+        return this.mapSettings.mapProvider ?? 'leaflet';
+    }
+
+    get shouldUseGoogleMaps() {
+        return this.provider === 'google';
+    }
+
+    get center() {
+        const [lat, lng] = this.coordinates[0] ?? [1.3521, 103.8198];
+
+        return { lat, lng };
+    }
+
+    get routeColor() {
+        return colorForId(this.args.orderId ?? 'ai-order-preview');
+    }
+
+    get routeStatus() {
+        return this.args.status ?? 'created';
+    }
+
+    get statusColor() {
+        return routeColorForStatus(this.routeStatus);
+    }
+
+    get routeStyles() {
+        return routeStyleForStatus(this.routeStatus, this.statusColor);
+    }
+
+    get routeCoordinates() {
+        return this.route?.coordinates?.length ? this.route.coordinates : this.coordinates;
+    }
+
+    get markerStops() {
+        return this.routePoints.map((routePoint, index) => {
+            const presentation = buildRoutePointMarkerPresentation(routePoint, this.routeColor);
+
+            return {
+                ...presentation,
+                index,
+                location: [Number(routePoint.place.latitude), Number(routePoint.place.longitude)],
+                title: presentation.title,
+                address: this.addressLabel(routePoint.place),
+            };
+        });
+    }
+
+    get tileUrl() {
+        const theme = document.body?.dataset?.theme;
+
+        if (theme === 'dark') {
+            return 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png';
+        }
+
+        return 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png';
+    }
+
+    get emptyText() {
+        if (this.error) {
+            return 'Unable to preview the route right now.';
+        }
+
+        return 'Select pickup and dropoff with coordinates to preview the route.';
+    }
+
+    addressLabel(place) {
+        return [place?.address, place?.street1, place?.name, place?.city, place?.postal_code, place?.country]
+            .map((value) => (value === null || value === undefined ? null : String(value).trim()))
+            .filter((value) => value && !['undefined', 'null'].includes(value.toLowerCase()))
+            .slice(0, 3)
+            .join(' - ');
+    }
+
+    waypointIconHtml(label, color) {
+        return waypointIconHtml(label, color);
+    }
+
+    @action async prepareLeafletPlugins() {
+        await ensureLeafletPluginsReady();
+        this.leafletPluginsReady = true;
+    }
+
+    @action didLoadLeafletMap({ target: map }) {
+        this.leafletMap = map;
+        this.syncPreview();
+    }
+
+    @action async setupGoogleMap(element) {
+        await this.mapSettings.load();
+        await this.loadGoogleMapsApi();
+
+        const googleMaps = window.google;
+        const { Map } = await googleMaps.maps.importLibrary('maps');
+        const mapOptions = {
+            center: { lat: this.center.lat, lng: this.center.lng },
+            zoom: 12,
+            mapTypeId: this.mapSettings.googleMapsMapType ?? googleMaps.maps.MapTypeId.ROADMAP,
+            disableDefaultUI: true,
+            gestureHandling: 'greedy',
+            clickableIcons: false,
+        };
+
+        if (this.mapSettings.googleMapsMapId) {
+            mapOptions.mapId = this.mapSettings.googleMapsMapId;
+        }
+
+        this.googleMap = new Map(element, mapOptions);
+        this.applyGoogleLayers();
+        this.syncPreview();
+    }
+
+    @action syncPreview() {
+        this.computeAndDrawRoute();
+    }
+
+    async computeAndDrawRoute() {
+        const token = ++this.computeToken;
+        this.error = null;
+
+        if (!this.canShowMap) {
+            this.route = null;
+            this.clearGoogleRoute();
+            return;
+        }
+
+        this.isLoading = true;
+
+        try {
+            const engine = this.routeEngine.getDisplayEngine('osrm');
+            const route = await this.routeEngine.compute(engine, this.coordinates, {
+                payload: this.payload,
+                fitOptions: this.fitOptions,
+            });
+
+            if (token !== this.computeToken) {
+                return;
+            }
+
+            this.route = route;
+            this.fitLeafletMap();
+            this.drawGoogleRoute();
+        } catch (error) {
+            if (token !== this.computeToken) {
+                return;
+            }
+
+            this.error = error;
+            this.route = null;
+            this.drawGoogleRoute();
+        } finally {
+            if (token === this.computeToken) {
+                this.isLoading = false;
+            }
+        }
+    }
+
+    get fitOptions() {
+        return {
+            padding: [18, 18],
+            maxZoom: this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS,
+        };
+    }
+
+    fitLeafletMap() {
+        if (!this.leafletMap || !this.routeCoordinates.length) {
+            return;
+        }
+
+        const bounds = this.route?.bounds ?? this.routeCoordinates;
+
+        if (isArray(bounds) && bounds.length > 1) {
+            this.leafletMap.fitBounds(bounds, this.fitOptions);
+        }
+    }
+
+    async drawGoogleRoute() {
+        if (!this.googleMap || !this.shouldUseGoogleMaps) {
+            return;
+        }
+
+        await this.loadGoogleMapsApi();
+        this.clearGoogleRoute();
+
+        const googleMaps = window.google;
+        const path = this.routeCoordinates.map(([lat, lng]) => ({ lat, lng }));
+
+        if (path.length > 1) {
+            this.routeStyles.forEach((style) => {
+                const polyline = new googleMaps.maps.Polyline({
+                    path,
+                    map: this.googleMap,
+                    strokeColor: style.color,
+                    strokeWeight: style.weight,
+                    strokeOpacity: style.opacity,
+                });
+
+                this.googlePolylines.push(polyline);
+            });
+        }
+
+        const { AdvancedMarkerElement } = await googleMaps.maps.importLibrary('marker');
+        this.markerStops.forEach((stop) => {
+            const position = { lat: stop.location[0], lng: stop.location[1] };
+            const content = document.createElement('div');
+            content.className = 'fleetops-map-marker';
+            content.innerHTML = waypointIconHtml(stop.waypointLabel, stop.waypointColor);
+
+            let marker;
+            if (this.mapSettings.googleMapsMapId) {
+                marker = new AdvancedMarkerElement({
+                    map: this.googleMap,
+                    position,
+                    title: stop.title,
+                    content,
+                    zIndex: stop.zIndexOffset,
+                });
+            } else {
+                marker = new googleMaps.maps.Marker({
+                    map: this.googleMap,
+                    position,
+                    title: stop.title,
+                    zIndex: stop.zIndexOffset,
+                    icon: this.googleWaypointIcon(stop.waypointLabel, stop.waypointColor),
+                });
+            }
+
+            this.googleMarkers.push(marker);
+        });
+
+        this.fitGoogleMap();
+    }
+
+    fitGoogleMap() {
+        const googleMaps = window.google;
+        if (!this.googleMap || !googleMaps?.maps || !this.routeCoordinates.length) {
+            return;
+        }
+
+        const bounds = new googleMaps.maps.LatLngBounds();
+        this.routeCoordinates.forEach(([lat, lng]) => bounds.extend({ lat, lng }));
+        this.googleMap.fitBounds(bounds, 18);
+
+        googleMaps.maps.event.addListenerOnce(this.googleMap, 'idle', () => {
+            if (this.googleMap.getZoom() > (this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS)) {
+                this.googleMap.setZoom(this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS);
+            }
+        });
+    }
+
+    clearGoogleRoute() {
+        this.googleMarkers.forEach((marker) => {
+            if ('map' in marker) {
+                marker.map = null;
+            } else {
+                marker.setMap?.(null);
+            }
+        });
+        this.googlePolylines.forEach((polyline) => polyline.setMap(null));
+        this.googleMarkers = [];
+        this.googlePolylines = [];
+    }
+
+    applyGoogleLayers() {
+        if (!this.googleMap || !window.google?.maps) {
+            return;
+        }
+
+        const googleMaps = window.google;
+        this.googleTrafficLayer?.setMap(null);
+        this.googleTransitLayer?.setMap(null);
+
+        if (this.mapSettings.showGoogleMapsTrafficLayer) {
+            this.googleTrafficLayer = new googleMaps.maps.TrafficLayer();
+            this.googleTrafficLayer.setMap(this.googleMap);
+        }
+
+        if (this.mapSettings.showGoogleMapsTransitLayer) {
+            this.googleTransitLayer = new googleMaps.maps.TransitLayer();
+            this.googleTransitLayer.setMap(this.googleMap);
+        }
+    }
+
+    googleWaypointIcon(label, color) {
+        const svg = `
+            <svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34">
+                <circle cx="17" cy="17" r="15" fill="${color}" stroke="white" stroke-width="2.5" />
+                <text x="17" y="21" text-anchor="middle" font-family="Inter, Arial, sans-serif" font-size="13" font-weight="700" fill="white">${label}</text>
+            </svg>
+        `;
+
+        return {
+            url: `data:image/svg+xml;charset=UTF-8,${encodeURIComponent(svg)}`,
+            scaledSize: new window.google.maps.Size(34, 34),
+            anchor: new window.google.maps.Point(17, 17),
+        };
+    }
+
+    async loadGoogleMapsApi() {
+        if (window.google?.maps?.importLibrary) {
+            return true;
+        }
+
+        if (this.googleApiLoadPromise) {
+            return this.googleApiLoadPromise;
+        }
+
+        const apiKey = this.mapSettings.googleMapsApiKey;
+        this.googleApiLoadPromise = new Promise((resolve, reject) => {
+            const callbackName = `__fleetops_ai_preview_gmaps_${Date.now().toString(36)}`;
+            window[callbackName] = () => {
+                delete window[callbackName];
+                resolve(true);
+            };
+
+            const script = document.createElement('script');
+            script.async = true;
+            script.defer = true;
+            script.onerror = () => {
+                delete window[callbackName];
+                reject(new Error('Failed to load Google Maps API for AI route preview.'));
+            };
+            script.src = `https://maps.googleapis.com/maps/api/js?key=${apiKey}&libraries=geometry,marker,routes&callback=${callbackName}&loading=async`;
+            document.head.appendChild(script);
+        });
+
+        return this.googleApiLoadPromise;
+    }
+}
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index 47d068ee..f4750e9d 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -8049,3 +8049,287 @@ body[data-theme='dark'] .issue-timeline-card time,
 body[data-theme='dark'] .issue-timeline-card p {
     color: #d1d5db;
 }
+
+.fleetbase-ai-create-order-preview {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding: 8px;
+}
+
+.fleetbase-ai-create-order-preview__header {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__map {
+    position: relative;
+    overflow: hidden;
+    border: 1px solid rgb(148 163 184 / 20%);
+    border-radius: 7px;
+    background: rgb(15 23 42 / 5%);
+}
+
+.fleetbase-ai-create-order-preview__leaflet,
+.fleetbase-ai-create-order-preview__google,
+.fleetbase-ai-create-order-preview__empty-map {
+    width: 100%;
+    height: 136px;
+}
+
+.fleetbase-ai-create-order-preview__empty-map {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    color: #64748b;
+    font-size: 12px;
+}
+
+.fleetbase-ai-create-order-preview__map-status {
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    border: 1px solid rgb(255 255 255 / 28%);
+    border-radius: 999px;
+    background: rgb(15 23 42 / 62%);
+    padding: 4px 8px;
+    color: #f8fafc;
+    font-size: 11px;
+    line-height: 1;
+    backdrop-filter: blur(5px);
+}
+
+.fleetbase-ai-create-order-preview__fields {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 4px 8px;
+}
+
+.fleetbase-ai-create-order-preview__field-row {
+    display: flex;
+    min-width: 0;
+    align-items: center;
+    justify-content: space-between;
+    gap: 6px;
+    border-radius: 7px;
+    padding: 5px 6px;
+    transition:
+        background 120ms ease,
+        box-shadow 120ms ease;
+}
+
+.fleetbase-ai-create-order-preview__field-row:hover,
+.fleetbase-ai-create-order-preview__field-row:focus-within {
+    background: rgb(255 255 255 / 20%);
+    box-shadow: inset 0 0 0 1px rgb(148 163 184 / 14%);
+}
+
+.fleetbase-ai-create-order-preview__field-row--notes {
+    grid-column: 1 / -1;
+}
+
+.fleetbase-ai-create-order-preview__field-copy {
+    min-width: 0;
+    flex: 1 1 auto;
+}
+
+.fleetbase-ai-create-order-preview__field-copy > span {
+    display: block;
+    margin-bottom: 1px;
+    color: #64748b;
+    font-size: 10px;
+    font-weight: 700;
+    letter-spacing: 0;
+    line-height: 1.1;
+    text-transform: uppercase;
+}
+
+.fleetbase-ai-create-order-preview__field-copy > strong {
+    display: block;
+    overflow: hidden;
+    color: #0f172a;
+    font-size: 12px;
+    font-weight: 650;
+    line-height: 1.25;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__field-row--notes .fleetbase-ai-create-order-preview__field-copy > strong {
+    white-space: normal;
+}
+
+.fleetbase-ai-create-order-preview__edit-wrapper {
+    width: 24px;
+    height: 24px;
+    flex: 0 0 24px;
+    box-shadow: none;
+}
+
+.fleetbase-ai-create-order-preview__edit-button {
+    display: inline-flex;
+    width: 24px;
+    height: 24px;
+    align-items: center;
+    justify-content: center;
+    border: 0;
+    border-radius: 6px;
+    color: #64748b;
+}
+
+.fleetbase-ai-create-order-preview__edit-button:hover {
+    background: rgb(148 163 184 / 16%);
+    color: #2563eb;
+}
+
+.fleetbase-ai-create-order-preview__inline-select,
+.fleetbase-ai-create-order-preview__inline-native-select,
+.fleetbase-ai-create-order-preview__inline-textarea {
+    width: 100%;
+    min-height: 24px;
+    border: 0;
+    background: transparent;
+    color: #0f172a;
+    font-size: 12px;
+    line-height: 1.25;
+    outline: 0;
+    box-shadow: none;
+}
+
+.fleetbase-ai-create-order-preview__inline-select.ember-power-select-trigger {
+    min-height: 24px;
+    border: 0;
+    background: transparent;
+    padding: 0;
+    color: #0f172a;
+    box-shadow: none;
+}
+
+.fleetbase-ai-create-order-preview__inline-select .ember-power-select-selected-item,
+.fleetbase-ai-create-order-preview__inline-select .ember-power-select-placeholder {
+    margin-left: 0;
+    color: inherit;
+    font-size: 12px;
+    line-height: 1.25;
+}
+
+.fleetbase-ai-create-order-preview__inline-textarea {
+    resize: vertical;
+}
+
+.fleetbase-ai-create-order-preview__toggles {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__toggle-row {
+    display: flex;
+    min-height: 28px;
+    align-items: center;
+    justify-content: space-between;
+    gap: 10px;
+    border-top: 1px solid rgb(148 163 184 / 14%);
+    padding: 7px 2px 0;
+}
+
+.fleetbase-ai-create-order-preview__inline-pill {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    border: 0;
+    border-radius: 999px;
+    background: rgb(148 163 184 / 14%);
+    padding: 3px 7px;
+    color: #475569;
+    font-size: 11px;
+    line-height: 1;
+}
+
+.fleetbase-ai-create-order-preview__inline-pill:hover {
+    background: rgb(37 99 235 / 14%);
+    color: #2563eb;
+}
+
+.fleetbase-ai-create-order-preview__select-label {
+    overflow: hidden;
+    color: #0f172a;
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 1.25;
+    text-overflow: ellipsis;
+    text-transform: uppercase;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__controls {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.fleetbase-ai-create-order-preview__refreshing {
+    color: #64748b;
+    font-size: 11px;
+}
+
+.fleetbase-ai-create-order-preview__cancelled {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    border: 1px solid rgb(239 68 68 / 20%);
+    border-radius: 7px;
+    background: rgb(239 68 68 / 10%);
+    padding: 8px 9px;
+    color: #991b1b;
+    font-size: 12px;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__map,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-row:hover,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-row:focus-within {
+    border-color: rgb(148 163 184 / 20%);
+    background: rgb(15 23 42 / 30%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-copy > strong,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-select,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-native-select,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-textarea,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-select.ember-power-select-trigger,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__select-label {
+    color: #f8fafc;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-copy > span,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__edit-button,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__refreshing,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__empty-map {
+    color: #cbd5e1;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__toggle-row {
+    border-top-color: rgb(148 163 184 / 18%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-pill {
+    background: rgb(148 163 184 / 14%);
+    color: #cbd5e1;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-pill:hover {
+    background: rgb(96 165 250 / 14%);
+    color: #bfdbfe;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__cancelled {
+    border-color: rgb(248 113 113 / 22%);
+    background: rgb(127 29 29 / 22%);
+    color: #fecaca;
+}
diff --git a/app/components/ai/route-preview-map.js b/app/components/ai/route-preview-map.js
new file mode 100644
index 00000000..d5012a16
--- /dev/null
+++ b/app/components/ai/route-preview-map.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/ai/route-preview-map';

From d0120068c08d1b447e064fa2c11aa54f7dd753e7 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 14:35:05 +0800
Subject: [PATCH 04/19] latest

---
 addon/components/fleet/details.hbs            |  29 +-
 addon/components/fleet/details.js             |  56 +-
 addon/components/fleet/hierarchy-tree.hbs     | 137 +++++
 addon/components/fleet/hierarchy-tree.js      | 528 ++++++++++++++++++
 addon/components/order/form.hbs               |  10 +-
 addon/components/order/form/details.hbs       |   4 +
 addon/components/vehicle/card.hbs             |  16 +-
 addon/components/vehicle/form.hbs             |  14 +-
 addon/extension.js                            |  10 +
 .../routes/management/fleets/index/details.js |   2 +-
 addon/styles/fleetops-engine.css              |  14 +
 app/components/fleet/hierarchy-tree.js        |   1 +
 server/src/Http/Resources/v1/Fleet.php        |  10 +-
 server/src/Models/Driver.php                  |   6 +
 server/tests/FleetHierarchyResourceTest.php   |  12 +
 .../components/fleet/details-test.js          |  66 ++-
 .../components/fleet/hierarchy-tree-test.js   | 183 ++++++
 17 files changed, 1069 insertions(+), 29 deletions(-)
 create mode 100644 addon/components/fleet/hierarchy-tree.hbs
 create mode 100644 addon/components/fleet/hierarchy-tree.js
 create mode 100644 app/components/fleet/hierarchy-tree.js
 create mode 100644 server/tests/FleetHierarchyResourceTest.php
 create mode 100644 tests/integration/components/fleet/hierarchy-tree-test.js

diff --git a/addon/components/fleet/details.hbs b/addon/components/fleet/details.hbs
index 4f72f9e2..c57af317 100644
--- a/addon/components/fleet/details.hbs
+++ b/addon/components/fleet/details.hbs
@@ -3,30 +3,43 @@
         <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
             <div class="field-info-container">
                 <div class="field-name">{{t "common.name"}}</div>
-                <div class="field-value">{{n-a @resource.name}}</div>
+                <div class="field-value">{{n-a this.resource.name}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "resource.service-area"}}</div>
-                <div class="field-value">{{n-a @resource.service_area.name}}</div>
+                <div class="field-value">{{n-a this.resource.service_area.name}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "resource.zone"}}</div>
-                <div class="field-value">{{n-a @resource.zone.name}}</div>
+                <div class="field-value">{{n-a this.resource.zone.name}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "fleet.fields.task"}}</div>
-                <div class="field-value">{{n-a @resource.task}}</div>
+                <div class="field-value">{{n-a this.resource.task}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "fleet.fields.active-manpower"}}</div>
-                <div class="field-value">{{@resource.drivers_online_count}} of {{@resource.drivers_count}} Online</div>
+                <div class="field-value">{{this.driversOnlineCount}} of {{this.driversCount}} Online</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.date-created"}}</div>
-                <div class="field-value">{{@resource.createdAtShort}}</div>
+                <div class="field-value">{{this.resource.createdAtShort}}</div>
             </div>
         </div>
     </ContentPanel>
 
-    <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
-</div>
\ No newline at end of file
+    <ContentPanel @title="Hierarchy" @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="p-0i">
+        <Fleet::HierarchyTree
+            @fleet={{this.resource}}
+            @onViewFleet={{this.viewFleet}}
+            @onViewDriver={{this.viewDriver}}
+            @onViewVehicle={{this.viewVehicle}}
+            @onAssignDriver={{this.assignDriver}}
+            @onAssignVehicle={{this.assignVehicle}}
+        />
+    </ContentPanel>
+
+    <CustomField::Yield @subject={{this.resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
+
+    <Spacer @height="200px" />
+</div>
diff --git a/addon/components/fleet/details.js b/addon/components/fleet/details.js
index 833a3470..89a4ec73 100644
--- a/addon/components/fleet/details.js
+++ b/addon/components/fleet/details.js
@@ -1,3 +1,57 @@
 import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class FleetDetailsComponent extends Component {}
+export default class FleetDetailsComponent extends Component {
+    @service fleetActions;
+    @service driverActions;
+    @service vehicleActions;
+
+    get resource() {
+        return this.args.resource ?? this.args.fleet;
+    }
+
+    get drivers() {
+        return this.resourceArray(this.resource?.drivers);
+    }
+
+    get driversCount() {
+        return Number(this.resource?.drivers_count ?? this.drivers.length ?? 0);
+    }
+
+    get driversOnlineCount() {
+        return Number(this.resource?.drivers_online_count ?? this.drivers.filter((driver) => driver?.online).length ?? 0);
+    }
+
+    resourceArray(resources) {
+        if (!resources) {
+            return [];
+        }
+
+        if (typeof resources.toArray === 'function') {
+            return resources.toArray();
+        }
+
+        return Array.isArray(resources) ? resources : [];
+    }
+
+    @action viewFleet(fleet) {
+        return this.fleetActions.panel.view(fleet);
+    }
+
+    @action viewDriver(driver) {
+        return this.driverActions.panel.view(driver);
+    }
+
+    @action viewVehicle(vehicle) {
+        return this.vehicleActions.panel.view(vehicle);
+    }
+
+    @action assignDriver(fleet) {
+        return this.fleetActions.assignDriver(fleet);
+    }
+
+    @action assignVehicle(fleet) {
+        return this.fleetActions.assignVehicle(fleet);
+    }
+}
diff --git a/addon/components/fleet/hierarchy-tree.hbs b/addon/components/fleet/hierarchy-tree.hbs
new file mode 100644
index 00000000..9d669dc0
--- /dev/null
+++ b/addon/components/fleet/hierarchy-tree.hbs
@@ -0,0 +1,137 @@
+<div class="fleet-hierarchy-tree" data-test-fleet-hierarchy-tree {{did-insert this.loadVisibleFleetResources}} ...attributes>
+    <div class="flex flex-col gap-2 border-b border-gray-200 bg-gray-50 px-2.5 pb-2 dark:border-gray-700 dark:bg-gray-800">
+        <div class="flex flex-col gap-2 md:flex-row md:items-center md:justify-between">
+            <div class="flex min-w-0 flex-1 items-center gap-1.5 rounded border border-gray-200 bg-white px-2 py-1 text-gray-400 dark:border-gray-700 dark:bg-gray-900">
+                <FaIcon @icon="magnifying-glass" @size="xs" />
+                <input
+                    type="search"
+                    value={{this.query}}
+                    placeholder="Search hierarchy..."
+                    class="min-w-0 flex-1 appearance-none rounded-md border-0 bg-transparent p-0 text-xs leading-5 text-gray-700 outline-none shadow-none ring-0 focus:border-transparent focus:outline-none focus:ring-0 dark:text-gray-100"
+                    data-test-fleet-hierarchy-search
+                    {{on "input" this.updateQuery}}
+                />
+            </div>
+            <div class="flex shrink-0 items-center gap-1 rounded bg-gray-100 p-1 dark:bg-gray-900" data-test-fleet-hierarchy-filters>
+                {{#each this.filters as |filter|}}
+                    <button
+                        type="button"
+                        class="rounded px-2 py-1 text-xs font-medium {{if (eq this.activeFilter filter.id) 'bg-white text-gray-900 shadow-sm dark:bg-gray-700 dark:text-white' 'text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white'}}"
+                        data-test-fleet-hierarchy-filter={{filter.id}}
+                        {{on "click" (fn this.setFilter filter.id)}}
+                    >
+                        {{filter.label}}
+                    </button>
+                {{/each}}
+            </div>
+            <div class="flex shrink-0 items-center gap-1">
+                <Button
+                    @type="default"
+                    @size="xs"
+                    @icon={{this.expandCollapseIcon}}
+                    @helpText={{this.expandCollapseHelpText}}
+                    @onClick={{this.toggleExpandCollapseAll}}
+                    data-test-fleet-hierarchy-expand-toggle
+                />
+            </div>
+        </div>
+    </div>
+
+    <div class="fleet-hierarchy-tree-list bg-white dark:bg-gray-900" aria-label="Fleet hierarchy">
+        {{#if this.visibleRows.length}}
+            {{#each this.visibleRows as |row|}}
+                {{#if (eq row.type "fleet")}}
+                    <div
+                        class="fleet-hierarchy-tree-row {{row.depthClass}} group flex min-w-0 items-start gap-2 border-b border-gray-100 px-3 py-2 text-sm text-gray-700 hover:bg-gray-50 dark:border-gray-800 dark:text-gray-200 dark:hover:bg-gray-800"
+                        data-test-fleet-hierarchy-row="fleet"
+                    >
+                        <button
+                            type="button"
+                            class="flex min-w-0 flex-1 items-start gap-2 text-left"
+                            aria-expanded={{if (this.fleetHasChildren row.fleet) (if (this.isFleetExpanded row.fleet) "true" "false")}}
+                            {{on "click" (fn this.toggleFleet row.fleet)}}
+                        >
+                            <span class="mt-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded bg-gray-100 text-gray-400 dark:bg-gray-800" aria-hidden="true">
+                                {{#if (this.fleetHasChildren row.fleet)}}
+                                    <FaIcon @icon={{if (this.isFleetExpanded row.fleet) "chevron-down" "chevron-right"}} @size="xs" />
+                                {{else}}
+                                    <FaIcon @icon="user-group" @size="xs" />
+                                {{/if}}
+                            </span>
+                            <span class="min-w-0 flex-1">
+                                <span class="block truncate font-semibold leading-5" title={{this.displayName row.fleet}}>{{this.displayName row.fleet}}</span>
+                                <span class="block truncate text-xs leading-4 text-gray-400">{{this.fleetSubtitle row.fleet}}</span>
+                            </span>
+                        </button>
+                        <div class="flex shrink-0 items-center gap-1">
+                            <span class="hidden rounded bg-gray-100 px-1.5 py-0.5 text-xs text-gray-500 dark:bg-gray-800 dark:text-gray-400 md:inline-flex">
+                                {{this.fleetSubfleetCount row.fleet}} subfleets
+                            </span>
+                            <DropdownButton
+                                @icon="ellipsis-h"
+                                @iconPrefix="fas"
+                                @size="xs"
+                                @buttonClass="fleetops-btn-xxs"
+                                @contentClass="dropdown-menu"
+                                @horizontalPosition="left"
+                                @calculatePosition={{this.calculateDropdownLeftPosition}}
+                                as |dd|
+                            >
+                                <div class="next-dd-menu mx-0 mt-1" role="menu">
+                                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.viewFleet row.fleet)}}>View details</a>
+                                    <div class="next-dd-menu-seperator"></div>
+                                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.assignDriver row.fleet)}}>Assign driver</a>
+                                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.assignVehicle row.fleet)}}>Assign vehicle</a>
+                                </div>
+                            </DropdownButton>
+                        </div>
+                    </div>
+                {{else if (eq row.type "driver")}}
+                    <button
+                        type="button"
+                        class="fleet-hierarchy-tree-row {{row.depthClass}} flex w-full min-w-0 items-start gap-2 border-b border-gray-100 px-3 py-1.5 text-left text-xs text-gray-600 hover:bg-gray-50 dark:border-gray-800 dark:text-gray-300 dark:hover:bg-gray-800"
+                        data-test-fleet-hierarchy-row="driver"
+                        {{on "click" (fn this.viewDriver row.driver)}}
+                    >
+                        <span class="mt-1 h-1.5 w-1.5 shrink-0 rounded-full {{if row.driver.online 'bg-green-500' 'bg-yellow-300'}}" aria-hidden="true"></span>
+                        <span class="min-w-0 flex-1">
+                            <span class="block truncate font-medium leading-4" title={{this.displayName row.driver}}>{{this.displayName row.driver}}</span>
+                            <span class="block truncate text-xs leading-4 text-gray-400">Driver - {{this.driverSubtitle row.driver}}</span>
+                        </span>
+                    </button>
+                {{else}}
+                    <button
+                        type="button"
+                        class="fleet-hierarchy-tree-row {{row.depthClass}} flex w-full min-w-0 items-start gap-2 border-b border-gray-100 px-3 py-1.5 text-left text-xs text-gray-600 hover:bg-gray-50 dark:border-gray-800 dark:text-gray-300 dark:hover:bg-gray-800"
+                        data-test-fleet-hierarchy-row="vehicle"
+                        {{on "click" (fn this.viewVehicle row.vehicle)}}
+                    >
+                        <span class="mt-1 h-1.5 w-1.5 shrink-0 rounded-full {{if row.vehicle.online 'bg-green-500' 'bg-yellow-300'}}" aria-hidden="true"></span>
+                        <span class="min-w-0 flex-1">
+                            <span class="block truncate font-medium leading-4" title={{this.displayName row.vehicle}}>{{this.displayName row.vehicle}}</span>
+                            <span class="block truncate text-xs leading-4 text-gray-400">Vehicle - {{this.vehicleSubtitle row.vehicle}}</span>
+                        </span>
+                    </button>
+                {{/if}}
+            {{/each}}
+        {{else}}
+            <div class="flex flex-col items-center justify-center gap-2 p-6 text-center" data-test-fleet-hierarchy-empty>
+                <span class="flex h-8 w-8 items-center justify-center rounded bg-gray-100 text-gray-400 dark:bg-gray-800">
+                    <FaIcon @icon={{if this.hasControlsApplied "magnifying-glass" "diagram-project"}} @size="sm" />
+                </span>
+                <div>
+                    <div class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{this.emptyTitle}}</div>
+                    <div class="mt-1 text-xs leading-5 text-gray-500 dark:text-gray-400">{{this.emptyDescription}}</div>
+                </div>
+                {{#if this.hasControlsApplied}}
+                    <Button @type="default" @size="xs" @icon="times" @text="Clear filters" @onClick={{this.clearFilters}} data-test-fleet-hierarchy-clear-filters />
+                {{else}}
+                    <div class="flex items-center gap-1">
+                        <Button @type="default" @size="xs" @icon="user-plus" @text="Assign driver" @onClick={{fn this.assignDriver this.rootFleet}} />
+                        <Button @type="default" @size="xs" @icon="car" @text="Assign vehicle" @onClick={{fn this.assignVehicle this.rootFleet}} />
+                    </div>
+                {{/if}}
+            </div>
+        {{/if}}
+    </div>
+</div>
diff --git a/addon/components/fleet/hierarchy-tree.js b/addon/components/fleet/hierarchy-tree.js
new file mode 100644
index 00000000..1241cdf0
--- /dev/null
+++ b/addon/components/fleet/hierarchy-tree.js
@@ -0,0 +1,528 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { debug } from '@ember/debug';
+
+const FILTER_ALL = 'all';
+const FILTER_DRIVERS = 'drivers';
+const FILTER_VEHICLES = 'vehicles';
+const FILTER_ONLINE = 'online';
+
+export default class FleetHierarchyTreeComponent extends Component {
+    @service store;
+
+    @tracked expandedFleetIds = new Set();
+    @tracked query = '';
+    @tracked activeFilter = FILTER_ALL;
+    @tracked loadedDriversByFleetKey = {};
+    @tracked loadedVehiclesByFleetKey = {};
+    loadingDriverFleetKeys = new Set();
+    loadingVehicleFleetKeys = new Set();
+
+    constructor() {
+        super(...arguments);
+        this.expandedFleetIds = new Set(this.initialExpandedFleetIds);
+    }
+
+    get filters() {
+        return [
+            { id: FILTER_ALL, label: 'All' },
+            { id: FILTER_DRIVERS, label: 'Drivers' },
+            { id: FILTER_VEHICLES, label: 'Vehicles' },
+            { id: FILTER_ONLINE, label: 'Online' },
+        ];
+    }
+
+    get rootFleet() {
+        return this.args.fleet;
+    }
+
+    get fleets() {
+        return this.rootFleet ? [this.rootFleet] : [];
+    }
+
+    get normalizedQuery() {
+        return String(this.query ?? '')
+            .trim()
+            .toLowerCase();
+    }
+
+    get hasQuery() {
+        return this.normalizedQuery.length > 0;
+    }
+
+    get hasActiveFilter() {
+        return this.activeFilter !== FILTER_ALL;
+    }
+
+    get hasControlsApplied() {
+        return this.hasQuery || this.hasActiveFilter;
+    }
+
+    get hasHierarchyResources() {
+        return this.fleets.some((fleet) => this.fleetHasChildren(fleet));
+    }
+
+    get allFleetNodesExpanded() {
+        const fleetKeys = this.collectFleetKeys(this.fleets);
+
+        return fleetKeys.length > 0 && fleetKeys.every((key) => this.expandedFleetIds.has(key));
+    }
+
+    get expandCollapseIcon() {
+        return this.allFleetNodesExpanded ? 'down-left-and-up-right-to-center' : 'up-right-and-down-left-from-center';
+    }
+
+    get expandCollapseHelpText() {
+        return this.allFleetNodesExpanded ? 'Collapse all' : 'Expand all';
+    }
+
+    get visibleRows() {
+        if (this.hasControlsApplied) {
+            return this.buildFilteredFleetRows(this.fleets);
+        }
+
+        return this.buildFleetRows(this.fleets);
+    }
+
+    get emptyTitle() {
+        if (this.hasControlsApplied) {
+            return 'No matching resources';
+        }
+
+        return 'No fleet resources assigned';
+    }
+
+    get emptyDescription() {
+        if (this.hasControlsApplied) {
+            return 'Clear the current search or filter to show the full fleet hierarchy.';
+        }
+
+        return 'Assign drivers or vehicles to make this fleet operationally useful.';
+    }
+
+    get initialExpandedFleetIds() {
+        return this.fleets.flatMap((fleet) => {
+            const key = this.fleetKey(fleet);
+            const childKeys = this.fleetSubfleets(fleet)
+                .map((subfleet) => this.fleetKey(subfleet))
+                .filter(Boolean);
+
+            return [key, ...childKeys].filter(Boolean);
+        });
+    }
+
+    resourceArray(resources) {
+        if (!resources) {
+            return [];
+        }
+
+        if (typeof resources.toArray === 'function') {
+            return resources.toArray();
+        }
+
+        return Array.isArray(resources) ? resources : [];
+    }
+
+    @action displayName(resource) {
+        return resource?.displayName ?? resource?.display_name ?? resource?.name ?? resource?.public_id ?? 'Unnamed resource';
+    }
+
+    fleetKey(fleet) {
+        return String(fleet?.id ?? fleet?.uuid ?? fleet?.public_id ?? fleet?.name ?? '');
+    }
+
+    fleetSubfleets(fleet) {
+        return this.sortByName(this.resourceArray(fleet?.subfleets));
+    }
+
+    @action fleetSubfleetCount(fleet) {
+        return this.fleetSubfleets(fleet).length;
+    }
+
+    fleetDrivers(fleet) {
+        const embeddedDrivers = this.resourceArray(fleet?.drivers);
+
+        if (embeddedDrivers.length) {
+            return this.sortOnlineFirst(embeddedDrivers);
+        }
+
+        return this.sortOnlineFirst(this.loadedDriversByFleetKey[this.fleetKey(fleet)] ?? []);
+    }
+
+    fleetVehicles(fleet) {
+        const embeddedVehicles = this.resourceArray(fleet?.vehicles);
+
+        if (embeddedVehicles.length) {
+            return this.sortOnlineFirst(embeddedVehicles);
+        }
+
+        return this.sortOnlineFirst(this.loadedVehiclesByFleetKey[this.fleetKey(fleet)] ?? []);
+    }
+
+    fleetDriverCount(fleet) {
+        return Number(fleet?.drivers_count ?? fleet?.driver_count ?? this.fleetDrivers(fleet).length ?? 0);
+    }
+
+    fleetVehicleCount(fleet) {
+        return Number(fleet?.vehicles_count ?? fleet?.vehicle_count ?? this.fleetVehicles(fleet).length ?? 0);
+    }
+
+    fleetOnlineDriverCount(fleet) {
+        return Number(fleet?.drivers_online_count ?? this.fleetDrivers(fleet).filter((driver) => driver?.online).length ?? 0);
+    }
+
+    fleetOnlineVehicleCount(fleet) {
+        return Number(fleet?.vehicles_online_count ?? this.fleetVehicles(fleet).filter((vehicle) => vehicle?.online).length ?? 0);
+    }
+
+    @action fleetSubtitle(fleet) {
+        return `${this.fleetOnlineDriverCount(fleet)}/${this.fleetDriverCount(fleet)} drivers online - ${this.fleetOnlineVehicleCount(fleet)}/${this.fleetVehicleCount(fleet)} vehicles online`;
+    }
+
+    @action driverSubtitle(driver) {
+        return [driver?.vehicle_name, driver?.status, driver?.public_id].filter(Boolean).join(' - ') || (driver?.online ? 'Online' : 'Offline');
+    }
+
+    @action vehicleSubtitle(vehicle) {
+        return [vehicle?.driver_name, vehicle?.plate_number, vehicle?.vin, vehicle?.status, vehicle?.public_id].filter(Boolean).join(' - ') || (vehicle?.online ? 'Online' : 'Offline');
+    }
+
+    @action fleetHasChildren(fleet) {
+        return this.fleetSubfleets(fleet).length > 0 || this.fleetDriverCount(fleet) > 0 || this.fleetVehicleCount(fleet) > 0;
+    }
+
+    @action isFleetExpanded(fleet) {
+        return this.expandedFleetIds.has(this.fleetKey(fleet));
+    }
+
+    buildFleetRows(fleets = [], depth = 0) {
+        return fleets.flatMap((fleet) => {
+            const rows = [this.fleetRow(fleet, depth)];
+
+            if (!this.isFleetExpanded(fleet)) {
+                return rows;
+            }
+
+            rows.push(...this.childRows(fleet, depth + 1));
+
+            return rows;
+        });
+    }
+
+    buildFilteredFleetRows(fleets = [], depth = 0) {
+        return fleets.flatMap((fleet) => {
+            const fleetMatches = this.fleetMatches(fleet);
+            const childDepth = depth + 1;
+            const subfleetRows = this.buildFilteredFleetRows(this.fleetSubfleets(fleet), childDepth);
+            const driverRows = this.fleetDrivers(fleet)
+                .filter((driver) => this.driverVisible(driver))
+                .map((driver) => this.driverRow(driver, childDepth));
+            const vehicleRows = this.fleetVehicles(fleet)
+                .filter((vehicle) => this.vehicleVisible(vehicle))
+                .map((vehicle) => this.vehicleRow(vehicle, childDepth));
+
+            if (fleetMatches) {
+                return [this.fleetRow(fleet, depth), ...this.childRows(fleet, childDepth, true)];
+            }
+
+            if (!subfleetRows.length && !driverRows.length && !vehicleRows.length) {
+                return [];
+            }
+
+            return [this.fleetRow(fleet, depth), ...subfleetRows, ...driverRows, ...vehicleRows];
+        });
+    }
+
+    childRows(fleet, depth, forceExpanded = false) {
+        const rows = [];
+
+        this.fleetSubfleets(fleet).forEach((subfleet) => {
+            if (forceExpanded) {
+                rows.push(this.fleetRow(subfleet, depth), ...this.childRows(subfleet, depth + 1, true));
+            } else {
+                rows.push(...this.buildFleetRows([subfleet], depth));
+            }
+        });
+
+        if (this.activeFilter !== FILTER_VEHICLES) {
+            this.fleetDrivers(fleet)
+                .filter((driver) => this.activeFilter !== FILTER_ONLINE || driver?.online)
+                .forEach((driver) => rows.push(this.driverRow(driver, depth)));
+        }
+
+        if (this.activeFilter !== FILTER_DRIVERS) {
+            this.fleetVehicles(fleet)
+                .filter((vehicle) => this.activeFilter !== FILTER_ONLINE || vehicle?.online)
+                .forEach((vehicle) => rows.push(this.vehicleRow(vehicle, depth)));
+        }
+
+        return rows;
+    }
+
+    fleetRow(fleet, depth) {
+        return {
+            type: 'fleet',
+            key: `fleet:${this.fleetKey(fleet)}`,
+            fleet,
+            depth,
+            depthClass: this.depthClass(depth),
+        };
+    }
+
+    driverRow(driver, depth) {
+        return {
+            type: 'driver',
+            key: `driver:${driver?.id ?? driver?.uuid ?? driver?.public_id ?? this.displayName(driver)}`,
+            driver,
+            depth,
+            depthClass: this.depthClass(depth),
+        };
+    }
+
+    vehicleRow(vehicle, depth) {
+        return {
+            type: 'vehicle',
+            key: `vehicle:${vehicle?.id ?? vehicle?.uuid ?? vehicle?.public_id ?? this.displayName(vehicle)}`,
+            vehicle,
+            depth,
+            depthClass: this.depthClass(depth),
+        };
+    }
+
+    depthClass(depth) {
+        return `fleet-hierarchy-tree-row-depth-${Math.min(Number(depth) || 0, 5)}`;
+    }
+
+    fleetMatches(fleet) {
+        return this.resourceMatches(fleet, ['name', 'public_id', 'status', 'slug'], [this.fleetSubtitle(fleet)]);
+    }
+
+    driverMatches(driver) {
+        return this.resourceMatches(driver, ['displayName', 'display_name', 'name', 'public_id', 'status', 'vehicle_name'], [this.driverSubtitle(driver)]);
+    }
+
+    vehicleMatches(vehicle) {
+        return this.resourceMatches(vehicle, ['displayName', 'display_name', 'name', 'public_id', 'status', 'driver_name', 'plate_number', 'vin'], [this.vehicleSubtitle(vehicle)]);
+    }
+
+    driverVisible(driver) {
+        if (this.activeFilter === FILTER_VEHICLES) {
+            return false;
+        }
+
+        if (this.activeFilter === FILTER_ONLINE && !driver?.online) {
+            return false;
+        }
+
+        return !this.hasQuery || this.driverMatches(driver);
+    }
+
+    vehicleVisible(vehicle) {
+        if (this.activeFilter === FILTER_DRIVERS) {
+            return false;
+        }
+
+        if (this.activeFilter === FILTER_ONLINE && !vehicle?.online) {
+            return false;
+        }
+
+        return !this.hasQuery || this.vehicleMatches(vehicle);
+    }
+
+    resourceMatches(resource, fields = [], extraValues = []) {
+        if (!this.hasQuery) {
+            return true;
+        }
+
+        const values = [...fields.map((field) => resource?.[field]), ...extraValues];
+
+        return values.filter(Boolean).some((value) => String(value).toLowerCase().includes(this.normalizedQuery));
+    }
+
+    sortOnlineFirst(resources = []) {
+        return [...resources].sort((a, b) => {
+            const onlineSort = Number(Boolean(b?.online)) - Number(Boolean(a?.online));
+
+            if (onlineSort !== 0) {
+                return onlineSort;
+            }
+
+            return String(this.displayName(a)).localeCompare(String(this.displayName(b)));
+        });
+    }
+
+    sortByName(resources = []) {
+        return [...resources].sort((a, b) => String(this.displayName(a)).localeCompare(String(this.displayName(b))));
+    }
+
+    @action toggleFleet(fleet) {
+        const key = this.fleetKey(fleet);
+        const expandedFleetIds = new Set(this.expandedFleetIds);
+        const willExpand = !expandedFleetIds.has(key);
+
+        if (!willExpand) {
+            expandedFleetIds.delete(key);
+        } else {
+            expandedFleetIds.add(key);
+        }
+
+        this.expandedFleetIds = expandedFleetIds;
+
+        if (willExpand) {
+            this.loadFleetResources(fleet);
+        }
+    }
+
+    @action expandAll() {
+        this.expandedFleetIds = new Set(this.collectFleetKeys(this.fleets));
+        this.loadVisibleFleetResources();
+    }
+
+    @action collapseAll() {
+        this.expandedFleetIds = new Set(this.fleets.map((fleet) => this.fleetKey(fleet)).filter(Boolean));
+    }
+
+    @action toggleExpandCollapseAll() {
+        if (this.allFleetNodesExpanded) {
+            this.collapseAll();
+        } else {
+            this.expandAll();
+        }
+    }
+
+    collectFleetKeys(fleets = []) {
+        return fleets.flatMap((fleet) => [this.fleetKey(fleet), ...this.collectFleetKeys(this.fleetSubfleets(fleet))].filter(Boolean));
+    }
+
+    visibleFleets(fleets = this.fleets) {
+        return fleets.flatMap((fleet) => {
+            if (!this.isFleetExpanded(fleet)) {
+                return [fleet];
+            }
+
+            return [fleet, ...this.visibleFleets(this.fleetSubfleets(fleet))];
+        });
+    }
+
+    @action loadVisibleFleetResources() {
+        this.visibleFleets().forEach((fleet) => this.loadFleetResources(fleet));
+    }
+
+    loadFleetResources(fleet) {
+        if (!fleet) {
+            return;
+        }
+
+        if (!this.fleetDrivers(fleet).length && this.fleetDriverCount(fleet) > 0) {
+            this.loadFleetDrivers(fleet);
+        }
+
+        if (!this.fleetVehicles(fleet).length && this.fleetVehicleCount(fleet) > 0) {
+            this.loadFleetVehicles(fleet);
+        }
+    }
+
+    async loadFleetDrivers(fleet) {
+        const key = this.fleetKey(fleet);
+
+        if (!key || this.loadingDriverFleetKeys.has(key) || this.loadedDriversByFleetKey[key]) {
+            return;
+        }
+
+        this.loadingDriverFleetKeys.add(key);
+
+        try {
+            const drivers = await this.store.query('driver', { fleet: fleet.id, limit: -1 });
+            this.loadedDriversByFleetKey = {
+                ...this.loadedDriversByFleetKey,
+                [key]: this.resourceArray(drivers),
+            };
+        } catch (error) {
+            debug(`Unable to load hierarchy drivers for fleet ${key}: ${error.message}`);
+        } finally {
+            this.loadingDriverFleetKeys.delete(key);
+        }
+    }
+
+    async loadFleetVehicles(fleet) {
+        const key = this.fleetKey(fleet);
+
+        if (!key || this.loadingVehicleFleetKeys.has(key) || this.loadedVehiclesByFleetKey[key]) {
+            return;
+        }
+
+        this.loadingVehicleFleetKeys.add(key);
+
+        try {
+            const vehicles = await this.store.query('vehicle', { fleet: fleet.id, limit: -1 });
+            this.loadedVehiclesByFleetKey = {
+                ...this.loadedVehiclesByFleetKey,
+                [key]: this.resourceArray(vehicles),
+            };
+        } catch (error) {
+            debug(`Unable to load hierarchy vehicles for fleet ${key}: ${error.message}`);
+        } finally {
+            this.loadingVehicleFleetKeys.delete(key);
+        }
+    }
+
+    @action updateQuery(event) {
+        this.query = event.target.value;
+    }
+
+    @action clearFilters() {
+        this.query = '';
+        this.activeFilter = FILTER_ALL;
+    }
+
+    @action setFilter(filter) {
+        this.activeFilter = filter;
+    }
+
+    @action viewFleet(fleet) {
+        if (typeof this.args.onViewFleet === 'function') {
+            return this.args.onViewFleet(fleet);
+        }
+    }
+
+    @action viewDriver(driver) {
+        if (typeof this.args.onViewDriver === 'function') {
+            return this.args.onViewDriver(driver);
+        }
+    }
+
+    @action viewVehicle(vehicle) {
+        if (typeof this.args.onViewVehicle === 'function') {
+            return this.args.onViewVehicle(vehicle);
+        }
+    }
+
+    @action assignDriver(fleet) {
+        if (typeof this.args.onAssignDriver === 'function') {
+            return this.args.onAssignDriver(fleet);
+        }
+    }
+
+    @action assignVehicle(fleet) {
+        if (typeof this.args.onAssignVehicle === 'function') {
+            return this.args.onAssignVehicle(fleet);
+        }
+    }
+
+    @action calculateDropdownLeftPosition(trigger, content) {
+        const triggerRect = trigger.getBoundingClientRect();
+        const contentRect = content?.getBoundingClientRect?.();
+        const contentWidth = contentRect?.width || 224;
+
+        return {
+            style: {
+                position: 'fixed',
+                marginTop: '0px',
+                left: triggerRect.left - contentWidth - 3,
+                top: triggerRect.top,
+            },
+        };
+    }
+}
diff --git a/addon/components/order/form.hbs b/addon/components/order/form.hbs
index 8163f622..54f41171 100644
--- a/addon/components/order/form.hbs
+++ b/addon/components/order/form.hbs
@@ -2,6 +2,7 @@
     {{#if (has-block)}}
         {{yield
             (hash
+                RegistryYieldStart=(component "registry-yield" registry="fleet-ops:component:order:form:start" order=@resource)
                 Details=(component "order/form/details" resource=@resource)
                 CustomFields=(component "order/form/custom-fields" resource=@resource customFields=@customFields)
                 Route=(component "order/form/route" resource=@resource)
@@ -12,9 +13,13 @@
                 Documents=(component "order/form/documents" resource=@resource)
                 OrchestratorConstraints=(component "order/form/orchestrator-constraints" resource=@resource)
                 Metadata=(component "order/form/metadata" resource=@resource)
+                RegistryYieldEnd=(component "registry-yield" registry="fleet-ops:component:order:form:end" order=@resource)
             )
         }}
     {{else}}
+        <RegistryYield @registry="fleet-ops:component:order:form:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <Order::Form::Details @resource={{@resource}} />
         <Order::Form::Route @resource={{@resource}} />
         <RegistryYield @registry="fleet-ops:component:order:form" as |RegistryComponent|>
@@ -26,5 +31,8 @@
         <Order::Form::Documents @resource={{@resource}} />
         <Order::Form::OrchestratorConstraints @resource={{@resource}} />
         <Order::Form::Metadata @resource={{@resource}} />
+        <RegistryYield @registry="fleet-ops:component:order:form:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     {{/if}}
-</div>
+</div>
\ No newline at end of file
diff --git a/addon/components/order/form/details.hbs b/addon/components/order/form/details.hbs
index e6f1523c..56057e44 100644
--- a/addon/components/order/form/details.hbs
+++ b/addon/components/order/form/details.hbs
@@ -234,6 +234,10 @@
                 />
             </InputGroup>
         </div>
+
+        <RegistryYield @registry="fleet-ops:component:order:form:details" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     </div>
 </ContentPanel>
 
diff --git a/addon/components/vehicle/card.hbs b/addon/components/vehicle/card.hbs
index d1aa720f..695ddb13 100644
--- a/addon/components/vehicle/card.hbs
+++ b/addon/components/vehicle/card.hbs
@@ -1,10 +1,16 @@
 <Layout::Resource::Card ...attributes as |Card|>
     <Card.header class="{{@headerClass}}">
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="font-semibold w-full truncate">{{or @resource.name @resource.yearMakeModel}}</div>
-        <div class="text-gray-300 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
+        <div class="text-gray-400 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
         {{#if (has-block "header")}}
             {{yield to="header"}}
         {{/if}}
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     </Card.header>
     <Card.body class={{@bodyClass}}>
         <Image src={{@resource.photo_url}} class="card-img-lg" />
@@ -13,16 +19,22 @@
         {{/if}}
     </Card.body>
     <Card.footer class={{@footerClass}}>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="flex flex-row items-center space-x-1">
             <Button @icon="eye" @size="xs" @onClick={{fn this.vehicleActions.transition.view @resource}} />
             <Button @icon="pencil" @size="xs" @onClick={{fn this.vehicleActions.transition.edit @resource}} />
             <Button @icon="trash" @size="xs" @type="danger" @onClick={{fn this.vehicleActions.delete @resource}} />
         </div>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         {{#if (has-block "footer")}}
             {{yield to="footer"}}
         {{/if}}
         <div class="mt-1.5">
-            <div class="text-gray-300 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
+            <div class="text-gray-400 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
         </div>
     </Card.footer>
 </Layout::Resource::Card>
diff --git a/addon/components/vehicle/form.hbs b/addon/components/vehicle/form.hbs
index 8f01e8f9..24091b08 100644
--- a/addon/components/vehicle/form.hbs
+++ b/addon/components/vehicle/form.hbs
@@ -1,4 +1,8 @@
 <div class="form-wrapper" ...attributes>
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:start" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! DETAILS / IDENTIFICATION }}
     <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="flex flex-row space-x-3 mb-3">
@@ -128,6 +132,10 @@
         </RegistryYield>
     </ContentPanel>
 
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:after-details" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! MEASUREMENT & UNITS / ODOMETER }}
     <ContentPanel @title="Measurement & Units" @open={{true}} @wrapperClass="bordered-top">
         <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
@@ -608,4 +616,8 @@
     <ContentPanel @title={{t "common.metadata"}} @open={{true}} @wrapperClass="bordered-top">
         <MetadataEditor @value={{@resource.meta}} @onChange={{fn (mut @resource.meta)}} />
     </ContentPanel>
-</div>
+
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:end" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+</div>
\ No newline at end of file
diff --git a/addon/extension.js b/addon/extension.js
index aefaf225..9a87ca51 100644
--- a/addon/extension.js
+++ b/addon/extension.js
@@ -369,6 +369,13 @@ export default {
             'fleet-ops:component:place:form:details',
             'fleet-ops:component:vehicle:form',
             'fleet-ops:component:vehicle:form:details',
+            'fleet-ops:component:vehicle:form:after-details',
+            'fleet-ops:component:vehicle:form:start',
+            'fleet-ops:component:vehicle:form:end',
+            'fleet-ops:component:vehicle:card:header:start',
+            'fleet-ops:component:vehicle:card:header:end',
+            'fleet-ops:component:vehicle:card:footer:start',
+            'fleet-ops:component:vehicle:card:footer:end',
             'fleet-ops:component:vendor:form:edit',
             'fleet-ops:component:vendor:form:edit:details',
             'fleet-ops:component:vendor:form:create',
@@ -393,6 +400,9 @@ export default {
             'fleet-ops:contextmenu:driver',
             'fleet-ops:component:order:details',
             'fleet-ops:component:order:form',
+            'fleet-ops:component:order:form:start',
+            'fleet-ops:component:order:form:end',
+            'fleet-ops:component:order:form:details',
             'fleet-ops:component:order:form:payload:entity',
             'fleet-ops:component:order:form:payload:entity:form',
             'fleet-ops:template:settings:routing',
diff --git a/addon/routes/management/fleets/index/details.js b/addon/routes/management/fleets/index/details.js
index 26d37666..39c83547 100644
--- a/addon/routes/management/fleets/index/details.js
+++ b/addon/routes/management/fleets/index/details.js
@@ -24,6 +24,6 @@ export default class ManagementFleetsIndexDetailsRoute extends Route {
     }
 
     model({ public_id }) {
-        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone'] });
+        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone', 'subfleets', 'drivers', 'vehicles'] });
     }
 }
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index e06d61cc..65ebad76 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -2242,6 +2242,20 @@ body[data-theme='dark'] .fleet-ops-operations-monitor-divider::before {
     padding-left: 2.75rem !important;
 }
 
+.fleet-hierarchy-tree-row-depth-1 {
+    padding-left: 1.5rem !important;
+}
+
+.fleet-hierarchy-tree-row-depth-2 {
+    padding-left: 2.5rem !important;
+}
+
+.fleet-hierarchy-tree-row-depth-3,
+.fleet-hierarchy-tree-row-depth-4,
+.fleet-hierarchy-tree-row-depth-5 {
+    padding-left: 3.5rem !important;
+}
+
 .fleet-ops-operations-monitor-child-row {
     margin-top: -0.125rem;
 }
diff --git a/app/components/fleet/hierarchy-tree.js b/app/components/fleet/hierarchy-tree.js
new file mode 100644
index 00000000..b9adb86a
--- /dev/null
+++ b/app/components/fleet/hierarchy-tree.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fleet/hierarchy-tree';
diff --git a/server/src/Http/Resources/v1/Fleet.php b/server/src/Http/Resources/v1/Fleet.php
index a1cf7eef..ab9378cb 100644
--- a/server/src/Http/Resources/v1/Fleet.php
+++ b/server/src/Http/Resources/v1/Fleet.php
@@ -24,8 +24,14 @@ public function toArray($request)
 
             $this->load($with);
 
-            if (in_array('subfleets', $with, true) && in_array('vehicles', $with, true)) {
-                $this->loadMissing('subFleets.vehicles');
+            if (in_array('subfleets', $with, true)) {
+                if (in_array('drivers', $with, true)) {
+                    $this->loadMissing('subFleets.drivers');
+                }
+
+                if (in_array('vehicles', $with, true)) {
+                    $this->loadMissing('subFleets.vehicles');
+                }
             }
         }
 
diff --git a/server/src/Models/Driver.php b/server/src/Models/Driver.php
index d82c045c..c9b857e8 100644
--- a/server/src/Models/Driver.php
+++ b/server/src/Models/Driver.php
@@ -278,6 +278,8 @@ public function vehicle()
             'photo_uuid',
             'avatar_url',
             'public_id',
+            'name',
+            'internal_id',
             'location',
             'online',
             'updated_at',
@@ -288,6 +290,10 @@ public function vehicle()
             'year',
             'make',
             'model',
+            'class',
+            'color',
+            'call_sign',
+            'status',
             'specs',
             'vin_data',
             'telematics',
diff --git a/server/tests/FleetHierarchyResourceTest.php b/server/tests/FleetHierarchyResourceTest.php
new file mode 100644
index 00000000..31122895
--- /dev/null
+++ b/server/tests/FleetHierarchyResourceTest.php
@@ -0,0 +1,12 @@
+<?php
+
+test('fleet resource expands subfleet drivers and vehicles for hierarchy payloads', function () {
+    $resource = file_get_contents(__DIR__ . '/../src/Http/Resources/v1/Fleet.php');
+
+    expect($resource)
+        ->toContain("if (in_array('subfleets', \$with, true))")
+        ->toContain("if (in_array('drivers', \$with, true))")
+        ->toContain("\$this->loadMissing('subFleets.drivers')")
+        ->toContain("if (in_array('vehicles', \$with, true))")
+        ->toContain("\$this->loadMissing('subFleets.vehicles')");
+});
diff --git a/tests/integration/components/fleet/details-test.js b/tests/integration/components/fleet/details-test.js
index ca71cd9b..4c0869c3 100644
--- a/tests/integration/components/fleet/details-test.js
+++ b/tests/integration/components/fleet/details-test.js
@@ -2,25 +2,65 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'dummy/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+
+class FleetActionsServiceStub extends Service {
+    panel = {
+        view() {},
+    };
+
+    assignDriver() {}
+    assignVehicle() {}
+}
+
+class DriverActionsServiceStub extends Service {
+    panel = {
+        view() {},
+    };
+}
+
+class VehicleActionsServiceStub extends Service {
+    panel = {
+        view() {},
+    };
+}
 
 module('Integration | Component | fleet/details', function (hooks) {
     setupRenderingTest(hooks);
 
-    test('it renders', async function (assert) {
-        // Set any properties with this.set('myProperty', 'value');
-        // Handle any actions with this.set('myAction', function(val) { ... });
-
-        await render(hbs`<Fleet::Details />`);
+    hooks.beforeEach(function () {
+        this.owner.register('service:fleet-actions', FleetActionsServiceStub);
+        this.owner.register('service:driver-actions', DriverActionsServiceStub);
+        this.owner.register('service:vehicle-actions', VehicleActionsServiceStub);
+    });
 
-        assert.dom().hasText('');
+    test('it renders fleet details and hierarchy without KPI summary noise', async function (assert) {
+        this.set('fleet', {
+            id: 'fleet_1',
+            name: 'Central Fleet',
+            status: 'active',
+            task: 'Same-day delivery',
+            drivers_count: 2,
+            drivers_online_count: 1,
+            vehicles_count: 1,
+            vehicles_online_count: 1,
+            createdAtShort: '30, Jun',
+            service_area: { name: 'Ulaanbaatar' },
+            zone: { name: 'North' },
+            drivers: [{ id: 'driver_1', name: 'Ari Driver', online: true }],
+            vehicles: [{ id: 'vehicle_1', displayName: 'Van 11', online: true }],
+            subfleets: [{ id: 'fleet_child', name: 'North Subfleet', drivers: [], vehicles: [], subfleets: [] }],
+        });
 
-        // Template block usage:
-        await render(hbs`
-      <Fleet::Details>
-        template block text
-      </Fleet::Details>
-    `);
+        await render(hbs`<Fleet::Details @resource={{this.fleet}} />`);
 
-        assert.dom().hasText('template block text');
+        assert.dom('[data-test-fleet-details-summary]').doesNotExist();
+        assert.dom().includesText('Central Fleet');
+        assert.dom().includesText('Same-day delivery');
+        assert.dom().includesText('1 of 2 Online');
+        assert.dom('[data-test-fleet-hierarchy-tree]').exists();
+        assert.dom().includesText('North Subfleet');
+        assert.dom().includesText('Ari Driver');
+        assert.dom().includesText('Van 11');
     });
 });
diff --git a/tests/integration/components/fleet/hierarchy-tree-test.js b/tests/integration/components/fleet/hierarchy-tree-test.js
new file mode 100644
index 00000000..d743548a
--- /dev/null
+++ b/tests/integration/components/fleet/hierarchy-tree-test.js
@@ -0,0 +1,183 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { click, fillIn, render, waitUntil } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+
+class StoreServiceStub extends Service {
+    queryCalls = [];
+    driverResults = [];
+    vehicleResults = [];
+
+    async query(modelName, params) {
+        this.queryCalls.push({ modelName, params });
+
+        const results = modelName === 'driver' ? this.driverResults : this.vehicleResults;
+
+        return {
+            toArray() {
+                return results;
+            },
+        };
+    }
+}
+
+module('Integration | Component | fleet/hierarchy-tree', function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:store', StoreServiceStub);
+        this.store = this.owner.lookup('service:store');
+        this.fleet = {
+            id: 'fleet_root',
+            name: 'Central Fleet',
+            drivers_count: 2,
+            drivers_online_count: 1,
+            vehicles_count: 2,
+            vehicles_online_count: 1,
+            drivers: [
+                { id: 'driver_1', name: 'Ari Driver', online: true, vehicle_name: 'Van 11' },
+                { id: 'driver_2', name: 'Bo Driver', online: false, status: 'standby' },
+            ],
+            vehicles: [
+                { id: 'vehicle_1', displayName: 'Van 11', online: true, driver_name: 'Ari Driver' },
+                { id: 'vehicle_2', displayName: 'Truck 12', online: false, plate_number: 'FB-12' },
+            ],
+            subfleets: [
+                {
+                    id: 'fleet_child',
+                    name: 'North Subfleet',
+                    drivers_count: 1,
+                    drivers_online_count: 1,
+                    vehicles_count: 1,
+                    vehicles_online_count: 0,
+                    drivers: [{ id: 'driver_3', name: 'Cy Driver', online: true }],
+                    vehicles: [{ id: 'vehicle_3', displayName: 'North Truck', online: false }],
+                    subfleets: [],
+                },
+            ],
+        };
+    });
+
+    test('it renders a nested fleet hierarchy with drivers and vehicles', async function (assert) {
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        assert.dom('[data-test-fleet-hierarchy-tree]').exists();
+        assert.dom('[data-test-fleet-hierarchy-row="fleet"]').exists({ count: 2 });
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 3 });
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').exists({ count: 3 });
+        assert.dom().includesText('Central Fleet');
+        assert.dom().includesText('North Subfleet');
+        assert.dom().includesText('Ari Driver');
+        assert.dom().includesText('Van 11');
+    });
+
+    test('it collapses and expands fleet nodes', async function (assert) {
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 3 });
+
+        await click('[data-test-fleet-hierarchy-row="fleet"] button');
+
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').doesNotExist();
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').doesNotExist();
+
+        await click('[data-test-fleet-hierarchy-row="fleet"] button');
+
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 3 });
+    });
+
+    test('it uses a single icon-only control to expand and collapse all fleet nodes', async function (assert) {
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        assert.dom('[data-test-fleet-hierarchy-expand-toggle]').exists({ count: 1 });
+        assert.dom('[data-test-fleet-hierarchy-expand-all]').doesNotExist();
+        assert.dom('[data-test-fleet-hierarchy-collapse-all]').doesNotExist();
+        assert.dom().includesText('North Truck');
+
+        await click('[data-test-fleet-hierarchy-expand-toggle]');
+
+        assert.dom().includesText('Ari Driver');
+        assert.dom().doesNotIncludeText('North Truck');
+
+        await click('[data-test-fleet-hierarchy-expand-toggle]');
+
+        assert.dom().includesText('North Truck');
+    });
+
+    test('it filters by search text', async function (assert) {
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        await fillIn('[data-test-fleet-hierarchy-search]', 'North Truck');
+
+        assert.dom('[data-test-fleet-hierarchy-row="fleet"]').exists({ count: 2 });
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').exists({ count: 1 });
+        assert.dom().includesText('North Truck');
+        assert.dom().doesNotIncludeText('Ari Driver');
+    });
+
+    test('it filters by resource type and online state', async function (assert) {
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        await click('[data-test-fleet-hierarchy-filter="drivers"]');
+
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 3 });
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').doesNotExist();
+
+        await click('[data-test-fleet-hierarchy-filter="online"]');
+
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 2 });
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').exists({ count: 1 });
+        assert.dom().doesNotIncludeText('Bo Driver');
+        assert.dom().doesNotIncludeText('Truck 12');
+    });
+
+    test('it shows empty and no-results states', async function (assert) {
+        this.set('fleet', { id: 'empty_fleet', name: 'Empty Fleet', subfleets: [], drivers: [], vehicles: [] });
+
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+
+        assert.dom('[data-test-fleet-hierarchy-empty]').exists();
+        assert.dom().includesText('No fleet resources assigned');
+
+        await fillIn('[data-test-fleet-hierarchy-search]', 'missing');
+
+        assert.dom('[data-test-fleet-hierarchy-empty]').exists();
+        assert.dom().includesText('No matching resources');
+
+        await click('[data-test-fleet-hierarchy-clear-filters]');
+
+        assert.dom().includesText('No fleet resources assigned');
+    });
+
+    test('it loads direct fleet resources when counts exist but embedded rows are missing', async function (assert) {
+        this.store.driverResults = [{ id: 'driver_loaded', name: 'Loaded Driver', online: true }];
+        this.store.vehicleResults = [{ id: 'vehicle_loaded', displayName: 'Loaded Vehicle', online: false }];
+        this.set('fleet', {
+            id: 'fleet_with_counts',
+            name: 'Counted Fleet',
+            drivers_count: 1,
+            drivers_online_count: 1,
+            vehicles_count: 1,
+            vehicles_online_count: 0,
+            drivers: [],
+            vehicles: [],
+            subfleets: [],
+        });
+
+        await render(hbs`<Fleet::HierarchyTree @fleet={{this.fleet}} />`);
+        await waitUntil(() => this.element.textContent.includes('Loaded Driver'));
+
+        assert.deepEqual(
+            this.store.queryCalls.map((call) => [call.modelName, call.params]),
+            [
+                ['driver', { fleet: 'fleet_with_counts', limit: -1 }],
+                ['vehicle', { fleet: 'fleet_with_counts', limit: -1 }],
+            ]
+        );
+        assert.dom('[data-test-fleet-hierarchy-row="driver"]').exists({ count: 1 });
+        assert.dom('[data-test-fleet-hierarchy-row="vehicle"]').exists({ count: 1 });
+        assert.dom().includesText('Loaded Driver');
+        assert.dom().includesText('Loaded Vehicle');
+    });
+});

From 3a6b58ed110bc2260a0780f7fccf3ec313a2fe83 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 14:35:21 +0800
Subject: [PATCH 05/19] ran php-cs-fixer

---
 .../CreateOrderPreviewCapability.php          | 20 +++++++++----------
 .../OperationalQueryCapability.php            | 14 ++++++-------
 .../OptimizeOrderRouteCapability.php          |  2 +-
 .../SearchResourcesCapability.php             | 16 +++++++--------
 .../Support/Ai/FleetOpsAiQueryResources.php   | 10 +++++-----
 .../AiCreateOrderPreviewCapabilityTest.php    |  2 +-
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
index 4597f365..a37077a0 100644
--- a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
+++ b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
@@ -61,12 +61,12 @@ public function executable(): bool
     public function inputSchema(): array
     {
         return [
-            'order_config_uuid' => 'Fleet-Ops order config UUID. Defaults to the company transport config when available.',
-            'payload.pickup_uuid' => 'Existing Fleet-Ops place UUID for pickup.',
+            'order_config_uuid'    => 'Fleet-Ops order config UUID. Defaults to the company transport config when available.',
+            'payload.pickup_uuid'  => 'Existing Fleet-Ops place UUID for pickup.',
             'payload.dropoff_uuid' => 'Existing Fleet-Ops place UUID for dropoff.',
-            'payload.waypoints' => 'Optional ordered waypoint place UUIDs.',
-            'customer' => 'Optional contact/vendor UUID.',
-            'dispatched' => 'Optional boolean. Defaults to false for AI-created drafts.',
+            'payload.waypoints'    => 'Optional ordered waypoint place UUIDs.',
+            'customer'             => 'Optional contact/vendor UUID.',
+            'dispatched'           => 'Optional boolean. Defaults to false for AI-created drafts.',
         ];
     }
 
@@ -96,7 +96,7 @@ public function preview(AiTask $task, array $input = []): array
         }
 
         if ($driver) {
-            $draft['driver'] = $driver->uuid;
+            $draft['driver']               = $driver->uuid;
             $draft['driver_assigned_uuid'] = $driver->uuid;
         }
 
@@ -172,10 +172,10 @@ public function apply(AiTask $task, array $preview = [], array $input = []): arr
             'status'   => 'completed',
             'message'  => 'Fleet-Ops order was created.',
             'resource' => [
-                'type'  => 'order',
-                'id'    => data_get($order, 'public_id') ?? data_get($order, 'id'),
-                'uuid'  => data_get($order, 'uuid'),
-                'route' => 'console.fleet-ops.operations.orders.index.details',
+                'type'   => 'order',
+                'id'     => data_get($order, 'public_id') ?? data_get($order, 'id'),
+                'uuid'   => data_get($order, 'uuid'),
+                'route'  => 'console.fleet-ops.operations.orders.index.details',
                 'models' => array_filter([data_get($order, 'public_id') ?? data_get($order, 'uuid')]),
             ],
         ];
diff --git a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
index 45e395e3..447fa365 100644
--- a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
+++ b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
@@ -85,9 +85,9 @@ protected function matchesPrompt(string $prompt): bool
     protected function driverQueries(string $prompt, AiQueryExecutor $executor): array
     {
         $queries = [
-            'total'           => $executor->count('fleet-ops.drivers'),
-            'online'          => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => '=', 'value' => true]]),
-            'offline'         => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => 'false_or_null']]),
+            'total'            => $executor->count('fleet-ops.drivers'),
+            'online'           => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => '=', 'value' => true]]),
+            'offline'          => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => 'false_or_null']]),
             'counts_by_status' => $executor->countsBy('fleet-ops.drivers', 'status'),
         ];
 
@@ -101,7 +101,7 @@ protected function driverQueries(string $prompt, AiQueryExecutor $executor): arr
         if ($this->mentions($prompt, ['where', 'located', 'location', 'majority', 'service area', 'zone'])) {
             $filters = $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : [];
 
-            $queries['location_summary'] = $executor->locationSummary('fleet-ops.drivers', $filters, 250);
+            $queries['location_summary']          = $executor->locationSummary('fleet-ops.drivers', $filters, 250);
             $queries['service_area_distribution'] = $this->driverGeofenceDistribution($filters);
         }
 
@@ -111,9 +111,9 @@ protected function driverQueries(string $prompt, AiQueryExecutor $executor): arr
     protected function onlineResourceQueries(string $resource, string $prompt, AiQueryExecutor $executor): array
     {
         $queries = [
-            'total'           => $executor->count($resource),
-            'online'          => $executor->count($resource, [['field' => 'online', 'operator' => '=', 'value' => true]]),
-            'offline'         => $executor->count($resource, [['field' => 'online', 'operator' => 'false_or_null']]),
+            'total'            => $executor->count($resource),
+            'online'           => $executor->count($resource, [['field' => 'online', 'operator' => '=', 'value' => true]]),
+            'offline'          => $executor->count($resource, [['field' => 'online', 'operator' => 'false_or_null']]),
             'counts_by_status' => $executor->countsBy($resource, 'status'),
         ];
 
diff --git a/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php b/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
index c9f4d54d..c8614ddb 100644
--- a/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
+++ b/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php
@@ -53,7 +53,7 @@ public function executable(): bool
     public function inputSchema(): array
     {
         return [
-            'order' => 'Fleet-Ops order UUID or public ID.',
+            'order'     => 'Fleet-Ops order UUID or public ID.',
             'waypoints' => 'Ordered waypoint place UUIDs generated by the preview.',
         ];
     }
diff --git a/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php b/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
index 9aa53489..99a6a5da 100644
--- a/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
+++ b/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php
@@ -83,15 +83,15 @@ protected function orders(array $terms): array
             ->limit(5)
             ->get()
             ->map(fn (Order $order) => [
-                'id'                  => $order->public_id,
-                'uuid'                => $order->uuid,
-                'tracking'            => $order->tracking,
-                'status'              => $order->status,
-                'type'                => $order->type,
-                'transaction_amount'  => $order->transaction_amount,
+                'id'                   => $order->public_id,
+                'uuid'                 => $order->uuid,
+                'tracking'             => $order->tracking,
+                'status'               => $order->status,
+                'type'                 => $order->type,
+                'transaction_amount'   => $order->transaction_amount,
                 'transaction_currency' => $order->transaction_currency,
-                'route'               => 'console.fleet-ops.operations.orders.index.details',
-                'models'              => [$order->public_id ?: $order->uuid],
+                'route'                => 'console.fleet-ops.operations.orders.index.details',
+                'models'               => [$order->public_id ?: $order->uuid],
             ])
             ->values()
             ->all();
diff --git a/server/src/Support/Ai/FleetOpsAiQueryResources.php b/server/src/Support/Ai/FleetOpsAiQueryResources.php
index b528069f..6471907b 100644
--- a/server/src/Support/Ai/FleetOpsAiQueryResources.php
+++ b/server/src/Support/Ai/FleetOpsAiQueryResources.php
@@ -90,12 +90,12 @@ public static function register(AiQueryRegistry $registry): void
             permission: 'fleet-ops see order',
             aliases: ['orders', 'order'],
             fields: [
-                'status'               => ['column' => 'status', 'type' => 'string'],
-                'type'                 => ['column' => 'type', 'type' => 'string'],
-                'driver_assigned_uuid' => ['column' => 'driver_assigned_uuid', 'type' => 'uuid'],
+                'status'                => ['column' => 'status', 'type' => 'string'],
+                'type'                  => ['column' => 'type', 'type' => 'string'],
+                'driver_assigned_uuid'  => ['column' => 'driver_assigned_uuid', 'type' => 'uuid'],
                 'vehicle_assigned_uuid' => ['column' => 'vehicle_assigned_uuid', 'type' => 'uuid'],
-                'created_at'           => ['column' => 'created_at', 'type' => 'datetime'],
-                'scheduled_at'         => ['column' => 'scheduled_at', 'type' => 'datetime'],
+                'created_at'            => ['column' => 'created_at', 'type' => 'datetime'],
+                'scheduled_at'          => ['column' => 'scheduled_at', 'type' => 'datetime'],
             ],
             sampleFields: ['public_id', 'status', 'type', 'driver_assigned_uuid', 'vehicle_assigned_uuid', 'created_at'],
             directivePermission: 'fleet-ops list order',
diff --git a/server/tests/AiCreateOrderPreviewCapabilityTest.php b/server/tests/AiCreateOrderPreviewCapabilityTest.php
index a8c016a8..5e7e150b 100644
--- a/server/tests/AiCreateOrderPreviewCapabilityTest.php
+++ b/server/tests/AiCreateOrderPreviewCapabilityTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Fleetbase\FleetOps\Support\Ai\Capabilities\CreateOrderPreviewCapability;
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\Ai\Capabilities\CreateOrderPreviewCapability;
 use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 
 function fleetopsAiCreateOrderCapability()

From a407394aab585d6e0d1ffc7ff290aa185a58d782 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 14:51:48 +0800
Subject: [PATCH 06/19] Fix AI route preview map errors

---
 addon/components/ai/route-preview-map.hbs | 26 +++++-----
 addon/components/ai/route-preview-map.js  | 58 +++++++++++++++--------
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/addon/components/ai/route-preview-map.hbs b/addon/components/ai/route-preview-map.hbs
index 79bdef29..e6d97341 100644
--- a/addon/components/ai/route-preview-map.hbs
+++ b/addon/components/ai/route-preview-map.hbs
@@ -1,4 +1,4 @@
-<div class="fleetbase-ai-create-order-preview__map">
+<div class="fleetbase-ai-create-order-preview__map" {{did-insert this.setupPreview}}>
     {{#if this.canShowMap}}
         {{#if this.shouldUseGoogleMaps}}
             <div
@@ -18,17 +18,19 @@
                 as |layers|
             >
                 <layers.tile @url={{this.tileUrl}} />
-                {{#each this.routeStyles as |style|}}
-                    <layers.polyline
-                        @locations={{this.routeCoordinates}}
-                        @color={{style.color}}
-                        @weight={{style.weight}}
-                        @opacity={{style.opacity}}
-                        @lineCap={{style.lineCap}}
-                        @lineJoin={{style.lineJoin}}
-                        @dashArray={{style.dashArray}}
-                    />
-                {{/each}}
+                {{#if this.hasRouteLine}}
+                    {{#each this.routeStyles as |style|}}
+                        <layers.polyline
+                            @locations={{this.routeLineCoordinates}}
+                            @color={{style.color}}
+                            @weight={{style.weight}}
+                            @opacity={{style.opacity}}
+                            @lineCap={{style.lineCap}}
+                            @lineJoin={{style.lineJoin}}
+                            @dashArray={{style.dashArray}}
+                        />
+                    {{/each}}
+                {{/if}}
                 {{#each this.markerStops as |stop|}}
                     <layers.marker
                         @location={{stop.location}}
diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
index 0ff8c7c9..e5dcc6aa 100644
--- a/addon/components/ai/route-preview-map.js
+++ b/addon/components/ai/route-preview-map.js
@@ -28,15 +28,6 @@ export default class AiRoutePreviewMapComponent extends Component {
     computeToken = 0;
     googleApiLoadPromise = null;
 
-    constructor() {
-        super(...arguments);
-        this.mapSettings.load();
-
-        if (!this.shouldUseGoogleMaps && !this.leafletPluginsReady) {
-            this.prepareLeafletPlugins();
-        }
-    }
-
     willDestroy() {
         super.willDestroy(...arguments);
         this.clearGoogleRoute();
@@ -100,18 +91,29 @@ export default class AiRoutePreviewMapComponent extends Component {
         return this.route?.coordinates?.length ? this.route.coordinates : this.coordinates;
     }
 
+    get routeLineCoordinates() {
+        return this.route?.coordinates?.length ? this.route.coordinates : [];
+    }
+
+    get hasRouteLine() {
+        return this.routeLineCoordinates.length > 1;
+    }
+
     get markerStops() {
-        return this.routePoints.map((routePoint, index) => {
-            const presentation = buildRoutePointMarkerPresentation(routePoint, this.routeColor);
-
-            return {
-                ...presentation,
-                index,
-                location: [Number(routePoint.place.latitude), Number(routePoint.place.longitude)],
-                title: presentation.title,
-                address: this.addressLabel(routePoint.place),
-            };
-        });
+        return this.routePoints
+            .map((routePoint, index) => {
+                const location = [Number(routePoint.place.latitude), Number(routePoint.place.longitude)];
+                const presentation = buildRoutePointMarkerPresentation(routePoint, this.routeColor);
+
+                return {
+                    ...presentation,
+                    index,
+                    location,
+                    title: presentation.title,
+                    address: this.addressLabel(routePoint.place),
+                };
+            })
+            .filter((stop) => stop.location.every((coordinate) => Number.isFinite(coordinate)));
     }
 
     get tileUrl() {
@@ -144,7 +146,21 @@ export default class AiRoutePreviewMapComponent extends Component {
         return waypointIconHtml(label, color);
     }
 
+    @action async setupPreview() {
+        await this.mapSettings.load();
+
+        if (!this.shouldUseGoogleMaps && !this.leafletPluginsReady) {
+            await this.prepareLeafletPlugins();
+        }
+
+        this.syncPreview();
+    }
+
     @action async prepareLeafletPlugins() {
+        if (this.leafletPluginsReady) {
+            return;
+        }
+
         await ensureLeafletPluginsReady();
         this.leafletPluginsReady = true;
     }
@@ -251,7 +267,7 @@ export default class AiRoutePreviewMapComponent extends Component {
         this.clearGoogleRoute();
 
         const googleMaps = window.google;
-        const path = this.routeCoordinates.map(([lat, lng]) => ({ lat, lng }));
+        const path = this.routeLineCoordinates.map(([lat, lng]) => ({ lat, lng }));
 
         if (path.length > 1) {
             this.routeStyles.forEach((style) => {

From d2f5e42591ba812b337e2c23f518d5f1bc34dc42 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 15:55:27 +0800
Subject: [PATCH 07/19] Polish AI create order preview

---
 addon/components/ai/create-order-preview.hbs  |  72 +++++--
 addon/components/ai/create-order-preview.js   |  83 +++++++-
 addon/components/ai/route-preview-map.hbs     |   5 +
 addon/components/ai/route-preview-map.js      |  40 +++-
 addon/styles/fleetops-engine.css              | 184 +++++++++++++++++-
 .../CreateOrderPreviewCapability.php          |   5 +
 6 files changed, 361 insertions(+), 28 deletions(-)

diff --git a/addon/components/ai/create-order-preview.hbs b/addon/components/ai/create-order-preview.hbs
index dd066eec..9eb2fd61 100644
--- a/addon/components/ai/create-order-preview.hbs
+++ b/addon/components/ai/create-order-preview.hbs
@@ -4,14 +4,38 @@
             <div class="fleetbase-ai-action-title">{{this.preview.label}}</div>
             <div class="fleetbase-ai-action-message">{{this.preview.message}}</div>
         </div>
-        <span class="fleetbase-ai-action-status">{{if this.isCancelled "Cancelled" (if this.preview.ready "Ready" "Needs info")}}</span>
+        <span class="fleetbase-ai-action-status">{{if this.isCompleted "Completed" (if this.isCancelled "Cancelled" (if this.preview.ready "Ready" "Needs info"))}}</span>
     </div>
 
-    {{#if this.isCancelled}}
+    {{#if @isApplying}}
+        <div class="fleetbase-ai-create-order-preview__applying">
+            <span class="fleetbase-ai-create-order-preview__magic-loader" aria-hidden="true">
+                <span></span>
+                <span></span>
+                <span></span>
+            </span>
+            <span>Creating Fleet-Ops order...</span>
+        </div>
+    {{else if this.isCompleted}}
+        <div class="fleetbase-ai-create-order-preview__completed">
+            <div class="fleetbase-ai-create-order-preview__completed-icon">
+                <FaIcon @icon="check" />
+            </div>
+            <div class="fleetbase-ai-create-order-preview__completed-copy">
+                <strong>{{this.completedMessage}}</strong>
+                <span>{{this.orderReference}}</span>
+            </div>
+            {{#if this.canOpenOrder}}
+                <Button @size="sm" @icon="arrow-up-right-from-square" @text="Open order" @onClick={{this.openOrder}} />
+            {{/if}}
+        </div>
+    {{else if this.isCancelled}}
         <div class="fleetbase-ai-create-order-preview__cancelled">
             <FaIcon @icon="circle-xmark" />
             <span>{{this.cancelledMessage}}</span>
         </div>
+    {{else if this.preview.error}}
+        <div class="fleetbase-ai-action-error">{{this.preview.error.message}}</div>
     {{else}}
         <Ai::RoutePreviewMap @payload={{this.payload}} @orderId={{this.orderPreviewId}} @status="created" />
 
@@ -45,6 +69,30 @@
                 />
             </div>
 
+            <div class="fleetbase-ai-create-order-preview__field-row">
+                <div class="fleetbase-ai-create-order-preview__field-copy">
+                    <span>Schedule</span>
+                    {{#if this.isEditingSchedule}}
+                        <DateTimeInput
+                            class="fleetbase-ai-create-order-preview__inline-datetime"
+                            @value={{this.draft.scheduled_at}}
+                            @minDate={{format-date-fns (now) "yyyy-MM-dd"}}
+                            @minTime={{format-date-fns (now) "HH:mm"}}
+                            @onUpdate={{this.setScheduledAt}}
+                        />
+                    {{else}}
+                        <strong>{{this.scheduledAtLabel}}</strong>
+                    {{/if}}
+                </div>
+                <Button
+                    @icon={{if this.isEditingSchedule "check" "pen"}}
+                    @helpText={{if this.isEditingSchedule "Done" "Edit schedule"}}
+                    @wrapperClass="fleetbase-ai-create-order-preview__edit-wrapper"
+                    class="fleetbase-ai-create-order-preview__edit-button"
+                    @onClick={{if this.isEditingSchedule this.closeEditor (fn this.editField "schedule")}}
+                />
+            </div>
+
             <div class="fleetbase-ai-create-order-preview__field-row">
                 <div class="fleetbase-ai-create-order-preview__field-copy">
                     <span>Pickup</span>
@@ -195,13 +243,11 @@
                 <Toggle @isToggled={{this.draft.pod_required}} @onToggle={{this.setPodRequired}} @label="Require POD" />
                 {{#if this.draft.pod_required}}
                     {{#if this.isEditingPodMethod}}
-                        <Select
-                            @options={{this.podMethods}}
-                            @value={{this.draft.pod_method}}
-                            @onSelect={{this.setPodMethod}}
-                            @placeholder="POD method"
-                            class="fleetbase-ai-create-order-preview__inline-native-select"
-                        />
+                        <select class="fleetbase-ai-create-order-preview__inline-native-select" value={{this.draft.pod_method}} {{on "change" this.setPodMethodFromEvent}}>
+                            {{#each this.podMethods as |method|}}
+                                <option value={{method}} selected={{eq method this.draft.pod_method}}>{{this.titleize method}}</option>
+                            {{/each}}
+                        </select>
                     {{else}}
                         <button type="button" class="fleetbase-ai-create-order-preview__inline-pill" {{on "click" (fn this.editField "podMethod")}}>
                             {{this.podMethodLabel}}
@@ -226,14 +272,6 @@
             </div>
         {{/if}}
 
-        {{#if this.preview.result}}
-            <div class="fleetbase-ai-action-result">{{this.preview.result.message}}</div>
-        {{/if}}
-
-        {{#if this.preview.error}}
-            <div class="fleetbase-ai-action-error">{{this.preview.error.message}}</div>
-        {{/if}}
-
         <div class="fleetbase-ai-create-order-preview__controls">
             <Button
                 @type="primary"
diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
index 11a534c6..a132d840 100644
--- a/addon/components/ai/create-order-preview.js
+++ b/addon/components/ai/create-order-preview.js
@@ -1,9 +1,12 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
 import { action, get } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 
 export default class AiCreateOrderPreviewComponent extends Component {
+    @service router;
+
     @tracked draft = this.clone(this.args.preview?.draft ?? {});
     @tracked preview = this.args.preview;
     @tracked editingField = null;
@@ -21,7 +24,15 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     get isReady() {
-        return this.preview?.ready === true && !this.preview?.result && !this.isCancelled;
+        return this.preview?.ready === true && !this.isTerminal;
+    }
+
+    get isCompleted() {
+        return Boolean(this.preview?.result);
+    }
+
+    get isTerminal() {
+        return this.isCompleted || this.isCancelled || Boolean(this.preview?.error);
     }
 
     get isCancelled() {
@@ -32,6 +43,22 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return this.preview?.error?.message ?? 'This order creation preview was cancelled.';
     }
 
+    get completedMessage() {
+        return this.preview?.result?.message ?? 'Fleet-Ops order was created.';
+    }
+
+    get resultResource() {
+        return this.preview?.result?.resource;
+    }
+
+    get orderReference() {
+        return this.resultResource?.id ?? this.resultResource?.uuid ?? 'Created order';
+    }
+
+    get canOpenOrder() {
+        return Boolean(this.resultResource?.route && (this.resultResource?.models?.length || this.resultResource?.uuid || this.resultResource?.id));
+    }
+
     get missingFields() {
         return this.preview?.missing_fields ?? [];
     }
@@ -48,6 +75,24 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return this.titleize(this.draft.type ?? this.draft.order_config_name ?? this.draft.order_config_uuid) ?? 'Select order type';
     }
 
+    get scheduledAtLabel() {
+        const scheduledAt = this.draft.scheduled_at;
+
+        if (!scheduledAt) {
+            return 'Add schedule';
+        }
+
+        const date = scheduledAt instanceof Date ? scheduledAt : new Date(scheduledAt);
+        if (Number.isNaN(date.getTime())) {
+            return String(scheduledAt);
+        }
+
+        return new Intl.DateTimeFormat(undefined, {
+            dateStyle: 'medium',
+            timeStyle: 'short',
+        }).format(date);
+    }
+
     get pickupLabel() {
         return this.addressLabel(this.payload.pickup) ?? this.payload.pickup_query ?? 'Add pickup';
     }
@@ -76,6 +121,10 @@ export default class AiCreateOrderPreviewComponent extends Component {
         return this.editingField === 'orderType';
     }
 
+    get isEditingSchedule() {
+        return this.editingField === 'schedule';
+    }
+
     get isEditingPickup() {
         return this.editingField === 'pickup';
     }
@@ -183,7 +232,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action editField(field) {
-        if (this.isCancelled) {
+        if (this.isTerminal) {
             return;
         }
 
@@ -229,6 +278,10 @@ export default class AiCreateOrderPreviewComponent extends Component {
         this.closeEditor();
     }
 
+    @action setScheduledAt(value) {
+        this.mergeDraft({ scheduled_at: value });
+    }
+
     @action setDriver(driver) {
         this.mergeDraft({
             driver: this.modelValue(driver, 'uuid') ?? this.modelValue(driver, 'id'),
@@ -257,6 +310,10 @@ export default class AiCreateOrderPreviewComponent extends Component {
         this.closeEditor();
     }
 
+    @action setPodMethodFromEvent(event) {
+        this.setPodMethod(event.target.value);
+    }
+
     @action setDispatched(value) {
         this.mergeDraft({ dispatched: value });
     }
@@ -266,13 +323,35 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action apply() {
+        if (this.isTerminal) {
+            return;
+        }
+
         return this.args.onApply?.(this.args.task, this.preview, { draft: this.draft });
     }
 
     @action cancel() {
+        if (this.isTerminal) {
+            return;
+        }
+
         return this.args.onCancel?.(this.args.task);
     }
 
+    @action openOrder() {
+        if (!this.canOpenOrder) {
+            return;
+        }
+
+        const models = this.resultResource.models?.length ? this.resultResource.models : [this.resultResource.uuid ?? this.resultResource.id].filter(Boolean);
+
+        try {
+            this.router.transitionTo(this.resultResource.route, ...models);
+        } catch {
+            this.router.transitionTo('operations.orders.index.details', ...models);
+        }
+    }
+
     @action updatePreview(preview) {
         this.preview = preview;
         if (preview?.draft) {
diff --git a/addon/components/ai/route-preview-map.hbs b/addon/components/ai/route-preview-map.hbs
index e6d97341..3988ce5a 100644
--- a/addon/components/ai/route-preview-map.hbs
+++ b/addon/components/ai/route-preview-map.hbs
@@ -64,6 +64,11 @@
                 <Spinner />
                 <span>Rendering route...</span>
             </div>
+        {{else if this.routeErrorMessage}}
+            <div class="fleetbase-ai-create-order-preview__map-status fleetbase-ai-create-order-preview__map-status--error">
+                <FaIcon @icon="triangle-exclamation" />
+                <span>{{this.routeErrorMessage}}</span>
+            </div>
         {{/if}}
     {{else}}
         <div class="fleetbase-ai-create-order-preview__empty-map">
diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
index e5dcc6aa..88a1cea2 100644
--- a/addon/components/ai/route-preview-map.js
+++ b/addon/components/ai/route-preview-map.js
@@ -54,7 +54,7 @@ export default class AiRoutePreviewMapComponent extends Component {
     }
 
     get routeSignature() {
-        return `${this.provider}:${this.coordinates.map((coordinate) => coordinate.join(',')).join('|')}`;
+        return `${this.provider}:${this.displayRouteEngine}:${this.coordinates.map((coordinate) => coordinate.join(',')).join('|')}`;
     }
 
     get provider() {
@@ -65,6 +65,20 @@ export default class AiRoutePreviewMapComponent extends Component {
         return this.provider === 'google';
     }
 
+    get displayRouteEngine() {
+        const configuredEngine = this.routeEngine.getDisplayEngine('osrm');
+
+        return this.routeEngine.get(configuredEngine) ? configuredEngine : 'osrm';
+    }
+
+    get routeErrorMessage() {
+        if (!this.error || this.isLoading || this.hasRouteLine) {
+            return null;
+        }
+
+        return 'Unable to calculate route';
+    }
+
     get center() {
         const [lat, lng] = this.coordinates[0] ?? [1.3521, 103.8198];
 
@@ -211,11 +225,7 @@ export default class AiRoutePreviewMapComponent extends Component {
         this.isLoading = true;
 
         try {
-            const engine = this.routeEngine.getDisplayEngine('osrm');
-            const route = await this.routeEngine.compute(engine, this.coordinates, {
-                payload: this.payload,
-                fitOptions: this.fitOptions,
-            });
+            const route = await this.computeRoute();
 
             if (token !== this.computeToken) {
                 return;
@@ -239,6 +249,24 @@ export default class AiRoutePreviewMapComponent extends Component {
         }
     }
 
+    async computeRoute() {
+        const engine = this.displayRouteEngine;
+        const options = {
+            payload: this.payload,
+            fitOptions: this.fitOptions,
+        };
+
+        try {
+            return await this.routeEngine.compute(engine, this.coordinates, options);
+        } catch (error) {
+            if (engine !== 'osrm') {
+                return this.routeEngine.compute('osrm', this.coordinates, options);
+            }
+
+            throw error;
+        }
+    }
+
     get fitOptions() {
         return {
             padding: [18, 18],
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index 712c9653..c0b53c4d 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -8119,6 +8119,11 @@ body[data-theme='dark'] .issue-timeline-card p {
     backdrop-filter: blur(5px);
 }
 
+.fleetbase-ai-create-order-preview__map-status--error {
+    border-color: rgb(245 158 11 / 32%);
+    background: rgb(120 53 15 / 64%);
+}
+
 .fleetbase-ai-create-order-preview__fields {
     display: grid;
     grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -8204,6 +8209,7 @@ body[data-theme='dark'] .issue-timeline-card p {
 
 .fleetbase-ai-create-order-preview__inline-select,
 .fleetbase-ai-create-order-preview__inline-native-select,
+.fleetbase-ai-create-order-preview__inline-datetime,
 .fleetbase-ai-create-order-preview__inline-textarea {
     width: 100%;
     min-height: 24px;
@@ -8217,26 +8223,91 @@ body[data-theme='dark'] .issue-timeline-card p {
 }
 
 .fleetbase-ai-create-order-preview__inline-select.ember-power-select-trigger {
+    display: flex;
     min-height: 24px;
+    align-items: center;
     border: 0;
+    border-radius: 0;
     background: transparent;
     padding: 0;
     color: #0f172a;
     box-shadow: none;
 }
 
+.fleetbase-ai-create-order-preview .ember-power-select-trigger,
+.fleetbase-ai-create-order-preview .ember-basic-dropdown-trigger,
+.fleetbase-ai-create-order-preview .ember-model-select,
+.fleetbase-ai-create-order-preview .fleetbase-model-select,
+.fleetbase-ai-create-order-preview .ember-power-select-status-icon,
+.fleetbase-ai-create-order-preview .ember-power-select-clear-btn {
+    border: 0;
+    background: transparent;
+    box-shadow: none;
+}
+
+.fleetbase-ai-create-order-preview .ember-power-select-trigger {
+    min-height: 24px;
+    padding: 0;
+}
+
+.fleetbase-ai-create-order-preview .ember-power-select-status-icon {
+    right: 0;
+    width: 12px;
+    height: 12px;
+}
+
+.fleetbase-ai-create-order-preview .ember-power-select-clear-btn {
+    right: 14px;
+    color: #94a3b8;
+}
+
+.fleetbase-ai-create-order-preview .ember-power-select-search-input,
+.fleetbase-ai-create-order-preview .ember-power-select-search-input:focus {
+    border: 0;
+    background: transparent;
+    color: inherit;
+    outline: 0;
+    box-shadow: none;
+}
+
 .fleetbase-ai-create-order-preview__inline-select .ember-power-select-selected-item,
 .fleetbase-ai-create-order-preview__inline-select .ember-power-select-placeholder {
+    overflow: hidden;
     margin-left: 0;
+    margin-right: 16px;
     color: inherit;
     font-size: 12px;
     line-height: 1.25;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__inline-native-select {
+    width: auto;
+    max-width: 150px;
+    appearance: none;
+    border-radius: 0;
+    padding: 0 16px 0 0;
+    font-weight: 650;
+    cursor: pointer;
 }
 
 .fleetbase-ai-create-order-preview__inline-textarea {
     resize: vertical;
 }
 
+.fleetbase-ai-create-order-preview__inline-datetime,
+.fleetbase-ai-create-order-preview__inline-datetime input {
+    border: 0;
+    background: transparent;
+    padding: 0;
+    color: inherit;
+    font-size: 12px;
+    line-height: 1.25;
+    outline: 0;
+    box-shadow: none;
+}
+
 .fleetbase-ai-create-order-preview__toggles {
     display: flex;
     flex-direction: column;
@@ -8293,18 +8364,102 @@ body[data-theme='dark'] .issue-timeline-card p {
     font-size: 11px;
 }
 
+.fleetbase-ai-create-order-preview__applying,
+.fleetbase-ai-create-order-preview__completed,
 .fleetbase-ai-create-order-preview__cancelled {
     display: flex;
     align-items: center;
     gap: 7px;
-    border: 1px solid rgb(239 68 68 / 20%);
     border-radius: 7px;
-    background: rgb(239 68 68 / 10%);
     padding: 8px 9px;
-    color: #991b1b;
     font-size: 12px;
 }
 
+.fleetbase-ai-create-order-preview__applying {
+    border: 1px solid rgb(96 165 250 / 20%);
+    background: rgb(37 99 235 / 10%);
+    color: #1d4ed8;
+}
+
+.fleetbase-ai-create-order-preview__magic-loader {
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+}
+
+.fleetbase-ai-create-order-preview__magic-loader span {
+    width: 5px;
+    height: 5px;
+    border-radius: 999px;
+    background: currentcolor;
+    opacity: 0.45;
+    animation: fleetbase-ai-create-order-dot 900ms ease-in-out infinite;
+}
+
+.fleetbase-ai-create-order-preview__magic-loader span:nth-child(2) {
+    animation-delay: 120ms;
+}
+
+.fleetbase-ai-create-order-preview__magic-loader span:nth-child(3) {
+    animation-delay: 240ms;
+}
+
+@keyframes fleetbase-ai-create-order-dot {
+    0%,
+    80%,
+    100% {
+        opacity: 0.35;
+        transform: translateY(0);
+    }
+
+    40% {
+        opacity: 1;
+        transform: translateY(-2px);
+    }
+}
+
+.fleetbase-ai-create-order-preview__completed {
+    border: 1px solid rgb(34 197 94 / 20%);
+    background: rgb(22 163 74 / 10%);
+    color: #166534;
+}
+
+.fleetbase-ai-create-order-preview__completed-icon {
+    display: inline-flex;
+    width: 26px;
+    height: 26px;
+    flex: 0 0 26px;
+    align-items: center;
+    justify-content: center;
+    border-radius: 999px;
+    background: rgb(34 197 94 / 16%);
+}
+
+.fleetbase-ai-create-order-preview__completed-copy {
+    display: flex;
+    min-width: 0;
+    flex: 1 1 auto;
+    flex-direction: column;
+    gap: 2px;
+}
+
+.fleetbase-ai-create-order-preview__completed-copy strong,
+.fleetbase-ai-create-order-preview__completed-copy span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-create-order-preview__completed-copy span {
+    opacity: 0.8;
+}
+
+.fleetbase-ai-create-order-preview__cancelled {
+    border: 1px solid rgb(239 68 68 / 20%);
+    background: rgb(239 68 68 / 10%);
+    color: #991b1b;
+}
+
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__map,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-row:hover,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-row:focus-within {
@@ -8315,6 +8470,7 @@ body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-row:focus-with
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__field-copy > strong,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-select,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-native-select,
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-datetime,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-textarea,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-select.ember-power-select-trigger,
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__select-label {
@@ -8342,8 +8498,30 @@ body[data-theme='dark'] .fleetbase-ai-create-order-preview__inline-pill:hover {
     color: #bfdbfe;
 }
 
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__applying {
+    border-color: rgb(96 165 250 / 24%);
+    background: rgb(30 64 175 / 24%);
+    color: #bfdbfe;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__completed {
+    border-color: rgb(74 222 128 / 22%);
+    background: rgb(20 83 45 / 28%);
+    color: #bbf7d0;
+}
+
+body[data-theme='dark'] .fleetbase-ai-create-order-preview__completed-icon {
+    background: rgb(34 197 94 / 18%);
+}
+
 body[data-theme='dark'] .fleetbase-ai-create-order-preview__cancelled {
     border-color: rgb(248 113 113 / 22%);
     background: rgb(127 29 29 / 22%);
     color: #fecaca;
 }
+
+@media (prefers-reduced-motion: reduce) {
+    .fleetbase-ai-create-order-preview__magic-loader span {
+        animation: none;
+    }
+}
diff --git a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
index a37077a0..c85bc923 100644
--- a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
+++ b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
@@ -66,6 +66,7 @@ public function inputSchema(): array
             'payload.dropoff_uuid' => 'Existing Fleet-Ops place UUID for dropoff.',
             'payload.waypoints'    => 'Optional ordered waypoint place UUIDs.',
             'customer'             => 'Optional contact/vendor UUID.',
+            'scheduled_at'         => 'Optional scheduled date/time for the order.',
             'dispatched'           => 'Optional boolean. Defaults to false for AI-created drafts.',
         ];
     }
@@ -126,6 +127,7 @@ public function preview(AiTask $task, array $input = []): array
             ],
             'fields'          => [
                 ['label' => 'Order config', 'value' => $orderConfig?->name ?? $orderConfig?->key],
+                ['label' => 'Schedule', 'value' => data_get($draft, 'scheduled_at')],
                 ['label' => 'Pickup', 'value' => data_get($pickup, 'address') ?? data_get($pickup, 'name')],
                 ['label' => 'Dropoff', 'value' => data_get($dropoff, 'address') ?? data_get($dropoff, 'name')],
                 ['label' => 'Driver', 'value' => $driver?->name],
@@ -193,6 +195,9 @@ protected function buildDraft(AiTask $task, array $input = []): array
 
         $draft['dispatched'] = filter_var(data_get($draft, 'dispatched', false), FILTER_VALIDATE_BOOLEAN);
         $draft['payload']    = (array) data_get($draft, 'payload', []);
+        if (blank(data_get($draft, 'scheduled_at'))) {
+            unset($draft['scheduled_at']);
+        }
 
         foreach (['pickup', 'dropoff'] as $role) {
             $query = data_get($draft, "payload.{$role}_query");

From 84f34e9565dc01a9aea373a3f7cb1a8c70bfaab4 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 16:16:18 +0800
Subject: [PATCH 08/19] Fix AI route preview engine lookup

---
 addon/components/ai/route-preview-map.js | 8 ++++++--
 addon/styles/fleetops-engine.css         | 2 +-
 app/services/route-engine.js             | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 app/services/route-engine.js

diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
index 88a1cea2..f96b7940 100644
--- a/addon/components/ai/route-preview-map.js
+++ b/addon/components/ai/route-preview-map.js
@@ -66,9 +66,9 @@ export default class AiRoutePreviewMapComponent extends Component {
     }
 
     get displayRouteEngine() {
-        const configuredEngine = this.routeEngine.getDisplayEngine('osrm');
+        const configuredEngine = this.routeEngine?.getDisplayEngine?.('osrm') ?? 'osrm';
 
-        return this.routeEngine.get(configuredEngine) ? configuredEngine : 'osrm';
+        return this.routeEngine?.get?.(configuredEngine) ? configuredEngine : 'osrm';
     }
 
     get routeErrorMessage() {
@@ -256,6 +256,10 @@ export default class AiRoutePreviewMapComponent extends Component {
             fitOptions: this.fitOptions,
         };
 
+        if (!this.routeEngine?.compute) {
+            throw new Error('No route engine is available for the AI order preview.');
+        }
+
         try {
             return await this.routeEngine.compute(engine, this.coordinates, options);
         } catch (error) {
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index c0b53c4d..3889865f 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -8090,7 +8090,7 @@ body[data-theme='dark'] .issue-timeline-card p {
 .fleetbase-ai-create-order-preview__google,
 .fleetbase-ai-create-order-preview__empty-map {
     width: 100%;
-    height: 136px;
+    height: 190px;
 }
 
 .fleetbase-ai-create-order-preview__empty-map {
diff --git a/app/services/route-engine.js b/app/services/route-engine.js
new file mode 100644
index 00000000..ccbc1b43
--- /dev/null
+++ b/app/services/route-engine.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/route-engine';

From 69c368d1dde6d0ac7ac5234d6a85f50602ba5849 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 18:31:54 +0800
Subject: [PATCH 09/19] Resolve relative dates in Fleet-Ops AI capabilities

---
 .../CreateOrderPreviewCapability.php          | 15 ++++
 .../OperationalQueryCapability.php            | 85 +++++++++++++------
 .../Capabilities/OrderInsightsCapability.php  | 33 ++-----
 .../AiCreateOrderPreviewCapabilityTest.php    | 17 ++++
 .../AiOperationalQueryCapabilityTest.php      | 22 +++++
 5 files changed, 123 insertions(+), 49 deletions(-)

diff --git a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
index c85bc923..ff27d49c 100644
--- a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
+++ b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
@@ -4,6 +4,7 @@
 
 use Fleetbase\Ai\Contracts\AIActionCapabilityInterface;
 use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\Ai\Support\AiRelativeDateResolver;
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\OrderConfig;
@@ -256,6 +257,10 @@ protected function draftFromPrompt(string $prompt): array
             $draft['dispatched'] = true;
         }
 
+        if ($scheduledAt = $this->scheduledAtFromPrompt($prompt)) {
+            $draft['scheduled_at'] = $scheduledAt;
+        }
+
         if (preg_match('/(?:note|notes)[:\s]+(.+)$/i', $prompt, $matches)) {
             $draft['notes'] = trim($matches[1]);
         }
@@ -268,6 +273,16 @@ protected function draftFromPrompt(string $prompt): array
         return $draft;
     }
 
+    protected function scheduledAtFromPrompt(string $prompt): ?string
+    {
+        return $this->relativeDateResolver()->resolveDateTime($prompt)?->toIso8601String();
+    }
+
+    protected function relativeDateResolver(): AiRelativeDateResolver
+    {
+        return function_exists('app') ? app(AiRelativeDateResolver::class) : new AiRelativeDateResolver(null);
+    }
+
     protected function addressPairFromPrompt(string $prompt): array
     {
         preg_match_all('/"([^"]+)"|\'([^\']+)\'/', $prompt, $quoted);
diff --git a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
index 447fa365..4729e0ac 100644
--- a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
+++ b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
@@ -4,11 +4,11 @@
 
 use Fleetbase\Ai\Models\AiTask;
 use Fleetbase\Ai\Services\AiQueryExecutor;
+use Fleetbase\Ai\Support\AiRelativeDateResolver;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\FleetOps\Models\Zone;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
 
 class OperationalQueryCapability extends AbstractFleetOpsAICapability
 {
@@ -79,11 +79,14 @@ public function resolve(AiTask $task): array
     protected function matchesPrompt(string $prompt): bool
     {
         return $this->mentions($prompt, ['driver', 'drivers', 'vehicle', 'vehicles', 'device', 'devices', 'order', 'orders', 'fleet', 'fleets'])
-            && $this->mentions($prompt, ['how many', 'count', 'where', 'located', 'location', 'majority', 'online', 'offline', 'without', 'unassigned', 'assigned', 'break down', 'status', 'service area', 'zone']);
+            && $this->mentions($prompt, ['how many', 'count', 'where', 'located', 'location', 'majority', 'online', 'offline', 'without', 'unassigned', 'assigned', 'break down', 'status', 'service area', 'zone', 'today', 'yesterday', 'tomorrow', 'this week', 'last week', 'next week', 'this month', 'last month', 'last 30 days']);
     }
 
     protected function driverQueries(string $prompt, AiQueryExecutor $executor): array
     {
+        $dateWindow  = $this->dateWindow($prompt);
+        $dateFilters = $dateWindow ? $this->dateFilters($dateWindow, 'updated_at') : [];
+
         $queries = [
             'total'            => $executor->count('fleet-ops.drivers'),
             'online'           => $executor->count('fleet-ops.drivers', [['field' => 'online', 'operator' => '=', 'value' => true]]),
@@ -91,6 +94,13 @@ protected function driverQueries(string $prompt, AiQueryExecutor $executor): arr
             'counts_by_status' => $executor->countsBy('fleet-ops.drivers', 'status'),
         ];
 
+        if ($dateWindow) {
+            $queries['date_window']       = $this->dateWindowPayload($dateWindow, 'updated_at');
+            $queries['total_in_window']   = $executor->count('fleet-ops.drivers', $dateFilters);
+            $queries['online_in_window']  = $executor->count('fleet-ops.drivers', array_merge($dateFilters, [['field' => 'online', 'operator' => '=', 'value' => true]]));
+            $queries['offline_in_window'] = $executor->count('fleet-ops.drivers', array_merge($dateFilters, [['field' => 'online', 'operator' => 'false_or_null']]));
+        }
+
         if ($this->mentions($prompt, ['without vehicle', 'without vehicles', 'unassigned vehicle', 'no vehicle'])) {
             $queries['without_vehicle'] = [
                 'count'   => $executor->count('fleet-ops.drivers', [['field' => 'vehicle_uuid', 'operator' => 'null']]),
@@ -99,7 +109,7 @@ protected function driverQueries(string $prompt, AiQueryExecutor $executor): arr
         }
 
         if ($this->mentions($prompt, ['where', 'located', 'location', 'majority', 'service area', 'zone'])) {
-            $filters = $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : [];
+            $filters = array_merge($dateFilters, $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : []);
 
             $queries['location_summary']          = $executor->locationSummary('fleet-ops.drivers', $filters, 250);
             $queries['service_area_distribution'] = $this->driverGeofenceDistribution($filters);
@@ -110,6 +120,10 @@ protected function driverQueries(string $prompt, AiQueryExecutor $executor): arr
 
     protected function onlineResourceQueries(string $resource, string $prompt, AiQueryExecutor $executor): array
     {
+        $dateWindow  = $this->dateWindow($prompt);
+        $dateField   = $resource === 'fleet-ops.devices' ? 'last_online_at' : 'updated_at';
+        $dateFilters = $dateWindow ? $this->dateFilters($dateWindow, $dateField) : [];
+
         $queries = [
             'total'            => $executor->count($resource),
             'online'           => $executor->count($resource, [['field' => 'online', 'operator' => '=', 'value' => true]]),
@@ -117,8 +131,15 @@ protected function onlineResourceQueries(string $resource, string $prompt, AiQue
             'counts_by_status' => $executor->countsBy($resource, 'status'),
         ];
 
+        if ($dateWindow) {
+            $queries['date_window']       = $this->dateWindowPayload($dateWindow, $dateField);
+            $queries['total_in_window']   = $executor->count($resource, $dateFilters);
+            $queries['online_in_window']  = $executor->count($resource, array_merge($dateFilters, [['field' => 'online', 'operator' => '=', 'value' => true]]));
+            $queries['offline_in_window'] = $executor->count($resource, array_merge($dateFilters, [['field' => 'online', 'operator' => 'false_or_null']]));
+        }
+
         if ($this->mentions($prompt, ['where', 'located', 'location', 'majority']) && $resource === 'fleet-ops.vehicles') {
-            $queries['location_summary'] = $executor->locationSummary($resource, $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : [], 250);
+            $queries['location_summary'] = $executor->locationSummary($resource, array_merge($dateFilters, $this->mentions($prompt, ['online']) ? [['field' => 'online', 'operator' => '=', 'value' => true]] : []), 250);
         }
 
         return $queries;
@@ -137,6 +158,10 @@ protected function orderQueries(string $prompt, AiQueryExecutor $executor): arra
             'counts_by_status' => $executor->countsBy('fleet-ops.orders', 'status', $filters),
         ];
 
+        if ($dateWindow = $this->dateWindow($prompt)) {
+            $queries['date_window'] = $this->dateWindowPayload($dateWindow, 'created_at');
+        }
+
         if ($this->mentions($prompt, ['without driver', 'unassigned driver', 'no driver'])) {
             $queries['without_driver'] = $executor->count('fleet-ops.orders', array_merge($filters, [['field' => 'driver_assigned_uuid', 'operator' => 'null']]));
         }
@@ -165,6 +190,10 @@ protected function driverGeofenceDistribution(array $filters = []): array
             if (($filter['field'] ?? null) === 'online') {
                 $query->where('online', (bool) ($filter['value'] ?? false));
             }
+
+            if (($filter['field'] ?? null) === 'updated_at' && in_array(($filter['operator'] ?? null), ['>=', '<='], true)) {
+                $query->where('updated_at', $filter['operator'], $filter['value']);
+            }
         }
 
         $drivers = $this->whereValidDriverLocation($query)
@@ -249,30 +278,38 @@ protected function whereValidDriverLocation(Builder $query): Builder
 
     protected function orderDateFilters(string $prompt): array
     {
-        $now = Carbon::now();
+        $window = $this->dateWindow($prompt);
 
-        if (str_contains($prompt, 'this month')) {
-            return [
-                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->startOfMonth()],
-                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->endOfMonth()],
-            ];
-        }
+        return $window ? $this->dateFilters($window, 'created_at') : [];
+    }
 
-        if (str_contains($prompt, 'last month')) {
-            return [
-                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->subMonthNoOverflow()->startOfMonth()],
-                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->subMonthNoOverflow()->endOfMonth()],
-            ];
-        }
+    protected function dateWindow(string $prompt): ?array
+    {
+        return $this->relativeDateResolver()->resolveWindow($prompt);
+    }
 
-        if (str_contains($prompt, 'last 30 days')) {
-            return [
-                ['field' => 'created_at', 'operator' => '>=', 'value' => $now->copy()->subDays(30)->startOfDay()],
-                ['field' => 'created_at', 'operator' => '<=', 'value' => $now->copy()->endOfDay()],
-            ];
-        }
+    protected function dateFilters(array $window, string $field): array
+    {
+        return [
+            ['field' => $field, 'operator' => '>=', 'value' => $window['start']],
+            ['field' => $field, 'operator' => '<=', 'value' => $window['end']],
+        ];
+    }
+
+    protected function dateWindowPayload(array $window, string $field): array
+    {
+        return [
+            'label'    => $window['label'],
+            'timezone' => $window['timezone'],
+            'field'    => $field,
+            'start'    => $window['start']->toIso8601String(),
+            'end'      => $window['end']->toIso8601String(),
+        ];
+    }
 
-        return [];
+    protected function relativeDateResolver(): AiRelativeDateResolver
+    {
+        return function_exists('app') ? app(AiRelativeDateResolver::class) : new AiRelativeDateResolver(null);
     }
 
     protected function mentions(string $prompt, array $terms): bool
diff --git a/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
index f2dbb719..a46ebeb4 100644
--- a/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
+++ b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Support\Ai\Capabilities;
 
 use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\Ai\Support\AiRelativeDateResolver;
 use Fleetbase\FleetOps\Models\Order;
-use Illuminate\Support\Carbon;
 
 class OrderInsightsCapability extends AbstractFleetOpsAICapability
 {
@@ -54,6 +54,7 @@ public function resolve(AiTask $task): array
             'metric'            => 'orders',
             'date_window'       => $window ? [
                 'label' => $window['label'],
+                'timezone' => $window['timezone'],
                 'start' => $window['start']->toIso8601String(),
                 'end'   => $window['end']->toIso8601String(),
             ] : null,
@@ -70,7 +71,7 @@ public function resolve(AiTask $task): array
 
     protected function matchesPrompt(string $prompt): bool
     {
-        return str_contains($prompt, 'order') && $this->containsAny($prompt, ['how many', 'count', 'report', 'value', 'over', 'status', 'last month', 'this month', 'completed', 'active']);
+        return str_contains($prompt, 'order') && $this->containsAny($prompt, ['how many', 'count', 'report', 'value', 'over', 'status', 'today', 'yesterday', 'tomorrow', 'last week', 'this week', 'next week', 'last month', 'this month', 'last 30 days', 'completed', 'active']);
     }
 
     protected function amountThreshold(string $prompt): ?float
@@ -84,29 +85,11 @@ protected function amountThreshold(string $prompt): ?float
 
     protected function dateWindow(string $prompt): ?array
     {
-        $now = Carbon::now();
-
-        if (str_contains($prompt, 'last month')) {
-            $start = $now->copy()->subMonthNoOverflow()->startOfMonth();
-            $end   = $now->copy()->subMonthNoOverflow()->endOfMonth();
-
-            return compact('start', 'end') + ['label' => 'last_month'];
-        }
-
-        if (str_contains($prompt, 'this month')) {
-            $start = $now->copy()->startOfMonth();
-            $end   = $now->copy()->endOfMonth();
-
-            return compact('start', 'end') + ['label' => 'this_month'];
-        }
-
-        if (str_contains($prompt, 'last 30 days')) {
-            $start = $now->copy()->subDays(30)->startOfDay();
-            $end   = $now->copy()->endOfDay();
-
-            return compact('start', 'end') + ['label' => 'last_30_days'];
-        }
+        return $this->relativeDateResolver()->resolveWindow($prompt);
+    }
 
-        return null;
+    protected function relativeDateResolver(): AiRelativeDateResolver
+    {
+        return function_exists('app') ? app(AiRelativeDateResolver::class) : new AiRelativeDateResolver(null);
     }
 }
diff --git a/server/tests/AiCreateOrderPreviewCapabilityTest.php b/server/tests/AiCreateOrderPreviewCapabilityTest.php
index 5e7e150b..4f36ba12 100644
--- a/server/tests/AiCreateOrderPreviewCapabilityTest.php
+++ b/server/tests/AiCreateOrderPreviewCapabilityTest.php
@@ -3,6 +3,7 @@
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Ai\Capabilities\CreateOrderPreviewCapability;
 use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
+use Illuminate\Support\Carbon;
 
 function fleetopsAiCreateOrderCapability()
 {
@@ -85,3 +86,19 @@ function fleetopsAiCreateOrderProtectedMethod(string $method): ReflectionMethod
         ->toBe(['pickup', 'dropoff'])
         ->and($preview['coordinates'])->toHaveCount(2);
 });
+
+test('create order preview resolves relative schedule phrases', function () {
+    $timezone = date_default_timezone_get();
+    date_default_timezone_set('Asia/Singapore');
+    Carbon::setTestNow(Carbon::parse('2026-06-30 15:00:00', 'Asia/Singapore'));
+
+    try {
+        $capability = fleetopsAiCreateOrderCapability();
+        $method     = fleetopsAiCreateOrderProtectedMethod('scheduledAtFromPrompt');
+
+        expect($method->invoke($capability, 'Create an order scheduled for 3 days from now'))->toBe('2026-07-03T15:00:00+08:00');
+    } finally {
+        Carbon::setTestNow();
+        date_default_timezone_set($timezone);
+    }
+});
diff --git a/server/tests/AiOperationalQueryCapabilityTest.php b/server/tests/AiOperationalQueryCapabilityTest.php
index 29b91a3f..85ac09bb 100644
--- a/server/tests/AiOperationalQueryCapabilityTest.php
+++ b/server/tests/AiOperationalQueryCapabilityTest.php
@@ -4,6 +4,7 @@
 use Fleetbase\FleetOps\Support\Ai\Capabilities\AssetStatusCapability;
 use Fleetbase\FleetOps\Support\Ai\Capabilities\OperationalQueryCapability;
 use Fleetbase\FleetOps\Support\Ai\FleetOpsAiQueryResources;
+use Illuminate\Support\Carbon;
 
 function fleetopsAiOperationalCapability()
 {
@@ -38,6 +39,7 @@ function fleetopsAiOperationalProtectedMethod(string $method): ReflectionMethod
 })->with([
     'How many drivers are currently online?',
     'Where are most of my drivers located?',
+    'How many vehicles were online yesterday?',
     'Which service area has the most online drivers?',
     'Show me drivers without vehicles.',
     'How many active orders have no assigned driver?',
@@ -51,3 +53,23 @@ function fleetopsAiOperationalProtectedMethod(string $method): ReflectionMethod
 
     expect($method->invoke($capability, 'how many drivers are online'))->toBeTrue();
 });
+
+test('operational query date filters use resolved local windows', function () {
+    $timezone = date_default_timezone_get();
+    date_default_timezone_set('Asia/Singapore');
+    Carbon::setTestNow(Carbon::parse('2026-06-30 15:00:00', 'Asia/Singapore'));
+
+    try {
+        $capability = fleetopsAiOperationalCapability();
+        $method     = fleetopsAiOperationalProtectedMethod('orderDateFilters');
+        $filters    = $method->invoke($capability, 'How many orders were created last week?');
+
+        expect($filters)->toHaveCount(2)
+            ->and($filters[0])->toMatchArray(['field' => 'created_at', 'operator' => '>='])
+            ->and($filters[0]['value']->toIso8601String())->toBe('2026-06-22T00:00:00+08:00')
+            ->and($filters[1]['value']->toIso8601String())->toBe('2026-06-28T23:59:59+08:00');
+    } finally {
+        Carbon::setTestNow();
+        date_default_timezone_set($timezone);
+    }
+});

From 52f795f026ed5698e49361b5c6779af8c39a9f8c Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 18:54:59 +0800
Subject: [PATCH 10/19] Stabilize AI order preview editing

---
 addon/components/ai/create-order-preview.js | 37 +++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
index a132d840..f539a8e6 100644
--- a/addon/components/ai/create-order-preview.js
+++ b/addon/components/ai/create-order-preview.js
@@ -219,7 +219,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
             .replace(/\b\w/g, (char) => char.toUpperCase());
     }
 
-    mergeDraft(updates = {}) {
+    updateDraft(updates = {}) {
         this.draft = {
             ...this.draft,
             ...updates,
@@ -228,6 +228,10 @@ export default class AiCreateOrderPreviewComponent extends Component {
                 ...(updates.payload ?? {}),
             },
         };
+    }
+
+    updateRouteDraft(updates = {}) {
+        this.updateDraft(updates);
         this.refreshPreview.perform();
     }
 
@@ -247,8 +251,11 @@ export default class AiCreateOrderPreviewComponent extends Component {
         yield timeout(180);
         const refreshed = yield this.args.onRefresh?.(this.args.task, this.preview, { draft: this.draft });
         if (refreshed) {
-            this.preview = refreshed;
-            this.draft = this.clone(refreshed.draft ?? this.draft);
+            this.preview = {
+                ...this.preview,
+                ...refreshed,
+                draft: this.draft,
+            };
         }
     }
 
@@ -265,12 +272,12 @@ export default class AiCreateOrderPreviewComponent extends Component {
             delete payload[`${role}_uuid`];
         }
 
-        this.mergeDraft({ payload });
+        this.updateRouteDraft({ payload });
         this.closeEditor();
     }
 
     @action setOrderConfig(orderConfig) {
-        this.mergeDraft({
+        this.updateDraft({
             order_config_uuid: this.modelValue(orderConfig, 'uuid') ?? this.modelValue(orderConfig, 'id'),
             order_config_name: this.modelValue(orderConfig, 'name'),
             type: this.modelValue(orderConfig, 'key'),
@@ -279,11 +286,11 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action setScheduledAt(value) {
-        this.mergeDraft({ scheduled_at: value });
+        this.updateDraft({ scheduled_at: value });
     }
 
     @action setDriver(driver) {
-        this.mergeDraft({
+        this.updateDraft({
             driver: this.modelValue(driver, 'uuid') ?? this.modelValue(driver, 'id'),
             driver_query: this.modelValue(driver, 'name') ?? this.modelValue(driver, 'public_id'),
         });
@@ -291,7 +298,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action setVehicle(vehicle) {
-        this.mergeDraft({
+        this.updateDraft({
             vehicle_assigned_uuid: this.modelValue(vehicle, 'uuid') ?? this.modelValue(vehicle, 'id'),
             vehicle_query: this.modelValue(vehicle, 'display_name') ?? this.modelValue(vehicle, 'name') ?? this.modelValue(vehicle, 'plate_number'),
         });
@@ -299,14 +306,14 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action setPodRequired(value) {
-        this.mergeDraft({
+        this.updateDraft({
             pod_required: value,
             pod_method: value ? (this.draft.pod_method ?? 'scan') : null,
         });
     }
 
     @action setPodMethod(value) {
-        this.mergeDraft({ pod_method: value });
+        this.updateDraft({ pod_method: value });
         this.closeEditor();
     }
 
@@ -315,11 +322,13 @@ export default class AiCreateOrderPreviewComponent extends Component {
     }
 
     @action setDispatched(value) {
-        this.mergeDraft({ dispatched: value });
+        this.updateDraft({ dispatched: value });
     }
 
-    @action setNotes(event) {
-        this.mergeDraft({ notes: event.target.value });
+    @action setNotes(valueOrEvent) {
+        const value = valueOrEvent?.target ? valueOrEvent.target.value : valueOrEvent;
+
+        this.updateDraft({ notes: value });
     }
 
     @action apply() {
@@ -354,7 +363,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
 
     @action updatePreview(preview) {
         this.preview = preview;
-        if (preview?.draft) {
+        if (preview?.draft && !this.editingField) {
             this.draft = this.clone(preview.draft);
         }
     }

From 1548082ff94fb265feddc9ff38fd8e5ea08c1e97 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 19:18:29 +0800
Subject: [PATCH 11/19] Fix AI order preview map and schedule display

---
 addon/components/ai/create-order-preview.js | 10 ++-
 addon/components/ai/route-preview-map.js    | 71 +++++++++++++++++++--
 addon/styles/fleetops-engine.css            | 11 ++++
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
index f539a8e6..f9ef62e9 100644
--- a/addon/components/ai/create-order-preview.js
+++ b/addon/components/ai/create-order-preview.js
@@ -3,6 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action, get } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
+import { format, isValid, parseISO } from 'date-fns';
 
 export default class AiCreateOrderPreviewComponent extends Component {
     @service router;
@@ -82,15 +83,12 @@ export default class AiCreateOrderPreviewComponent extends Component {
             return 'Add schedule';
         }
 
-        const date = scheduledAt instanceof Date ? scheduledAt : new Date(scheduledAt);
-        if (Number.isNaN(date.getTime())) {
+        const date = scheduledAt instanceof Date ? scheduledAt : parseISO(String(scheduledAt));
+        if (!isValid(date)) {
             return String(scheduledAt);
         }
 
-        return new Intl.DateTimeFormat(undefined, {
-            dateStyle: 'medium',
-            timeStyle: 'short',
-        }).format(date);
+        return format(date, 'yyyy-MM-dd HH:mm');
     }
 
     get pickupLabel() {
diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
index f96b7940..27d5f177 100644
--- a/addon/components/ai/route-preview-map.js
+++ b/addon/components/ai/route-preview-map.js
@@ -3,12 +3,45 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { isArray } from '@ember/array';
+import { debug } from '@ember/debug';
 import { colorForId, routeColorForStatus, routeStyleForStatus, waypointIconHtml } from '../../utils/route-colors';
 import { buildRoutePointMarkerPresentation, buildRoutePointsFromPayload } from '../../utils/route-visualization';
 import ensureLeafletPluginsReady, { hasLeafletPluginsReady } from '../../utils/leaflet-plugin-loader';
 
 const PREVIEW_MAX_ZOOM_TWO_POINTS = 13;
 const PREVIEW_MAX_ZOOM_MULTI_POINTS = 12;
+const GOOGLE_MAP_STYLES = [
+    {
+        featureType: 'all',
+        elementType: 'labels.icon',
+        stylers: [{ visibility: 'off' }],
+    },
+    {
+        featureType: 'poi',
+        elementType: 'all',
+        stylers: [{ visibility: 'off' }],
+    },
+    {
+        featureType: 'transit',
+        elementType: 'all',
+        stylers: [{ visibility: 'off' }],
+    },
+    {
+        featureType: 'administrative.land_parcel',
+        elementType: 'all',
+        stylers: [{ visibility: 'off' }],
+    },
+    {
+        featureType: 'road',
+        elementType: 'labels.icon',
+        stylers: [{ visibility: 'off' }],
+    },
+    {
+        featureType: 'landscape.man_made',
+        elementType: 'labels',
+        stylers: [{ visibility: 'off' }],
+    },
+];
 
 export default class AiRoutePreviewMapComponent extends Component {
     @service mapSettings;
@@ -197,6 +230,7 @@ export default class AiRoutePreviewMapComponent extends Component {
             disableDefaultUI: true,
             gestureHandling: 'greedy',
             clickableIcons: false,
+            styles: this.googleMapStyles,
         };
 
         if (this.mapSettings.googleMapsMapId) {
@@ -204,11 +238,15 @@ export default class AiRoutePreviewMapComponent extends Component {
         }
 
         this.googleMap = new Map(element, mapOptions);
-        this.applyGoogleLayers();
+        this.applyGoogleViewSettings();
         this.syncPreview();
     }
 
     @action syncPreview() {
+        if (this.shouldUseGoogleMaps) {
+            this.applyGoogleViewSettings();
+        }
+
         this.computeAndDrawRoute();
     }
 
@@ -232,8 +270,9 @@ export default class AiRoutePreviewMapComponent extends Component {
             }
 
             this.route = route;
+            this.error = null;
             this.fitLeafletMap();
-            this.drawGoogleRoute();
+            this.drawGoogleRoute().catch((error) => this.logRenderError(error));
         } catch (error) {
             if (token !== this.computeToken) {
                 return;
@@ -241,7 +280,8 @@ export default class AiRoutePreviewMapComponent extends Component {
 
             this.error = error;
             this.route = null;
-            this.drawGoogleRoute();
+            this.logRouteError(error);
+            this.drawGoogleRoute().catch((renderError) => this.logRenderError(renderError));
         } finally {
             if (token === this.computeToken) {
                 this.isLoading = false;
@@ -278,6 +318,14 @@ export default class AiRoutePreviewMapComponent extends Component {
         };
     }
 
+    get googleMapStyles() {
+        if (this.mapSettings.showGoogleMapsTransitLayer) {
+            return GOOGLE_MAP_STYLES.filter((style) => style.featureType !== 'transit');
+        }
+
+        return GOOGLE_MAP_STYLES;
+    }
+
     fitLeafletMap() {
         if (!this.leafletMap || !this.routeCoordinates.length) {
             return;
@@ -377,7 +425,7 @@ export default class AiRoutePreviewMapComponent extends Component {
         this.googlePolylines = [];
     }
 
-    applyGoogleLayers() {
+    applyGoogleViewSettings() {
         if (!this.googleMap || !window.google?.maps) {
             return;
         }
@@ -385,6 +433,13 @@ export default class AiRoutePreviewMapComponent extends Component {
         const googleMaps = window.google;
         this.googleTrafficLayer?.setMap(null);
         this.googleTransitLayer?.setMap(null);
+        this.googleTrafficLayer = null;
+        this.googleTransitLayer = null;
+        this.googleMap.setOptions({
+            mapTypeId: this.mapSettings.googleMapsMapType ?? googleMaps.maps.MapTypeId.ROADMAP,
+            clickableIcons: false,
+            styles: this.googleMapStyles,
+        });
 
         if (this.mapSettings.showGoogleMapsTrafficLayer) {
             this.googleTrafficLayer = new googleMaps.maps.TrafficLayer();
@@ -397,6 +452,14 @@ export default class AiRoutePreviewMapComponent extends Component {
         }
     }
 
+    logRouteError(error) {
+        debug(`[Fleet-Ops AI Route Preview] Unable to calculate route with ${this.displayRouteEngine}. coordinates=${this.coordinates.length}. error=${error?.message ?? error}`);
+    }
+
+    logRenderError(error) {
+        debug(`[Fleet-Ops AI Route Preview] Route calculated but map rendering failed. error=${error?.message ?? error}`);
+    }
+
     googleWaypointIcon(label, color) {
         const svg = `
             <svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34">
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index 3889865f..91d2c3cf 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -8308,6 +8308,17 @@ body[data-theme='dark'] .issue-timeline-card p {
     box-shadow: none;
 }
 
+.fleetbase-ai-create-order-preview__inline-datetime {
+    display: grid;
+    grid-template-columns: minmax(0, 1.15fr) minmax(0, 0.85fr);
+    gap: 6px;
+}
+
+.fleetbase-ai-create-order-preview__inline-datetime input {
+    width: 100%;
+    min-width: 0;
+}
+
 .fleetbase-ai-create-order-preview__toggles {
     display: flex;
     flex-direction: column;

From b2d2930ba5e64c820779e7112d330943b978e56a Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 30 Jun 2026 19:27:32 +0800
Subject: [PATCH 12/19] Use format-date-fns for AI preview schedule

---
 addon/components/ai/create-order-preview.hbs | 8 +++++++-
 addon/components/ai/create-order-preview.js  | 8 +-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addon/components/ai/create-order-preview.hbs b/addon/components/ai/create-order-preview.hbs
index 9eb2fd61..edcba9b1 100644
--- a/addon/components/ai/create-order-preview.hbs
+++ b/addon/components/ai/create-order-preview.hbs
@@ -81,7 +81,13 @@
                             @onUpdate={{this.setScheduledAt}}
                         />
                     {{else}}
-                        <strong>{{this.scheduledAtLabel}}</strong>
+                        <strong>
+                            {{#if this.draft.scheduled_at}}
+                                {{format-date-fns this.draft.scheduled_at "yyyy-MM-dd HH:mm" fallback=this.scheduledAtLabel}}
+                            {{else}}
+                                {{this.scheduledAtLabel}}
+                            {{/if}}
+                        </strong>
                     {{/if}}
                 </div>
                 <Button
diff --git a/addon/components/ai/create-order-preview.js b/addon/components/ai/create-order-preview.js
index f9ef62e9..ce04f8ff 100644
--- a/addon/components/ai/create-order-preview.js
+++ b/addon/components/ai/create-order-preview.js
@@ -3,7 +3,6 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action, get } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
-import { format, isValid, parseISO } from 'date-fns';
 
 export default class AiCreateOrderPreviewComponent extends Component {
     @service router;
@@ -83,12 +82,7 @@ export default class AiCreateOrderPreviewComponent extends Component {
             return 'Add schedule';
         }
 
-        const date = scheduledAt instanceof Date ? scheduledAt : parseISO(String(scheduledAt));
-        if (!isValid(date)) {
-            return String(scheduledAt);
-        }
-
-        return format(date, 'yyyy-MM-dd HH:mm');
+        return String(scheduledAt);
     }
 
     get pickupLabel() {

From 2f2148946088e71d4a4777a0355e3d5b0477e9bc Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:39:21 +0800
Subject: [PATCH 13/19] Fix AI route preview Google map lifecycle

---
 addon/components/ai/route-preview-map.js | 29 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/addon/components/ai/route-preview-map.js b/addon/components/ai/route-preview-map.js
index 27d5f177..be7e145f 100644
--- a/addon/components/ai/route-preview-map.js
+++ b/addon/components/ai/route-preview-map.js
@@ -58,11 +58,13 @@ export default class AiRoutePreviewMapComponent extends Component {
     googlePolylines = [];
     googleTrafficLayer = null;
     googleTransitLayer = null;
+    googleListeners = [];
     computeToken = 0;
     googleApiLoadPromise = null;
 
     willDestroy() {
         super.willDestroy(...arguments);
+        this.clearGoogleListeners();
         this.clearGoogleRoute();
         this.googleTrafficLayer?.setMap(null);
         this.googleTransitLayer?.setMap(null);
@@ -397,19 +399,27 @@ export default class AiRoutePreviewMapComponent extends Component {
 
     fitGoogleMap() {
         const googleMaps = window.google;
-        if (!this.googleMap || !googleMaps?.maps || !this.routeCoordinates.length) {
+        const map = this.googleMap;
+
+        if (!map || !googleMaps?.maps || !this.routeCoordinates.length) {
             return;
         }
 
+        const maxZoom = this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS;
         const bounds = new googleMaps.maps.LatLngBounds();
         this.routeCoordinates.forEach(([lat, lng]) => bounds.extend({ lat, lng }));
-        this.googleMap.fitBounds(bounds, 18);
+        map.fitBounds(bounds, 18);
+
+        this.clearGoogleListeners();
+        const idleListener = googleMaps.maps.event.addListenerOnce(map, 'idle', () => {
+            const currentZoom = map.getZoom?.();
 
-        googleMaps.maps.event.addListenerOnce(this.googleMap, 'idle', () => {
-            if (this.googleMap.getZoom() > (this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS)) {
-                this.googleMap.setZoom(this.coordinates.length === 2 ? PREVIEW_MAX_ZOOM_TWO_POINTS : PREVIEW_MAX_ZOOM_MULTI_POINTS);
+            if (Number.isFinite(currentZoom) && currentZoom > maxZoom) {
+                map.setZoom?.(maxZoom);
             }
         });
+
+        this.googleListeners.push(idleListener);
     }
 
     clearGoogleRoute() {
@@ -425,6 +435,15 @@ export default class AiRoutePreviewMapComponent extends Component {
         this.googlePolylines = [];
     }
 
+    clearGoogleListeners() {
+        const googleMaps = window.google;
+
+        this.googleListeners.forEach((listener) => {
+            googleMaps?.maps?.event?.removeListener?.(listener);
+        });
+        this.googleListeners = [];
+    }
+
     applyGoogleViewSettings() {
         if (!this.googleMap || !window.google?.maps) {
             return;

From 48860b78aa8b7185a206584289f749deb5e6599d Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:39:50 +0800
Subject: [PATCH 14/19] Fix AI order place point resolution

---
 server/src/Models/Order.php                   | 24 +++++--
 server/src/Models/Place.php                   | 14 ++++-
 .../CreateOrderPreviewCapability.php          | 18 ++++++
 server/src/Support/Utils.php                  | 52 +++++++++++++++
 .../AiCreateOrderPreviewCapabilityTest.php    | 27 ++++++++
 .../tests/OrderPayloadPlaceResolutionTest.php | 53 ++++++++++++++++
 server/tests/PointResolutionTest.php          | 63 +++++++++++++++++++
 7 files changed, 242 insertions(+), 9 deletions(-)
 create mode 100644 server/tests/OrderPayloadPlaceResolutionTest.php
 create mode 100644 server/tests/PointResolutionTest.php

diff --git a/server/src/Models/Order.php b/server/src/Models/Order.php
index c6d09adb..6809c834 100644
--- a/server/src/Models/Order.php
+++ b/server/src/Models/Order.php
@@ -849,7 +849,7 @@ public function createPayload(?array $attributes = [], bool $setPayload = true):
             $attributes['type'] = $this->type;
         }
 
-        if (isset($attributes['pickup']) && is_array($attributes['pickup'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'pickup')) {
             $pickup = Place::createFromMixed($attributes['pickup']);
 
             if ($pickup instanceof Place) {
@@ -857,7 +857,7 @@ public function createPayload(?array $attributes = [], bool $setPayload = true):
             }
         }
 
-        if (isset($attributes['dropoff']) && is_array($attributes['dropoff'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'dropoff')) {
             $dropoff = Place::createFromMixed($attributes['dropoff']);
 
             if ($dropoff instanceof Place) {
@@ -865,7 +865,7 @@ public function createPayload(?array $attributes = [], bool $setPayload = true):
             }
         }
 
-        if (isset($attributes['return']) && is_array($attributes['return'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'return')) {
             $return = Place::createFromMixed($attributes['return']);
 
             if ($return instanceof Place) {
@@ -897,19 +897,19 @@ public function insertPayload(?array $attributes = [], bool $setPayload = true):
             $attributes['type'] = $this->type;
         }
 
-        if (isset($attributes['pickup']) && is_array($attributes['pickup'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'pickup')) {
             $pickupId = Place::insertFromMixed($attributes['pickup']);
 
             $attributes['pickup_uuid'] = $pickupId;
         }
 
-        if (isset($attributes['dropoff']) && is_array($attributes['dropoff'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'dropoff')) {
             $dropoffId = Place::insertFromMixed($attributes['dropoff']);
 
             $attributes['dropoff_uuid'] = $dropoffId;
         }
 
-        if (isset($attributes['return']) && is_array($attributes['return'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'return')) {
             $returnId = Place::insertFromMixed($attributes['return']);
 
             $attributes['return_uuid'] = $returnId;
@@ -947,6 +947,18 @@ public function insertPayload(?array $attributes = [], bool $setPayload = true):
         return $payload;
     }
 
+    protected function shouldResolvePayloadPlace(?array $attributes, string $role): bool
+    {
+        return !$this->hasExistingPayloadPlaceUuid($attributes, $role) && isset($attributes[$role]) && is_array($attributes[$role]);
+    }
+
+    protected function hasExistingPayloadPlaceUuid(?array $attributes, string $role): bool
+    {
+        $uuid = data_get($attributes, "{$role}_uuid");
+
+        return is_string($uuid) && Str::isUuid($uuid) && Place::where('uuid', $uuid)->exists();
+    }
+
     /**
      * Retrieves the payload associated with the order.
      * If the payload is not already loaded, it loads the payload relationship.
diff --git a/server/src/Models/Place.php b/server/src/Models/Place.php
index cf919215..b8946d11 100644
--- a/server/src/Models/Place.php
+++ b/server/src/Models/Place.php
@@ -471,9 +471,17 @@ public static function findExistingSharedPlace(array $place): ?Place
             return null;
         }
 
-        $postalCode = static::normalizePlaceValue(data_get($place, 'postal_code'));
-        $street2    = static::normalizePlaceValue(data_get($place, 'street2'));
-        $location   = Utils::getPointFromMixed(data_get($place, 'location'));
+        $postalCode    = static::normalizePlaceValue(data_get($place, 'postal_code'));
+        $street2       = static::normalizePlaceValue(data_get($place, 'street2'));
+        $locationValue = data_get($place, 'location');
+        $location      = new SpatialPoint(0, 0);
+        if (!empty($locationValue)) {
+            try {
+                $location = Utils::getPointFromMixed($locationValue);
+            } catch (\Throwable $e) {
+                $location = new SpatialPoint(0, 0);
+            }
+        }
 
         $existingPlace = static::query()
             ->where('company_uuid', $companyUuid)
diff --git a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
index ff27d49c..110b8100 100644
--- a/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
+++ b/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php
@@ -153,6 +153,7 @@ public function apply(AiTask $task, array $preview = [], array $input = []): arr
         }
 
         $draft = array_replace_recursive((array) data_get($preview, 'draft', []), (array) data_get($input, 'draft', $input));
+        $draft = $this->sanitizeDraftForApply($draft);
         Arr::forget($draft, [
             'payload.pickup_query',
             'payload.dropoff_query',
@@ -184,6 +185,23 @@ public function apply(AiTask $task, array $preview = [], array $input = []): arr
         ];
     }
 
+    protected function sanitizeDraftForApply(array $draft): array
+    {
+        foreach (['pickup', 'dropoff', 'return'] as $role) {
+            $uuid = data_get($draft, "payload.{$role}_uuid");
+            if ($this->hasExistingPlaceUuid($uuid)) {
+                Arr::forget($draft, "payload.{$role}");
+            }
+        }
+
+        return $draft;
+    }
+
+    protected function hasExistingPlaceUuid($uuid): bool
+    {
+        return is_string($uuid) && Str::isUuid($uuid) && Place::where('uuid', $uuid)->exists();
+    }
+
     protected function matchesPrompt(string $prompt): bool
     {
         return str_contains($prompt, 'order') && $this->containsAny($prompt, ['create', 'new order', 'make an order', 'book an order']);
diff --git a/server/src/Support/Utils.php b/server/src/Support/Utils.php
index 8c67ca43..6659d381 100644
--- a/server/src/Support/Utils.php
+++ b/server/src/Support/Utils.php
@@ -248,6 +248,10 @@ public static function getPointFromMixed($coordinates): ?Point
             $coordinates = static::extractPointWktFromQueryExpression($coordinates) ?? $coordinates;
         }
 
+        if ($geoJsonPoint = static::pointFromGeoJson($coordinates)) {
+            return $geoJsonPoint;
+        }
+
         if ($coordinates instanceof Point) {
             $latitude  = $coordinates->getLat();
             $longitude = $coordinates->getLng();
@@ -452,6 +456,10 @@ public static function getPointFromCoordinatesStrict($coordinates): ?Point
             return $coordinates;
         }
 
+        if ($geoJsonPoint = static::pointFromGeoJson($coordinates)) {
+            return $geoJsonPoint;
+        }
+
         if (static::isGeoJson($coordinates)) {
             $coordinatesJson = null;
 
@@ -541,6 +549,10 @@ public static function getCoordinateFromCoordinates($coordinates, $prop = 'latit
             $coordinates = $coordinates->location;
         }
 
+        if ($geoJsonPoint = static::pointFromGeoJson($coordinates)) {
+            $coordinates = $geoJsonPoint;
+        }
+
         if ($coordinates instanceof Point) {
             $latitude  = $coordinates->getLat();
             $longitude = $coordinates->getLng();
@@ -639,6 +651,10 @@ public static function getPointFromCoordinates($coordinates): Point
             return $coordinates;
         }
 
+        if ($geoJsonPoint = static::pointFromGeoJson($coordinates)) {
+            return $geoJsonPoint;
+        }
+
         if (is_null($coordinates) || !static::isCoordinates($coordinates)) {
             return new Point(0, 0);
         }
@@ -649,6 +665,42 @@ public static function getPointFromCoordinates($coordinates): Point
         return new Point($latitude, $longitude);
     }
 
+    /**
+     * Resolve direct GeoJSON Point values and Feature-wrapped Point values.
+     */
+    protected static function pointFromGeoJson($coordinates): ?Point
+    {
+        if (is_string($coordinates) && static::isJson($coordinates)) {
+            $coordinates = json_decode($coordinates, true);
+        }
+
+        if (!is_array($coordinates) && !is_object($coordinates)) {
+            return null;
+        }
+
+        if (data_get($coordinates, 'type') === 'Feature') {
+            $coordinates = data_get($coordinates, 'geometry');
+        }
+
+        if (data_get($coordinates, 'type') !== 'Point') {
+            return null;
+        }
+
+        $pointCoordinates = data_get($coordinates, 'coordinates');
+        if (!is_array($pointCoordinates) || count($pointCoordinates) < 2) {
+            return null;
+        }
+
+        $longitude = $pointCoordinates[0];
+        $latitude  = $pointCoordinates[1];
+
+        if (!is_numeric($latitude) || !is_numeric($longitude)) {
+            return null;
+        }
+
+        return new Point((float) $latitude, (float) $longitude);
+    }
+
     /**
      * Converts a point to a WKT (Well-Known Text) representation for SQL insert.
      *
diff --git a/server/tests/AiCreateOrderPreviewCapabilityTest.php b/server/tests/AiCreateOrderPreviewCapabilityTest.php
index 4f36ba12..c52dd849 100644
--- a/server/tests/AiCreateOrderPreviewCapabilityTest.php
+++ b/server/tests/AiCreateOrderPreviewCapabilityTest.php
@@ -87,6 +87,33 @@ function fleetopsAiCreateOrderProtectedMethod(string $method): ReflectionMethod
         ->and($preview['coordinates'])->toHaveCount(2);
 });
 
+test('create order apply draft removes embedded places when endpoint uuids exist', function () {
+    $capability = new class extends CreateOrderPreviewCapability {
+        public function sanitizeForTest(array $draft): array
+        {
+            return $this->sanitizeDraftForApply($draft);
+        }
+
+        protected function hasExistingPlaceUuid($uuid): bool
+        {
+            return in_array($uuid, ['pickup_uuid_test', 'dropoff_uuid_test'], true);
+        }
+    };
+
+    $draft = $capability->sanitizeForTest([
+        'payload' => [
+            'pickup_uuid'  => 'pickup_uuid_test',
+            'dropoff_uuid' => 'dropoff_uuid_test',
+            'pickup'       => ['uuid' => 'pickup_uuid_test', 'location' => ['type' => 'Point', 'coordinates' => [103.851, 1.2816]]],
+            'dropoff'      => ['uuid' => 'dropoff_uuid_test', 'location' => ['type' => 'Point', 'coordinates' => [103.8318, 1.3048]]],
+            'return'       => ['location' => ['type' => 'Point', 'coordinates' => [103.8, 1.3]]],
+        ],
+    ]);
+
+    expect($draft['payload'])->toHaveKeys(['pickup_uuid', 'dropoff_uuid', 'return'])
+        ->and($draft['payload'])->not->toHaveKeys(['pickup', 'dropoff']);
+});
+
 test('create order preview resolves relative schedule phrases', function () {
     $timezone = date_default_timezone_get();
     date_default_timezone_set('Asia/Singapore');
diff --git a/server/tests/OrderPayloadPlaceResolutionTest.php b/server/tests/OrderPayloadPlaceResolutionTest.php
new file mode 100644
index 00000000..05dfbf04
--- /dev/null
+++ b/server/tests/OrderPayloadPlaceResolutionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Order;
+
+function fleetopsOrderPayloadResolutionProbe(bool $hasExistingUuid)
+{
+    return new class($hasExistingUuid) extends Order {
+        public function __construct(private bool $hasExistingUuid = false)
+        {
+            parent::__construct();
+        }
+
+        public function shouldResolveForTest(array $attributes, string $role): bool
+        {
+            return $this->shouldResolvePayloadPlace($attributes, $role);
+        }
+
+        protected function hasExistingPayloadPlaceUuid(?array $attributes, string $role): bool
+        {
+            return $this->hasExistingUuid;
+        }
+    };
+}
+
+test('order payload creation prefers existing place uuid over embedded place object', function () {
+    $order = fleetopsOrderPayloadResolutionProbe(true);
+
+    expect($order->shouldResolveForTest([
+        'pickup_uuid' => '628892cc-271c-89fd-cdaa-39d02b40bd13',
+        'pickup'      => [
+            'uuid'     => '628892cc-271c-89fd-cdaa-39d02b40bd13',
+            'location' => [
+                'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+                'type'        => 'Point',
+                'coordinates' => [103.851, 1.2816],
+            ],
+        ],
+    ], 'pickup'))->toBeFalse();
+});
+
+test('order payload creation resolves embedded place when no valid uuid exists', function () {
+    $order = fleetopsOrderPayloadResolutionProbe(false);
+
+    expect($order->shouldResolveForTest([
+        'pickup' => [
+            'location' => [
+                'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+                'type'        => 'Point',
+                'coordinates' => [103.851, 1.2816],
+            ],
+        ],
+    ], 'pickup'))->toBeTrue();
+});
diff --git a/server/tests/PointResolutionTest.php b/server/tests/PointResolutionTest.php
new file mode 100644
index 00000000..1a68dc40
--- /dev/null
+++ b/server/tests/PointResolutionTest.php
@@ -0,0 +1,63 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\Utils;
+
+function fleetopsBboxPoint(): array
+{
+    return [
+        'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+        'type'        => 'Point',
+        'coordinates' => [103.851, 1.2816],
+    ];
+}
+
+test('point resolution accepts GeoJSON point with bbox', function () {
+    $point = Utils::getPointFromMixed(fleetopsBboxPoint());
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('point resolution accepts feature wrapped GeoJSON point with bbox', function () {
+    $point = Utils::getPointFromMixed([
+        'type'     => 'Feature',
+        'geometry' => fleetopsBboxPoint(),
+    ]);
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('point resolution rejects malformed feature points cleanly', function () {
+    expect(fn () => Utils::getPointFromMixed([
+        'type'     => 'Feature',
+        'geometry' => [
+            'type'        => 'Point',
+            'coordinates' => [],
+        ],
+    ]))->toThrow(Exception::class, 'Attempted to resolve Point from invalid location.');
+});
+
+test('coordinate helper does not collapse bbox GeoJSON point to zero', function () {
+    $point = Utils::getPointFromCoordinates([
+        'type'     => 'Feature',
+        'geometry' => fleetopsBboxPoint(),
+    ]);
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('structured place normalization accepts bbox GeoJSON point locations', function () {
+    $place = Place::mergeStructuredPlaceAttributes([
+        'name'     => 'AI Pickup',
+        'street1'  => '16 Simon Walk',
+        'city'     => 'Singapore',
+        'country'  => 'SG',
+        'location' => fleetopsBboxPoint(),
+    ]);
+
+    expect($place['location']->getLat())->toBe(1.2816)
+        ->and($place['location']->getLng())->toBe(103.851);
+});

From 374a2c8193a518ca715c3d3aa2ef5a4e65dc2757 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:45:22 +0800
Subject: [PATCH 15/19] fix ai order creation capability and payload
 normalization

---
 .../Support/Ai/Capabilities/OperationalQueryCapability.php  | 2 +-
 .../src/Support/Ai/Capabilities/OrderInsightsCapability.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
index 4729e0ac..c633ee0b 100644
--- a/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
+++ b/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php
@@ -191,7 +191,7 @@ protected function driverGeofenceDistribution(array $filters = []): array
                 $query->where('online', (bool) ($filter['value'] ?? false));
             }
 
-            if (($filter['field'] ?? null) === 'updated_at' && in_array(($filter['operator'] ?? null), ['>=', '<='], true)) {
+            if (($filter['field'] ?? null) === 'updated_at' && in_array($filter['operator'] ?? null, ['>=', '<='], true)) {
                 $query->where('updated_at', $filter['operator'], $filter['value']);
             }
         }
diff --git a/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
index a46ebeb4..60443c91 100644
--- a/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
+++ b/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php
@@ -53,10 +53,10 @@ public function resolve(AiTask $task): array
             'authorized'        => true,
             'metric'            => 'orders',
             'date_window'       => $window ? [
-                'label' => $window['label'],
+                'label'    => $window['label'],
                 'timezone' => $window['timezone'],
-                'start' => $window['start']->toIso8601String(),
-                'end'   => $window['end']->toIso8601String(),
+                'start'    => $window['start']->toIso8601String(),
+                'end'      => $window['end']->toIso8601String(),
             ] : null,
             'amount_threshold'  => $amount,
             'count'             => $total,

From 12ac1d934c77c27c8792d908c142e02d548145a8 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:45:39 +0800
Subject: [PATCH 16/19] upgraded dependencies

---
 addon/components/fleet/hierarchy-tree.js |  4 +-
 package.json                             |  8 +--
 pnpm-lock.yaml                           | 63 +++++++++++++++++++++---
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/addon/components/fleet/hierarchy-tree.js b/addon/components/fleet/hierarchy-tree.js
index 1241cdf0..e4e4a6a6 100644
--- a/addon/components/fleet/hierarchy-tree.js
+++ b/addon/components/fleet/hierarchy-tree.js
@@ -520,8 +520,8 @@ export default class FleetHierarchyTreeComponent extends Component {
             style: {
                 position: 'fixed',
                 marginTop: '0px',
-                left: triggerRect.left - contentWidth - 3,
-                top: triggerRect.top,
+                left: triggerRect.left - (triggerRect.width / 2) - contentWidth - 9,
+                top: triggerRect.top - (triggerRect.height / 2) + 5,
             },
         };
     }
diff --git a/package.json b/package.json
index 33f31835..8f7cae7a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,9 @@
     "scripts": {
         "build": "ember build --environment=production",
         "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
-        "lint:css": "stylelint \"**/*.css\"",
+        "check:css-alpha": "node scripts/normalize-rgba-alpha.js --check",
+        "fix:css-alpha": "node scripts/normalize-rgba-alpha.js",
+        "lint:css": "npm run check:css-alpha && stylelint \"**/*.css\"",
         "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
         "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
         "lint:hbs": "ember-template-lint .",
@@ -42,8 +44,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.23",
-        "@fleetbase/ember-ui": "^0.3.38",
+        "@fleetbase/ember-core": "^0.3.24",
+        "@fleetbase/ember-ui": "^0.3.39",
         "@fleetbase/fleetops-data": "^0.1.40",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d0adb01..d7f2b5b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,11 +12,11 @@ importers:
         specifier: ^7.23.2
         version: 7.29.0
       '@fleetbase/ember-core':
-        specifier: ^0.3.23
-        version: 0.3.23(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(eslint@8.57.1)(webpack@5.106.2(postcss@8.5.14))
+        specifier: ^0.3.24
+        version: 0.3.24(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(eslint@8.57.1)(webpack@5.106.2(postcss@8.5.14))
       '@fleetbase/ember-ui':
-        specifier: ^0.3.38
-        version: 0.3.38(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(postcss@8.5.14)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.106.2(postcss@8.5.14))
+        specifier: ^0.3.39
+        version: 0.3.39(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(postcss@8.5.14)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.106.2(postcss@8.5.14))
       '@fleetbase/fleetops-data':
         specifier: ^0.1.40
         version: 0.1.40(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(eslint@8.57.1)(webpack@5.106.2(postcss@8.5.14))
@@ -1385,8 +1385,12 @@ packages:
     resolution: {integrity: sha512-geUudr6UWXpvRLfIhlEqjTn3YaZ8Bu+LmhigiHM8OVSmmQtCKn9ZiHHjhlX4hAxixf0+9/82t6/qvPRB8LlX4g==}
     engines: {node: '>= 18'}
 
-  '@fleetbase/ember-ui@0.3.38':
-    resolution: {integrity: sha512-8nDYCKSTGtkFk0DQGwrxIljkrp/ANrZk/YOGiyBYSQ20/Uzkn6hciFxrUCUgxMOL511XRPWFdfdXJ6G8uJH0MA==}
+  '@fleetbase/ember-core@0.3.24':
+    resolution: {integrity: sha512-WG32JlX4S75ofa34RQEMxFEqc20fTv2Qn3A5+NlqXtL0lfnCthdO+a1DrGqIIierthHl3mVTxhe+z63f8sM6EA==}
+    engines: {node: '>= 18'}
+
+  '@fleetbase/ember-ui@0.3.39':
+    resolution: {integrity: sha512-qb8sCq4bfAMq8UGWVlUiXWvRoInmCPqeFu3XDWxUdwJUYR4kGL0lvyO1q2Ej7GcxtiDEnZ4JX+Qp2Tj+TvG3yw==}
     engines: {node: '>= 18'}
 
   '@fleetbase/fleetops-data@0.1.40':
@@ -3708,6 +3712,11 @@ packages:
   decorator-transforms@2.3.2:
     resolution: {integrity: sha512-XcErcjlmCzG5ODgYjt6ZTXwd6S8fPKln/sJmw15ZXkWG2JpoQNwszis+AwF6XSGlOoG7g8MCEO97g+Yw3fk5OQ==}
 
+  decorator-transforms@2.4.0:
+    resolution: {integrity: sha512-IB+0RqnJpuS7ndH4dVY5dfWTZsrCzN3avWFdjSiET0uT2U24jKywjpVEK97TflnZkZgiSRfmeqc1WfS+1CI23w==}
+    peerDependencies:
+      '@babel/core': ^7.23.0 || ^8.0.0
+
   deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
@@ -10359,7 +10368,40 @@ snapshots:
       - utf-8-validate
       - webpack
 
-  '@fleetbase/ember-ui@0.3.38(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(postcss@8.5.14)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.106.2(postcss@8.5.14))':
+  '@fleetbase/ember-core@0.3.24(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(eslint@8.57.1)(webpack@5.106.2(postcss@8.5.14))':
+    dependencies:
+      '@babel/core': 7.29.0
+      compress-json: 3.4.0
+      date-fns: 2.30.0
+      ember-auto-import: 2.13.1(webpack@5.106.2(postcss@8.5.14))
+      ember-can: 6.0.0(@babel/core@7.29.0)(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))
+      ember-cli-babel: 8.3.1(@babel/core@7.29.0)
+      ember-cli-htmlbars: 6.3.0
+      ember-cli-notifications: 9.1.0(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))
+      ember-concurrency: 4.0.6(@babel/core@7.29.0)
+      ember-decorators: 6.1.1
+      ember-get-config: 2.1.1(@babel/core@7.29.0)
+      ember-inflector: 4.0.3(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))
+      ember-intl: 6.3.2(@babel/core@7.29.0)(webpack@5.106.2(postcss@8.5.14))
+      ember-loading: 2.0.0(@babel/core@7.29.0)
+      ember-local-storage: 2.0.7(@babel/core@7.29.0)
+      ember-simple-auth: 6.1.0(@babel/core@7.29.0)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(eslint@8.57.1)
+      ember-wormhole: 0.6.1
+      socketcluster-client: 17.2.2
+    transitivePeerDependencies:
+      - '@ember/string'
+      - '@ember/test-helpers'
+      - '@glint/template'
+      - bufferutil
+      - ember-resolver
+      - ember-source
+      - eslint
+      - supports-color
+      - typescript
+      - utf-8-validate
+      - webpack
+
+  '@fleetbase/ember-ui@0.3.39(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14)))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14))))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))(postcss@8.5.14)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.106.2(postcss@8.5.14))':
     dependencies:
       '@babel/core': 7.29.0
       '@ember/render-modifiers': 2.1.0(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.106.2(postcss@8.5.14)))
@@ -13434,6 +13476,11 @@ snapshots:
     transitivePeerDependencies:
       - '@babel/core'
 
+  decorator-transforms@2.4.0(@babel/core@7.29.0):
+    dependencies:
+      '@babel/core': 7.29.0
+      babel-import-util: 3.0.1
+
   deep-extend@0.6.0: {}
 
   deep-is@0.1.4: {}
@@ -19632,7 +19679,7 @@ snapshots:
   tracked-built-ins@3.4.0(@babel/core@7.29.0):
     dependencies:
       '@embroider/addon-shim': 1.10.3
-      decorator-transforms: 2.3.2(@babel/core@7.29.0)
+      decorator-transforms: 2.4.0(@babel/core@7.29.0)
       ember-tracked-storage-polyfill: 1.0.1
     transitivePeerDependencies:
       - '@babel/core'

From f784e71098c08f39a09de29032afc9834ee8bfcb Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:46:10 +0800
Subject: [PATCH 17/19] added more order details registries & minor
 improvements on fleet/heiararchy component

---
 addon/components/order/details.hbs          | 35 ++++++++++++++++++++-
 addon/extension.js                          |  3 ++
 addon/styles/fleetops-engine.css            |  1 -
 addon/utils/map-drawer-dropdown-position.js |  8 ++---
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/addon/components/order/details.hbs b/addon/components/order/details.hbs
index 2167c38e..1efdb1cb 100644
--- a/addon/components/order/details.hbs
+++ b/addon/components/order/details.hbs
@@ -2,8 +2,24 @@
     {{#if (has-block)}}
         {{yield
             (hash
+                RegistryYieldStart=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:start"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
                 Activity=(component "order/details/activity" resource=@resource onChange=this.handleActivityChanged isLoadingActivity=@isLoadingActivity isLoading=@isLoading)
                 Detail=(component "order/details/detail" resource=@resource onChange=@onDetailsChanged isLoading=@isLoading)
+                RegistryYieldAfterDetails=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:after-details"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
                 CustomFields=(component "order/details/custom-fields" resource=@resource onChange=@onCustomFieldsChanged isLoading=@isLoading)
                 PurchaseRate=(component "order/details/purchase-rate" resource=@resource isLoading=@isLoading)
                 Tracking=(component "order/details/tracking" resource=@resource isLoading=@isLoading)
@@ -18,11 +34,25 @@
                 Documents=(component "order/details/documents" resource=@resource onChange=@onDocumentsChanged isLoading=@isLoading)
                 Comments=(component "order/details/comments" resource=@resource onChange=@onCommentsChanged isLoading=@isLoading)
                 Metadata=(component "order/details/metadata" resource=@resource onChange=@onMetadataChanged isLoading=@isLoading)
+                RegistryYieldEnd=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:end"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
             )
         }}
     {{else}}
+        <RegistryYield @registry="fleet-ops:component:order:details:start" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
         <Order::Details::Activity @resource={{@resource}} @onChange={{this.handleActivityChanged}} @isLoadingActivity={{@isLoadingActivity}} @isLoading={{@isLoading}} />
         <Order::Details::Detail @resource={{@resource}} @onChange={{@onDetailsChanged}} @isLoading={{@isLoading}} />
+        <RegistryYield @registry="fleet-ops:component:order:details:after-details" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
         <Order::Details::CustomFields @resource={{@resource}} @onChange={{@onCustomFieldsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::PurchaseRate @resource={{@resource}} @isLoading={{@isLoading}} />
         <Order::Details::Tracking @resource={{@resource}} @isLoading={{@isLoading}} />
@@ -37,5 +67,8 @@
         <Order::Details::Documents @resource={{@resource}} @onChange={{@onDocumentsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::Comments @resource={{@resource}} @onChange={{@onCommentsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::Metadata @resource={{@resource}} @onChange={{@onMetadataChanged}} @isLoading={{@isLoading}} />
+        <RegistryYield @registry="fleet-ops:component:order:details:end" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
     {{/if}}
-</div>
+</div>
\ No newline at end of file
diff --git a/addon/extension.js b/addon/extension.js
index 9a87ca51..a23afa40 100644
--- a/addon/extension.js
+++ b/addon/extension.js
@@ -403,6 +403,9 @@ export default {
             'fleet-ops:component:order:form:start',
             'fleet-ops:component:order:form:end',
             'fleet-ops:component:order:form:details',
+            'fleet-ops:component:order:form:details:start',
+            'fleet-ops:component:order:form:details:end',
+            'fleet-ops:component:order:form:details:after-details',
             'fleet-ops:component:order:form:payload:entity',
             'fleet-ops:component:order:form:payload:entity:form',
             'fleet-ops:template:settings:routing',
diff --git a/addon/styles/fleetops-engine.css b/addon/styles/fleetops-engine.css
index 91d2c3cf..3e05fd5c 100644
--- a/addon/styles/fleetops-engine.css
+++ b/addon/styles/fleetops-engine.css
@@ -1,4 +1,3 @@
-/* stylelint-disable alpha-value-notation -- Fleet-Ops lazy engine production CSS is minified by legacy clean-css, which corrupts comma-form rgba() percent alpha values. */
 .scheduler-left-sidebar {
     border-right: 1px rgb(229 231 235 / 100%) solid;
     height: 100vh;
diff --git a/addon/utils/map-drawer-dropdown-position.js b/addon/utils/map-drawer-dropdown-position.js
index ec892695..be8827dd 100644
--- a/addon/utils/map-drawer-dropdown-position.js
+++ b/addon/utils/map-drawer-dropdown-position.js
@@ -21,8 +21,8 @@ export default function calculateMapDrawerDropdownPosition(trigger, content) {
     const boundaryRect = drawerRect ?? viewportRect;
     const minLeft = boundaryRect.left + gap;
     const maxLeft = boundaryRect.right - contentWidth - gap;
-    const minTop = boundaryRect.top + gap;
-    const maxTop = boundaryRect.bottom - contentHeight - gap;
+    const minTop = boundaryRect.top;
+    const maxTop = boundaryRect.bottom - contentHeight + 8;
 
     const preferredLeft = triggerRect.left - contentWidth - gap;
     const preferredTop = triggerRect.top;
@@ -31,11 +31,11 @@ export default function calculateMapDrawerDropdownPosition(trigger, content) {
 
     return {
         style: {
-            position: 'fixed',
+            position: 'absolute',
             left,
             top,
             marginTop: '0px',
-            zIndex: 10000,
+            zIndex: '10000',
         },
     };
 }

From 2c6cc68dcd65009120e640e8502f012518275043 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:46:34 +0800
Subject: [PATCH 18/19] script to fix rgba alpha normalization from percentage
 to decimal

---
 .stylelintrc.js                 |  1 +
 scripts/normalize-rgba-alpha.js | 90 +++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 scripts/normalize-rgba-alpha.js

diff --git a/.stylelintrc.js b/.stylelintrc.js
index f1804fe2..21ff5894 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -5,6 +5,7 @@ module.exports = {
     rules: {
         'selector-class-pattern': null,
         'no-descending-specificity': null,
+        'alpha-value-notation': null,
         'color-function-notation': null,
     },
 };
diff --git a/scripts/normalize-rgba-alpha.js b/scripts/normalize-rgba-alpha.js
new file mode 100644
index 00000000..c5827661
--- /dev/null
+++ b/scripts/normalize-rgba-alpha.js
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const root = process.cwd();
+const checkOnly = process.argv.includes('--check');
+const cssRoot = path.join(root, 'addon');
+const rgbaPercentAlphaPattern = /rgba\(\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)%\s*\)/g;
+
+function collectCssFiles(dir, files = []) {
+    if (!fs.existsSync(dir)) {
+        return files;
+    }
+
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+
+        if (entry.isDirectory()) {
+            collectCssFiles(fullPath, files);
+            continue;
+        }
+
+        if (entry.isFile() && entry.name.endsWith('.css')) {
+            files.push(fullPath);
+        }
+    }
+
+    return files;
+}
+
+function formatAlpha(percent) {
+    const alpha = Number(percent) / 100;
+    return Number.isInteger(alpha) ? String(alpha) : String(Number(alpha.toFixed(4)));
+}
+
+function lineForIndex(source, index) {
+    return source.slice(0, index).split('\n').length;
+}
+
+const changes = [];
+
+for (const filePath of collectCssFiles(cssRoot)) {
+    const source = fs.readFileSync(filePath, 'utf8');
+    const matches = [];
+
+    const next = source.replace(rgbaPercentAlphaPattern, (match, red, green, blue, alphaPercent, offset) => {
+        const replacement = `rgba(${red}, ${green}, ${blue}, ${formatAlpha(alphaPercent)})`;
+        matches.push({
+            line: lineForIndex(source, offset),
+            before: match,
+            after: replacement,
+        });
+        return replacement;
+    });
+
+    if (matches.length === 0) {
+        continue;
+    }
+
+    changes.push({
+        filePath,
+        matches,
+    });
+
+    if (!checkOnly) {
+        fs.writeFileSync(filePath, next);
+    }
+}
+
+if (changes.length === 0) {
+    console.log('No comma-form rgba() percent-alpha values found.');
+    process.exit(0);
+}
+
+for (const change of changes) {
+    const relativePath = path.relative(root, change.filePath);
+
+    for (const match of change.matches) {
+        console.log(`${relativePath}:${match.line} ${match.before} -> ${match.after}`);
+    }
+}
+
+if (checkOnly) {
+    console.error('\nRun `npm run fix:css-alpha` to normalize these values before production builds.');
+    process.exit(1);
+}
+
+console.log(`\nNormalized ${changes.reduce((total, change) => total + change.matches.length, 0)} rgba() alpha value(s).`);

From 02bc35a6f182e7e0dc26ae41f971dbd4159be1c5 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:57:24 +0800
Subject: [PATCH 19/19] Fix fleet hierarchy dropdown formatting

---
 addon/components/fleet/hierarchy-tree.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/components/fleet/hierarchy-tree.js b/addon/components/fleet/hierarchy-tree.js
index e4e4a6a6..85b3f6f0 100644
--- a/addon/components/fleet/hierarchy-tree.js
+++ b/addon/components/fleet/hierarchy-tree.js
@@ -520,8 +520,8 @@ export default class FleetHierarchyTreeComponent extends Component {
             style: {
                 position: 'fixed',
                 marginTop: '0px',
-                left: triggerRect.left - (triggerRect.width / 2) - contentWidth - 9,
-                top: triggerRect.top - (triggerRect.height / 2) + 5,
+                left: triggerRect.left - triggerRect.width / 2 - contentWidth - 9,
+                top: triggerRect.top - triggerRect.height / 2 + 5,
             },
         };
     }