From e6da7ba5130099442833e50606db0292f40bb352 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 13:40:51 +0800
Subject: [PATCH 1/3] Polish AI prompt controls

---
 addon/components/ai-prompt.hbs | 10 ----------
 addon/components/ai-prompt.js  |  5 -----
 addon/styles/ai-engine.css     | 35 ++++++++++++++++++----------------
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/addon/components/ai-prompt.hbs b/addon/components/ai-prompt.hbs
index 03c07b5..ecd9a40 100644
--- a/addon/components/ai-prompt.hbs
+++ b/addon/components/ai-prompt.hbs
@@ -184,16 +184,6 @@
                             {{on "input" this.resizePromptTextarea}}
                             {{did-insert this.focusPromptInput}}
                         />
-                        {{#if this.hasCurrentSession}}
-                            <Button
-                                @icon="check"
-                                @helpText="End chat"
-                                @wrapperClass="fleetbase-ai-button-wrapper"
-                                class="fleetbase-ai-icon-button"
-                                @disabled={{this.ai.endSession.isRunning}}
-                                @onClick={{this.endSession}}
-                            />
-                        {{/if}}
                         <Button
                             @icon="paper-plane"
                             @type="primary"
diff --git a/addon/components/ai-prompt.js b/addon/components/ai-prompt.js
index dd2148e..b9ce45b 100644
--- a/addon/components/ai-prompt.js
+++ b/addon/components/ai-prompt.js
@@ -212,11 +212,6 @@ export default class AiPromptComponent extends Component {
         this.scheduleResponseScroll({ force: true });
     }
 
-    @action async endSession() {
-        this.showHistory = false;
-        await this.ai.endSession.perform();
-    }
-
     @action async applyAction(task, preview, input = {}) {
         const updatedTask = await this.ai.applyTask.perform(task, preview.key ?? preview.action, input);
         this.replaceResponse(updatedTask);
diff --git a/addon/styles/ai-engine.css b/addon/styles/ai-engine.css
index 8d3266d..e00924b 100644
--- a/addon/styles/ai-engine.css
+++ b/addon/styles/ai-engine.css
@@ -64,42 +64,45 @@
 
 .fleetbase-ai-scroll-latest-wrapper {
     position: absolute;
-    right: 8px;
-    bottom: 52px;
+    left: 50%;
+    bottom: 58px;
     z-index: 3;
-    width: 30px;
-    height: 30px;
+    width: 28px;
+    height: 28px;
     box-shadow: none;
+    transform: translateX(-50%);
 }
 
 .fleetbase-ai-scroll-latest {
     display: inline-flex;
-    width: 30px;
-    height: 30px;
+    width: 28px;
+    height: 28px;
     align-items: center;
     justify-content: center;
-    border: 1px solid rgb(255 255 255 / 42%);
-    border-radius: 999px;
-    background: rgb(255 255 255 / 82%);
+    border: 1px solid rgb(148 163 184 / 24%);
+    border-radius: 50%;
+    background: rgb(255 255 255 / 58%);
     color: #2563eb;
-    box-shadow: 0 10px 26px rgb(15 23 42 / 18%);
-    backdrop-filter: blur(5px) saturate(150%);
+    box-shadow: 0 8px 20px rgb(15 23 42 / 12%);
+    backdrop-filter: blur(5px) saturate(135%);
 }
 
 .fleetbase-ai-scroll-latest:hover {
-    background: rgb(239 246 255 / 92%);
+    border-color: rgb(37 99 235 / 26%);
+    background: rgb(239 246 255 / 76%);
     color: #1d4ed8;
 }
 
 body[data-theme='dark'] .fleetbase-ai-scroll-latest {
-    border-color: rgb(148 163 184 / 28%);
-    background: rgb(15 23 42 / 82%);
+    border-color: rgb(148 163 184 / 20%);
+    background: rgb(15 23 42 / 58%);
     color: #93c5fd;
-    box-shadow: 0 10px 26px rgb(0 0 0 / 26%);
+    box-shadow: 0 8px 20px rgb(0 0 0 / 18%);
 }
 
 body[data-theme='dark'] .fleetbase-ai-scroll-latest:hover {
-    background: rgb(30 41 59 / 92%);
+    border-color: rgb(96 165 250 / 24%);
+    background: rgb(30 41 59 / 72%);
     color: #bfdbfe;
 }
 

From 3c3af378e38a07bda2625e81757452fcd6439856 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 13:44:34 +0800
Subject: [PATCH 2/3] upgraded depndencies & ran php-cs-formatter

---
 package.json                                  |  4 +-
 pnpm-lock.yaml                                | 20 ++++----
 .../Controllers/Internal/AiTaskController.php | 16 +++----
 server/src/Services/AiContextResolver.php     | 10 ++--
 server/src/Services/AiQueryExecutor.php       |  4 +-
 server/src/Services/AiTaskService.php         | 48 +++++++++----------
 server/tests/Feature.php                      |  2 +-
 7 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 7be5f74..55491e0 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,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",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d86de86..d69bc41 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.105.4))(webpack@5.105.4))(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.105.4)))(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.105.4))(eslint@8.57.1)(webpack@5.105.4)
+        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.105.4))(webpack@5.105.4))(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.105.4)))(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.105.4))(eslint@8.57.1)(webpack@5.105.4)
       '@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.105.4))(webpack@5.105.4))(@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.105.4)))(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.105.4))(postcss@8.5.8)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.4)
+        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.105.4))(webpack@5.105.4))(@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.105.4)))(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.105.4))(postcss@8.5.8)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.4)
       '@fortawesome/ember-fontawesome':
         specifier: ^2.0.0
         version: 2.0.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.105.4))(rollup@2.80.0)(webpack@5.105.4)
@@ -1288,12 +1288,12 @@ packages:
     peerDependencies:
       ember-source: '>= 4.0.0'
 
-  '@fleetbase/ember-core@0.3.23':
-    resolution: {integrity: sha512-geUudr6UWXpvRLfIhlEqjTn3YaZ8Bu+LmhigiHM8OVSmmQtCKn9ZiHHjhlX4hAxixf0+9/82t6/qvPRB8LlX4g==}
+  '@fleetbase/ember-core@0.3.24':
+    resolution: {integrity: sha512-WG32JlX4S75ofa34RQEMxFEqc20fTv2Qn3A5+NlqXtL0lfnCthdO+a1DrGqIIierthHl3mVTxhe+z63f8sM6EA==}
     engines: {node: '>= 18'}
 
-  '@fleetbase/ember-ui@0.3.38':
-    resolution: {integrity: sha512-8nDYCKSTGtkFk0DQGwrxIljkrp/ANrZk/YOGiyBYSQ20/Uzkn6hciFxrUCUgxMOL511XRPWFdfdXJ6G8uJH0MA==}
+  '@fleetbase/ember-ui@0.3.39':
+    resolution: {integrity: sha512-qb8sCq4bfAMq8UGWVlUiXWvRoInmCPqeFu3XDWxUdwJUYR4kGL0lvyO1q2Ej7GcxtiDEnZ4JX+Qp2Tj+TvG3yw==}
     engines: {node: '>= 18'}
 
   '@floating-ui/core@1.7.5':
@@ -9984,7 +9984,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@fleetbase/ember-core@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.105.4))(webpack@5.105.4))(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.105.4)))(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.105.4))(eslint@8.57.1)(webpack@5.105.4)':
+  '@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.105.4))(webpack@5.105.4))(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.105.4)))(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.105.4))(eslint@8.57.1)(webpack@5.105.4)':
     dependencies:
       '@babel/core': 7.29.0
       compress-json: 3.4.0
@@ -10017,7 +10017,7 @@ 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.105.4))(webpack@5.105.4))(@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.105.4)))(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.105.4))(postcss@8.5.8)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.4)':
+  '@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.105.4))(webpack@5.105.4))(@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.105.4)))(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.105.4))(postcss@8.5.8)(rollup@2.80.0)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.4)':
     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.105.4))
diff --git a/server/src/Http/Controllers/Internal/AiTaskController.php b/server/src/Http/Controllers/Internal/AiTaskController.php
index 1a30b37..cac6fd2 100644
--- a/server/src/Http/Controllers/Internal/AiTaskController.php
+++ b/server/src/Http/Controllers/Internal/AiTaskController.php
@@ -23,9 +23,9 @@ public function index(Request $request)
     public function store(Request $request, AiTaskService $tasks)
     {
         $request->validate([
-            'prompt'       => ['required', 'string', 'max:12000'],
-            'session_uuid' => ['nullable', 'string'],
-            'attachments'  => ['nullable', 'array'],
+            'prompt'        => ['required', 'string', 'max:12000'],
+            'session_uuid'  => ['nullable', 'string'],
+            'attachments'   => ['nullable', 'array'],
             'attachments.*' => ['string'],
         ]);
 
@@ -53,12 +53,12 @@ public function apply(string $id, Request $request, AiTaskService $tasks)
 
     public function cancel(string $id, AiTaskService $tasks)
     {
-        $task = $this->findTask($id);
-        $metadata = (array) $task->metadata;
-        $previews = collect((array) data_get($metadata, 'action_previews', []));
-        $preview  = $previews->first();
+        $task      = $this->findTask($id);
+        $metadata  = (array) $task->metadata;
+        $previews  = collect((array) data_get($metadata, 'action_previews', []));
+        $preview   = $previews->first();
         $actionKey = is_array($preview) ? ($preview['key'] ?? $preview['action'] ?? null) : null;
-        $error = [
+        $error     = [
             'action'  => $actionKey,
             'type'    => 'cancelled',
             'message' => 'This AI action preview was cancelled.',
diff --git a/server/src/Services/AiContextResolver.php b/server/src/Services/AiContextResolver.php
index 486fe36..385453b 100644
--- a/server/src/Services/AiContextResolver.php
+++ b/server/src/Services/AiContextResolver.php
@@ -37,11 +37,11 @@ public function resolve(AiTask $task): array
             }
 
             $context[] = [
-                'key'         => $capability->key(),
-                'label'       => $capability->label(),
-                'module'      => $capability->module(),
-                'type'        => $capability->type(),
-                'mode'        => $capability->mode(),
+                'key'          => $capability->key(),
+                'label'        => $capability->label(),
+                'module'       => $capability->module(),
+                'type'         => $capability->type(),
+                'mode'         => $capability->mode(),
                 'preview_only' => $capability->previewOnly(),
                 'result'       => $result,
             ];
diff --git a/server/src/Services/AiQueryExecutor.php b/server/src/Services/AiQueryExecutor.php
index 591e44a..823005c 100644
--- a/server/src/Services/AiQueryExecutor.php
+++ b/server/src/Services/AiQueryExecutor.php
@@ -135,8 +135,8 @@ public function applyFilters(AiQueryableResource $resource, Builder $query, arra
             $column = $resource->columnFor($field);
 
             match ($operator) {
-                'null'     => $query->whereNull($column),
-                'not_null' => $query->whereNotNull($column),
+                'null'          => $query->whereNull($column),
+                'not_null'      => $query->whereNotNull($column),
                 'false_or_null' => $query->where(function (Builder $nested) use ($column) {
                     $nested->where($column, false)->orWhereNull($column);
                 }),
diff --git a/server/src/Services/AiTaskService.php b/server/src/Services/AiTaskService.php
index 102f8db..450fa89 100644
--- a/server/src/Services/AiTaskService.php
+++ b/server/src/Services/AiTaskService.php
@@ -2,9 +2,8 @@
 
 namespace Fleetbase\Ai\Services;
 
-use Fleetbase\Ai\Contracts\AIProviderInterface;
 use Fleetbase\Ai\Contracts\AIActionCapabilityInterface;
-use Fleetbase\Ai\Services\AiProviderManager;
+use Fleetbase\Ai\Contracts\AIProviderInterface;
 use Fleetbase\Ai\Models\AiSession;
 use Fleetbase\Ai\Models\AiTask;
 use Fleetbase\Ai\Models\AiTaskStep;
@@ -22,24 +21,24 @@ public function __construct(protected AIProviderInterface $provider, protected A
 
     public function createFromRequest(Request $request): AiTask
     {
-        $config   = Setting::system('ai', []);
-        $provider = $this->provider instanceof AiProviderManager ? $this->provider->providerNameFor($config) : 'local';
-        $model    = $this->provider instanceof AiProviderManager ? $this->provider->modelFor($config) : 'fleetbase-local-preview';
-        $session  = $this->resolveSessionForRequest($request);
+        $config      = Setting::system('ai', []);
+        $provider    = $this->provider instanceof AiProviderManager ? $this->provider->providerNameFor($config) : 'local';
+        $model       = $this->provider instanceof AiProviderManager ? $this->provider->modelFor($config) : 'fleetbase-local-preview';
+        $session     = $this->resolveSessionForRequest($request);
         $attachments = $this->attachmentResolver->resolveFromRequest($request);
 
         $task = AiTask::create([
             'ai_session_uuid'  => $session->uuid,
-            'company_uuid'    => session('company'),
-            'created_by_uuid' => optional($request->user())->uuid,
-            'task_type'       => $request->input('task_type', 'prompt'),
-            'status'          => 'running',
-            'prompt'          => $request->input('prompt'),
-            'provider'        => $provider,
-            'model'           => $model,
-            'context'         => $request->input('context', []),
-            'metadata'        => ['attachments' => $attachments],
-            'started_at'      => now(),
+            'company_uuid'     => session('company'),
+            'created_by_uuid'  => optional($request->user())->uuid,
+            'task_type'        => $request->input('task_type', 'prompt'),
+            'status'           => 'running',
+            'prompt'           => $request->input('prompt'),
+            'provider'         => $provider,
+            'model'            => $model,
+            'context'          => $request->input('context', []),
+            'metadata'         => ['attachments' => $attachments],
+            'started_at'       => now(),
         ]);
 
         $temporalContext   = $this->temporalContext->context();
@@ -76,9 +75,9 @@ public function createFromRequest(Request $request): AiTask
             ]);
 
             $providerContext[] = [
-                'capability' => 'fleetbase.ai.action_previews',
-                'type'       => 'action_preview',
-                'data'       => $actionPreviews,
+                'capability'  => 'fleetbase.ai.action_previews',
+                'type'        => 'action_preview',
+                'data'        => $actionPreviews,
                 'instruction' => 'A Fleetbase action preview has already been prepared from the user prompt. Do not ask again for details already present in the preview draft. Do not say the action has been applied until Fleetbase returns an apply result.',
             ];
 
@@ -181,8 +180,8 @@ public function apply(AiTask $task, ?string $actionKey = null, array $input = []
         ]);
 
         try {
-            $result   = $capability->apply($task, (array) $preview, $input);
-            $metadata = (array) $task->metadata;
+            $result                     = $capability->apply($task, (array) $preview, $input);
+            $metadata                   = (array) $task->metadata;
             $metadata['action_results'] = array_values(array_merge((array) data_get($metadata, 'action_results', []), [$result]));
 
             $task->update([
@@ -197,8 +196,8 @@ public function apply(AiTask $task, ?string $actionKey = null, array $input = []
                 'completed_at' => now(),
             ]);
         } catch (\Throwable $e) {
-            $error    = ['message' => $e->getMessage(), 'type' => get_class($e)];
-            $metadata = (array) $task->metadata;
+            $error                     = ['message' => $e->getMessage(), 'type' => get_class($e)];
+            $metadata                  = (array) $task->metadata;
             $metadata['action_errors'] = array_values(array_merge((array) data_get($metadata, 'action_errors', []), [$error]));
 
             $task->update(['status' => 'apply_failed', 'metadata' => $metadata]);
@@ -211,7 +210,7 @@ public function apply(AiTask $task, ?string $actionKey = null, array $input = []
     public function recordStep(AiTask $task, array $attributes): AiTaskStep
     {
         return AiTaskStep::create(array_merge([
-            'ai_task_uuid'   => $task->uuid,
+            'ai_task_uuid'    => $task->uuid,
             'company_uuid'    => $task->company_uuid,
             'created_by_uuid' => $task->created_by_uuid,
         ], $attributes));
@@ -399,5 +398,4 @@ protected function sessionContext(AiTask $task): ?array
             ],
         ];
     }
-
 }
diff --git a/server/tests/Feature.php b/server/tests/Feature.php
index 12ee426..a7f70cc 100644
--- a/server/tests/Feature.php
+++ b/server/tests/Feature.php
@@ -1,8 +1,8 @@
 <?php
 
 use Fleetbase\Ai\Models\AiTask;
-use Fleetbase\Ai\Services\AnthropicProvider;
 use Fleetbase\Ai\Services\AiProviderManager;
+use Fleetbase\Ai\Services\AnthropicProvider;
 use Fleetbase\Ai\Services\LocalAIProvider;
 use Fleetbase\Ai\Services\OpenAIProvider;
 use Fleetbase\Ai\Support\AiCapabilityRegistry;

From 960df852fdb0b17b97fa61a4d363493b144ab42d Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 1 Jul 2026 15:24:02 +0800
Subject: [PATCH 3/3] Add AI admin audit and usage panels

---
 addon/components/admin/ai-audit-logs.hbs      | 205 ++++++++
 addon/components/admin/ai-audit-logs.js       | 268 ++++++++++
 addon/components/admin/ai-usage-analytics.hbs | 137 +++++
 addon/components/admin/ai-usage-analytics.js  | 212 ++++++++
 addon/components/ai-usage-group-table.hbs     |  31 ++
 addon/components/ai-usage-group-table.js      |   3 +
 addon/extension.js                            |  14 +-
 addon/styles/ai-engine.css                    | 373 ++++++++++++-
 app/components/admin/ai-audit-logs.js         |   1 +
 app/components/admin/ai-usage-analytics.js    |   1 +
 app/components/ai-usage-group-table.js        |   1 +
 ...0000_create_ai_admin_access_logs_table.php |  30 ++
 .../Internal/AiAdminController.php            | 497 ++++++++++++++++++
 server/src/Models/AiAdminAccessLog.php        |  31 ++
 server/src/Models/AiSession.php               |  12 +
 server/src/Models/AiTask.php                  |  12 +
 server/src/routes.php                         |  10 +
 17 files changed, 1834 insertions(+), 4 deletions(-)
 create mode 100644 addon/components/admin/ai-audit-logs.hbs
 create mode 100644 addon/components/admin/ai-audit-logs.js
 create mode 100644 addon/components/admin/ai-usage-analytics.hbs
 create mode 100644 addon/components/admin/ai-usage-analytics.js
 create mode 100644 addon/components/ai-usage-group-table.hbs
 create mode 100644 addon/components/ai-usage-group-table.js
 create mode 100644 app/components/admin/ai-audit-logs.js
 create mode 100644 app/components/admin/ai-usage-analytics.js
 create mode 100644 app/components/ai-usage-group-table.js
 create mode 100644 server/migrations/2026_07_01_000000_create_ai_admin_access_logs_table.php
 create mode 100644 server/src/Http/Controllers/Internal/AiAdminController.php
 create mode 100644 server/src/Models/AiAdminAccessLog.php

diff --git a/addon/components/admin/ai-audit-logs.hbs b/addon/components/admin/ai-audit-logs.hbs
new file mode 100644
index 0000000..e543756
--- /dev/null
+++ b/addon/components/admin/ai-audit-logs.hbs
@@ -0,0 +1,205 @@
+<ContentPanel @title="AI Task & Chat Logs" @open={{true}} @wrapperClass="bordered-classic">
+    <div class="fleetbase-ai-admin-panel">
+        <div class="fleetbase-ai-admin-filters">
+            <InputGroup @name="Search">
+                <Input class="form-input form-input-sm w-full" @value={{this.filters.search}} placeholder="Search title, prompt summary, provider, model..." {{on "input" (fn this.setFilterFromInput "search")}} />
+            </InputGroup>
+            <InputGroup @name="Status">
+                <Select class="w-full" @value={{this.filters.status}} @options={{this.statusOptions}} @optionLabel="label" @optionValue="value" @onSelect={{fn this.setFilter "status"}} />
+            </InputGroup>
+            <InputGroup @name="Provider">
+                <Select class="w-full" @value={{this.filters.provider}} @options={{this.providerOptions}} @optionLabel="label" @optionValue="value" @placeholder="Any provider" @onSelect={{this.setProvider}} />
+            </InputGroup>
+            <InputGroup @name="Model">
+                <Select class="w-full" @value={{this.filters.model}} @options={{this.modelOptions}} @optionLabel="label" @optionValue="value" @placeholder="Any model" @onSelect={{fn this.setFilter "model"}} />
+            </InputGroup>
+            <InputGroup @name="Organization">
+                <ModelSelect
+                    @modelName="company"
+                    @source={{this.companySource}}
+                    @selectedModel={{this.selectedCompany}}
+                    @placeholder="Select organization"
+                    @triggerClass="form-select form-input"
+                    @allowClear={{true}}
+                    @renderInPlace={{true}}
+                    @onChange={{this.setCompany}}
+                    as |company|
+                >
+                    {{or company.name company.public_id company.uuid}}
+                </ModelSelect>
+            </InputGroup>
+            <InputGroup @name="User">
+                <ModelSelect
+                    @modelName="user"
+                    @source={{this.userSource}}
+                    @query={{this.userQuery}}
+                    @selectedModel={{this.selectedUser}}
+                    @placeholder="Select user"
+                    @triggerClass="form-select form-input"
+                    @allowClear={{true}}
+                    @renderInPlace={{true}}
+                    @onChange={{this.setUser}}
+                    as |user|
+                >
+                    {{or user.name user.email user.public_id user.uuid}}
+                </ModelSelect>
+            </InputGroup>
+            <InputGroup @name="Date">
+                <DatePicker @value={{this.dateRange}} @range={{true}} @onSelect={{this.setDateRange}} @autoClose={{true}} @buttons={{array "clear"}} @placeholder="Exact date or range" class="w-full form-input-sm" />
+            </InputGroup>
+        </div>
+
+        <div class="fleetbase-ai-admin-actions">
+            <Button @type="primary" @icon="magnifying-glass" @text="Search logs" @isLoading={{this.loadSessions.isRunning}} @onClick={{perform this.loadSessions}} />
+            <Button @icon="xmark" @text="Clear" @onClick={{this.clearFilters}} />
+        </div>
+
+        <div class="fleetbase-ai-admin-stack">
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>Chat Sessions</span>
+                    <small>{{this.sessions.length}} shown</small>
+                </div>
+
+                <div class="fleetbase-ai-admin-table-wrap fleetbase-ai-admin-scroll-area">
+                    <table class="fleetbase-ai-admin-table">
+                        <thead>
+                            <tr>
+                                <th>Title</th>
+                                <th>Organization</th>
+                                <th>User</th>
+                                <th>Status</th>
+                                <th>Turns</th>
+                                <th>Tokens</th>
+                                <th>Last message</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {{#each this.sessions as |session|}}
+                                <tr role="button" class="fleetbase-ai-admin-row" {{on "click" (fn this.selectSession session)}}>
+                                    <td>
+                                        <strong>{{or session.title "New AI chat"}}</strong>
+                                        <small>{{session.uuid}}</small>
+                                    </td>
+                                    <td>{{or session.company.name session.company_uuid "Unknown"}}</td>
+                                    <td>{{or session.created_by.name session.created_by.email session.created_by_uuid "Unknown"}}</td>
+                                    <td><span class="fleetbase-ai-admin-badge">{{or session.status "unknown"}}</span></td>
+                                    <td>{{session.tasks_count}}</td>
+                                    <td>{{session.total_tokens}}</td>
+                                    <td>{{n-a (format-date-fns session.last_message_at "dd MMM yyyy HH:mm")}}</td>
+                                </tr>
+                            {{else}}
+                                <tr>
+                                    <td colspan="7" class="fleetbase-ai-admin-empty">No AI sessions found.</td>
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>Session Tasks</span>
+                    {{#if this.selectedSession}}
+                        <small>{{this.selectedSessionTasks.length}} turns</small>
+                    {{/if}}
+                </div>
+
+                {{#if this.selectedSession}}
+                    <div class="fleetbase-ai-admin-task-list">
+                        {{#each this.selectedSessionTasks as |task|}}
+                            <button type="button" class="fleetbase-ai-admin-task-item" {{on "click" (fn this.selectTask task)}}>
+                                <span>
+                                    <strong>{{or task.prompt_excerpt "Untitled prompt"}}</strong>
+                                    <small>{{or task.response_summary "No response summary"}} </small>
+                                </span>
+                                <span class="fleetbase-ai-admin-task-meta">
+                                    {{or task.provider "local"}} / {{or task.model "unknown"}}
+                                    <b>{{task.total_tokens}}</b>
+                                </span>
+                            </button>
+                        {{else}}
+                            <div class="fleetbase-ai-admin-empty">This session has no tasks.</div>
+                        {{/each}}
+                    </div>
+                {{else}}
+                    <div class="fleetbase-ai-admin-empty">Select a chat session to inspect its tasks.</div>
+                {{/if}}
+            </div>
+        </div>
+
+        <div class="fleetbase-ai-admin-card">
+            <div class="fleetbase-ai-admin-card-header">
+                <span>Task Detail</span>
+                {{#if this.selectedTask}}
+                    <small>{{this.selectedTask.uuid}}</small>
+                {{/if}}
+            </div>
+
+            {{#if this.selectedTask}}
+                <div class="fleetbase-ai-admin-detail-grid">
+                    <div><label>Status</label><span>{{or this.selectedTask.status "unknown"}}</span></div>
+                    <div><label>Provider</label><span>{{or this.selectedTask.provider "local"}}</span></div>
+                    <div><label>Model</label><span>{{or this.selectedTask.model "unknown"}}</span></div>
+                    <div><label>Total tokens</label><span>{{this.selectedTask.total_tokens}}</span></div>
+                    <div><label>Created</label><span>{{n-a (format-date-fns this.selectedTask.created_at "dd MMM yyyy HH:mm")}}</span></div>
+                    <div><label>Completed</label><span>{{n-a (format-date-fns this.selectedTask.completed_at "dd MMM yyyy HH:mm")}}</span></div>
+                </div>
+
+                {{#if this.hasSelectedTaskContent}}
+                    <div class="fleetbase-ai-admin-content-grid">
+                        <div>
+                            <h4>Prompt</h4>
+                            <pre>{{this.selectedTask.prompt}}</pre>
+                        </div>
+                        <div>
+                            <h4>Response</h4>
+                            <pre>{{this.selectedTask.response}}</pre>
+                        </div>
+                    </div>
+                {{else}}
+                    <div class="fleetbase-ai-admin-redacted">
+                        <span>Prompt and response content is redacted.</span>
+                        {{#if this.canRevealContent}}
+                            <Button @icon="eye" @text="Reveal content" @size="sm" @isLoading={{this.revealTaskContent.isRunning}} @onClick={{perform this.revealTaskContent}} />
+                        {{/if}}
+                    </div>
+                {{/if}}
+
+                <div class="fleetbase-ai-admin-table-wrap mt-3">
+                    <table class="fleetbase-ai-admin-table">
+                        <thead>
+                            <tr>
+                                <th>Step</th>
+                                <th>Status</th>
+                                <th>Tool</th>
+                                <th>Provider</th>
+                                <th>Tokens</th>
+                                <th>Created</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {{#each this.selectedTaskSteps as |step|}}
+                                <tr>
+                                    <td>{{or step.type "step"}}</td>
+                                    <td>{{or step.status "unknown"}}</td>
+                                    <td>{{n-a step.tool}}</td>
+                                    <td>{{or step.provider this.selectedTask.provider "local"}}</td>
+                                    <td>{{or step.usage.total_tokens "-"}}</td>
+                                    <td>{{n-a (format-date-fns step.created_at "dd MMM HH:mm")}}</td>
+                                </tr>
+                            {{else}}
+                                <tr>
+                                    <td colspan="6" class="fleetbase-ai-admin-empty">No task steps recorded.</td>
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                </div>
+            {{else}}
+                <div class="fleetbase-ai-admin-empty">Select a task to view its details.</div>
+            {{/if}}
+        </div>
+    </div>
+</ContentPanel>
diff --git a/addon/components/admin/ai-audit-logs.js b/addon/components/admin/ai-audit-logs.js
new file mode 100644
index 0000000..cfa8c0e
--- /dev/null
+++ b/addon/components/admin/ai-audit-logs.js
@@ -0,0 +1,268 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
+import { action } from '@ember/object';
+
+export default class AdminAiAuditLogsComponent extends Component {
+    @service fetch;
+    @service notifications;
+
+    @tracked filters = {
+        search: '',
+        status: '',
+        provider: '',
+        model: '',
+        company_uuid: '',
+        created_by_uuid: '',
+        from: '',
+        to: '',
+    };
+    @tracked sessions = [];
+    @tracked selectedSession = null;
+    @tracked selectedTask = null;
+    @tracked canRevealContent = false;
+    @tracked metadata = { providers: [] };
+    @tracked selectedCompany = null;
+    @tracked selectedUser = null;
+    @tracked dateRange = null;
+
+    statusOptions = [
+        { label: 'Any status', value: '' },
+        { label: 'Active', value: 'active' },
+        { label: 'Ended', value: 'ended' },
+        { label: 'Completed', value: 'completed' },
+        { label: 'Failed', value: 'failed' },
+        { label: 'Cancelled', value: 'cancelled' },
+        { label: 'Running', value: 'running' },
+    ];
+
+    constructor() {
+        super(...arguments);
+        this.loadConfigMetadata.perform();
+        this.loadSessions.perform();
+    }
+
+    get providerOptions() {
+        return [{ label: 'Any provider', value: '' }, ...(this.metadata.providers ?? [])];
+    }
+
+    get selectedProviderMetadata() {
+        return (this.metadata.providers ?? []).find((provider) => provider.value === this.filters.provider);
+    }
+
+    get modelOptions() {
+        return [{ label: 'Any model', value: '' }, ...(this.selectedProviderMetadata?.models ?? [])];
+    }
+
+    get userQuery() {
+        return this.filters.company_uuid ? { company_uuid: this.filters.company_uuid } : {};
+    }
+
+    get companySource() {
+        return {
+            query: (modelName, query = {}) => this.fetch.get('admin/companies', query, { namespace: 'ai/int/v1' }),
+        };
+    }
+
+    get userSource() {
+        return {
+            query: (modelName, query = {}) => this.fetch.get('admin/users', query, { namespace: 'ai/int/v1' }),
+        };
+    }
+
+    get selectedSessionTasks() {
+        return this.selectedSession?.tasks ?? [];
+    }
+
+    get hasSelectedTaskContent() {
+        return this.selectedTask && this.selectedTask.content_redacted === false;
+    }
+
+    get selectedTaskSteps() {
+        return this.selectedTask?.steps ?? [];
+    }
+
+    @task *loadSessions() {
+        try {
+            const response = yield this.fetch.get('admin/sessions', this.cleanFilters({ ...this.filters, limit: 50 }), { namespace: 'ai/int/v1' });
+            this.sessions = response.sessions ?? [];
+            this.canRevealContent = response.meta?.can_reveal_content === true;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *loadConfigMetadata() {
+        try {
+            const response = yield this.fetch.get('config', {}, { namespace: 'ai/int/v1' });
+            this.metadata = response.metadata ?? this.metadata;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *loadSession(session) {
+        const id = session?.uuid ?? session?.id;
+        if (!id) {
+            return;
+        }
+
+        try {
+            const response = yield this.fetch.get(`admin/sessions/${id}`, {}, { namespace: 'ai/int/v1' });
+            this.selectedSession = response.session;
+            this.canRevealContent = response.meta?.can_reveal_content === true;
+            this.selectedTask = this.selectedSessionTasks[0] ?? null;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *loadTask(task) {
+        const id = task?.uuid ?? task?.id;
+        if (!id) {
+            return;
+        }
+
+        try {
+            const response = yield this.fetch.get(`admin/tasks/${id}`, {}, { namespace: 'ai/int/v1' });
+            this.selectedTask = response.task;
+            this.canRevealContent = response.meta?.can_reveal_content === true;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *revealTaskContent() {
+        const id = this.selectedTask?.uuid ?? this.selectedTask?.id;
+        if (!id) {
+            return;
+        }
+
+        if (!window.confirm('Reveal raw AI prompt and response content? This access will be logged.')) {
+            return;
+        }
+
+        try {
+            const response = yield this.fetch.post(`admin/tasks/${id}/reveal-content`, {}, { namespace: 'ai/int/v1' });
+            this.selectedTask = response.task;
+            this.notifications.success('AI task content revealed.');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @action setFilter(field, value) {
+        this.filters = {
+            ...this.filters,
+            [field]: this.normalizeValue(value),
+        };
+    }
+
+    @action setFilterFromInput(field, event) {
+        this.setFilter(field, event.target.value);
+    }
+
+    @action setProvider(value) {
+        const provider = this.normalizeValue(value);
+        this.filters = {
+            ...this.filters,
+            provider,
+            model: '',
+        };
+    }
+
+    @action setCompany(company) {
+        this.selectedCompany = company ?? null;
+        this.selectedUser = null;
+        this.filters = {
+            ...this.filters,
+            company_uuid: company?.uuid ?? company?.id ?? '',
+            created_by_uuid: '',
+        };
+    }
+
+    @action setUser(user) {
+        this.selectedUser = user ?? null;
+        this.filters = {
+            ...this.filters,
+            created_by_uuid: user?.uuid ?? user?.id ?? '',
+        };
+    }
+
+    @action setDateRange({ formattedDate } = {}) {
+        this.dateRange = formattedDate;
+
+        if (Array.isArray(formattedDate) && formattedDate.length >= 2) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate[0],
+                to: formattedDate[1],
+            };
+            return;
+        }
+
+        if (Array.isArray(formattedDate) && formattedDate.length === 1) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate[0],
+                to: formattedDate[0],
+            };
+            return;
+        }
+
+        if (typeof formattedDate === 'string' && formattedDate) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate,
+                to: formattedDate,
+            };
+            return;
+        }
+
+        this.filters = {
+            ...this.filters,
+            from: '',
+            to: '',
+        };
+    }
+
+    @action clearFilters() {
+        this.filters = {
+            search: '',
+            status: '',
+            provider: '',
+            model: '',
+            company_uuid: '',
+            created_by_uuid: '',
+            from: '',
+            to: '',
+        };
+        this.selectedCompany = null;
+        this.selectedUser = null;
+        this.dateRange = null;
+        this.loadSessions.perform();
+    }
+
+    @action selectSession(session) {
+        this.loadSession.perform(session);
+    }
+
+    @action selectTask(task) {
+        this.loadTask.perform(task);
+    }
+
+    cleanFilters(filters) {
+        return Object.entries(filters).reduce((params, [key, value]) => {
+            if (value !== null && value !== undefined && value !== '') {
+                params[key] = value;
+            }
+
+            return params;
+        }, {});
+    }
+
+    normalizeValue(value) {
+        return value?.value ?? value?.target?.value ?? value;
+    }
+}
diff --git a/addon/components/admin/ai-usage-analytics.hbs b/addon/components/admin/ai-usage-analytics.hbs
new file mode 100644
index 0000000..edd92a2
--- /dev/null
+++ b/addon/components/admin/ai-usage-analytics.hbs
@@ -0,0 +1,137 @@
+<ContentPanel @title="AI Usage Analytics" @open={{true}} @wrapperClass="bordered-classic">
+    <div class="fleetbase-ai-admin-panel">
+        <div class="fleetbase-ai-admin-filters">
+            <InputGroup @name="Status">
+                <Select class="w-full" @value={{this.filters.status}} @options={{this.statusOptions}} @optionLabel="label" @optionValue="value" @onSelect={{fn this.setFilter "status"}} />
+            </InputGroup>
+            <InputGroup @name="Provider">
+                <Select class="w-full" @value={{this.filters.provider}} @options={{this.providerOptions}} @optionLabel="label" @optionValue="value" @placeholder="Any provider" @onSelect={{this.setProvider}} />
+            </InputGroup>
+            <InputGroup @name="Model">
+                <Select class="w-full" @value={{this.filters.model}} @options={{this.modelOptions}} @optionLabel="label" @optionValue="value" @placeholder="Any model" @onSelect={{fn this.setFilter "model"}} />
+            </InputGroup>
+            <InputGroup @name="Organization">
+                <ModelSelect
+                    @modelName="company"
+                    @source={{this.companySource}}
+                    @selectedModel={{this.selectedCompany}}
+                    @placeholder="Select organization"
+                    @triggerClass="form-select form-input"
+                    @allowClear={{true}}
+                    @renderInPlace={{true}}
+                    @onChange={{this.setCompany}}
+                    as |company|
+                >
+                    {{or company.name company.public_id company.uuid}}
+                </ModelSelect>
+            </InputGroup>
+            <InputGroup @name="User">
+                <ModelSelect
+                    @modelName="user"
+                    @source={{this.userSource}}
+                    @query={{this.userQuery}}
+                    @selectedModel={{this.selectedUser}}
+                    @placeholder="Select user"
+                    @triggerClass="form-select form-input"
+                    @allowClear={{true}}
+                    @renderInPlace={{true}}
+                    @onChange={{this.setUser}}
+                    as |user|
+                >
+                    {{or user.name user.email user.public_id user.uuid}}
+                </ModelSelect>
+            </InputGroup>
+            <InputGroup @name="Date">
+                <DatePicker @value={{this.dateRange}} @range={{true}} @onSelect={{this.setDateRange}} @autoClose={{true}} @buttons={{array "clear"}} @placeholder="Exact date or range" class="w-full form-input-sm" />
+            </InputGroup>
+        </div>
+
+        <div class="fleetbase-ai-admin-actions">
+            <Button @type="primary" @icon="chart-column" @text="Update analytics" @isLoading={{this.loadUsage.isRunning}} @onClick={{perform this.loadUsage}} />
+            <Button @icon="xmark" @text="Clear" @onClick={{this.clearFilters}} />
+        </div>
+
+        <div class="fleetbase-ai-usage-cards">
+            {{#each this.usageCards as |card|}}
+                <div class="fleetbase-ai-usage-card">
+                    <FaIcon @icon={{card.icon}} />
+                    <span>{{card.label}}</span>
+                    <strong>{{card.value}}</strong>
+                </div>
+            {{/each}}
+        </div>
+
+        <div class="fleetbase-ai-admin-stack">
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By Organization</span>
+                    <small>Top 50</small>
+                </div>
+                <AiUsageGroupTable @rows={{this.usage.by_company}} @label="Organization" />
+            </div>
+
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By User</span>
+                    <small>Top 50</small>
+                </div>
+                <AiUsageGroupTable @rows={{this.usage.by_user}} @label="User" />
+            </div>
+
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By Provider</span>
+                    <small>Top 50</small>
+                </div>
+                <AiUsageGroupTable @rows={{this.usage.by_provider}} @label="Provider" />
+            </div>
+
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By Model</span>
+                    <small>Top 50</small>
+                </div>
+                <AiUsageGroupTable @rows={{this.usage.by_model}} @label="Model" />
+            </div>
+        </div>
+
+        <div class="fleetbase-ai-admin-stack">
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By Status</span>
+                </div>
+                <AiUsageGroupTable @rows={{this.usage.by_status}} @label="Status" />
+            </div>
+
+            <div class="fleetbase-ai-admin-card">
+                <div class="fleetbase-ai-admin-card-header">
+                    <span>By Day</span>
+                </div>
+                <div class="fleetbase-ai-admin-table-wrap">
+                    <table class="fleetbase-ai-admin-table">
+                        <thead>
+                            <tr>
+                                <th>Day</th>
+                                <th>Tasks</th>
+                                <th>Total Tokens</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {{#each this.usage.by_day as |row|}}
+                                <tr>
+                                    <td>{{row.day}}</td>
+                                    <td>{{row.task_count}}</td>
+                                    <td>{{row.total_tokens}}</td>
+                                </tr>
+                            {{else}}
+                                <tr>
+                                    <td colspan="3" class="fleetbase-ai-admin-empty">No usage found.</td>
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</ContentPanel>
diff --git a/addon/components/admin/ai-usage-analytics.js b/addon/components/admin/ai-usage-analytics.js
new file mode 100644
index 0000000..774b1c2
--- /dev/null
+++ b/addon/components/admin/ai-usage-analytics.js
@@ -0,0 +1,212 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
+import { action } from '@ember/object';
+
+export default class AdminAiUsageAnalyticsComponent extends Component {
+    @service fetch;
+    @service notifications;
+
+    @tracked filters = {
+        status: '',
+        provider: '',
+        model: '',
+        company_uuid: '',
+        created_by_uuid: '',
+        from: '',
+        to: '',
+    };
+    @tracked usage = {
+        summary: {},
+        by_company: [],
+        by_user: [],
+        by_provider: [],
+        by_model: [],
+        by_status: [],
+        by_day: [],
+    };
+    @tracked metadata = { providers: [] };
+    @tracked selectedCompany = null;
+    @tracked selectedUser = null;
+    @tracked dateRange = null;
+
+    statusOptions = [
+        { label: 'Any status', value: '' },
+        { label: 'Completed', value: 'completed' },
+        { label: 'Failed', value: 'failed' },
+        { label: 'Cancelled', value: 'cancelled' },
+        { label: 'Running', value: 'running' },
+    ];
+
+    constructor() {
+        super(...arguments);
+        this.loadConfigMetadata.perform();
+        this.loadUsage.perform();
+    }
+
+    get summary() {
+        return this.usage.summary ?? {};
+    }
+
+    get usageCards() {
+        return [
+            { label: 'Tasks', value: this.summary.task_count ?? 0, icon: 'list-check' },
+            { label: 'Total tokens', value: this.summary.total_tokens ?? 0, icon: 'coins' },
+            { label: 'Input tokens', value: this.summary.input_tokens ?? 0, icon: 'arrow-right-to-bracket' },
+            { label: 'Output tokens', value: this.summary.output_tokens ?? 0, icon: 'arrow-right-from-bracket' },
+            { label: 'Completed', value: this.summary.completed_count ?? 0, icon: 'circle-check' },
+            { label: 'Failed', value: this.summary.failed_count ?? 0, icon: 'triangle-exclamation' },
+        ];
+    }
+
+    get providerOptions() {
+        return [{ label: 'Any provider', value: '' }, ...(this.metadata.providers ?? [])];
+    }
+
+    get selectedProviderMetadata() {
+        return (this.metadata.providers ?? []).find((provider) => provider.value === this.filters.provider);
+    }
+
+    get modelOptions() {
+        return [{ label: 'Any model', value: '' }, ...(this.selectedProviderMetadata?.models ?? [])];
+    }
+
+    get userQuery() {
+        return this.filters.company_uuid ? { company_uuid: this.filters.company_uuid } : {};
+    }
+
+    get companySource() {
+        return {
+            query: (modelName, query = {}) => this.fetch.get('admin/companies', query, { namespace: 'ai/int/v1' }),
+        };
+    }
+
+    get userSource() {
+        return {
+            query: (modelName, query = {}) => this.fetch.get('admin/users', query, { namespace: 'ai/int/v1' }),
+        };
+    }
+
+    @task *loadConfigMetadata() {
+        try {
+            const response = yield this.fetch.get('config', {}, { namespace: 'ai/int/v1' });
+            this.metadata = response.metadata ?? this.metadata;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *loadUsage() {
+        try {
+            this.usage = yield this.fetch.get('admin/usage', this.cleanFilters(this.filters), { namespace: 'ai/int/v1' });
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @action setFilter(field, value) {
+        this.filters = {
+            ...this.filters,
+            [field]: this.normalizeValue(value),
+        };
+    }
+
+    @action setFilterFromInput(field, event) {
+        this.setFilter(field, event.target.value);
+    }
+
+    @action setProvider(value) {
+        const provider = this.normalizeValue(value);
+        this.filters = {
+            ...this.filters,
+            provider,
+            model: '',
+        };
+    }
+
+    @action setCompany(company) {
+        this.selectedCompany = company ?? null;
+        this.selectedUser = null;
+        this.filters = {
+            ...this.filters,
+            company_uuid: company?.uuid ?? company?.id ?? '',
+            created_by_uuid: '',
+        };
+    }
+
+    @action setUser(user) {
+        this.selectedUser = user ?? null;
+        this.filters = {
+            ...this.filters,
+            created_by_uuid: user?.uuid ?? user?.id ?? '',
+        };
+    }
+
+    @action setDateRange({ formattedDate } = {}) {
+        this.dateRange = formattedDate;
+
+        if (Array.isArray(formattedDate) && formattedDate.length >= 2) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate[0],
+                to: formattedDate[1],
+            };
+            return;
+        }
+
+        if (Array.isArray(formattedDate) && formattedDate.length === 1) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate[0],
+                to: formattedDate[0],
+            };
+            return;
+        }
+
+        if (typeof formattedDate === 'string' && formattedDate) {
+            this.filters = {
+                ...this.filters,
+                from: formattedDate,
+                to: formattedDate,
+            };
+            return;
+        }
+
+        this.filters = {
+            ...this.filters,
+            from: '',
+            to: '',
+        };
+    }
+
+    @action clearFilters() {
+        this.filters = {
+            status: '',
+            provider: '',
+            model: '',
+            company_uuid: '',
+            created_by_uuid: '',
+            from: '',
+            to: '',
+        };
+        this.selectedCompany = null;
+        this.selectedUser = null;
+        this.dateRange = null;
+        this.loadUsage.perform();
+    }
+
+    cleanFilters(filters) {
+        return Object.entries(filters).reduce((params, [key, value]) => {
+            if (value !== null && value !== undefined && value !== '') {
+                params[key] = value;
+            }
+
+            return params;
+        }, {});
+    }
+
+    normalizeValue(value) {
+        return value?.value ?? value?.target?.value ?? value;
+    }
+}
diff --git a/addon/components/ai-usage-group-table.hbs b/addon/components/ai-usage-group-table.hbs
new file mode 100644
index 0000000..7a71a97
--- /dev/null
+++ b/addon/components/ai-usage-group-table.hbs
@@ -0,0 +1,31 @@
+<div class="fleetbase-ai-admin-table-wrap">
+    <table class="fleetbase-ai-admin-table">
+        <thead>
+            <tr>
+                <th>{{@label}}</th>
+                <th>Tasks</th>
+                <th>Input</th>
+                <th>Output</th>
+                <th>Total</th>
+            </tr>
+        </thead>
+        <tbody>
+            {{#each @rows as |row|}}
+                <tr>
+                    <td>
+                        <strong>{{or row.label row.key}}</strong>
+                        <small>{{row.key}}</small>
+                    </td>
+                    <td>{{row.task_count}}</td>
+                    <td>{{row.input_tokens}}</td>
+                    <td>{{row.output_tokens}}</td>
+                    <td>{{row.total_tokens}}</td>
+                </tr>
+            {{else}}
+                <tr>
+                    <td colspan="5" class="fleetbase-ai-admin-empty">No usage found.</td>
+                </tr>
+            {{/each}}
+        </tbody>
+    </table>
+</div>
diff --git a/addon/components/ai-usage-group-table.js b/addon/components/ai-usage-group-table.js
new file mode 100644
index 0000000..4b7c54b
--- /dev/null
+++ b/addon/components/ai-usage-group-table.js
@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class AiUsageGroupTableComponent extends Component {}
diff --git a/addon/extension.js b/addon/extension.js
index 4ebece5..7350217 100644
--- a/addon/extension.js
+++ b/addon/extension.js
@@ -9,15 +9,25 @@ export default {
         registryService.registerRenderableComponent('header-tray-items', new ExtensionComponent('@fleetbase/ai-engine', 'ai-header-tray-button'));
 
         menuService.registerAdminMenuPanel(
-            'AI',
+            'AI Config',
             [
                 new MenuItem({
                     title: 'Provider Settings',
                     icon: 'wand-magic-sparkles',
                     component: new ExtensionComponent('@fleetbase/ai-engine', 'admin/ai-settings'),
                 }),
+                new MenuItem({
+                    title: 'Task & Chat Logs',
+                    icon: 'list-check',
+                    component: new ExtensionComponent('@fleetbase/ai-engine', 'admin/ai-audit-logs'),
+                }),
+                new MenuItem({
+                    title: 'Usage Analytics',
+                    icon: 'chart-column',
+                    component: new ExtensionComponent('@fleetbase/ai-engine', 'admin/ai-usage-analytics'),
+                }),
             ],
-            { icon: 'wand-magic-sparkles', priority: 30 }
+            { icon: 'brain', priority: 30 }
         );
     },
 };
diff --git a/addon/styles/ai-engine.css b/addon/styles/ai-engine.css
index e00924b..93a5647 100644
--- a/addon/styles/ai-engine.css
+++ b/addon/styles/ai-engine.css
@@ -1,3 +1,5 @@
+/* stylelint-disable no-descending-specificity */
+
 .fleetbase-ai-backdrop {
     position: fixed;
     inset: 0;
@@ -106,6 +108,375 @@ body[data-theme='dark'] .fleetbase-ai-scroll-latest:hover {
     color: #bfdbfe;
 }
 
+.fleetbase-ai-admin-panel {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+}
+
+.fleetbase-ai-admin-filters {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+    gap: 0.75rem;
+}
+
+.fleetbase-ai-admin-actions {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.fleetbase-ai-admin-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+    gap: 1rem;
+}
+
+.fleetbase-ai-admin-stack {
+    display: flex;
+    width: 100%;
+    flex-direction: column;
+    gap: 1rem;
+}
+
+.fleetbase-ai-admin-card {
+    overflow: hidden;
+    border: 1px solid rgb(148 163 184 / 22%);
+    border-radius: 8px;
+    background: rgb(255 255 255 / 70%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-card {
+    border-color: rgb(148 163 184 / 18%);
+    background: rgb(15 23 42 / 42%);
+}
+
+.fleetbase-ai-admin-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid rgb(148 163 184 / 18%);
+    padding: 0.65rem 0.75rem;
+    color: #0f172a;
+    font-size: 0.8rem;
+    font-weight: 700;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-card-header {
+    border-bottom-color: rgb(148 163 184 / 14%);
+    color: #f8fafc;
+}
+
+.fleetbase-ai-admin-card-header small {
+    color: #64748b;
+    font-size: 0.7rem;
+    font-weight: 500;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-card-header small {
+    color: #94a3b8;
+}
+
+.fleetbase-ai-admin-table-wrap {
+    max-width: 100%;
+    overflow-x: auto;
+}
+
+.fleetbase-ai-admin-scroll-area {
+    max-height: 360px;
+    overflow: auto;
+}
+
+.fleetbase-ai-admin-scroll-area .fleetbase-ai-admin-table thead th {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+}
+
+.fleetbase-ai-admin-table {
+    width: 100%;
+    border-collapse: collapse;
+    color: #334155;
+    font-size: 0.78rem;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-table {
+    color: #cbd5e1;
+}
+
+.fleetbase-ai-admin-table th,
+.fleetbase-ai-admin-table td {
+    border-bottom: 1px solid rgb(148 163 184 / 14%);
+    padding: 0.55rem 0.65rem;
+    text-align: left;
+    vertical-align: top;
+}
+
+.fleetbase-ai-admin-table th {
+    background: rgb(248 250 252 / 72%);
+    color: #64748b;
+    font-size: 0.68rem;
+    font-weight: 700;
+    letter-spacing: 0;
+    text-transform: uppercase;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-table th {
+    background: rgb(30 41 59 / 38%);
+    color: #94a3b8;
+}
+
+.fleetbase-ai-admin-table td strong {
+    display: block;
+    max-width: 280px;
+    color: #0f172a;
+    font-size: 0.78rem;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-table td strong {
+    color: #f8fafc;
+}
+
+.fleetbase-ai-admin-table td small {
+    display: block;
+    max-width: 280px;
+    overflow: hidden;
+    color: #64748b;
+    font-size: 0.68rem;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-admin-row {
+    cursor: pointer;
+}
+
+.fleetbase-ai-admin-row:hover {
+    background: rgb(37 99 235 / 6%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-row:hover {
+    background: rgb(96 165 250 / 8%);
+}
+
+.fleetbase-ai-admin-badge {
+    display: inline-flex;
+    align-items: center;
+    border: 1px solid rgb(59 130 246 / 22%);
+    border-radius: 999px;
+    background: rgb(59 130 246 / 10%);
+    padding: 0.12rem 0.45rem;
+    color: #1d4ed8;
+    font-size: 0.68rem;
+    font-weight: 700;
+    line-height: 1.2;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-badge {
+    border-color: rgb(96 165 250 / 22%);
+    background: rgb(59 130 246 / 14%);
+    color: #bfdbfe;
+}
+
+.fleetbase-ai-admin-empty {
+    padding: 0.85rem;
+    color: #64748b;
+    font-size: 0.78rem;
+    text-align: center;
+}
+
+.fleetbase-ai-admin-task-list {
+    display: flex;
+    max-height: 360px;
+    flex-direction: column;
+    overflow-y: auto;
+    padding: 0.5rem;
+    gap: 0.45rem;
+}
+
+.fleetbase-ai-admin-task-item {
+    display: flex;
+    width: 100%;
+    align-items: flex-start;
+    justify-content: space-between;
+    border: 1px solid rgb(148 163 184 / 16%);
+    border-radius: 7px;
+    background: rgb(248 250 252 / 64%);
+    padding: 0.55rem 0.6rem;
+    color: inherit;
+    text-align: left;
+}
+
+.fleetbase-ai-admin-task-item:hover {
+    border-color: rgb(59 130 246 / 30%);
+    background: rgb(239 246 255 / 76%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-task-item {
+    border-color: rgb(148 163 184 / 14%);
+    background: rgb(15 23 42 / 38%);
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-task-item:hover {
+    border-color: rgb(96 165 250 / 28%);
+    background: rgb(30 41 59 / 54%);
+}
+
+.fleetbase-ai-admin-task-item strong,
+.fleetbase-ai-admin-task-item small {
+    display: block;
+}
+
+.fleetbase-ai-admin-task-item strong {
+    color: #0f172a;
+    font-size: 0.78rem;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-task-item strong {
+    color: #f8fafc;
+}
+
+.fleetbase-ai-admin-task-item small,
+.fleetbase-ai-admin-task-meta {
+    color: #64748b;
+    font-size: 0.68rem;
+}
+
+.fleetbase-ai-admin-task-meta {
+    margin-left: 0.75rem;
+    text-align: right;
+    white-space: nowrap;
+}
+
+.fleetbase-ai-admin-task-meta b {
+    display: block;
+    color: #0f172a;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-task-meta b {
+    color: #f8fafc;
+}
+
+.fleetbase-ai-admin-detail-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 0.65rem;
+    padding: 0.75rem;
+}
+
+.fleetbase-ai-admin-detail-grid label {
+    display: block;
+    color: #64748b;
+    font-size: 0.65rem;
+    font-weight: 700;
+    text-transform: uppercase;
+}
+
+.fleetbase-ai-admin-detail-grid span {
+    color: #0f172a;
+    font-size: 0.8rem;
+    font-weight: 600;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-detail-grid span {
+    color: #f8fafc;
+}
+
+.fleetbase-ai-admin-redacted {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0 0.75rem 0.75rem;
+    border: 1px dashed rgb(148 163 184 / 28%);
+    border-radius: 8px;
+    padding: 0.75rem;
+    color: #64748b;
+    font-size: 0.78rem;
+}
+
+.fleetbase-ai-admin-content-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+    gap: 0.75rem;
+    padding: 0.75rem;
+}
+
+.fleetbase-ai-admin-content-grid h4 {
+    margin: 0 0 0.35rem;
+    color: #334155;
+    font-size: 0.72rem;
+    font-weight: 700;
+    text-transform: uppercase;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-content-grid h4 {
+    color: #cbd5e1;
+}
+
+.fleetbase-ai-admin-content-grid pre {
+    max-height: 260px;
+    overflow: auto;
+    margin: 0;
+    border: 1px solid rgb(148 163 184 / 18%);
+    border-radius: 7px;
+    background: rgb(15 23 42 / 4%);
+    padding: 0.65rem;
+    color: #0f172a;
+    font-size: 0.76rem;
+    white-space: pre-wrap;
+}
+
+body[data-theme='dark'] .fleetbase-ai-admin-content-grid pre {
+    border-color: rgb(148 163 184 / 14%);
+    background: rgb(15 23 42 / 48%);
+    color: #e5e7eb;
+}
+
+.fleetbase-ai-usage-cards {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 0.75rem;
+}
+
+.fleetbase-ai-usage-card {
+    display: grid;
+    grid-template-columns: auto 1fr;
+    align-items: center;
+    border: 1px solid rgb(148 163 184 / 20%);
+    border-radius: 8px;
+    background: rgb(255 255 255 / 72%);
+    padding: 0.75rem;
+    column-gap: 0.65rem;
+}
+
+body[data-theme='dark'] .fleetbase-ai-usage-card {
+    border-color: rgb(148 163 184 / 16%);
+    background: rgb(15 23 42 / 44%);
+}
+
+.fleetbase-ai-usage-card svg {
+    grid-row: span 2;
+    color: #2563eb;
+}
+
+.fleetbase-ai-usage-card span {
+    color: #64748b;
+    font-size: 0.7rem;
+    font-weight: 700;
+    text-transform: uppercase;
+}
+
+.fleetbase-ai-usage-card strong {
+    color: #0f172a;
+    font-size: 1.2rem;
+    line-height: 1.2;
+}
+
+body[data-theme='dark'] .fleetbase-ai-usage-card strong {
+    color: #f8fafc;
+}
+
 .fleetbase-ai-spotlight {
     position: relative;
     z-index: 4;
@@ -342,7 +713,6 @@ body[data-theme='dark'] .fleetbase-ai-thinking {
     color: #e5e7eb;
 }
 
-/* stylelint-disable no-descending-specificity -- Action card descendants intentionally mirror answer/dark-mode descendants in a scoped prompt surface. */
 .fleetbase-ai-action-card {
     display: flex;
     flex-direction: column;
@@ -519,7 +889,6 @@ body[data-theme='dark'] .fleetbase-ai-action-error {
 .fleetbase-ai-thinking-orbs span:nth-child(3) {
     animation-delay: 220ms;
 }
-/* stylelint-enable no-descending-specificity */
 
 .fleetbase-ai-muted {
     color: #64748b;
diff --git a/app/components/admin/ai-audit-logs.js b/app/components/admin/ai-audit-logs.js
new file mode 100644
index 0000000..07ae2d4
--- /dev/null
+++ b/app/components/admin/ai-audit-logs.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/ai-engine/components/admin/ai-audit-logs';
diff --git a/app/components/admin/ai-usage-analytics.js b/app/components/admin/ai-usage-analytics.js
new file mode 100644
index 0000000..2efcae7
--- /dev/null
+++ b/app/components/admin/ai-usage-analytics.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/ai-engine/components/admin/ai-usage-analytics';
diff --git a/app/components/ai-usage-group-table.js b/app/components/ai-usage-group-table.js
new file mode 100644
index 0000000..e4d5dc4
--- /dev/null
+++ b/app/components/ai-usage-group-table.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/ai-engine/components/ai-usage-group-table';
diff --git a/server/migrations/2026_07_01_000000_create_ai_admin_access_logs_table.php b/server/migrations/2026_07_01_000000_create_ai_admin_access_logs_table.php
new file mode 100644
index 0000000..214a957
--- /dev/null
+++ b/server/migrations/2026_07_01_000000_create_ai_admin_access_logs_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('ai_admin_access_logs', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->nullable()->unique();
+            $table->foreignUuid('company_uuid')->nullable()->index()->references('uuid')->on('companies');
+            $table->foreignUuid('ai_session_uuid')->nullable()->index()->references('uuid')->on('ai_sessions')->onDelete('set null');
+            $table->foreignUuid('ai_task_uuid')->nullable()->index()->references('uuid')->on('ai_tasks')->onDelete('set null');
+            $table->foreignUuid('viewed_by_uuid')->nullable()->index()->references('uuid')->on('users')->onDelete('set null');
+            $table->string('action')->nullable()->index();
+            $table->string('ip_address')->nullable();
+            $table->text('user_agent')->nullable();
+            $table->json('metadata')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('ai_admin_access_logs');
+    }
+};
diff --git a/server/src/Http/Controllers/Internal/AiAdminController.php b/server/src/Http/Controllers/Internal/AiAdminController.php
new file mode 100644
index 0000000..f23bde9
--- /dev/null
+++ b/server/src/Http/Controllers/Internal/AiAdminController.php
@@ -0,0 +1,497 @@
+<?php
+
+namespace Fleetbase\Ai\Http\Controllers\Internal;
+
+use Carbon\Carbon;
+use Fleetbase\Ai\Models\AiAdminAccessLog;
+use Fleetbase\Ai\Models\AiSession;
+use Fleetbase\Ai\Models\AiTask;
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Http\Requests\AdminRequest;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\CompanyUser;
+use Fleetbase\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class AiAdminController extends Controller
+{
+    public function companies(AdminRequest $request)
+    {
+        abort_unless($this->canUseAdminFilters($request), 403, 'You are not authorized to use AI admin filters.');
+
+        $query  = Company::query()->select(['uuid', 'public_id', 'name', 'status', 'created_at'])->orderBy('name');
+        $search = $request->searchQuery() ?: $request->input('query');
+
+        if ($search) {
+            $query->where(function (Builder $query) use ($search) {
+                $query->where('name', 'like', "%{$search}%")
+                    ->orWhere('public_id', 'like', "%{$search}%")
+                    ->orWhere('uuid', $search);
+            });
+        }
+
+        return response()->json($query->limit(min(max((int) $request->input('limit', 25), 1), 50))->get()->map(fn (Company $company) => [
+            'id'        => $company->uuid,
+            'uuid'      => $company->uuid,
+            'public_id' => $company->public_id,
+            'name'      => $company->name,
+            'status'    => $company->status,
+        ]));
+    }
+
+    public function users(AdminRequest $request)
+    {
+        abort_unless($this->canUseAdminFilters($request), 403, 'You are not authorized to use AI admin filters.');
+
+        $search = $request->searchQuery() ?: $request->input('query');
+        $limit  = min(max((int) $request->input('limit', 25), 1), 50);
+
+        if ($request->filled('company_uuid')) {
+            $usersQuery = CompanyUser::where('company_uuid', $request->input('company_uuid'))
+                ->whereHas('user')
+                ->with(['user' => fn ($query) => $query->select(['uuid', 'public_id', 'company_uuid', 'name', 'email', 'status'])]);
+
+            if ($search) {
+                $usersQuery->whereHas('user', function (Builder $query) use ($search) {
+                    $this->applyUserSearch($query, $search);
+                });
+            }
+
+            return response()->json(
+                $usersQuery->limit($limit)->get()->pluck('user')->filter()->values()->map(fn (User $user) => $this->serializeUserOption($user))
+            );
+        }
+
+        $query = User::query()->select(['uuid', 'public_id', 'company_uuid', 'name', 'email', 'status'])->orderBy('name');
+
+        if ($search) {
+            $this->applyUserSearch($query, $search);
+        }
+
+        return response()->json($query->limit($limit)->get()->map(fn (User $user) => $this->serializeUserOption($user)));
+    }
+
+    public function sessions(AdminRequest $request)
+    {
+        abort_unless($this->can($request, 'ai view audit logs'), 403, 'You are not authorized to view AI audit logs.');
+
+        $query = AiSession::query()
+            ->with(['company:uuid,public_id,name', 'createdBy:uuid,public_id,name,email'])
+            ->withCount('tasks')
+            ->withSum('tasks as total_tokens_sum', 'total_tokens')
+            ->latest('last_message_at')
+            ->latest();
+
+        $this->applySessionFilters($query, $request);
+
+        $limit = min(max((int) $request->input('limit', 30), 1), 100);
+
+        return response()->json([
+            'sessions' => $query->limit($limit)->get()->map(fn (AiSession $session) => $this->serializeSession($session)),
+            'meta'     => [
+                'can_reveal_content' => $this->can($request, 'ai view task content'),
+            ],
+        ]);
+    }
+
+    public function session(string $id, AdminRequest $request)
+    {
+        abort_unless($this->can($request, 'ai view audit logs'), 403, 'You are not authorized to view AI audit logs.');
+
+        $session = $this->findSession($id)
+            ->load([
+                'company:uuid,public_id,name',
+                'createdBy:uuid,public_id,name,email',
+                'tasks' => fn ($query) => $query->with(['steps', 'company:uuid,public_id,name', 'createdBy:uuid,public_id,name,email'])->oldest(),
+            ])
+            ->loadCount('tasks')
+            ->loadSum('tasks as total_tokens_sum', 'total_tokens');
+
+        return response()->json([
+            'session' => array_merge($this->serializeSession($session), [
+                'tasks' => $session->tasks->map(fn (AiTask $task) => $this->serializeTask($task, false)),
+            ]),
+            'meta'    => [
+                'can_reveal_content' => $this->can($request, 'ai view task content'),
+            ],
+        ]);
+    }
+
+    public function task(string $id, AdminRequest $request)
+    {
+        abort_unless($this->can($request, 'ai view audit logs'), 403, 'You are not authorized to view AI audit logs.');
+
+        $task = $this->findTask($id)->load(['steps', 'session', 'company:uuid,public_id,name', 'createdBy:uuid,public_id,name,email']);
+
+        return response()->json([
+            'task' => $this->serializeTask($task, false),
+            'meta' => [
+                'can_reveal_content' => $this->can($request, 'ai view task content'),
+            ],
+        ]);
+    }
+
+    public function revealTaskContent(string $id, AdminRequest $request)
+    {
+        abort_unless($this->can($request, 'ai view task content'), 403, 'You are not authorized to view AI task content.');
+
+        $task = $this->findTask($id)->load(['steps', 'session', 'company:uuid,public_id,name', 'createdBy:uuid,public_id,name,email']);
+
+        AiAdminAccessLog::create([
+            'company_uuid'     => $task->company_uuid,
+            'ai_session_uuid'  => $task->ai_session_uuid,
+            'ai_task_uuid'     => $task->uuid,
+            'viewed_by_uuid'   => optional($request->user())->uuid,
+            'action'           => 'view_task_content',
+            'ip_address'       => $request->ip(),
+            'user_agent'       => substr((string) $request->userAgent(), 0, 1000),
+            'metadata'         => [
+                'task_status' => $task->status,
+                'provider'    => $task->provider,
+                'model'       => $task->model,
+            ],
+        ]);
+
+        return response()->json(['task' => $this->serializeTask($task, true)]);
+    }
+
+    public function usage(AdminRequest $request)
+    {
+        abort_unless($this->can($request, 'ai view usage analytics'), 403, 'You are not authorized to view AI usage analytics.');
+
+        $base = AiTask::query();
+        $this->applyTaskFilters($base, $request);
+
+        $summary = (clone $base)
+            ->selectRaw('COUNT(*) as task_count')
+            ->selectRaw('COALESCE(SUM(input_tokens), 0) as input_tokens')
+            ->selectRaw('COALESCE(SUM(output_tokens), 0) as output_tokens')
+            ->selectRaw('COALESCE(SUM(total_tokens), 0) as total_tokens')
+            ->selectRaw("SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) as failed_count")
+            ->selectRaw("SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) as completed_count")
+            ->first();
+
+        return response()->json([
+            'summary'  => [
+                'task_count'      => (int) ($summary->task_count ?? 0),
+                'input_tokens'    => (int) ($summary->input_tokens ?? 0),
+                'output_tokens'   => (int) ($summary->output_tokens ?? 0),
+                'total_tokens'    => (int) ($summary->total_tokens ?? 0),
+                'failed_count'    => (int) ($summary->failed_count ?? 0),
+                'completed_count' => (int) ($summary->completed_count ?? 0),
+            ],
+            'by_company' => $this->usageGroup(clone $base, 'company_uuid', 'company'),
+            'by_user'    => $this->usageGroup(clone $base, 'created_by_uuid', 'user'),
+            'by_provider'=> $this->usageGroup(clone $base, 'provider'),
+            'by_model'   => $this->usageGroup(clone $base, 'model'),
+            'by_status'  => $this->usageGroup(clone $base, 'status'),
+            'by_day'     => $this->usageByDay(clone $base),
+        ]);
+    }
+
+    protected function applySessionFilters(Builder $query, AdminRequest $request): void
+    {
+        if ($request->filled('company_uuid')) {
+            $query->where('company_uuid', $request->input('company_uuid'));
+        }
+
+        if ($request->filled('created_by_uuid')) {
+            $query->where('created_by_uuid', $request->input('created_by_uuid'));
+        }
+
+        if ($request->filled('status')) {
+            $query->where('status', $request->input('status'));
+        }
+
+        if ($request->filled('from')) {
+            $query->where('created_at', '>=', Carbon::parse($request->input('from'))->startOfDay());
+        }
+
+        if ($request->filled('to')) {
+            $query->where('created_at', '<=', Carbon::parse($request->input('to'))->endOfDay());
+        }
+
+        if ($request->filled('search')) {
+            $search = trim((string) $request->input('search'));
+            $query->where(function (Builder $query) use ($search) {
+                $query->where('title', 'like', "%{$search}%")
+                    ->orWhere('uuid', $search)
+                    ->orWhereHas('tasks', function (Builder $query) use ($search) {
+                        $query->where('prompt', 'like', "%{$search}%")
+                            ->orWhere('response_summary', 'like', "%{$search}%")
+                            ->orWhere('provider', 'like', "%{$search}%")
+                            ->orWhere('model', 'like', "%{$search}%");
+                    });
+            });
+        }
+
+        if ($request->filled('provider') || $request->filled('model')) {
+            $query->whereHas('tasks', function (Builder $query) use ($request) {
+                if ($request->filled('provider')) {
+                    $query->where('provider', $request->input('provider'));
+                }
+
+                if ($request->filled('model')) {
+                    $query->where('model', $request->input('model'));
+                }
+            });
+        }
+    }
+
+    protected function applyTaskFilters(Builder $query, AdminRequest $request): void
+    {
+        foreach (['company_uuid', 'created_by_uuid', 'status', 'provider', 'model'] as $field) {
+            if ($request->filled($field)) {
+                $query->where($field, $request->input($field));
+            }
+        }
+
+        if ($request->filled('from')) {
+            $query->where('created_at', '>=', Carbon::parse($request->input('from'))->startOfDay());
+        }
+
+        if ($request->filled('to')) {
+            $query->where('created_at', '<=', Carbon::parse($request->input('to'))->endOfDay());
+        }
+    }
+
+    protected function findSession(string $id): AiSession
+    {
+        return AiSession::where(function (Builder $query) use ($id) {
+            $query->where('uuid', $id)->orWhere('id', $id);
+        })->firstOrFail();
+    }
+
+    protected function findTask(string $id): AiTask
+    {
+        return AiTask::where(function (Builder $query) use ($id) {
+            $query->where('uuid', $id)->orWhere('id', $id);
+        })->firstOrFail();
+    }
+
+    protected function serializeSession(AiSession $session): array
+    {
+        return [
+            'id'                => $session->id,
+            'uuid'              => $session->uuid,
+            'company_uuid'      => $session->company_uuid,
+            'created_by_uuid'   => $session->created_by_uuid,
+            'title'             => $session->title,
+            'status'            => $session->status,
+            'tasks_count'       => (int) ($session->tasks_count ?? $session->tasks()->count()),
+            'total_tokens'      => (int) ($session->total_tokens_sum ?? 0),
+            'company'           => $this->serializeCompany($session->company),
+            'created_by'        => $this->serializeUser($session->createdBy),
+            'last_message_at'   => optional($session->last_message_at)->toISOString(),
+            'ended_at'          => optional($session->ended_at)->toISOString(),
+            'created_at'        => optional($session->created_at)->toISOString(),
+            'updated_at'        => optional($session->updated_at)->toISOString(),
+        ];
+    }
+
+    protected function serializeTask(AiTask $task, bool $includeContent): array
+    {
+        $responseSummary = $task->response_summary ?: $this->excerpt($task->response);
+
+        return [
+            'id'                => $task->id,
+            'uuid'              => $task->uuid,
+            'ai_session_uuid'   => $task->ai_session_uuid,
+            'company_uuid'      => $task->company_uuid,
+            'created_by_uuid'   => $task->created_by_uuid,
+            'task_type'         => $task->task_type,
+            'status'            => $task->status,
+            'provider'          => $task->provider,
+            'model'             => $task->model,
+            'input_tokens'      => (int) ($task->input_tokens ?? 0),
+            'output_tokens'     => (int) ($task->output_tokens ?? 0),
+            'total_tokens'      => (int) ($task->total_tokens ?? 0),
+            'prompt_excerpt'    => $this->excerpt($task->prompt),
+            'response_summary'  => $responseSummary,
+            'prompt'            => $includeContent ? $task->prompt : null,
+            'response'          => $includeContent ? $task->response : null,
+            'context'           => $includeContent ? $task->context : null,
+            'usage'             => $task->usage,
+            'metadata'          => $includeContent ? $task->metadata : $this->metadataSummary($task->metadata),
+            'error'             => $task->error,
+            'content_redacted'  => !$includeContent,
+            'steps'             => $task->relationLoaded('steps') ? $task->steps->map(fn ($step) => $this->serializeStep($step, $includeContent))->values() : [],
+            'session'           => $task->relationLoaded('session') && $task->session ? $this->serializeSession($task->session) : null,
+            'company'           => $this->serializeCompany($task->company),
+            'created_by'        => $this->serializeUser($task->createdBy),
+            'started_at'        => optional($task->started_at)->toISOString(),
+            'completed_at'      => optional($task->completed_at)->toISOString(),
+            'created_at'        => optional($task->created_at)->toISOString(),
+            'updated_at'        => optional($task->updated_at)->toISOString(),
+        ];
+    }
+
+    protected function serializeStep($step, bool $includeContent): array
+    {
+        return [
+            'id'               => $step->id,
+            'uuid'             => $step->uuid,
+            'type'             => $step->type,
+            'status'           => $step->status,
+            'provider'         => $step->provider,
+            'model'            => $step->model,
+            'tool'             => $step->tool,
+            'input'            => $includeContent ? $step->input : null,
+            'output'           => $includeContent ? $step->output : null,
+            'usage'            => $step->usage,
+            'metadata'         => $includeContent ? $step->metadata : $this->metadataSummary($step->metadata),
+            'error'            => $step->error,
+            'content_redacted' => !$includeContent,
+            'started_at'       => optional($step->started_at)->toISOString(),
+            'completed_at'     => optional($step->completed_at)->toISOString(),
+            'created_at'       => optional($step->created_at)->toISOString(),
+        ];
+    }
+
+    protected function serializeCompany($company): ?array
+    {
+        if (!$company) {
+            return null;
+        }
+
+        return [
+            'uuid'      => $company->uuid,
+            'public_id' => $company->public_id ?? null,
+            'name'      => $company->name ?? null,
+        ];
+    }
+
+    protected function serializeUser($user): ?array
+    {
+        if (!$user) {
+            return null;
+        }
+
+        return [
+            'uuid'      => $user->uuid,
+            'public_id' => $user->public_id ?? null,
+            'name'      => $user->name ?? null,
+            'email'     => $user->email ?? null,
+        ];
+    }
+
+    protected function metadataSummary($metadata): array
+    {
+        $metadata = (array) $metadata;
+
+        return [
+            'keys'                  => array_values(array_keys($metadata)),
+            'action_previews_count' => count((array) data_get($metadata, 'action_previews', [])),
+            'action_results_count'  => count((array) data_get($metadata, 'action_results', [])),
+            'action_errors_count'   => count((array) data_get($metadata, 'action_errors', [])),
+            'attachments_count'     => count((array) data_get($metadata, 'attachments', [])),
+        ];
+    }
+
+    protected function usageGroup(Builder $query, string $field, ?string $labelType = null)
+    {
+        $rows = $query
+            ->select($field)
+            ->selectRaw('COUNT(*) as task_count')
+            ->selectRaw('COALESCE(SUM(input_tokens), 0) as input_tokens')
+            ->selectRaw('COALESCE(SUM(output_tokens), 0) as output_tokens')
+            ->selectRaw('COALESCE(SUM(total_tokens), 0) as total_tokens')
+            ->groupBy($field)
+            ->orderByDesc('total_tokens')
+            ->limit(50)
+            ->get();
+
+        $labels = $this->usageLabels($labelType, $rows->pluck($field)->filter()->values()->all());
+
+        return $rows->map(fn ($row) => [
+            'key'           => $row->{$field} ?: 'unknown',
+            'label'         => $labels[$row->{$field}] ?? ($row->{$field} ?: 'unknown'),
+            'task_count'    => (int) $row->task_count,
+            'input_tokens'  => (int) $row->input_tokens,
+            'output_tokens' => (int) $row->output_tokens,
+            'total_tokens'  => (int) $row->total_tokens,
+        ]);
+    }
+
+    protected function usageLabels(?string $type, array $ids): array
+    {
+        if (!$type || empty($ids)) {
+            return [];
+        }
+
+        if ($type === 'company') {
+            return Company::whereIn('uuid', $ids)->get(['uuid', 'public_id', 'name'])->mapWithKeys(fn ($company) => [
+                $company->uuid => $company->name ?: ($company->public_id ?: $company->uuid),
+            ])->all();
+        }
+
+        if ($type === 'user') {
+            return User::whereIn('uuid', $ids)->get(['uuid', 'public_id', 'name', 'email'])->mapWithKeys(fn ($user) => [
+                $user->uuid => $user->name ?: ($user->email ?: ($user->public_id ?: $user->uuid)),
+            ])->all();
+        }
+
+        return [];
+    }
+
+    protected function usageByDay(Builder $query)
+    {
+        return $query
+            ->selectRaw('DATE(created_at) as day')
+            ->selectRaw('COUNT(*) as task_count')
+            ->selectRaw('COALESCE(SUM(total_tokens), 0) as total_tokens')
+            ->groupBy(DB::raw('DATE(created_at)'))
+            ->orderBy('day')
+            ->get()
+            ->map(fn ($row) => [
+                'day'          => $row->day,
+                'task_count'   => (int) $row->task_count,
+                'total_tokens' => (int) $row->total_tokens,
+            ]);
+    }
+
+    protected function excerpt(?string $value, int $limit = 180): ?string
+    {
+        if (!$value) {
+            return null;
+        }
+
+        return Str::limit(trim(preg_replace('/\s+/', ' ', $value)), $limit);
+    }
+
+    protected function can(AdminRequest $request, string $permission): bool
+    {
+        return optional($request->user())->isAdmin() === true || Auth::can($permission);
+    }
+
+    protected function canUseAdminFilters(AdminRequest $request): bool
+    {
+        return $this->can($request, 'ai view audit logs') || $this->can($request, 'ai view usage analytics');
+    }
+
+    protected function applyUserSearch(Builder $query, string $search): void
+    {
+        $query->where(function (Builder $query) use ($search) {
+            $query->where('name', 'like', "%{$search}%")
+                ->orWhere('email', 'like', "%{$search}%")
+                ->orWhere('public_id', 'like', "%{$search}%")
+                ->orWhere('uuid', $search);
+        });
+    }
+
+    protected function serializeUserOption(User $user): array
+    {
+        return [
+            'id'           => $user->uuid,
+            'uuid'         => $user->uuid,
+            'public_id'    => $user->public_id,
+            'company_uuid' => $user->company_uuid,
+            'name'         => $user->name,
+            'email'        => $user->email,
+            'status'       => $user->status,
+        ];
+    }
+}
diff --git a/server/src/Models/AiAdminAccessLog.php b/server/src/Models/AiAdminAccessLog.php
new file mode 100644
index 0000000..110f118
--- /dev/null
+++ b/server/src/Models/AiAdminAccessLog.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Ai\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasUuid;
+
+class AiAdminAccessLog extends Model
+{
+    use HasUuid;
+    use HasApiModelBehavior;
+
+    protected $table = 'ai_admin_access_logs';
+
+    protected $fillable = [
+        'company_uuid',
+        'ai_session_uuid',
+        'ai_task_uuid',
+        'viewed_by_uuid',
+        'action',
+        'ip_address',
+        'user_agent',
+        'metadata',
+    ];
+
+    protected $casts = [
+        'metadata' => Json::class,
+    ];
+}
diff --git a/server/src/Models/AiSession.php b/server/src/Models/AiSession.php
index ef79c48..85352b6 100644
--- a/server/src/Models/AiSession.php
+++ b/server/src/Models/AiSession.php
@@ -3,7 +3,9 @@
 namespace Fleetbase\Ai\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\Filterable;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
@@ -42,4 +44,14 @@ public function tasks()
     {
         return $this->hasMany(AiTask::class, 'ai_session_uuid', 'uuid');
     }
+
+    public function company()
+    {
+        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
+    }
+
+    public function createdBy()
+    {
+        return $this->belongsTo(User::class, 'created_by_uuid', 'uuid');
+    }
 }
diff --git a/server/src/Models/AiTask.php b/server/src/Models/AiTask.php
index 7d33665..b5fd494 100644
--- a/server/src/Models/AiTask.php
+++ b/server/src/Models/AiTask.php
@@ -3,7 +3,9 @@
 namespace Fleetbase\Ai\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\Filterable;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
@@ -62,4 +64,14 @@ public function session()
     {
         return $this->belongsTo(AiSession::class, 'ai_session_uuid', 'uuid');
     }
+
+    public function company()
+    {
+        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
+    }
+
+    public function createdBy()
+    {
+        return $this->belongsTo(User::class, 'created_by_uuid', 'uuid');
+    }
 }
diff --git a/server/src/routes.php b/server/src/routes.php
index e4fae60..4da22ef 100644
--- a/server/src/routes.php
+++ b/server/src/routes.php
@@ -42,6 +42,16 @@ function ($router) {
                         $router->post('tasks/{id}/apply', 'Internal\AiTaskController@apply');
                         $router->post('tasks/{id}/cancel', 'Internal\AiTaskController@cancel');
                         $router->get('tools', 'Internal\AiToolController@index');
+
+                        $router->prefix('admin')->group(function ($router) {
+                            $router->get('companies', 'Internal\AiAdminController@companies');
+                            $router->get('users', 'Internal\AiAdminController@users');
+                            $router->get('sessions', 'Internal\AiAdminController@sessions');
+                            $router->get('sessions/{id}', 'Internal\AiAdminController@session');
+                            $router->get('tasks/{id}', 'Internal\AiAdminController@task');
+                            $router->post('tasks/{id}/reveal-content', 'Internal\AiAdminController@revealTaskContent');
+                            $router->get('usage', 'Internal\AiAdminController@usage');
+                        });
                     }
                 );
             }