diff --git a/.github/workflows/rc7-source-audit.yml b/.github/workflows/rc7-source-audit.yml
new file mode 100644
index 00000000..b4266997
--- /dev/null
+++ b/.github/workflows/rc7-source-audit.yml
@@ -0,0 +1,51 @@
+name: rc.7 source audit
+
+on:
+  push:
+    branches: [fix/rc7-remove-legacy-ai]
+    paths: [.github/workflows/rc7-source-audit.yml]
+
+permissions:
+  contents: read
+
+jobs:
+  source-audit:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      DOTNET_INSTALL_DIR: /tmp/rateldesk-rc7/sdk
+      NUGET_PACKAGES: /tmp/rateldesk-rc7/packages
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6
+        with:
+          global-json-file: global.json
+      - name: Restore public build inputs
+        run: |
+          dotnet restore Helpdesk.sln
+          tar -czf - -C /tmp/rateldesk-rc7 sdk packages | split -b 350M -d - "$RUNNER_TEMP/build-inputs.part"
+          git ls-files '*AGENTS.md' '*SKILL.md'
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rc7-inputs-00
+          path: ${{ runner.temp }}/build-inputs.part00
+          compression-level: 0
+          retention-days: 1
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rc7-inputs-01
+          path: ${{ runner.temp }}/build-inputs.part01
+          compression-level: 0
+          retention-days: 1
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rc7-inputs-02
+          path: ${{ runner.temp }}/build-inputs.part02
+          compression-level: 0
+          retention-days: 1
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rc7-inputs-03
+          path: ${{ runner.temp }}/build-inputs.part03
+          compression-level: 0
+          retention-days: 1
diff --git a/Directory.Build.props b/Directory.Build.props
index 2be02c8c..3e84a3e1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">0.1.0</VersionPrefix>
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''">rc.6</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">rc.7</VersionSuffix>
 
     <Version Condition="'$(Version)' == '' and '$(VersionSuffix)' == ''">$(VersionPrefix)</Version>
     <Version Condition="'$(Version)' == '' and '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</Version>
diff --git a/README.md b/README.md
index 7c686c9c..5208576b 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Use an exact SemVer tag in production, or preferably replace tags with the publi
 
 ## Bundled PostgreSQL
 
-For a fresh installation with PostgreSQL and the required `vector` and `pg_trgm` extensions, add the bundled sidecar overlay. Choose a unique password outside source control:
+For a fresh installation with PostgreSQL, add the bundled sidecar overlay. Choose a unique password outside source control:
 
 ```bash
 RATELDESK_POSTGRES_PASSWORD='replace-with-a-secret' \
@@ -58,7 +58,7 @@ At `/setup`, select PostgreSQL and enter host `postgres`, port `5432`, database
 
 ## External PostgreSQL
 
-For an externally managed PostgreSQL database, start the normal source or release stack and enter its connection details at `/setup`; the API must be able to reach the database network. The target must be empty for a new setup and have the required `vector` and `pg_trgm` extensions installed by the database operator.
+For an externally managed PostgreSQL database, start the normal source or release stack and enter its connection details at `/setup`; the API must be able to reach the database network. The target must be empty for a new setup.
 
 ```bash
 docker compose -f docker/docker-compose.yml up --build
diff --git a/docker/docker-compose.e2e.yml b/docker/docker-compose.e2e.yml
index b51127da..2de98c67 100644
--- a/docker/docker-compose.e2e.yml
+++ b/docker/docker-compose.e2e.yml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: pgvector/pgvector:pg16
+    image: postgres:16
     environment:
       POSTGRES_DB: rateldesk
       POSTGRES_USER: rateldesk
diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml
index 3b847df3..5f67f7ce 100644
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@@ -1,13 +1,12 @@
 services:
   postgres:
-    image: pgvector/pgvector:pg16
+    image: postgres:16
     environment:
       POSTGRES_DB: ${RATELDESK_POSTGRES_DATABASE:-rateldesk}
       POSTGRES_USER: ${RATELDESK_POSTGRES_USERNAME:-rateldesk}
       POSTGRES_PASSWORD: ${RATELDESK_POSTGRES_PASSWORD:?Set RATELDESK_POSTGRES_PASSWORD before starting PostgreSQL}
     volumes:
       - rateldesk-postgres-data:/var/lib/postgresql/data
-      - ./postgres/init-extensions.sql:/docker-entrypoint-initdb.d/10-rateldesk-extensions.sql:ro
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
       interval: 5s
diff --git a/docker/postgres/init-extensions.sql b/docker/postgres/init-extensions.sql
deleted file mode 100644
index 6aa6c6f7..00000000
--- a/docker/postgres/init-extensions.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS vector;
-CREATE EXTENSION IF NOT EXISTS pg_trgm;
diff --git a/docs/SELF_HOSTING.md b/docs/SELF_HOSTING.md
index 596db80a..5bc2988d 100644
--- a/docs/SELF_HOSTING.md
+++ b/docs/SELF_HOSTING.md
@@ -107,7 +107,7 @@ docker compose -f docker/docker-compose.yml exec api \
 
 For PostgreSQL, set `Bootstrap__Unattended__Provider=PostgreSql` and
 `Bootstrap__Unattended__PostgreSqlConnectionString` instead. The same bounded
-preflight accepts only an empty target with `vector` and `pg_trgm` available.
+preflight accepts only an empty target with the required database connectivity and permissions.
 Completion writes the normal durable marker and descriptor. A restricted API
 host observes that descriptor, exits, and Compose restarts it into the normal
 runtime; it does not retain the unattended password.
@@ -120,11 +120,11 @@ SQLite uses its own EF Core migration assembly; setup and every normal API start
 
 ## PostgreSQL
 
-An existing PostgreSQL deployment continues to use `ConnectionStrings__HelpdeskDb`; select `Database__Provider=PostgreSql` explicitly for new deployment-managed PostgreSQL configuration. Preserve the database and shared data-protection keys before an upgrade. PostgreSQL uses the existing provider-specific migration chain and requires the extensions used by it, including `vector` and `pg_trgm`; do not point RatelDesk at an unrelated or non-empty database.
+An existing PostgreSQL deployment continues to use `ConnectionStrings__HelpdeskDb`; select `Database__Provider=PostgreSql` explicitly for new deployment-managed PostgreSQL configuration. Preserve the database and shared data-protection keys before an upgrade. PostgreSQL uses the existing provider-specific migration chain and does not require non-standard extensions; do not point RatelDesk at an unrelated or non-empty database.
 
 ### Bundled PostgreSQL
 
-For a fresh local or single-host deployment, combine the default stack with [docker/docker-compose.postgres.yml](../docker/docker-compose.postgres.yml). It runs the compatible `pgvector/pgvector:pg16` image, creates `vector` and `pg_trgm` only when its new PostgreSQL volume is initialized, and keeps database data in a separate named volume:
+For a fresh local or single-host deployment, combine the default stack with [docker/docker-compose.postgres.yml](../docker/docker-compose.postgres.yml). It runs the standard `postgres:16` image and keeps database data in a separate named volume:
 
 ```bash
 RATELDESK_POSTGRES_PASSWORD='replace-with-a-secret' \
@@ -160,9 +160,9 @@ unset RATELDESK_POSTGRES_CONNECTION_STRING RATELDESK_BOOTSTRAP_ADMIN_EMAIL RATEL
 docker compose -f docker/docker-compose.release.yml up -d
 ```
 
-For a new instance, the target must be empty. RatelDesk tests the connection with bounded timeouts before it creates schema. It identifies a historical RatelDesk schema separately from an unrelated non-empty database, but refuses setup for both so an existing installation cannot be modified by a first-run session. The setup principal must be able to apply the existing migrations but does not need superuser access. A database administrator must install the required `vector` and `pg_trgm` extensions in the target database before setup, and should enforce TLS, least-privilege credentials, and provider-managed backups. Deployment-managed `ConnectionStrings__HelpdeskDb` supports both fresh setup and established installations. Readiness is determined from installation evidence, not from the presence of a connection string.
+For a new instance, the target must be empty. RatelDesk tests the connection with bounded timeouts before it creates schema. It identifies a historical RatelDesk schema separately from an unrelated non-empty database, but refuses setup for both so an existing installation cannot be modified by a first-run session. The setup principal must be able to apply the existing migrations but does not need superuser access. Use TLS, least-privilege credentials, and provider-managed backups. Deployment-managed `ConnectionStrings__HelpdeskDb` supports both fresh setup and established installations. Readiness is determined from installation evidence, not from the presence of a connection string.
 
-Back up an external deployment as a complete recovery set: a consistent PostgreSQL backup (including required extensions and roles according to the database provider's procedure), the bootstrap state directory, the shared data-protection key ring, and attachments. Test restoring that set into an isolated target before relying on it. To upgrade, take and verify this backup, deploy one versioned image release, and let the API apply its existing migration chain. If the migration fails, stop the new image and restore the complete recovery set; never point the original initialized descriptor at a new empty database to recover it.
+Back up an external deployment as a complete recovery set: a consistent PostgreSQL backup and roles according to the database provider's procedure, the bootstrap state directory, the shared data-protection key ring, and attachments. Test restoring that set into an isolated target before relying on it. To upgrade, take and verify this backup, deploy one versioned image release, and let the API apply its existing migration chain. If the migration fails, stop the new image and restore the complete recovery set; never point the original initialized descriptor at a new empty database to recover it.
 
 ## Reverse proxy and Traefik
 
diff --git a/docs/rc4-phase0-inventory.md b/docs/rc4-phase0-inventory.md
index a386f5ec..9ff36904 100644
--- a/docs/rc4-phase0-inventory.md
+++ b/docs/rc4-phase0-inventory.md
@@ -7,7 +7,7 @@ owned by `Directory.Build.props`.
 | Surface | Existing state | rc.4 direction |
 | --- | --- | --- |
 | API startup | Requires `HelpdeskDb` and PostgreSQL Hangfire before serving. | Split bootstrap from the selected application runtime and gate workers until ready. |
-| Database | Npgsql/pgvector is the runtime default; SQLite package is present but query and migration assumptions remain. | Explicit provider selection, provider migrations, SQLite query compatibility, and declared semantic-search capability. |
+| Database | Historical rc.4 inventory: provider migration assumptions required review. | Explicit provider selection, provider migrations, and SQLite query compatibility. |
 | Authentication | API validates external JWTs; Web uses OIDC/cookie forwarding; legacy BCrypt/JWT login is Development-only. | API-owned ASP.NET Core Identity local accounts, with OIDC retained as an opt-in scheme. |
 | Identity links | Customer links could fall back to email and provisioning accepted body-controlled identity fields. | Use only validated issuer/subject or provider ID and explicit links. |
 | Roles | Free-text user role plus claim bundles; generic role CRUD. | Protected built-ins, custom roles, permissions, and scoped assignments. |
diff --git a/src/HelpDesk.NewWeb/Components/Dialogs/Settings/AiSettingsDialog.razor b/src/HelpDesk.NewWeb/Components/Dialogs/Settings/AiSettingsDialog.razor
deleted file mode 100644
index 78652e8c..00000000
--- a/src/HelpDesk.NewWeb/Components/Dialogs/Settings/AiSettingsDialog.razor
+++ /dev/null
@@ -1,467 +0,0 @@
-@using HelpDesk.NewWeb.Services
-@using Helpdesk.Shared.DTOs
-@using Helpdesk.Shared.DTOs.AI
-@using Helpdesk.Shared.Enums
-@inject IAiAdminClient AiAdmin
-@inject ISnackbar Snackbar
-
-<MudDialog>
-    <TitleContent>
-        <MudText Typo="Typo.h6">
-            <MudIcon Icon="@Icons.Material.Filled.SmartToy" class="mr-2 mb-n1" />
-            AI / Model Settings
-        </MudText>
-    </TitleContent>
-
-    <DialogContent>
-        <MudTabs @bind-ActivePanelIndex="_tabIndex">
-            <MudTabPanel Text="PROVIDERS">
-                <MudTable Items="_providers" Hover="true" Dense="true" Bordered="true">
-                    <HeaderContent>
-                        <MudTh>Name</MudTh>
-                        <MudTh>Type</MudTh>
-                        <MudTh>Base URL</MudTh>
-                        <MudTh>Enabled</MudTh>
-                        <MudTh></MudTh>
-                    </HeaderContent>
-                    <RowTemplate>
-                        <MudTd DataLabel="Name">@context.Name</MudTd>
-                        <MudTd DataLabel="Type">@context.ProviderType</MudTd>
-                        <MudTd DataLabel="Base URL">@context.BaseUrl</MudTd>
-                        <MudTd DataLabel="Enabled">@context.IsEnabled</MudTd>
-                        <MudTd>
-                            <MudIconButton Icon="@Icons.Material.Filled.Edit" Size="Size.Small" OnClick="() => EditProvider(context)" />
-                            <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" Size="Size.Small" OnClick="() => DeleteProvider(context)" />
-                            <MudIconButton Icon="@Icons.Material.Filled.Bolt" Size="Size.Small" Title="Test" OnClick="() => TestFromList(context)" />
-                        </MudTd>
-                    </RowTemplate>
-                </MudTable>
-
-                <MudButton Class="mt-2" Variant="Variant.Filled" Color="Color.Primary"
-                           StartIcon="@Icons.Material.Filled.Add" OnClick="AddProvider">
-                    Add Provider
-                </MudButton>
-            </MudTabPanel>
-
-            <MudTabPanel Text="PROVIDER EDITOR">
-                <MudForm @ref="_form" Model="_edit" Validated="OnValidated">
-                    <MudTextField Label="Name" @bind-Value="_edit.Name" Required="true" />
-                    <MudSelect T="AiProviderType" Label="Provider Type" @bind-Value="_edit.ProviderType" Required="true">
-                        @foreach (var t in Enum.GetValues<AiProviderType>())
-                        {
-                            <MudSelectItem Value="t">@t</MudSelectItem>
-                        }
-                    </MudSelect>
-
-                    @if (ShowOpenWebUiHint)
-                    {
-                        <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Outlined" Class="mb-2">
-                            For an OpenAI-compatible provider, enter its API root (for example, <strong>https://ai.example.com/v1</strong>),
-                            configure the provider's credential in the secret field, and select a discovered model.
-                        </MudAlert>
-                    }
-
-                    <MudTextField Label="Base URL / Endpoint" @bind-Value="_edit.BaseUrl" Required="true"
-                                  HelperText="@BaseUrlHelperText" />
-                    <MudTextField Label="API Key / Bearer Token" @bind-Value="_edit.ApiKey" InputType="InputType.Password"
-                                  Placeholder="Leave blank to keep existing"
-                                  HelperText="@SecretHelperText" />
-
-                    <MudSwitch T="bool" @bind-Value="_edit.IsEnabled" Color="Color.Primary" Label="Enabled" />
-
-                    <MudSelect T="string" Label="Default Model" @bind-Value="_edit.DefaultModel" Clearable="true">
-                        @if (_edit.AvailableModels?.Count > 0)
-                        {
-                            @foreach (var m in _edit.AvailableModels)
-                            {
-                                <MudSelectItem Value="@m">@m</MudSelectItem>
-                            }
-                        }
-                    </MudSelect>
-
-                    <MudStack Row="true" Class="mt-4" Spacing="2">
-                        <MudButton Variant="Variant.Filled" Color="Color.Primary" Disabled="_saving" OnClick="SaveProvider">
-                            @(_edit.Id is null ? "Create" : "Save")
-                        </MudButton>
-                        <MudButton Disabled="_testing || string.IsNullOrEmpty(_edit.Id)" OnClick="TestConnection">Test Connection</MudButton>
-                        <MudButton Disabled="_refreshing || string.IsNullOrEmpty(_edit.Id)" OnClick="RefreshModels">Refresh Models</MudButton>
-                    </MudStack>
-
-                    @if (_lastTestResult is not null)
-                    {
-                        <MudPaper Class="mt-4 pa-3" Outlined="true">
-                            <MudText Typo="Typo.subtitle2">Last Connection Test</MudText>
-                            <MudText Typo="Typo.body2">Status: @(_lastTestResult.Success ? "OK" : "Failed")</MudText>
-                            @if (!string.IsNullOrWhiteSpace(_lastTestResult.AttemptedUrl))
-                            {
-                                <MudText Typo="Typo.body2">Attempted URL: @_lastTestResult.AttemptedUrl</MudText>
-                            }
-                            @if (_lastTestResult.StatusCode.HasValue)
-                            {
-                                <MudText Typo="Typo.body2">HTTP Status: @_lastTestResult.StatusCode</MudText>
-                            }
-                            @if (!string.IsNullOrWhiteSpace(_lastTestResult.Message))
-                            {
-                                <MudText Typo="Typo.body2">Message: @_lastTestResult.Message</MudText>
-                            }
-                            @if (!string.IsNullOrWhiteSpace(_lastTestResult.ErrorBody))
-                            {
-                                <MudText Typo="Typo.body2">Body: @_lastTestResult.ErrorBody</MudText>
-                            }
-                        </MudPaper>
-                    }
-                </MudForm>
-            </MudTabPanel>
-
-            <MudTabPanel Text="QUICK CHAT TEST">
-                <MudSelect T="string"
-                           Label="Provider"
-                           Value="_selectedProviderId"
-                           ValueChanged="OnProviderChanged"
-                           Dense="true"
-                           Required="true">
-                    @foreach (var p in _providers)
-                    {
-                        <MudSelectItem Value="@p.Id">@p.Name</MudSelectItem>
-                    }
-                </MudSelect>
-
-                <MudSelect T="string" Label="Model" @bind-Value="_selectedModel" Dense="true" Disabled="_availableModels.Count == 0">
-                    @foreach (var m in _availableModels)
-                    {
-                        <MudSelectItem Value="@m">@m</MudSelectItem>
-                    }
-                </MudSelect>
-
-                <MudTextField Label="Message" @bind-Value="_chatMessage" Lines="3" />
-
-                <MudButton Class="mt-2" Variant="Variant.Filled" Color="Color.Primary"
-                           Disabled="_chatLoading || string.IsNullOrEmpty(_selectedProviderId)"
-                           OnClick="SendChat">
-                    Send
-                </MudButton>
-
-                <MudPaper Class="mt-2 pa-2" Elevation="0">@_chatResponse</MudPaper>
-            </MudTabPanel>
-        </MudTabs>
-    </DialogContent>
-
-    <DialogActions>
-        <MudButton OnClick="Close">Close</MudButton>
-    </DialogActions>
-</MudDialog>
-
-@code {
-    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
-
-    private int _tabIndex;
-    private MudForm? _form;
-
-    private List<AiProviderSummaryDto> _providers = new();
-
-    private EditVm _edit = new();
-    private bool _saving;
-    private bool _testing;
-    private bool _refreshing;
-    private AiProviderTestResultDto? _lastTestResult;
-
-    private string _selectedProviderId = string.Empty;
-    private string _selectedModel = string.Empty;
-    private List<string> _availableModels = new();
-    private string _chatMessage = string.Empty;
-    private string _chatResponse = string.Empty;
-    private bool _chatLoading;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadProviders();
-    }
-
-    private async Task LoadProviders()
-    {
-        var page = await AiAdmin.GetProvidersAsync(page: 1, pageSize: 100);
-        _providers = page.Items?.ToList() ?? new();
-        StateHasChanged();
-    }
-
-    private void AddProvider()
-    {
-        _edit = new EditVm
-        {
-            ProviderType = AiProviderType.OpenAICompatible,
-            IsEnabled = true
-        };
-        _lastTestResult = null;
-        _tabIndex = 1;
-    }
-
-    private void EditProvider(AiProviderSummaryDto p)
-    {
-        _edit = new EditVm
-        {
-            Id = p.Id,
-            Name = p.Name,
-            ProviderType = p.ProviderType,
-            BaseUrl = p.BaseUrl,
-            IsEnabled = p.IsEnabled,
-            DefaultModel = p.DefaultModel,
-            AvailableModels = p.Models?.Select(m => m.Name).ToList() ?? new()
-        };
-        _lastTestResult = null;
-        _tabIndex = 1;
-    }
-
-    private async Task DeleteProvider(AiProviderSummaryDto p)
-    {
-        if (await AiAdmin.DeleteProviderAsync(p.Id))
-        {
-            Snackbar.Add("Provider deleted", Severity.Success);
-            await LoadProviders();
-        }
-        else
-        {
-            Snackbar.Add("Delete failed", Severity.Error);
-        }
-    }
-
-    private async Task TestFromList(AiProviderSummaryDto p)
-    {
-        var result = await AiAdmin.TestAsync(p.Id);
-        Snackbar.Add(
-            result.Success ? $"Test OK for {p.Name}" : $"{p.Name} failed: {result.Message ?? "Connection failed"}",
-            result.Success ? Severity.Success : Severity.Error);
-    }
-
-    private async Task SaveProvider()
-    {
-        await _form!.ValidateAsync();
-        if (!_form!.IsValid)
-        {
-            return;
-        }
-
-        _saving = true;
-
-        try
-        {
-            if (string.IsNullOrEmpty(_edit.Id))
-            {
-                var dto = new AiProviderCreateDto
-                {
-                    Name = _edit.Name,
-                    ProviderType = _edit.ProviderType,
-                    BaseUrl = _edit.BaseUrl,
-                    ApiKey = string.IsNullOrWhiteSpace(_edit.ApiKey) ? null : _edit.ApiKey,
-                    IsEnabled = _edit.IsEnabled,
-                    DefaultModel = _edit.DefaultModel
-                };
-
-                var created = await AiAdmin.CreateProviderAsync(dto);
-                if (created is null)
-                {
-                    throw new Exception("Create failed");
-                }
-
-                _edit.Id = created.Id;
-                _edit.AvailableModels = created.Models?.Select(m => m.Name).ToList() ?? new();
-                _edit.DefaultModel ??= created.DefaultModel;
-                Snackbar.Add("Provider created", Severity.Success);
-            }
-            else
-            {
-                var upd = new AiProviderUpdateDto
-                {
-                    Name = _edit.Name,
-                    ProviderType = _edit.ProviderType,
-                    BaseUrl = _edit.BaseUrl,
-                    ApiKey = string.IsNullOrWhiteSpace(_edit.ApiKey) ? null : _edit.ApiKey,
-                    IsEnabled = _edit.IsEnabled,
-                    DefaultModel = _edit.DefaultModel
-                };
-
-                var updated = await AiAdmin.UpdateProviderAsync(_edit.Id, upd);
-                if (updated is null)
-                {
-                    throw new Exception("Update failed");
-                }
-
-                _edit.AvailableModels = updated.Models?.Select(m => m.Name).ToList() ?? new();
-                _edit.DefaultModel = updated.DefaultModel ?? _edit.DefaultModel;
-                Snackbar.Add("Provider saved", Severity.Success);
-            }
-
-            await LoadProviders();
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Save failed: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _saving = false;
-        }
-    }
-
-    private async Task TestConnection()
-    {
-        if (string.IsNullOrEmpty(_edit.Id))
-        {
-            Snackbar.Add("Save provider first, then test.", Severity.Info);
-            return;
-        }
-
-        _testing = true;
-        try
-        {
-            _lastTestResult = await AiAdmin.TestAsync(_edit.Id);
-            if (_lastTestResult.Success)
-            {
-                await RefreshModels(loadModelsMessage: false);
-            }
-
-            Snackbar.Add(
-                _lastTestResult.Success
-                    ? $"Connection OK via {_lastTestResult.AttemptedUrl}"
-                    : _lastTestResult.Message ?? "Connection failed",
-                _lastTestResult.Success ? Severity.Success : Severity.Error);
-        }
-        finally
-        {
-            _testing = false;
-        }
-    }
-
-    private async Task RefreshModels()
-        => await RefreshModels(loadModelsMessage: true);
-
-    private async Task RefreshModels(bool loadModelsMessage)
-    {
-        if (string.IsNullOrEmpty(_edit.Id))
-        {
-            Snackbar.Add("Save provider first, then refresh models.", Severity.Info);
-            return;
-        }
-
-        _refreshing = true;
-        try
-        {
-            var items = (await AiAdmin.GetModelsAsync(_edit.Id)).ToList();
-            _edit.AvailableModels = items.Select(m => m.Name).ToList();
-
-            if (string.IsNullOrWhiteSpace(_edit.DefaultModel) && _edit.AvailableModels.Count > 0)
-            {
-                _edit.DefaultModel = _edit.AvailableModels[0];
-            }
-
-            if (loadModelsMessage)
-            {
-                Snackbar.Add($"Loaded {_edit.AvailableModels.Count} models", Severity.Success);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Model refresh failed: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _refreshing = false;
-        }
-    }
-
-    private void OnValidated()
-    {
-    }
-
-    private async Task OnProviderChanged(string id)
-    {
-        _selectedProviderId = id;
-
-        _availableModels.Clear();
-        _selectedModel = string.Empty;
-
-        var p = _providers.FirstOrDefault(x => x.Id == id);
-        if (p is null)
-        {
-            return;
-        }
-
-        var stored = p.Models?.Select(m => m.Name).ToList() ?? new();
-        if (stored.Count == 0)
-        {
-            stored = (await AiAdmin.GetModelsAsync(p.Id)).Select(m => m.Name).ToList();
-        }
-
-        _availableModels = stored;
-        if (!string.IsNullOrWhiteSpace(p.DefaultModel) && _availableModels.Contains(p.DefaultModel))
-        {
-            _selectedModel = p.DefaultModel;
-        }
-        else if (_availableModels.Count > 0)
-        {
-            _selectedModel = _availableModels[0];
-        }
-    }
-
-    private async Task SendChat()
-    {
-        if (string.IsNullOrWhiteSpace(_selectedProviderId))
-        {
-            Snackbar.Add("Select a provider", Severity.Info);
-            return;
-        }
-
-        var model = !string.IsNullOrWhiteSpace(_selectedModel)
-            ? _selectedModel
-            : _providers.FirstOrDefault(p => p.Id == _selectedProviderId)?.DefaultModel ?? string.Empty;
-
-        _chatLoading = true;
-        _chatResponse = string.Empty;
-
-        try
-        {
-            var text = await AiAdmin.ChatTestAsync(new AiTestChatRequest
-            {
-                ProviderId = _selectedProviderId,
-                Model = model,
-                Prompt = _chatMessage
-            });
-
-            _chatResponse = text ?? "(no response)";
-        }
-        catch (Exception ex)
-        {
-            _chatResponse = $"Error: {ex.Message}";
-        }
-        finally
-        {
-            _chatLoading = false;
-        }
-    }
-
-    private void Close() => Dialog.Close(DialogResult.Ok(true));
-
-    private bool ShowOpenWebUiHint => _edit.ProviderType == AiProviderType.OpenAICompatible;
-
-    private string BaseUrlHelperText => _edit.ProviderType switch
-    {
-        AiProviderType.OpenAICompatible => "Use the provider API root, for example https://ai.example.com/v1. Bare roots are also probed as /v1 then /api.",
-        AiProviderType.OpenAI => "Use the provider API root, typically ending in /v1.",
-        _ => "Enter the provider API root."
-    };
-
-    private string SecretHelperText => _edit.ProviderType == AiProviderType.OpenAICompatible
-        ? "Use a bearer token or API key accepted by the upstream provider. This OpenWebUI instance currently accepts JWT bearer tokens for chat/model calls."
-        : "Stored encrypted; leave blank to keep the existing secret.";
-
-    private sealed class EditVm
-    {
-        public string? Id { get; set; }
-        public string Name { get; set; } = string.Empty;
-        public AiProviderType ProviderType { get; set; } = AiProviderType.OpenAICompatible;
-        public string BaseUrl { get; set; } = string.Empty;
-        public string? ApiKey { get; set; }
-        public bool IsEnabled { get; set; } = true;
-        public string? DefaultModel { get; set; }
-        public List<string> AvailableModels { get; set; } = new();
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Layout/MainLayout.razor b/src/HelpDesk.NewWeb/Components/Layout/MainLayout.razor
index e4d9fafc..fbbd273e 100644
--- a/src/HelpDesk.NewWeb/Components/Layout/MainLayout.razor
+++ b/src/HelpDesk.NewWeb/Components/Layout/MainLayout.razor
@@ -63,7 +63,6 @@
                         <MudMenuItem>Profile</MudMenuItem>
                         <MudMenuItem>Preferences</MudMenuItem>
                         <MudMenuItem OnClick="OpenEmailSettings">Email Settings</MudMenuItem>
-                        <MudMenuItem OnClick="OpenAiSettings">AI / Model Settings</MudMenuItem>
                         <MudDivider />
                         @if (SupportsLocalAccounts)
                         {
@@ -92,7 +91,6 @@
                         <MudMenuItem Icon="@Icons.Material.Filled.Person">Profile</MudMenuItem>
                         <MudMenuItem Icon="@Icons.Material.Filled.Tune">Preferences</MudMenuItem>
                         <MudMenuItem OnClick="OpenEmailSettings" Icon="@Icons.Material.Filled.Email">Email Settings</MudMenuItem>
-                        <MudMenuItem OnClick="OpenAiSettings" Icon="@Icons.Material.Filled.Psychology">AI / Model Settings</MudMenuItem>
                         <MudDivider />
                         @if (SupportsLocalAccounts)
                         {
@@ -208,12 +206,6 @@
         await DialogService.ShowAsync<Dialogs.Settings.EmailSettingsDialog>("IMAP Settings", options);
     }
 
-    private async Task OpenAiSettings()
-    {
-        var options = new DialogOptions { MaxWidth = MaxWidth.Large, FullWidth = true };
-        await DialogService.ShowAsync<Dialogs.Settings.AiSettingsDialog>("AI / Model Settings", options);
-    }
-
     public async ValueTask DisposeAsync()
     {
         if (hotkeyRegistrationId.HasValue)
diff --git a/src/HelpDesk.NewWeb/Components/Layout/NavMenu.razor b/src/HelpDesk.NewWeb/Components/Layout/NavMenu.razor
index edbb9a06..1bd7bcd7 100644
--- a/src/HelpDesk.NewWeb/Components/Layout/NavMenu.razor
+++ b/src/HelpDesk.NewWeb/Components/Layout/NavMenu.razor
@@ -55,14 +55,6 @@
              <AuthorizeView Roles="HelpdeskAdmin,DataManagement.Admin" Context="dataManagementAuth">
                 <MudNavLink Href="/admin/resources/data-management" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.DataObject">Data Management</MudNavLink>
              </AuthorizeView>
-             <AuthorizeView Roles="HelpdeskAdmin" Context="resourceAdmin">
-                <MudNavGroup Title="Knowledge" Icon="@Icons.Material.Filled.Article" Expanded="false">
-                    <MudNavLink Href="kb" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Article">Knowledge</MudNavLink>
-                    <MudNavLink Href="/admin/knowledgebase/articles" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.EditNote">Articles</MudNavLink>
-                    <MudNavLink Href="/admin/kb/categories" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Category">Categories</MudNavLink>
-                    <MudNavLink Href="/kb/health" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.MonitorHeart">Health</MudNavLink>
-                </MudNavGroup>
-             </AuthorizeView>
         </MudNavGroup>
         </AuthorizeView>
     </AuthorizeView>
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/Categories.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/Categories.razor
index 4a336687..b173a045 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/Categories.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Admin/Categories.razor
@@ -1,7 +1,6 @@
 @page "/admin/categories0"
 @attribute [Authorize(Roles = "HelpdeskAdmin")]
 
-@using HelpDesk.NewWeb.Components.Pages.Admin.KnowledgeBase
 @using Helpdesk.Shared.DTOs.Category
 @using Helpdesk.Shared.DTOs.Organization
 @using Helpdesk.Shared.Enums
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/EditCategoryDialog2.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/EditCategoryDialog2.razor
new file mode 100644
index 00000000..0ada6932
--- /dev/null
+++ b/src/HelpDesk.NewWeb/Components/Pages/Admin/EditCategoryDialog2.razor
@@ -0,0 +1,51 @@
+@using Helpdesk.Shared.DTOs.Category
+@using Helpdesk.Shared.Enums
+@inject IHttpClientFactory HttpClientFactory
+
+<MudDialog>
+    <DialogContent>
+        <MudForm @ref="form">
+            <MudTextField T="string" Label="Name" @bind-Value="model.Name" Required="true" />
+            <MudTextField T="string" Label="Description" @bind-Value="model.Description" Lines="3" />
+            <MudSelect T="TicketCategoryType" Label="Type" @bind-Value="model.Type">
+                @foreach (TicketCategoryType type in Enum.GetValues(typeof(TicketCategoryType)))
+                {
+                    <MudSelectItem T="TicketCategoryType" Value="@type">@type</MudSelectItem>
+                }
+            </MudSelect>
+            <MudNumericField T="int" Label="Sort order" @bind-Value="model.SortOrder" />
+            <MudCheckBox T="bool" Label="Active" @bind-Value="model.IsActive" />
+        </MudForm>
+    </DialogContent>
+    <DialogActions>
+        <MudButton OnClick="Dialog.Cancel">Cancel</MudButton>
+        <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="SaveAsync">Save</MudButton>
+    </DialogActions>
+</MudDialog>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
+    [Parameter] public TicketCategoryDto? Category { get; set; }
+    [Parameter] public TicketCategoryType DefaultType { get; set; }
+
+    private HttpClient Api => HttpClientFactory.CreateClient("HelpdeskApi");
+    private MudForm form = default!;
+    private EditModel model = new();
+
+    protected override void OnParametersSet() => model = Category is null
+        ? new EditModel { Type = DefaultType, IsActive = true }
+        : new EditModel { Name = Category.Name, Description = Category.Description, Type = Category.Type, SortOrder = Category.SortOrder, IsActive = Category.IsActive };
+
+    private async Task SaveAsync()
+    {
+        await form.ValidateAsync();
+        if (!form.IsValid || string.IsNullOrWhiteSpace(model.Name)) return;
+        var response = Category is null
+            ? await Api.PostAsJsonAsync("api/v1/categories", new CreateTicketCategoryDto { Name = model.Name.Trim(), Description = model.Description, Type = model.Type, SortOrder = model.SortOrder, IsActive = model.IsActive })
+            : await Api.PutAsJsonAsync($"api/v1/categories/{Category.Id}", new UpdateTicketCategoryDto { Name = model.Name.Trim(), Description = model.Description, Type = model.Type, SortOrder = model.SortOrder, IsActive = model.IsActive });
+        Dialog.Close(response.IsSuccessStatusCode ? DialogResult.Ok(true) : DialogResult.Ok(new DialogError(await response.Content.ReadAsStringAsync())));
+    }
+
+    private sealed class EditModel { public string Name { get; set; } = string.Empty; public string? Description { get; set; } public TicketCategoryType Type { get; set; } public int SortOrder { get; set; } public bool IsActive { get; set; } }
+    public sealed class DialogError(string message) { public string Message { get; } = message; }
+}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleEditor.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleEditor.razor
deleted file mode 100644
index 19d2d413..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleEditor.razor
+++ /dev/null
@@ -1,96 +0,0 @@
-@page "/admin/knowledgebase/articles/{Id?}"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@inject IHttpClientFactory HttpClientFactory
-@inject NavigationManager NavigationManager
-@inject ISnackbar Snackbar
-@inject IErrorLoggingService ErrorLogger
-@using Helpdesk.Shared.DTOs.Article
-@using HelpDesk.NewWeb.Services
-
-<PageTitle>Article Editor</PageTitle>
-
-@if (loading)
-{
-    <MudPaper Class="pa-4 d-flex justify-center">
-        <MudProgressCircular Color="Color.Primary" Indeterminate="true" />
-    </MudPaper>
-}
-else
-{
-    <MudCard Class="pa-4">
-        <MudTextField @bind-Value="article.Title" Label="Title" Required="true" />
-        <MudSelect T="string" @bind-Value="article.CategoryId" Label="Category" Class="mt-2" Required="true">
-            @foreach (var cat in categories)
-            {
-                <MudSelectItem T="string" Value="@cat.Id">@cat.Name</MudSelectItem>
-            }
-        </MudSelect>
-        <MudSwitch T="bool" @bind-Value="article.IsPublic" Color="Color.Primary" Class="mt-2">Public</MudSwitch>
-        <MudTextField T="string" @bind-Value="article.Content" Label="Content" Lines="10" Class="mt-2" Variant="Variant.Outlined" />
-        <MudCardActions Class="pt-4">
-            <MudButton OnClick="SaveAsync" Color="Color.Primary" Variant="Variant.Filled">Save</MudButton>
-            <MudButton OnClick="Cancel">Back</MudButton>
-        </MudCardActions>
-    </MudCard>
-}
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    [Parameter] public string? Id { get; set; }
-
-    private ArticleDto article = new();
-    private List<Helpdesk.Shared.DTOs.Category.CategoryDto> categories = new();
-    private bool loading = true;
-    private bool IsNew => string.IsNullOrEmpty(Id) || Id == "new";
-
-    protected override async Task OnInitializedAsync()
-    {
-        categories = await HelpdeskApi.GetFromJsonAsync<List<Helpdesk.Shared.DTOs.Category.CategoryDto>>("api/v1/knowledgebase/categories") ?? new();
-        if (!IsNew && Id is not null)
-        {
-            var existing = await HelpdeskApi.GetFromJsonAsync<ArticleDto>($"api/v1/knowledgebase/articles/{Id}");
-            if (existing != null)
-            {
-                article = existing;
-            }
-        }
-        loading = false;
-    }
-
-    private async Task SaveAsync()
-    {
-        try
-        {
-            HttpResponseMessage response;
-            if (IsNew)
-            {
-                response = await HelpdeskApi.PostAsJsonAsync("api/v1/knowledgebase/articles", article);
-            }
-            else
-            {
-                response = await HelpdeskApi.PutAsJsonAsync($"api/v1/knowledgebase/articles/{Id}", article);
-            }
-
-            if (response.IsSuccessStatusCode)
-            {
-                NavigationManager.NavigateTo("/admin/knowledgebase/articles");
-            }
-            else
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add($"Error saving article: {error}", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add("Unexpected error", Severity.Error);
-            await ErrorLogger.LogAsync(ex, nameof(ArticleEditor));
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/admin/knowledgebase/articles");
-    }
-
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleList.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleList.razor
deleted file mode 100644
index 36ad93d1..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/ArticleList.razor
+++ /dev/null
@@ -1,52 +0,0 @@
-@page "/admin/knowledgebase/articles"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@inject IHttpClientFactory HttpClientFactory
-@inject NavigationManager NavigationManager
-@using Helpdesk.Shared.DTOs.Article
-
-<PageTitle>KB Articles</PageTitle>
-
-<MudPaper Class="pa-4">
-    <MudStack Row="true" AlignItems="AlignItems.Center" Class="mb-4">
-        <MudText Typo="Typo.h5">Knowledge Base Articles</MudText>
-        <MudSpacer />
-        <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="CreateArticle">Create</MudButton>
-    </MudStack>
-    <MudTable Items="articles" Hover="true" Dense="true" T="ArticleDto">
-        <HeaderContent>
-            <MudTh>Title</MudTh>
-            <MudTh>Category</MudTh>
-            <MudTh>Public</MudTh>
-            <MudTh></MudTh>
-        </HeaderContent>
-        <RowTemplate>
-            <MudTd DataLabel="Title">@context.Title</MudTd>
-            <MudTd DataLabel="Category">@context.CategoryId</MudTd>
-            <MudTd DataLabel="Public">@context.IsPublic</MudTd>
-            <MudTd>
-                <MudButton Variant="Variant.Text" OnClick="() => EditArticle(context.Id)">Edit</MudButton>
-            </MudTd>
-        </RowTemplate>
-    </MudTable>
-</MudPaper>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    private List<ArticleDto> articles = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        articles = await HelpdeskApi.GetFromJsonAsync<List<ArticleDto>>("api/v1/knowledgebase/articles") ?? new();
-    }
-
-    private void CreateArticle()
-    {
-        NavigationManager.NavigateTo("/admin/knowledgebase/articles/new");
-    }
-
-    private void EditArticle(string id)
-    {
-        NavigationManager.NavigateTo($"/admin/knowledgebase/articles/{id}");
-    }
-
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/Categories.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/Categories.razor
deleted file mode 100644
index cc048565..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/Categories.razor
+++ /dev/null
@@ -1,214 +0,0 @@
-@page "/admin/categories"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-
-@using HelpDesk.NewWeb.Components.Pages.Admin.KnowledgeBase
-@using Helpdesk.Shared.DTOs.Category
-@using Helpdesk.Shared.DTOs.Organization
-@using Helpdesk.Shared.Enums
-
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject IDialogService DialogService
-
-<PageTitle>Ticket Categories</PageTitle>
-
-<MudPaper Class="pa-4">
-    <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-4">
-        <MudText Typo="Typo.h5">Ticket Categories</MudText>
-        <MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add" OnClick="StartCreateAsync">
-            New Category
-        </MudButton>
-    </MudStack>
-
-    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="mb-3">
-        <MudSelect T="TicketCategoryType" Label="Filter by type" Value="@selectedType" ValueChanged="OnTypeChanged" Dense="true">
-            @foreach (TicketCategoryType type in Enum.GetValues(typeof(TicketCategoryType)))
-            {
-                <MudSelectItem T="TicketCategoryType" Value="@type">@type</MudSelectItem>
-            }
-        </MudSelect>
-    </MudStack>
-
-    @if (loading)
-    {
-        <MudProgressLinear Indeterminate="true" />
-    }
-    else
-    {
-        <MudTable Items="@categories" Hover="true" Dense="true" T="TicketCategoryDto">
-            <HeaderContent>
-                <MudTh>Name</MudTh>
-                <MudTh>Description</MudTh>
-                <MudTh>Type</MudTh>
-                <MudTh>Sort</MudTh>
-                <MudTh>Scope</MudTh>
-                <MudTh>Active</MudTh>
-                <MudTh></MudTh>
-            </HeaderContent>
-            <RowTemplate>
-                <MudTd DataLabel="Name">@context.Name</MudTd>
-                <MudTd DataLabel="Description">@context.Description</MudTd>
-                <MudTd DataLabel="Type">@context.Type</MudTd>
-                <MudTd DataLabel="Sort">@context.SortOrder</MudTd>
-                <MudTd DataLabel="Scope">@ResolveScope(context)</MudTd>
-                <MudTd DataLabel="Active">@(context.IsActive ? "Yes" : "No")</MudTd>
-                <MudTd>
-                    <MudIconButton Icon="@Icons.Material.Filled.Edit"
-                                   Color="Color.Primary"
-                                   Disabled="@context.IsSystem"
-                                   OnClick="@(() => StartEditAsync(context))" />
-                    <MudIconButton Icon="@Icons.Material.Filled.Delete"
-                                   Color="Color.Error"
-                                   Disabled="@context.IsSystem"
-                                   OnClick="@(() => DeleteAsync(context))" />
-                </MudTd>
-            </RowTemplate>
-        </MudTable>
-    }
-</MudPaper>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
-    private List<TicketCategoryDto> categories = new();
-    private Dictionary<Guid, string> tenantLookup = new();
-    private TicketCategoryType selectedType = TicketCategoryType.Request;
-    private bool loading = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTenantLookupAsync();
-        await LoadCategoriesAsync();
-    }
-
-    private async Task LoadTenantLookupAsync()
-    {
-        try
-        {
-            var tenants = await HelpdeskApi.GetFromJsonAsync<List<TenantLookupDto>>("api/v1/admin/tenants/lookup") ?? new();
-            tenantLookup = tenants
-                .Select(x => new { Tenant = x, Parsed = Guid.TryParse(x.Id, out var id) ? id : Guid.Empty })
-                .Where(x => x.Parsed != Guid.Empty)
-                .ToDictionary(x => x.Parsed, x => x.Tenant.Name);
-        }
-        catch
-        {
-            tenantLookup = new Dictionary<Guid, string>();
-        }
-    }
-
-    private async Task OnTypeChanged(TicketCategoryType type)
-    {
-        selectedType = type;
-        await LoadCategoriesAsync();
-    }
-
-    private async Task LoadCategoriesAsync()
-    {
-        loading = true;
-        try
-        {
-            categories = await HelpdeskApi.GetFromJsonAsync<List<TicketCategoryDto>>(
-                $"api/v1/categories?type={(int)selectedType}") ?? new();
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Could not load categories: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            loading = false;
-        }
-    }
-
-    private async Task StartCreateAsync()
-    {
-        var parameters = new DialogParameters
-        {
-            [nameof(EditCategoryDialog2.DefaultType)] = selectedType
-        };
-
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<EditCategoryDialog>("Create Category", parameters, options);
-        var result = await dialog.Result;
-
-        if (!result.Canceled)
-        {
-            if (result.Data is EditCategoryDialog2.DialogError err)
-            {
-                Snackbar.Add($"Save failed: {err.Message}", Severity.Error);
-            }
-            else
-            {
-                Snackbar.Add("Category saved.", Severity.Success);
-                await LoadTenantLookupAsync();
-                await LoadCategoriesAsync();
-            }
-        }
-    }
-
-    private async Task StartEditAsync(TicketCategoryDto category)
-    {
-        var parameters = new DialogParameters
-        {
-            [nameof(EditCategoryDialog.Category)] = category
-        };
-
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<EditCategoryDialog>("Edit Category", parameters, options);
-        var result = await dialog.Result;
-
-        if (!result.Canceled)
-        {
-            if (result.Data is EditCategoryDialog2.DialogError err)
-            {
-                Snackbar.Add($"Save failed: {err.Message}", Severity.Error);
-            }
-            else
-            {
-                Snackbar.Add("Category saved.", Severity.Success);
-                await LoadTenantLookupAsync();
-                await LoadCategoriesAsync();
-            }
-        }
-    }
-
-    private async Task DeleteAsync(TicketCategoryDto category)
-    {
-        if (category.IsSystem)
-        {
-            Snackbar.Add("System categories are read-only.", Severity.Warning);
-            return;
-        }
-
-        try
-        {
-            var response = await HelpdeskApi.DeleteAsync($"api/v1/categories/{category.Id}");
-            if (!response.IsSuccessStatusCode)
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add($"Delete failed: {error}", Severity.Error);
-                return;
-            }
-
-            Snackbar.Add("Category deleted.", Severity.Success);
-            await LoadCategoriesAsync();
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Delete failed: {ex.Message}", Severity.Error);
-        }
-    }
-
-    private string ResolveScope(TicketCategoryDto category)
-    {
-        if (category.TenantId is null)
-        {
-            return "Global";
-        }
-
-        return tenantLookup.TryGetValue(category.TenantId.Value, out var tenantName)
-            ? tenantName
-            : category.TenantId.Value.ToString();
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/CreateCategoryDialog.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/CreateCategoryDialog.razor
deleted file mode 100644
index ea22e033..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/CreateCategoryDialog.razor
+++ /dev/null
@@ -1,41 +0,0 @@
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-@inject IHttpClientFactory HttpClientFactory
-    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
-
-    private MudForm form = default!;
-    private Helpdesk.Shared.DTOs.Category.CategoryDto model = new();
-
-    private async Task Submit()
-    {
-        await form.ValidateAsync();
-        if (form.IsValid)
-        {
-            var response = await HelpdeskApi.PostAsJsonAsync("api/v1/knowledgebase/categories", model);
-            if (response.IsSuccessStatusCode)
-            {
-                Dialog.Close(DialogResult.Ok(true));
-            }
-        }
-    }
-
-    private void Cancel() => Dialog.Cancel();
-}
-
-<MudDialog>
-    <TitleContent>
-        <MudText Typo="Typo.h6">
-            <MudIcon Icon="@Icons.Material.Filled.AddCircle" Class="mr-2 mb-n1" />
-            Create Category
-        </MudText>
-    </TitleContent>
-    <DialogContent>
-        <MudForm @ref="form" Model="model" OnValidSubmit="Submit" Class="mt-2">
-            <MudTextField @bind-Value="model.Name" Label="Name" Required="true" />
-        </MudForm>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton OnClick="Submit" Color="Color.Primary" Variant="Variant.Filled">Create</MudButton>
-    </DialogActions>
-</MudDialog>
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/DeleteCategoryDialog.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/DeleteCategoryDialog.razor
deleted file mode 100644
index 9a6de5b0..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/DeleteCategoryDialog.razor
+++ /dev/null
@@ -1,43 +0,0 @@
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject IErrorLoggingService ErrorLogger
-@using HelpDesk.NewWeb.Services
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
-    [Parameter] public Helpdesk.Shared.DTOs.Category.CategoryDto Category { get; set; } = default!;
-
-    private async Task Delete()
-    {
-        try
-        {
-            var response = await HelpdeskApi.DeleteAsync($"api/v1/knowledgebase/categories/{Category.Id}");
-            if (response.IsSuccessStatusCode)
-            {
-                Dialog.Close(DialogResult.Ok(true));
-            }
-            else
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add($"Error deleting category: {error}", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add("Unexpected error", Severity.Error);
-            await ErrorLogger.LogAsync(ex, nameof(DeleteCategoryDialog));
-        }
-    }
-
-    private void Cancel() => Dialog.Cancel();
-}
-
-<MudDialog>
-    <DialogContent>
-        <MudText Typo="Typo.body1">Are you sure you want to delete @Category.Name?</MudText>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton OnClick="Delete" Color="Color.Error" Variant="Variant.Filled">Delete</MudButton>
-    </DialogActions>
-</MudDialog>
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog.razor
deleted file mode 100644
index 3fc7ba9a..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog.razor
+++ /dev/null
@@ -1,70 +0,0 @@
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject IErrorLoggingService ErrorLogger
-@using System.ComponentModel.DataAnnotations
-@using HelpDesk.NewWeb.Services
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
-    [Parameter] public Helpdesk.Shared.DTOs.Category.CategoryDto Category { get; set; } = default!;
-
-    private MudForm form = default!;
-    private EditModel model = new();
-
-    protected override void OnInitialized()
-    {
-        model = new EditModel { Name = Category.Name };
-    }
-
-    private async Task Submit()
-    {
-        await form.ValidateAsync();
-        if (form.IsValid)
-        {
-            try
-            {
-                var response = await HelpdeskApi.PutAsJsonAsync($"api/v1/knowledgebase/categories/{Category.Id}", model);
-                if (response.IsSuccessStatusCode)
-                {
-                    Dialog.Close(DialogResult.Ok(true));
-                }
-                else
-                {
-                    var error = await response.Content.ReadAsStringAsync();
-                    Snackbar.Add($"Error saving category: {error}", Severity.Error);
-                }
-            }
-            catch (Exception ex)
-            {
-                Snackbar.Add("Unexpected error", Severity.Error);
-                await ErrorLogger.LogAsync(ex, nameof(EditCategoryDialog));
-            }
-        }
-    }
-
-    private void Cancel() => Dialog.Cancel();
-
-    public class EditModel
-    {
-        [Required]
-        public string Name { get; set; } = string.Empty;
-    }
-}
-
-<MudDialog>
-    <TitleContent>
-        <MudText Typo="Typo.h6">
-            <MudIcon Icon="@Icons.Material.Filled.Edit" Class="mr-2 mb-n1" />
-            Edit Category
-        </MudText>
-    </TitleContent>
-    <DialogContent>
-        <MudForm @ref="form" Model="model" OnValidSubmit="Submit" Class="mt-2">
-            <MudTextField @bind-Value="model.Name" Label="Name" Required="true" />
-        </MudForm>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton OnClick="Submit" Color="Color.Primary" Variant="Variant.Filled">Save</MudButton>
-    </DialogActions>
-</MudDialog>
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog2.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog2.razor
deleted file mode 100644
index 65f13436..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/EditCategoryDialog2.razor
+++ /dev/null
@@ -1,166 +0,0 @@
-@using Helpdesk.Shared.DTOs.Category
-@using Helpdesk.Shared.DTOs.Organization
-@using Helpdesk.Shared.Enums
-@using Microsoft.AspNetCore.Components.Authorization
-
-@inject IHttpClientFactory HttpClientFactory
-@inject AuthenticationStateProvider AuthenticationStateProvider
-
-<MudDialog>
-    <TitleContent>
-        <MudText Typo="Typo.h6">@((Category is null) ? "Create Category" : "Edit Category")</MudText>
-    </TitleContent>
-
-    <DialogContent>
-        <MudForm @ref="form" Class="mt-2">
-            <MudTextField T="string" Label="Name" @bind-Value="Model.Name" Required="true" />
-            <MudTextField T="string" Label="Description" Lines="3" @bind-Value="Model.Description" />
-
-            <MudSelect T="TicketCategoryType" Label="Type" @bind-Value="Model.Type">
-                @foreach (TicketCategoryType type in Enum.GetValues(typeof(TicketCategoryType)))
-                {
-                    <MudSelectItem T="TicketCategoryType" Value="@type">@type</MudSelectItem>
-                }
-            </MudSelect>
-
-            @if (isHelpdeskAdmin)
-            {
-                <MudSelect T="Guid?"
-                           Label="Scope"
-                           @bind-Value="Model.TenantId"
-                           Disabled="@(Category is not null)">
-                    <MudSelectItem T="Guid?" Value="@((Guid?)null)">Global (System)</MudSelectItem>
-                    @foreach (var tenant in Tenants)
-                    {
-                        if (Guid.TryParse(tenant.Id, out var tenantGuid))
-                        {
-                            <MudSelectItem T="Guid?" Value="@tenantGuid">@tenant.Name</MudSelectItem>
-                        }
-                    }
-                </MudSelect>
-            }
-
-            <MudNumericField T="int" Label="Sort Order" @bind-Value="Model.SortOrder" />
-            <MudCheckBox T="bool" Label="Active" @bind-Value="Model.IsActive" />
-        </MudForm>
-    </DialogContent>
-
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton OnClick="SaveAsync" Color="Color.Primary" Variant="Variant.Filled">Save</MudButton>
-    </DialogActions>
-</MudDialog>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
-    [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
-
-    [Parameter] public TicketCategoryDto? Category { get; set; }
-    [Parameter] public TicketCategoryType DefaultType { get; set; } = TicketCategoryType.Request;
-
-    private MudForm form = default!;
-
-    private EditModel Model { get; set; } = new();
-    private bool isHelpdeskAdmin;
-    private List<TenantLookupDto> Tenants { get; set; } = new();
-
-    protected override async Task OnParametersSetAsync()
-    {
-        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-        var user = authState.User;
-        isHelpdeskAdmin = user.IsInRole("HelpdeskAdmin") ||
-                          user.Claims.Any(c =>
-                              (c.Type == "roles" || c.Type == System.Security.Claims.ClaimTypes.Role) &&
-                              string.Equals(c.Value, "HelpdeskAdmin", StringComparison.OrdinalIgnoreCase));
-
-        if (isHelpdeskAdmin)
-        {
-            Tenants = await HelpdeskApi.GetFromJsonAsync<List<TenantLookupDto>>("api/v1/admin/tenants/lookup") ?? new();
-        }
-
-        if (Category is null)
-        {
-            Model = new EditModel
-            {
-                Type = DefaultType,
-                TenantId = null,
-                IsActive = true
-            };
-        }
-        else
-        {
-            Model = new EditModel
-            {
-                Name = Category.Name,
-                Description = Category.Description,
-                Type = Category.Type,
-                TenantId = Category.TenantId,
-                SortOrder = Category.SortOrder,
-                IsActive = Category.IsActive
-            };
-        }
-    }
-
-    private async Task SaveAsync()
-    {
-        await form.ValidateAsync();
-        if (!form.IsValid || string.IsNullOrWhiteSpace(Model.Name))
-        {
-            return;
-        }
-
-        HttpResponseMessage response;
-
-        if (Category is null)
-        {
-            response = await HelpdeskApi.PostAsJsonAsync("api/v1/categories", new CreateTicketCategoryDto
-            {
-                Name = Model.Name.Trim(),
-                Description = Model.Description,
-                Type = Model.Type,
-                TenantId = Model.TenantId,
-                SortOrder = Model.SortOrder,
-                IsActive = Model.IsActive
-            });
-        }
-        else
-        {
-            response = await HelpdeskApi.PutAsJsonAsync($"api/v1/categories/{Category.Id}", new UpdateTicketCategoryDto
-            {
-                Name = Model.Name.Trim(),
-                Description = Model.Description,
-                Type = Model.Type,
-                SortOrder = Model.SortOrder,
-                IsActive = Model.IsActive
-            });
-        }
-
-        if (response.IsSuccessStatusCode)
-        {
-            Dialog.Close(DialogResult.Ok(true));
-            return;
-        }
-
-        var error = await response.Content.ReadAsStringAsync();
-        Dialog.Close(DialogResult.Ok(new DialogError(error)));
-    }
-
-    private void Cancel() => Dialog.Cancel();
-
-    private sealed class EditModel
-    {
-        public string Name { get; set; } = string.Empty;
-        public string? Description { get; set; }
-        public TicketCategoryType Type { get; set; }
-        public Guid? TenantId { get; set; }
-        public int SortOrder { get; set; }
-        public bool IsActive { get; set; } = true;
-    }
-
-    public sealed class DialogError
-    {
-        public DialogError(string message) => Message = message;
-        public string Message { get; }
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/KBCategoryManagement.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/KBCategoryManagement.razor
deleted file mode 100644
index 5195d946..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/KnowledgeBase/KBCategoryManagement.razor
+++ /dev/null
@@ -1,79 +0,0 @@
-@page "/admin/kb/categories"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@inject IHttpClientFactory HttpClientFactory
-@inject IDialogService DialogService
-@using Helpdesk.Shared.DTOs.Category
-
-<PageTitle>KB Categories</PageTitle>
-
-<MudPaper Class="pa-4">
-    <MudStack Row="true" AlignItems="AlignItems.Center" Class="mb-4">
-        <MudText Typo="Typo.h5">Knowledge Base Categories</MudText>
-        <MudSpacer />
-        <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog">Create</MudButton>
-    </MudStack>
-    <MudTable Items="categories" Hover="true" Dense="true" T="CategoryDto">
-        <HeaderContent>
-            <MudTh>Name</MudTh>
-            <MudTh></MudTh>
-        </HeaderContent>
-        <RowTemplate>
-            <MudTd DataLabel="Name">@context.Name</MudTd>
-            <MudTd>
-                <MudIconButton Icon="@Icons.Material.Filled.Edit" Color="Color.Primary" OnClick="() => OpenEditDialog(context)" />
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="() => OpenDeleteDialog(context)" />
-            </MudTd>
-        </RowTemplate>
-    </MudTable>
-</MudPaper>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    private List<CategoryDto> categories = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadCategories();
-    }
-
-    private async Task LoadCategories()
-    {
-        categories = await HelpdeskApi.GetFromJsonAsync<List<CategoryDto>>("api/v1/knowledgebase/categories") ?? new();
-    }
-
-    private async Task OpenCreateDialog()
-    {
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<CreateCategoryDialog>("Create Category", options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-        {
-            await LoadCategories();
-        }
-    }
-
-    private async Task OpenEditDialog(CategoryDto category)
-    {
-        var parameters = new DialogParameters { ["Category"] = category };
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<EditCategoryDialog>("Edit Category", parameters, options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-        {
-            await LoadCategories();
-        }
-    }
-
-    private async Task OpenDeleteDialog(CategoryDto category)
-    {
-        var parameters = new DialogParameters { ["Category"] = category };
-        var options = new DialogOptions { MaxWidth = MaxWidth.ExtraSmall };
-        var dialog = await DialogService.ShowAsync<DeleteCategoryDialog>("Delete Category", parameters, options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-        {
-            await LoadCategories();
-        }
-    }
-
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/CreateOrganizationDialog.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/CreateOrganizationDialog.razor
index 8478745b..fb04e7e1 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/CreateOrganizationDialog.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/CreateOrganizationDialog.razor
@@ -1,6 +1,5 @@
 @using System.ComponentModel.DataAnnotations
 @using Helpdesk.Shared.DTOs.Orchestration
-@using Helpdesk.Shared.DTOs.Organization
 @using Helpdesk.Shared.Models
 @inject IHttpClientFactory HttpClientFactory
 
@@ -47,18 +46,6 @@
                         Leave empty if this organization is not yet linked to External orchestration.
                     </MudText>
                 </MudTabPanel>
-                <MudTabPanel Text="AI / KB Settings">
-                    <MudSwitch T="bool" @bind-Value="aiSettings.EnableAiSearch" Label="Enable AI" />
-                    <MudSwitch T="bool" @bind-Value="aiSettings.EnableAiAnswers" Label="Enable KB" />
-                    <MudText Typo="Typo.body2">Suggestion Limit</MudText>
-                    <MudSlider @bind-Value="aiSettings.SuggestionLimit" Min="1" Max="10" Step="1" />
-                    <MudSelect @bind-Value="aiSettings.EmbeddingModel" Label="Embedding Model">
-                        <MudSelectItem Value="@("text-embedding-ada-002")">text-embedding-ada-002</MudSelectItem>
-                        <MudSelectItem Value="@("embeddinggemma")">embeddinggemma</MudSelectItem>
-                    </MudSelect>
-                    <MudNumericField @bind-Value="aiSettings.EmbeddingDimensions" Label="Dimensions" />
-                    <MudTextField @bind-Value="aiSettings.AllowedServicesCsv" Label="Allowed Services (CSV)" />
-                </MudTabPanel>
             </MudTabs>
 
         </MudForm>
@@ -75,7 +62,6 @@
 
     private MudForm form = default!;
     private CreateOrganizationModel model = new();
-    private OrganizationAiKbSettingsDto aiSettings = CreateDefaultAiSettings();
     private List<OrchestrationCatalogTenantDto> orchestrationTenants = new();
     private bool orchestrationTenantsLoading;
     private string? orchestrationTenantsError;
@@ -102,11 +88,6 @@
             });
             if (response.IsSuccessStatusCode)
             {
-                var created = await response.Content.ReadFromJsonAsync<Helpdesk.Shared.DTOs.Organization.OrganizationDto>();
-                if (created != null)
-                {
-                    await HelpdeskApi.PutAsJsonAsync($"api/v1/organizations/{created.Id}/ai-kb-settings", aiSettings);
-                }
                 Dialog.Close(DialogResult.Ok(true));
             }
         }
@@ -154,19 +135,4 @@
         }
     }
 
-    private static OrganizationAiKbSettingsDto CreateDefaultAiSettings()
-    {
-        return new OrganizationAiKbSettingsDto
-        {
-            EmbeddingModel = "embeddinggemma",
-            EmbeddingDimensions = 768,
-            SuggestionLimit = 3,
-            EnableProviderFallback = true,
-            MaxProviderAttempts = 2,
-            MinimumSuggestionFeedbackCount = 5,
-            MinimumSuggestionHelpfulRate = 0.6,
-            MinimumAutomationFeedbackCount = 3,
-            MinimumAutomationResolvedRate = 0.5
-        };
-    }
 }
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/EditOrganizationDialog.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/EditOrganizationDialog.razor
index bfc61114..5c39c8a3 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/EditOrganizationDialog.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/EditOrganizationDialog.razor
@@ -1,674 +1,107 @@
 @using System.ComponentModel.DataAnnotations
-@using Helpdesk.Shared.Models
-@using Helpdesk.Shared.DTOs.AI
 @using Helpdesk.Shared.DTOs.Orchestration
 @using Helpdesk.Shared.DTOs.Organization
-@using HelpDesk.NewWeb.Models
+@using Helpdesk.Shared.Models
 @inject IHttpClientFactory HttpClientFactory
 @inject ISnackbar Snackbar
 
 <MudDialog>
-    <TitleContent>
-        <MudText Typo="Typo.h6">
-            <MudIcon Icon="@Icons.Material.Filled.Edit" class="mr-2 mb-n1" />
-            Edit Organization
-        </MudText>
-    </TitleContent>
-
+    <TitleContent><MudText Typo="Typo.h6">Edit Organization</MudText></TitleContent>
     <DialogContent>
-        <MudForm @ref="form" Model="model" OnValidSubmit="Submit" Class="mt-2" @key="model">
-
+        <MudForm @ref="form" Model="model" Class="mt-2">
             <MudTabs>
                 <MudTabPanel Text="General">
                     <MudTextField @bind-Value="model.Name" Label="Name" Required="true" />
                     <MudTextField @bind-Value="model.DnsName" Label="DNS Name" />
                     <MudTextField @bind-Value="model.ContactInfo" Label="Contact Info" />
-                    <MudSelect T="string"
-                               @bind-Value="model.ItSupportOrganizationId"
-                               Label="ITIL/MSP manager organization"
-                               Clearable="true"
-                               Dense="true"
-                               Margin="Margin.Dense">
+                    <MudSelect T="string" @bind-Value="model.ItSupportOrganizationId" Label="ITIL/MSP manager organization" Clearable="true">
                         @foreach (var organization in ManagerOrganizationOptions)
                         {
                             <MudSelectItem T="string" Value="@organization.Id">@organization.Name</MudSelectItem>
                         }
                     </MudSelect>
-
-                    <MudSwitch T="bool"
-                               @bind-Value="model.Enabled"
-                               For="@(() => model.Enabled)"
-                               Label="Enable organization" />
+                    <MudSwitch T="bool" @bind-Value="model.Enabled" Label="Enable organization" />
                 </MudTabPanel>
-
                 <MudTabPanel Text="External orchestration Tenant">
-                    <MudText Typo="Typo.body2" Class="mb-2">
-                        Link this Helpdesk organization to an External orchestration tenant for tenant-scoped automation request definitions and executions.
-                    </MudText>
                     @if (!string.IsNullOrWhiteSpace(orchestrationTenantsError))
                     {
-                        <MudAlert Severity="Severity.Warning" Variant="Variant.Outlined" Dense="true" Class="mb-2">
-                            @orchestrationTenantsError
-                        </MudAlert>
+                        <MudAlert Severity="Severity.Warning">@orchestrationTenantsError</MudAlert>
                     }
-                    <MudSelect T="int?"
-                               @bind-Value="model.OrchestrationTenantId"
-                               Label="External orchestration Tenant"
-                               Variant="Variant.Outlined"
-                               Margin="Margin.Dense"
-                               Clearable="true"
-                               Disabled="orchestrationTenantsLoading">
+                    <MudSelect T="int?" @bind-Value="model.OrchestrationTenantId" Label="External orchestration Tenant" Clearable="true" Disabled="orchestrationTenantsLoading">
                         @foreach (var tenant in orchestrationTenants)
                         {
                             <MudSelectItem T="int?" Value="@tenant.TenantId">@tenant.Name (@tenant.TenantId)</MudSelectItem>
                         }
                     </MudSelect>
-                    @if (model.OrchestrationTenantLinkedAtUtc.HasValue)
-                    {
-                        <MudText Typo="Typo.caption">
-                            Linked: @model.OrchestrationTenantLinkedAtUtc.Value.ToLocalTime().ToString("yyyy/MM/dd HH:mm")
-                        </MudText>
-                    }
-                </MudTabPanel>
-
-                <MudTabPanel Text="AI / KB Settings">
-                    <MudStack Spacing="2">
-                        @if (!string.IsNullOrWhiteSpace(aiSettingsError))
-                        {
-                            <MudAlert Severity="Severity.Error" Variant="Variant.Outlined" Dense="true">
-                                @aiSettingsError
-                            </MudAlert>
-                        }
-
-                        <MudSwitch T="bool"
-                                   @bind-Value="aiSettings.EnableAiSearch"
-                                   For="@(() => aiSettings.EnableAiSearch)"
-                                   Color="Color.Primary"
-                                   Label="Enable embeddings search / suggestions" />
-                        <MudText Typo="Typo.caption" Class="mb-2 text-secondary">
-                            If disabled, incident pages won't perform embeddings lookup and suggestions won't be generated.
-                        </MudText>
-
-                        <MudSwitch T="bool"
-                                   @bind-Value="aiSettings.EnableAiAnswers"
-                                   For="@(() => aiSettings.EnableAiAnswers)"
-                                   Label="Enable KB" />
-
-                        @if (readiness is not null)
-                        {
-                            <MudAlert Severity="@(readiness.ProductionReady ? Severity.Success : Severity.Warning)"
-                                      Variant="Variant.Outlined"
-                                      Dense="true">
-                                @(readiness.ProductionReady
-                                    ? "AI rollout gates are currently met for this organization."
-                                    : "AI rollout gates are not yet met for this organization.")
-                            </MudAlert>
-                            @if (readiness.BlockingReasons.Count > 0)
-                            {
-                                <MudList T="string" Dense="true">
-                                    @foreach (var reason in readiness.BlockingReasons)
-                                    {
-                                        <MudListItem T="string">@reason</MudListItem>
-                                    }
-                                </MudList>
-                            }
-                        }
-
-                        @if (runtimeStatus is not null)
-                        {
-                            <MudAlert Severity="@GetRuntimeSeverity(runtimeStatus.Status)"
-                                      Variant="Variant.Outlined"
-                                      Dense="true">
-                                @($"AI runtime is currently {runtimeStatus.Status.ToLowerInvariant()} for this organization.")
-                            </MudAlert>
-
-                            @if (runtimeStatus.Reasons.Count > 0)
-                            {
-                                <MudList T="string" Dense="true">
-                                    @foreach (var reason in runtimeStatus.Reasons.Take(4))
-                                    {
-                                        <MudListItem T="string">@reason</MudListItem>
-                                    }
-                                </MudList>
-                            }
-
-                            @if (runtimeStatus.Providers.Count > 0)
-                            {
-                                <MudTable Items="runtimeStatus.Providers" Dense="true" Hover="true" T="OrganizationAiRuntimeProviderStatusDto">
-                                    <HeaderContent>
-                                        <MudTh>Channel</MudTh>
-                                        <MudTh>Provider</MudTh>
-                                        <MudTh>Model</MudTh>
-                                        <MudTh>Status</MudTh>
-                                    </HeaderContent>
-                                    <RowTemplate Context="provider">
-                                        <MudTd DataLabel="Channel">@provider.Channel</MudTd>
-                                        <MudTd DataLabel="Provider">@(string.IsNullOrWhiteSpace(provider.ProviderName) ? "Unconfigured" : provider.ProviderName)</MudTd>
-                                        <MudTd DataLabel="Model">@(string.IsNullOrWhiteSpace(provider.ModelId) ? "-" : provider.ModelId)</MudTd>
-                                        <MudTd DataLabel="Status">
-                                            <MudChip T="string"
-                                                     Color="@GetRuntimeColor(provider.Status)"
-                                                     Variant="Variant.Outlined"
-                                                     Dense="true">
-                                                @provider.Status
-                                            </MudChip>
-                                        </MudTd>
-                                    </RowTemplate>
-                                </MudTable>
-                            }
-
-                            @if (runtimeStatus.RecentEvidence.Count > 0)
-                            {
-                                <MudText Typo="Typo.subtitle2" Class="mt-2">Recent Runtime Evidence</MudText>
-                                <MudList T="string" Dense="true">
-                                    @foreach (var evidence in runtimeStatus.RecentEvidence.Take(5))
-                                    {
-                                        <MudListItem T="string">@evidence</MudListItem>
-                                    }
-                                </MudList>
-                            }
-                        }
-
-                        <MudDivider Class="my-2" />
-
-                        <!-- Knowledge Provider/Model -->
-                        <MudText Typo="Typo.subtitle2">Knowledge Model</MudText>
-                        <MudSelect @bind-Value="SelectedKnowledgeProviderId"
-                                   Label="Knowledge Provider"
-                                   Required="@aiSettings.EnableAiAnswers"
-                                   Dense="true"
-                                   Disabled="@(isLoadingProviders || !aiSettings.EnableAiAnswers)">
-                            @if (isLoadingProviders)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Loading providers</em></MudSelectItem>
-                            }
-                            else if (providers.Count == 0)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>No providers found</em></MudSelectItem>
-                            }
-                            else
-                            {
-                                @foreach (var p in providers)
-                                {
-                                    <MudSelectItem Value="@p.Id">@p.Name</MudSelectItem>
-                                }
-                            }
-                        </MudSelect>
-
-                        <MudSelect @bind-Value="SelectedKnowledgeModelName"
-                                   Label="Knowledge Model"
-                                   Required="@aiSettings.EnableAiAnswers"
-                                   Dense="true"
-                                   Disabled="@(!aiSettings.EnableAiAnswers || !knowledgeModels.Any())">
-                            @if (isLoadingKnowledgeModels)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Loading models</em></MudSelectItem>
-                            }
-                            else if (!knowledgeModels.Any())
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Select a provider first</em></MudSelectItem>
-                            }
-                            else
-                            {
-                                @foreach (var m in knowledgeModels.Where(m => m.IsEnabled))
-                                {
-                                    <MudSelectItem Value="@m.Name">@m.Name</MudSelectItem>
-                                }
-                            }
-                        </MudSelect>
-
-                        <MudDivider Class="my-4" />
-
-                        <!-- Embedding Provider/Model -->
-                        <MudText Typo="Typo.subtitle2">Embedding Model</MudText>
-                        <MudSelect @bind-Value="SelectedEmbeddingProviderId"
-                                   Label="Embedding Provider"
-                                   Required="@aiSettings.EnableAiSearch"
-                                   Dense="true"
-                                   Disabled="@(isLoadingProviders || !aiSettings.EnableAiSearch)">
-                            @if (isLoadingProviders)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Loading providers</em></MudSelectItem>
-                            }
-                            else if (providers.Count == 0)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>No providers found</em></MudSelectItem>
-                            }
-                            else
-                            {
-                                @foreach (var p in providers)
-                                {
-                                    <MudSelectItem Value="@p.Id">@p.Name</MudSelectItem>
-                                }
-                            }
-                        </MudSelect>
-
-                        <MudSelect @bind-Value="SelectedEmbeddingModelName"
-                                   Label="Embedding Model"
-                                   Required="@aiSettings.EnableAiSearch"
-                                   Dense="true"
-                                   Disabled="@(!aiSettings.EnableAiSearch || !embeddingModels.Any())">
-                            @if (isLoadingEmbeddingModels)
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Loading models</em></MudSelectItem>
-                            }
-                            else if (!embeddingModels.Any())
-                            {
-                                <MudSelectItem T="string" Value="@null"><em>Select a provider first</em></MudSelectItem>
-                            }
-                            else
-                            {
-                                @foreach (var m in embeddingModels.Where(m => m.IsEnabled))
-                                {
-                                    <MudSelectItem Value="@m.Name">@m.Name</MudSelectItem>
-                                }
-                            }
-                        </MudSelect>
-
-                        <MudNumericField @bind-Value="aiSettings.EmbeddingDimensions"
-                                         Label="Embedding Dimensions"
-                                         HelperText="Must match the pgvector column dimension."
-                                         Dense="true" />
-
-                        <MudDivider Class="my-4" />
-                        <MudText Typo="Typo.subtitle2">Runtime Hardening</MudText>
-                        <MudSwitch T="bool"
-                                   @bind-Value="aiSettings.EnableProviderFallback"
-                                   For="@(() => aiSettings.EnableProviderFallback)"
-                                   Color="Color.Primary"
-                                   Label="Enable provider fallback" />
-                        <MudNumericField T="int"
-                                         @bind-Value="aiSettings.MaxProviderAttempts"
-                                         Label="Max provider attempts"
-                                         Min="1"
-                                         Max="5"
-                                         Dense="true" />
-
-                        <MudDivider Class="my-4" />
-                        <MudText Typo="Typo.subtitle2">Rollout Gates</MudText>
-                        <MudNumericField T="int"
-                                         @bind-Value="aiSettings.MinimumSuggestionFeedbackCount"
-                                         Label="Min suggestion feedback count"
-                                         Min="0"
-                                         Dense="true" />
-                        <MudNumericField T="double"
-                                         @bind-Value="aiSettings.MinimumSuggestionHelpfulRate"
-                                         Label="Min suggestion helpful rate"
-                                         Min="0"
-                                         Max="1"
-                                         Step="0.05"
-                                         Dense="true" />
-                        <MudNumericField T="int"
-                                         @bind-Value="aiSettings.MinimumAutomationFeedbackCount"
-                                         Label="Min automation feedback count"
-                                         Min="0"
-                                         Dense="true" />
-                        <MudNumericField T="double"
-                                         @bind-Value="aiSettings.MinimumAutomationResolvedRate"
-                                         Label="Min automation resolved rate"
-                                         Min="0"
-                                         Max="1"
-                                         Step="0.05"
-                                         Dense="true" />
-                    </MudStack>
                 </MudTabPanel>
             </MudTabs>
         </MudForm>
     </DialogContent>
-
     <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
+        <MudButton OnClick="Dialog.Cancel">Cancel</MudButton>
         <MudButton OnClick="Submit" Color="Color.Primary" Variant="Variant.Filled">Save</MudButton>
     </DialogActions>
 </MudDialog>
 
 @code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
     [CascadingParameter] private IMudDialogInstance Dialog { get; set; } = default!;
     [Parameter] public OrganizationDto Organization { get; set; } = default!;
     [Parameter] public List<OrganizationDto> Organizations { get; set; } = new();
 
+    private HttpClient Api => HttpClientFactory.CreateClient("HelpdeskApi");
     private MudForm form = default!;
     private EditOrganizationModel model = new();
-    private OrganizationAiKbSettingsDto aiSettings = CreateDefaultAiSettings();
-
-    private List<AiProviderSummaryDto> providers = new();
-
-    // Provider/model lists for Knowledge
-    private List<AiModelDto> knowledgeModels = new();
-    private bool isLoadingKnowledgeModels;
-    private string? _selectedKnowledgeProviderId;
-    private string? SelectedKnowledgeProviderId
-    {
-        get => _selectedKnowledgeProviderId;
-        set
-        {
-            if (_selectedKnowledgeProviderId == value) return;
-            _selectedKnowledgeProviderId = value;
-            aiSettings.KnowledgeProviderId = value;
-            _ = OnKnowledgeProviderChanged(value);
-        }
-    }
-    private string? _selectedKnowledgeModelName;
-    private string? SelectedKnowledgeModelName
-    {
-        get => _selectedKnowledgeModelName;
-        set
-        {
-            if (_selectedKnowledgeModelName == value) return;
-            _selectedKnowledgeModelName = value;
-            aiSettings.KnowledgeModelName = value;
-        }
-    }
-
-    // Provider/model lists for Embedding
-    private List<AiModelDto> embeddingModels = new();
-    private bool isLoadingEmbeddingModels;
-    private string? _selectedEmbeddingProviderId;
-    private string? SelectedEmbeddingProviderId
-    {
-        get => _selectedEmbeddingProviderId;
-        set
-        {
-            if (_selectedEmbeddingProviderId == value) return;
-            _selectedEmbeddingProviderId = value;
-            aiSettings.EmbeddingProviderId = value;
-            _ = OnEmbeddingProviderChanged(value);
-        }
-    }
-    private string? _selectedEmbeddingModelName;
-    private string? SelectedEmbeddingModelName
-    {
-        get => _selectedEmbeddingModelName;
-        set
-        {
-            if (_selectedEmbeddingModelName == value) return;
-            _selectedEmbeddingModelName = value;
-            aiSettings.EmbeddingModel = value;
-        }
-    }
-
-    private bool isLoadingProviders;
     private List<OrchestrationCatalogTenantDto> orchestrationTenants = new();
     private bool orchestrationTenantsLoading;
     private string? orchestrationTenantsError;
-    private string? aiSettingsError;
-    private OrganizationAiReadinessDto? readiness;
-    private OrganizationAiRuntimeStatusDto? runtimeStatus;
-    private IEnumerable<OrganizationDto> ManagerOrganizationOptions => Organizations
-        .Where(x => x.IsEnabled && !string.Equals(x.Id, Organization?.Id, StringComparison.OrdinalIgnoreCase))
-        .OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase);
+    private IEnumerable<OrganizationDto> ManagerOrganizationOptions => Organizations.Where(x => x.IsEnabled && !string.Equals(x.Id, Organization.Id, StringComparison.OrdinalIgnoreCase)).OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase);
 
     protected override async Task OnParametersSetAsync()
     {
         model = new EditOrganizationModel
         {
-            Name = Organization?.Name ?? string.Empty,
-            DnsName = Organization?.DnsName,
-            ContactInfo = Organization?.ContactInfo,
-            ItSupportOrganizationId = Organization?.ItSupportOrganizationId,
-            OrchestrationTenantId = Organization?.OrchestrationTenantId,
-            OrchestrationTenantName = Organization?.OrchestrationTenantName,
-            OrchestrationTenantLinkedAtUtc = Organization?.OrchestrationTenantLinkedAtUtc,
-            State = Organization?.State ?? EntityState.Enabled,
-            Enabled = (Organization?.State ?? EntityState.Enabled) == EntityState.Enabled
+            Name = Organization.Name, DnsName = Organization.DnsName, ContactInfo = Organization.ContactInfo,
+            ItSupportOrganizationId = Organization.ItSupportOrganizationId, OrchestrationTenantId = Organization.OrchestrationTenantId,
+            OrchestrationTenantLinkedAtUtc = Organization.OrchestrationTenantLinkedAtUtc, State = Organization.State,
+            Enabled = Organization.State == EntityState.Enabled
         };
-        aiSettings = CreateDefaultAiSettings();
-        aiSettingsError = null;
-        readiness = null;
-        runtimeStatus = null;
-
-        await LoadProvidersAsync();
         await LoadOrchestrationTenantsAsync();
-
-        try
-        {
-            var dto = await HelpdeskApi
-                .GetFromJsonAsync<OrganizationAiKbSettingsDto>($"api/v1/organizations/{Organization.Id}/ai-kb-settings");
-
-            if (dto is not null)
-            {
-                aiSettings.EnableAiSearch = dto.EnableAiSearch;
-                aiSettings.EnableAiAnswers = dto.EnableAiAnswers;
-                aiSettings.KnowledgeProviderId = dto.KnowledgeProviderId;
-                aiSettings.KnowledgeModelName = dto.KnowledgeModelName;
-                aiSettings.EmbeddingProviderId = dto.EmbeddingProviderId;
-                aiSettings.EmbeddingModel = dto.EmbeddingModel;
-                aiSettings.EmbeddingDimensions = dto.EmbeddingDimensions;
-                aiSettings.EnableProviderFallback = dto.EnableProviderFallback;
-                aiSettings.MaxProviderAttempts = dto.MaxProviderAttempts;
-                aiSettings.MinimumSuggestionFeedbackCount = dto.MinimumSuggestionFeedbackCount;
-                aiSettings.MinimumSuggestionHelpfulRate = dto.MinimumSuggestionHelpfulRate;
-                aiSettings.MinimumAutomationFeedbackCount = dto.MinimumAutomationFeedbackCount;
-                aiSettings.MinimumAutomationResolvedRate = dto.MinimumAutomationResolvedRate;
-
-                await PreloadProviderSelectionsAsync();
-            }
-
-            readiness = await HelpdeskApi
-                .GetFromJsonAsync<OrganizationAiReadinessDto>($"api/v1/organizations/{Organization.Id}/ai-kb-settings/readiness");
-            runtimeStatus = await HelpdeskApi
-                .GetFromJsonAsync<OrganizationAiRuntimeStatusDto>($"api/v1/organizations/{Organization.Id}/ai-kb-settings/runtime-status");
-        }
-        catch { }
-    }
-
-    private static Severity GetRuntimeSeverity(string? status)
-        => status?.ToLowerInvariant() switch
-        {
-            "ready" => Severity.Success,
-            "degraded" => Severity.Warning,
-            "unavailable" => Severity.Error,
-            _ => Severity.Info
-        };
-
-    private static Color GetRuntimeColor(string? status)
-        => status?.ToLowerInvariant() switch
-        {
-            "ready" => Color.Success,
-            "degraded" => Color.Warning,
-            "unavailable" => Color.Error,
-            _ => Color.Default
-        };
-
-    private async Task LoadProvidersAsync()
-    {
-        isLoadingProviders = true;
-        try
-        {
-            var resp = await HelpdeskApi.GetFromJsonAsync<PagedResult<AiProviderSummaryDto>>(
-                "api/v1/ai/providers?page=1&pageSize=100");
-
-            providers = resp?.Items?.Where(p => p.IsEnabled).ToList() ?? new();
-        }
-        finally { isLoadingProviders = false; }
-    }
-
-    private async Task PreloadProviderSelectionsAsync()
-    {
-        _selectedKnowledgeProviderId = aiSettings.KnowledgeProviderId;
-        _selectedKnowledgeModelName = aiSettings.KnowledgeModelName;
-        _selectedEmbeddingProviderId = aiSettings.EmbeddingProviderId;
-        _selectedEmbeddingModelName = aiSettings.EmbeddingModel;
-
-        if (!string.IsNullOrWhiteSpace(_selectedKnowledgeProviderId))
-        {
-            await LoadKnowledgeModelsAsync(_selectedKnowledgeProviderId);
-        }
-
-        if (!string.IsNullOrWhiteSpace(_selectedEmbeddingProviderId))
-        {
-            await LoadEmbeddingModelsAsync(_selectedEmbeddingProviderId);
-        }
-    }
-
-    private async Task OnKnowledgeProviderChanged(string? providerId)
-    {
-        SelectedKnowledgeModelName = null;
-        knowledgeModels.Clear();
-        if (!string.IsNullOrWhiteSpace(providerId))
-            await LoadKnowledgeModelsAsync(providerId);
-    }
-
-    private async Task LoadKnowledgeModelsAsync(string providerId)
-    {
-        isLoadingKnowledgeModels = true;
-        try
-        {
-            var list = await HelpdeskApi.GetFromJsonAsync<List<AiModelDto>>(
-                $"api/v1/ai/providers/{providerId}/models");
-
-            knowledgeModels = list?.Where(m => m.IsEnabled).OrderBy(m => m.Name).ToList() ?? new();
-            StateHasChanged();
-        }
-        finally
-        {
-            isLoadingKnowledgeModels = false;
-        }
-    }
-
-    private async Task OnEmbeddingProviderChanged(string? providerId)
-    {
-        SelectedEmbeddingModelName = null;
-        embeddingModels.Clear();
-        if (!string.IsNullOrWhiteSpace(providerId))
-            await LoadEmbeddingModelsAsync(providerId);
-    }
-
-    private async Task LoadEmbeddingModelsAsync(string providerId)
-    {
-        isLoadingEmbeddingModels = true;
-        try
-        {
-            var list = await HelpdeskApi.GetFromJsonAsync<List<AiModelDto>>(
-                $"api/v1/ai/providers/{providerId}/models");
-            embeddingModels = list?.Where(m => m.IsEnabled).OrderBy(m => m.Name).ToList() ?? new();
-            StateHasChanged();
-
-        }
-        finally { isLoadingEmbeddingModels = false; }
     }
 
     private async Task Submit()
     {
         await form.ValidateAsync();
         if (!form.IsValid) return;
-        aiSettingsError = null;
-
         model.State = model.Enabled ? EntityState.Enabled : EntityState.Blocked;
-
-        var updateResp = await HelpdeskApi.PutAsJsonAsync(
-            $"api/v1/organizations/{Organization.Id}",
-            new
-            {
-                model.Name,
-                model.DnsName,
-                model.ContactInfo,
-                ItSupportOrganizationId = string.IsNullOrWhiteSpace(model.ItSupportOrganizationId) ? null : model.ItSupportOrganizationId,
-                model.State,
-                OrchestrationTenantId = model.OrchestrationTenantId,
-                OrchestrationTenantName = SelectedOrchestrationTenantName,
-                OrchestrationTenantLinkedAtUtc = model.OrchestrationTenantId.HasValue ? (DateTimeOffset?)(model.OrchestrationTenantLinkedAtUtc ?? DateTimeOffset.UtcNow) : null
-            });
-
-        if (!updateResp.IsSuccessStatusCode)
+        var response = await Api.PutAsJsonAsync($"api/v1/organizations/{Organization.Id}", new
         {
-            aiSettingsError = await ExtractResponseMessageAsync(updateResp, "Organization settings could not be saved.");
-            Snackbar.Add(aiSettingsError, Severity.Error);
-            return;
-        }
-
-        var aiSettingsResp = await HelpdeskApi.PutAsJsonAsync(
-            $"api/v1/organizations/{Organization.Id}/ai-kb-settings",
-            aiSettings);
-
-        if (!aiSettingsResp.IsSuccessStatusCode)
-        {
-            aiSettingsError = await ExtractResponseMessageAsync(aiSettingsResp, "AI / KB settings could not be saved.");
-            Snackbar.Add(aiSettingsError, Severity.Error);
-            return;
-        }
-
-        Dialog.Close(DialogResult.Ok(true));
+            model.Name, model.DnsName, model.ContactInfo,
+            ItSupportOrganizationId = string.IsNullOrWhiteSpace(model.ItSupportOrganizationId) ? null : model.ItSupportOrganizationId,
+            model.State, model.OrchestrationTenantId,
+            OrchestrationTenantName = orchestrationTenants.FirstOrDefault(x => x.TenantId == model.OrchestrationTenantId)?.Name,
+            OrchestrationTenantLinkedAtUtc = model.OrchestrationTenantId.HasValue ? (DateTimeOffset?)(model.OrchestrationTenantLinkedAtUtc ?? DateTimeOffset.UtcNow) : null
+        });
+        if (response.IsSuccessStatusCode) { Dialog.Close(DialogResult.Ok(true)); return; }
+        Snackbar.Add(await response.Content.ReadAsStringAsync(), Severity.Error);
     }
 
-    private void Cancel() => Dialog.Cancel();
-
-    private string? SelectedOrchestrationTenantName => orchestrationTenants
-        .FirstOrDefault(x => x.TenantId == model.OrchestrationTenantId)?.Name;
-
     private async Task LoadOrchestrationTenantsAsync()
     {
         orchestrationTenantsLoading = true;
-        orchestrationTenantsError = null;
-        try
-        {
-            orchestrationTenants = await HelpdeskApi.GetFromJsonAsync<List<OrchestrationCatalogTenantDto>>(
-                "api/v1/admin/orchestration/orchestration/catalog/tenants") ?? new();
-        }
-        catch (Exception ex)
-        {
-            orchestrationTenantsError = $"External orchestration tenant catalog could not be loaded: {ex.Message}";
-            orchestrationTenants = new();
-        }
-        finally
-        {
-            orchestrationTenantsLoading = false;
-        }
+        try { orchestrationTenants = await Api.GetFromJsonAsync<List<OrchestrationCatalogTenantDto>>("api/v1/admin/orchestration/orchestration/catalog/tenants") ?? new(); }
+        catch (Exception ex) { orchestrationTenantsError = $"External orchestration tenant catalog could not be loaded: {ex.Message}"; }
+        finally { orchestrationTenantsLoading = false; }
     }
 
-    public class EditOrganizationModel
+    private sealed class EditOrganizationModel
     {
         [Required] public string Name { get; set; } = string.Empty;
         public string? DnsName { get; set; }
         public string? ContactInfo { get; set; }
         public string? ItSupportOrganizationId { get; set; }
         public int? OrchestrationTenantId { get; set; }
-        public string? OrchestrationTenantName { get; set; }
         public DateTimeOffset? OrchestrationTenantLinkedAtUtc { get; set; }
-        public EntityState State { get; set; } = EntityState.Enabled;
+        public EntityState State { get; set; }
         public bool Enabled { get; set; }
     }
-
-    private static OrganizationAiKbSettingsDto CreateDefaultAiSettings()
-    {
-        return new OrganizationAiKbSettingsDto
-        {
-            EmbeddingModel = "embeddinggemma",
-            EmbeddingDimensions = 768,
-            EnableProviderFallback = true,
-            MaxProviderAttempts = 2,
-            MinimumSuggestionFeedbackCount = 5,
-            MinimumSuggestionHelpfulRate = 0.6,
-            MinimumAutomationFeedbackCount = 3,
-            MinimumAutomationResolvedRate = 0.5
-        };
-    }
-
-    private static async Task<string> ExtractResponseMessageAsync(HttpResponseMessage response, string fallback)
-    {
-        try
-        {
-            var body = await response.Content.ReadAsStringAsync();
-            if (!string.IsNullOrWhiteSpace(body))
-            {
-                return $"{fallback} HTTP {(int)response.StatusCode}: {body}";
-            }
-        }
-        catch
-        {
-            // Fall through to status-only message below.
-        }
-
-        return $"{fallback} HTTP {(int)response.StatusCode}.";
-    }
-
-    private sealed class PagedResult<TItem>
-    {
-        public int Page { get; set; }
-        public int PageSize { get; set; }
-        public int TotalCount { get; set; }
-        public List<TItem> Items { get; set; } = new();
-    }
 }
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/OrganizationManagement.razor b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/OrganizationManagement.razor
index 14b2e5a9..458c821b 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/OrganizationManagement.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Admin/Organization/OrganizationManagement.razor
@@ -6,7 +6,6 @@
 
 @using Helpdesk.Shared.DTOs.Orchestration
 @using Helpdesk.Shared.DTOs.Organization
-@using Helpdesk.Shared.Models
 @using MudBlazor
 
 <PageTitle>Organization Management</PageTitle>
@@ -18,581 +17,63 @@
         <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog">Create</MudButton>
     </MudStack>
 
-    <MudGrid Class="mb-4">
-        <MudItem xs="12" sm="6" md="3">
-            <MudPaper Outlined="true" Class="pa-3 h-100">
-                <MudText Typo="Typo.overline">AI Ready Orgs</MudText>
-                <MudText Typo="Typo.h6">@organizations.Count(org => IsAiReady(org.Id))</MudText>
-                <MudText Typo="Typo.caption" Class="text-secondary">Readiness gates met</MudText>
-            </MudPaper>
-        </MudItem>
-        <MudItem xs="12" sm="6" md="3">
-            <MudPaper Outlined="true" Class="pa-3 h-100">
-                <MudText Typo="Typo.overline">Runtime Degraded</MudText>
-                <MudText Typo="Typo.h6">@organizations.Count(org => HasRuntimeStatus(org.Id, "Degraded"))</MudText>
-                <MudText Typo="Typo.caption" Class="text-secondary">Fallback or provider issues detected</MudText>
-            </MudPaper>
-        </MudItem>
-        <MudItem xs="12" sm="6" md="3">
-            <MudPaper Outlined="true" Class="pa-3 h-100">
-                <MudText Typo="Typo.overline">Runtime Unavailable</MudText>
-                <MudText Typo="Typo.h6">@organizations.Count(org => HasRuntimeStatus(org.Id, "Unavailable"))</MudText>
-                <MudText Typo="Typo.caption" Class="text-secondary">Configured AI currently blocked</MudText>
-            </MudPaper>
-        </MudItem>
-        <MudItem xs="12" sm="6" md="3">
-            <MudPaper Outlined="true" Class="pa-3 h-100">
-                <MudText Typo="Typo.overline">Recent Runtime Evidence</MudText>
-                <MudText Typo="Typo.h6">@organizations.Count(org => HasRecentRuntimeEvidence(org.Id))</MudText>
-                <MudText Typo="Typo.caption" Class="text-secondary">Organizations with fallback/failure events</MudText>
-            </MudPaper>
-        </MudItem>
-    </MudGrid>
+    <MudTextField @bind-Value="searchText" Label="Search organizations" Variant="Variant.Outlined"
+                  Margin="Margin.Dense" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search"
+                  Class="mb-4" Style="min-width: 260px;" />
 
-    <MudStack Row="true" Wrap="Wrap.Wrap" AlignItems="AlignItems.Center" Spacing="2" Class="mb-4">
-        <MudTextField @bind-Value="searchText"
-                      Label="Search organizations"
-                      Variant="Variant.Outlined"
-                      Margin="Margin.Dense"
-                      Adornment="Adornment.Start"
-                      AdornmentIcon="@Icons.Material.Filled.Search"
-                      Class="me-2"
-                      Style="min-width: 260px;" />
-
-        <MudSelect T="string" @bind-Value="sortMode" Label="Sort" Variant="Variant.Outlined" Margin="Margin.Dense" Style="min-width: 220px;">
-            <MudSelectItem Value="@SortByName">Name</MudSelectItem>
-            <MudSelectItem Value="@SortByRuntime">Runtime severity</MudSelectItem>
-            <MudSelectItem Value="@SortByReadiness">Readiness</MudSelectItem>
-            <MudSelectItem Value="@SortByEvidence">Recent runtime evidence</MudSelectItem>
-        </MudSelect>
-
-        <MudChipSet T="string" SelectionMode="SelectionMode.MultiSelection" CheckMark="true">
-            <MudChip T="string"
-                     Color="@(filterAiReadyOnly ? Color.Primary : Color.Default)"
-                     Variant="Variant.Outlined"
-                     OnClick="@ToggleAiReadyFilter">
-                AI ready only
-            </MudChip>
-            <MudChip T="string"
-                     Color="@(filterRuntimeDegradedOnly ? Color.Warning : Color.Default)"
-                     Variant="Variant.Outlined"
-                     OnClick="@ToggleRuntimeDegradedFilter">
-                Runtime degraded only
-            </MudChip>
-            <MudChip T="string"
-                     Color="@(filterRuntimeUnavailableOnly ? Color.Error : Color.Default)"
-                     Variant="Variant.Outlined"
-                     OnClick="@ToggleRuntimeUnavailableFilter">
-                Runtime unavailable only
-            </MudChip>
-            <MudChip T="string"
-                     Color="@(filterRecentEvidenceOnly ? Color.Info : Color.Default)"
-                     Variant="Variant.Outlined"
-                     OnClick="@ToggleRecentEvidenceFilter">
-                Recent evidence only
-            </MudChip>
-        </MudChipSet>
-    </MudStack>
-
-    <MudTable Items="filteredOrganizations" Hover="true" Dense="true" T="OrganizationDto">
+    <MudTable Items="FilteredOrganizations" Hover="true" Dense="true" T="OrganizationDto">
         <HeaderContent>
             <MudTh>Name</MudTh>
             <MudTh>Contact Info</MudTh>
             <MudTh>MSP</MudTh>
             <MudTh>State</MudTh>
             <MudTh>External orchestration Tenant</MudTh>
-            <MudTh class="text-center">AI</MudTh>
             <MudTh class="text-end"></MudTh>
         </HeaderContent>
-
         <RowTemplate Context="row">
             <MudTd DataLabel="Name">@row.Name</MudTd>
             <MudTd DataLabel="Contact Info">@row.ContactInfo</MudTd>
-            <MudTd DataLabel="MSP">
-                @if (!string.IsNullOrWhiteSpace(row.ItSupportOrganizationId))
-                {
-                    <MudChip T="string" Color="Color.Info" Variant="Variant.Outlined" Dense="true">
-                        @GetMspOrganizationName(row.ItSupportOrganizationId)
-                    </MudChip>
-                }
-                else
-                {
-                    <MudText Typo="Typo.body2" Class="text-secondary">Self-managed</MudText>
-                }
-            </MudTd>
-
+            <MudTd DataLabel="MSP">@GetMspOrganizationName(row.ItSupportOrganizationId)</MudTd>
             <MudTd DataLabel="State">
-                <MudTooltip Text="@(row.IsEnabled ? "Enabled" : "Disabled")">
-                    <MudIconButton Icon="@(row.IsEnabled ? Icons.Material.Filled.CheckCircle : Icons.Material.Filled.Block)"
-                                   Color="@(row.IsEnabled ? Color.Success : Color.Error)"
-                                   Size="Size.Small"
-                                   aria-label="@(row.IsEnabled ? "Organization enabled" : "Organization disabled")" />
-                </MudTooltip>
-            </MudTd>
-
-            <MudTd DataLabel="External orchestration Tenant">
-                @if (row.OrchestrationTenantId.HasValue)
-                {
-                    <MudChip T="string" Color="Color.Info" Variant="Variant.Outlined" Dense="true">
-                        @GetOrchestrationTenantDisplayName(row)
-                    </MudChip>
-                }
-                else
-                {
-                    <MudText Typo="Typo.body2" Class="text-secondary">Not linked</MudText>
-                }
-            </MudTd>
-
-            <MudTd DataLabel="AI" Class="text-center">
-                @if (TryGetSettings(row.Id, out var settings)
-                    && TryGetReadiness(row.Id, out var readiness)
-                    && TryGetRuntimeStatus(row.Id, out var runtimeStatus))
-                {
-                    <div class="org-ai-status" aria-label="@GetAiStatusSummary(settings, readiness, runtimeStatus)">
-                        <MudTooltip Text="@(settings.EnableAiSearch ? "AI Search on" : "AI Search off")">
-                            <span class="@GetAiSquareClass(settings.EnableAiSearch ? Color.Success : Color.Default)" aria-label="@(settings.EnableAiSearch ? "AI Search on" : "AI Search off")">
-                                <MudIcon Icon="@Icons.Material.Filled.Search" Size="Size.Small" />
-                            </span>
-                        </MudTooltip>
-                        <MudTooltip Text="@(settings.EnableAiAnswers ? "AI Answers on" : "AI Answers off")">
-                            <span class="@GetAiSquareClass(settings.EnableAiAnswers ? Color.Success : Color.Default)" aria-label="@(settings.EnableAiAnswers ? "AI Answers on" : "AI Answers off")">
-                                <MudIcon Icon="@Icons.Material.Filled.QuestionAnswer" Size="Size.Small" />
-                            </span>
-                        </MudTooltip>
-                        <MudTooltip Text="@(readiness.ProductionReady ? "AI Ready" : "AI Blocked")">
-                            <span class="@GetAiSquareClass(readiness.ProductionReady ? Color.Success : Color.Warning)" aria-label="@(readiness.ProductionReady ? "AI Ready" : "AI Blocked")">
-                                <MudIcon Icon="@(readiness.ProductionReady ? Icons.Material.Filled.CheckCircle : Icons.Material.Filled.ReportProblem)" Size="Size.Small" />
-                            </span>
-                        </MudTooltip>
-                        <MudTooltip Text="@($"AI Runtime {runtimeStatus.Status}")">
-                            <span class="@GetAiSquareClass(GetRuntimeColor(runtimeStatus.Status))" aria-label="@($"AI Runtime {runtimeStatus.Status}")">
-                                <MudIcon Icon="@Icons.Material.Filled.Speed" Size="Size.Small" />
-                            </span>
-                        </MudTooltip>
-                    </div>
-                }
-                else
-                {
-                    <MudSkeleton Width="104px" Height="24px" Class="mx-auto" />
-                }
+                <MudChip T="string" Color="@(row.IsEnabled ? Color.Success : Color.Error)" Variant="Variant.Outlined" Dense="true">
+                    @(row.IsEnabled ? "Enabled" : "Disabled")
+                </MudChip>
             </MudTd>
-
+            <MudTd DataLabel="External orchestration Tenant">@GetOrchestrationTenantDisplayName(row)</MudTd>
             <MudTd Class="text-end">
-                <MudIconButton Icon="@(IsExpanded(row.Id) ? Icons.Material.Filled.ExpandLess : Icons.Material.Filled.ExpandMore)"
-                               Color="Color.Default"
-                               Size="Size.Small"
-                               aria-label="@(IsExpanded(row.Id) ? "Collapse organization detail" : "Expand organization detail")"
-                               OnClick="() => ToggleExpanded(row.Id)" />
-                <MudIconButton Icon="@Icons.Material.Filled.Edit"
-                               Color="Color.Primary"
-                               Size="Size.Small"
-                               aria-label="Edit organization"
-                               OnClick="() => OpenEditDialog(row)" />
-                <MudIconButton Icon="@Icons.Material.Filled.SupportAgent"
-                               Color="Color.Info"
-                               Size="Size.Small"
-                               aria-label="Support routing"
-                               OnClick="() => OpenSupportRouting(row)" />
-                <span class="org-runtime-evidence-anchor"
-                      @onmouseenter="() => ShowRuntimeEvidence(row.Id, false)"
-                      @onmouseleave="() => HideRuntimeEvidence(row.Id)"
-                      @onfocusin="() => ShowRuntimeEvidence(row.Id, false)"
-                      @onfocusout="() => HideRuntimeEvidence(row.Id)">
-                    <MudIconButton Icon="@Icons.Material.Filled.Info"
-                                   Color="@GetRuntimeEvidenceActionColor(row.Id)"
-                                   Size="Size.Small"
-                                   aria-label="View runtime evidence"
-                                   OnClick="() => ToggleRuntimeEvidence(row.Id)" />
-                    <MudPopover Open="@IsRuntimeEvidenceOpen(row.Id)"
-                                AnchorOrigin="Origin.BottomRight"
-                                TransformOrigin="Origin.TopRight"
-                                Class="org-runtime-evidence-popover">
-                        <div @onmouseenter="() => ShowRuntimeEvidence(row.Id, runtimeEvidencePinned)"
-                             @onmouseleave="() => HideRuntimeEvidence(row.Id)"
-                             @onclick:stopPropagation="true">
-                            <MudPaper Elevation="8" Class="org-runtime-evidence-panel">
-                                <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-2">
-                                    <MudText Typo="Typo.subtitle2">Runtime Evidence</MudText>
-                                    <MudIconButton Icon="@Icons.Material.Filled.Close"
-                                                   Size="Size.Small"
-                                                   aria-label="Close runtime evidence"
-                                                   OnClick="CloseRuntimeEvidence" />
-                                </MudStack>
-                                @if (TryGetRuntimeStatus(row.Id, out var evidenceRuntime))
-                                {
-                                    <MudText Typo="Typo.caption" Class="text-secondary d-block mb-2">
-                                        @GetRuntimeEvidenceSummary(evidenceRuntime)
-                                    </MudText>
-
-                                    if (evidenceRuntime.RecentEvidence.Count > 0)
-                                    {
-                                        <MudStack Spacing="1">
-                                            @foreach (var evidence in evidenceRuntime.RecentEvidence.Take(5))
-                                            {
-                                                <MudText Typo="Typo.body2">@evidence</MudText>
-                                            }
-                                        </MudStack>
-                                    }
-                                    else if (evidenceRuntime.Reasons.Count > 0)
-                                    {
-                                        <MudStack Spacing="1">
-                                            @foreach (var reason in evidenceRuntime.Reasons.Take(5))
-                                            {
-                                                <MudText Typo="Typo.body2">@reason</MudText>
-                                            }
-                                        </MudStack>
-                                    }
-                                    else
-                                    {
-                                        <MudText Typo="Typo.body2" Class="text-secondary">No recent runtime issues</MudText>
-                                    }
-                                }
-                                else
-                                {
-                                    <MudSkeleton Width="220px" />
-                                }
-                            </MudPaper>
-                        </div>
-                    </MudPopover>
-                </span>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete"
-                               Color="Color.Error"
-                               Size="Size.Small"
-                               aria-label="Delete organization"
-                               OnClick="() => OpenDeleteDialog(row)" />
+                <MudIconButton Icon="@Icons.Material.Filled.Edit" Color="Color.Primary" Size="Size.Small" aria-label="Edit organization" OnClick="() => OpenEditDialog(row)" />
+                <MudIconButton Icon="@Icons.Material.Filled.SupportAgent" Color="Color.Info" Size="Size.Small" aria-label="Support routing" OnClick="() => OpenSupportRouting(row)" />
+                <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" Size="Size.Small" aria-label="Delete organization" OnClick="() => OpenDeleteDialog(row)" />
             </MudTd>
         </RowTemplate>
-
-        <ChildRowContent Context="row">
-            @if (IsExpanded(row.Id))
-            {
-                <MudTr Class="mud-theme-surface">
-                    <td colspan="6" class="pa-4">
-                        <MudGrid>
-                            <MudItem xs="12" md="4">
-                                <MudPaper Outlined="true" Class="pa-3 h-100">
-                                    <MudText Typo="Typo.subtitle2" Class="mb-2">Rollout Readiness</MudText>
-                                    @if (TryGetReadiness(row.Id, out var readiness))
-                                    {
-                                        <MudChip T="bool"
-                                                 Color="@(readiness.ProductionReady ? Color.Success : Color.Warning)"
-                                                 Variant="Variant.Filled"
-                                                 Dense="true"
-                                                 Class="mb-2">
-                                            @(readiness.ProductionReady ? "Production ready" : "Blocked")
-                                        </MudChip>
-
-                                        @if (readiness.BlockingReasons.Count > 0)
-                                        {
-                                            <MudList T="string" Dense="true" Clickable="false">
-                                                @foreach (var reason in readiness.BlockingReasons)
-                                                {
-                                                    <MudListItem T="string">
-                                                        <MudText Typo="Typo.body2">@reason</MudText>
-                                                    </MudListItem>
-                                                }
-                                            </MudList>
-                                        }
-                                        else
-                                        {
-                                            <MudText Typo="Typo.body2" Class="text-secondary">No rollout blockers recorded.</MudText>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <MudText Typo="Typo.body2" Class="text-secondary">Readiness data unavailable.</MudText>
-                                    }
-                                </MudPaper>
-                            </MudItem>
-
-                            <MudItem xs="12" md="4">
-                                <MudPaper Outlined="true" Class="pa-3 h-100">
-                                    <MudText Typo="Typo.subtitle2" Class="mb-2">Runtime Status</MudText>
-                                    @if (TryGetRuntimeStatus(row.Id, out var runtimeStatus))
-                                    {
-                                        <MudChip T="string"
-                                                 Color="@GetRuntimeColor(runtimeStatus.Status)"
-                                                 Variant="Variant.Filled"
-                                                 Dense="true"
-                                                 Class="mb-2">
-                                            @runtimeStatus.Status
-                                        </MudChip>
-
-                                        @if (runtimeStatus.Reasons.Count > 0)
-                                        {
-                                            <MudList T="string" Dense="true" Clickable="false">
-                                                @foreach (var reason in runtimeStatus.Reasons.Take(4))
-                                                {
-                                                    <MudListItem T="string">
-                                                        <MudText Typo="Typo.body2">@reason</MudText>
-                                                    </MudListItem>
-                                                }
-                                            </MudList>
-                                        }
-                                        else
-                                        {
-                                            <MudText Typo="Typo.body2" Class="text-secondary">No active runtime blockers.</MudText>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <MudText Typo="Typo.body2" Class="text-secondary">Runtime status unavailable.</MudText>
-                                    }
-                                </MudPaper>
-                            </MudItem>
-
-                            <MudItem xs="12" md="4">
-                                <MudPaper Outlined="true" Class="pa-3 h-100">
-                                    <MudText Typo="Typo.subtitle2" Class="mb-2">Recent Runtime Evidence</MudText>
-                                    @if (TryGetRuntimeStatus(row.Id, out var runtimeEvidence) && runtimeEvidence.RecentEvidence.Count > 0)
-                                    {
-                                        <MudList T="string" Dense="true" Clickable="false">
-                                            @foreach (var evidence in runtimeEvidence.RecentEvidence.Take(5))
-                                            {
-                                                <MudListItem T="string">
-                                                    <MudText Typo="Typo.body2">@evidence</MudText>
-                                                </MudListItem>
-                                            }
-                                        </MudList>
-                                    }
-                                    else
-                                    {
-                                        <MudText Typo="Typo.body2" Class="text-secondary">No recent fallback or failure events.</MudText>
-                                    }
-                                </MudPaper>
-                            </MudItem>
-
-                            <MudItem xs="12">
-                                <MudPaper Outlined="true" Class="pa-3">
-                                    <MudText Typo="Typo.subtitle2" Class="mb-2">Provider Detail</MudText>
-                                    @if (TryGetRuntimeStatus(row.Id, out var runtimeProviders) && runtimeProviders.Providers.Count > 0)
-                                    {
-                                        <MudTable Items="runtimeProviders.Providers" Dense="true" Hover="true" T="OrganizationAiRuntimeProviderStatusDto">
-                                            <HeaderContent>
-                                                <MudTh>Channel</MudTh>
-                                                <MudTh>Provider</MudTh>
-                                                <MudTh>Model</MudTh>
-                                                <MudTh>Status</MudTh>
-                                                <MudTh>Evidence</MudTh>
-                                            </HeaderContent>
-                                            <RowTemplate Context="provider">
-                                                <MudTd DataLabel="Channel">@provider.Channel</MudTd>
-                                                <MudTd DataLabel="Provider">@(string.IsNullOrWhiteSpace(provider.ProviderName) ? "Unconfigured" : provider.ProviderName)</MudTd>
-                                                <MudTd DataLabel="Model">@(string.IsNullOrWhiteSpace(provider.ModelId) ? "-" : provider.ModelId)</MudTd>
-                                                <MudTd DataLabel="Status">
-                                                    <MudChip T="string"
-                                                             Color="@GetRuntimeColor(provider.Status)"
-                                                             Variant="Variant.Outlined"
-                                                             Dense="true">
-                                                        @provider.Status
-                                                    </MudChip>
-                                                </MudTd>
-                                                <MudTd DataLabel="Evidence">
-                                                    @if (provider.Reasons.Count > 0)
-                                                    {
-                                                        <MudText Typo="Typo.body2">@provider.Reasons[0]</MudText>
-                                                    }
-                                                    else if (provider.RecentEvidence.Count > 0)
-                                                    {
-                                                        <MudText Typo="Typo.body2">@provider.RecentEvidence[0]</MudText>
-                                                    }
-                                                    else
-                                                    {
-                                                        <MudText Typo="Typo.body2" Class="text-secondary">No issues recorded</MudText>
-                                                    }
-                                                </MudTd>
-                                            </RowTemplate>
-                                        </MudTable>
-                                    }
-                                    else
-                                    {
-                                        <MudText Typo="Typo.body2" Class="text-secondary">No provider detail available.</MudText>
-                                    }
-                                </MudPaper>
-                            </MudItem>
-                        </MudGrid>
-                    </td>
-                </MudTr>
-            }
-        </ChildRowContent>
     </MudTable>
 </MudPaper>
 
-<style>
-    .org-ai-status {
-        display: inline-grid;
-        grid-template-columns: repeat(4, 24px);
-        width: 96px;
-        border: 1px solid var(--mud-palette-lines-default);
-        border-radius: 6px;
-        overflow: hidden;
-        vertical-align: middle;
-    }
-
-    .org-ai-square {
-        width: 24px;
-        height: 24px;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        border-right: 1px solid var(--mud-palette-lines-default);
-        background: var(--mud-palette-surface);
-        color: var(--mud-palette-text-secondary);
-    }
-
-    .org-ai-square:last-child {
-        border-right: 0;
-    }
-
-    .org-ai-square-success {
-        background: color-mix(in srgb, var(--mud-palette-success) 14%, var(--mud-palette-surface));
-        color: var(--mud-palette-success);
-    }
-
-    .org-ai-square-warning {
-        background: color-mix(in srgb, var(--mud-palette-warning) 16%, var(--mud-palette-surface));
-        color: var(--mud-palette-warning);
-    }
-
-    .org-ai-square-error {
-        background: color-mix(in srgb, var(--mud-palette-error) 14%, var(--mud-palette-surface));
-        color: var(--mud-palette-error);
-    }
-
-    .org-ai-square-default {
-        background: var(--mud-palette-action-default-hover);
-        color: var(--mud-palette-text-secondary);
-    }
-
-    .org-runtime-evidence-anchor {
-        display: inline-flex;
-        position: relative;
-        vertical-align: middle;
-    }
-
-    .org-runtime-evidence-popover {
-        max-width: min(420px, calc(100vw - 32px));
-    }
-
-    .org-runtime-evidence-panel {
-        width: min(420px, calc(100vw - 32px));
-        max-height: 360px;
-        overflow: auto;
-        padding: 12px;
-    }
-</style>
-
 @code {
     [SupplyParameterFromQuery(Name = "search")]
     public string? QuerySearch { get; set; }
 
     private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
     private List<OrganizationDto> organizations = new();
     private List<OrchestrationCatalogTenantDto> orchestrationTenants = new();
     private string searchText = string.Empty;
-    private string? appliedQuerySearch;
-    private string sortMode = SortByRuntime;
-    private bool filterAiReadyOnly;
-    private bool filterRuntimeDegradedOnly;
-    private bool filterRuntimeUnavailableOnly;
-    private bool filterRecentEvidenceOnly;
-    private string? runtimeEvidencePopoverOrgId;
-    private bool runtimeEvidencePinned;
-    // Cache: orgId -> settings
-    private readonly Dictionary<string, OrganizationAiKbSettingsDto> _settings = new();
-    private readonly Dictionary<string, OrganizationAiReadinessDto> _readiness = new();
-    private readonly Dictionary<string, OrganizationAiRuntimeStatusDto> _runtimeStatuses = new();
-    private readonly HashSet<string> expandedOrganizationIds = new(StringComparer.OrdinalIgnoreCase);
-    private const string SortByName = "name";
-    private const string SortByRuntime = "runtime";
-    private const string SortByReadiness = "readiness";
-    private const string SortByEvidence = "evidence";
 
-    private IEnumerable<OrganizationDto> filteredOrganizations => GetFilteredOrganizations();
+    private IEnumerable<OrganizationDto> FilteredOrganizations => organizations
+        .Where(org => string.IsNullOrWhiteSpace(searchText)
+            || (org.Name?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false)
+            || (org.DnsName?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false)
+            || (org.ContactInfo?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false))
+        .OrderBy(org => org.Name, StringComparer.OrdinalIgnoreCase);
 
     protected override async Task OnInitializedAsync()
     {
+        searchText = QuerySearch ?? string.Empty;
         await LoadOrganizations();
     }
 
-    protected override void OnParametersSet()
-    {
-        if (!string.Equals(appliedQuerySearch, QuerySearch, StringComparison.Ordinal))
-        {
-            appliedQuerySearch = QuerySearch;
-            searchText = QuerySearch ?? string.Empty;
-        }
-    }
-
     private async Task LoadOrganizations()
     {
-        organizations = await HelpdeskApi.GetFromJsonAsync<List<OrganizationDto>>("api/v1/organizations")
-                        ?? new();
-        await LoadOrchestrationTenantsAsync();
-
-        _settings.Clear();
-        _readiness.Clear();
-        _runtimeStatuses.Clear();
-        // fetch settings in parallel
-        var tasks = organizations.Select(async org =>
-        {
-            try
-            {
-                var s = await HelpdeskApi
-                    .GetFromJsonAsync<OrganizationAiKbSettingsDto>($"api/v1/organizations/{org.Id}/ai-kb-settings");
-
-                if (s is not null)
-                    _settings[org.Id] = s;
-            }
-            catch
-            {
-                // Keep loading the other AI surfaces even if settings fail for one org.
-            }
-
-            try
-            {
-                var readiness = await HelpdeskApi
-                    .GetFromJsonAsync<OrganizationAiReadinessDto>($"api/v1/organizations/{org.Id}/ai-kb-settings/readiness");
-                if (readiness is not null)
-                {
-                    _readiness[org.Id] = readiness;
-                }
-                else
-                {
-                    _readiness[org.Id] = CreateUnavailableReadiness("Readiness data returned no content.");
-                }
-            }
-            catch (Exception ex)
-            {
-                _readiness[org.Id] = CreateUnavailableReadiness($"Readiness could not be loaded: {ex.Message}");
-            }
-
-            try
-            {
-                var runtimeStatus = await HelpdeskApi
-                    .GetFromJsonAsync<OrganizationAiRuntimeStatusDto>($"api/v1/organizations/{org.Id}/ai-kb-settings/runtime-status");
-                if (runtimeStatus is not null)
-                {
-                    _runtimeStatuses[org.Id] = runtimeStatus;
-                }
-                else
-                {
-                    _runtimeStatuses[org.Id] = CreateUnavailableRuntimeStatus("Runtime status returned no content.");
-                }
-            }
-            catch (Exception ex)
-            {
-                _runtimeStatuses[org.Id] = CreateUnavailableRuntimeStatus($"Runtime status could not be loaded: {ex.Message}");
-            }
-        }).ToArray();
-
-        await Task.WhenAll(tasks);
-        StateHasChanged();
-    }
-
-    private async Task LoadOrchestrationTenantsAsync()
-    {
+        organizations = await HelpdeskApi.GetFromJsonAsync<List<OrganizationDto>>("api/v1/organizations") ?? new();
         try
         {
             orchestrationTenants = await HelpdeskApi.GetFromJsonAsync<List<OrchestrationCatalogTenantDto>>(
@@ -604,297 +85,36 @@
         }
     }
 
-    private bool TryGetSettings(string orgId, out OrganizationAiKbSettingsDto dto)
-        => _settings.TryGetValue(orgId, out dto!);
-
-    private bool TryGetReadiness(string orgId, out OrganizationAiReadinessDto dto)
-        => _readiness.TryGetValue(orgId, out dto!);
-
-    private bool TryGetRuntimeStatus(string orgId, out OrganizationAiRuntimeStatusDto dto)
-        => _runtimeStatuses.TryGetValue(orgId, out dto!);
-
-    private bool IsAiReady(string orgId)
-        => _readiness.TryGetValue(orgId, out var readiness) && readiness.ProductionReady;
-
-    private bool HasRuntimeStatus(string orgId, string status)
-        => _runtimeStatuses.TryGetValue(orgId, out var runtimeStatus)
-            && string.Equals(runtimeStatus.Status, status, StringComparison.OrdinalIgnoreCase);
-
-    private bool HasRecentRuntimeEvidence(string orgId)
-        => _runtimeStatuses.TryGetValue(orgId, out var runtimeStatus)
-            && runtimeStatus.RecentEvidence.Count > 0;
-
-    private bool MatchesSearch(OrganizationDto org)
-    {
-        if (string.IsNullOrWhiteSpace(searchText))
-        {
-            return true;
-        }
-
-        return (org.Name?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false)
-            || (org.DnsName?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false)
-            || (org.ContactInfo?.Contains(searchText, StringComparison.OrdinalIgnoreCase) ?? false);
-    }
-
-    private bool MatchesFilters(OrganizationDto org)
-    {
-        if (filterAiReadyOnly && !IsAiReady(org.Id))
-        {
-            return false;
-        }
-
-        if (filterRuntimeDegradedOnly && !HasRuntimeStatus(org.Id, "Degraded"))
-        {
-            return false;
-        }
-
-        if (filterRuntimeUnavailableOnly && !HasRuntimeStatus(org.Id, "Unavailable"))
-        {
-            return false;
-        }
-
-        if (filterRecentEvidenceOnly && !HasRecentRuntimeEvidence(org.Id))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    private IEnumerable<OrganizationDto> GetFilteredOrganizations()
-    {
-        var query = organizations
-            .Where(MatchesSearch)
-            .Where(MatchesFilters);
-
-        return sortMode switch
-        {
-            SortByRuntime => query
-                .OrderBy(org => GetRuntimeSeverity(org.Id))
-                .ThenBy(org => org.Name, StringComparer.OrdinalIgnoreCase),
-            SortByReadiness => query
-                .OrderByDescending(org => IsAiReady(org.Id))
-                .ThenBy(org => GetRuntimeSeverity(org.Id))
-                .ThenBy(org => org.Name, StringComparer.OrdinalIgnoreCase),
-            SortByEvidence => query
-                .OrderByDescending(org => GetEvidenceCount(org.Id))
-                .ThenBy(org => GetRuntimeSeverity(org.Id))
-                .ThenBy(org => org.Name, StringComparer.OrdinalIgnoreCase),
-            _ => query.OrderBy(org => org.Name, StringComparer.OrdinalIgnoreCase)
-        };
-    }
-
-    private int GetRuntimeSeverity(string orgId)
-    {
-        if (!_runtimeStatuses.TryGetValue(orgId, out var runtimeStatus))
-        {
-            return 3;
-        }
-
-        return runtimeStatus.Status.ToLowerInvariant() switch
-        {
-            "unavailable" => 0,
-            "degraded" => 1,
-            "ready" => 2,
-            _ => 3
-        };
-    }
-
-    private int GetEvidenceCount(string orgId)
-        => _runtimeStatuses.TryGetValue(orgId, out var runtimeStatus)
-            ? runtimeStatus.RecentEvidence.Count
-            : 0;
-
-    private static OrganizationAiReadinessDto CreateUnavailableReadiness(string reason)
-        => new()
-        {
-            ProductionReady = false,
-            BlockingReasons = [reason]
-        };
-
-    private static OrganizationAiRuntimeStatusDto CreateUnavailableRuntimeStatus(string reason)
-        => new()
-        {
-            Status = "Unknown",
-            Reasons = [reason]
-        };
-
-    private static Color GetRuntimeColor(string? status)
-        => status?.ToLowerInvariant() switch
-        {
-            "ready" => Color.Success,
-            "degraded" => Color.Warning,
-            "unavailable" => Color.Error,
-            _ => Color.Default
-        };
-
-    private static string GetAiSquareClass(Color color)
-        => color switch
-        {
-            Color.Success => "org-ai-square org-ai-square-success",
-            Color.Warning => "org-ai-square org-ai-square-warning",
-            Color.Error => "org-ai-square org-ai-square-error",
-            _ => "org-ai-square org-ai-square-default"
-        };
-
-    private static string GetAiStatusSummary(
-        OrganizationAiKbSettingsDto settings,
-        OrganizationAiReadinessDto readiness,
-        OrganizationAiRuntimeStatusDto runtimeStatus)
-        => $"AI Search {(settings.EnableAiSearch ? "on" : "off")}, "
-           + $"AI Answers {(settings.EnableAiAnswers ? "on" : "off")}, "
-           + $"AI {(readiness.ProductionReady ? "ready" : "blocked")}, "
-           + $"Runtime {runtimeStatus.Status}";
-
-    private static string GetRuntimeEvidenceSummary(OrganizationAiRuntimeStatusDto runtimeStatus)
-    {
-        if (runtimeStatus.RecentEvidence.Count > 0)
-        {
-            return $"{runtimeStatus.RecentEvidence.Count} recent event{(runtimeStatus.RecentEvidence.Count == 1 ? string.Empty : "s")}";
-        }
-
-        if (runtimeStatus.Reasons.Count > 0)
-        {
-            return $"{runtimeStatus.Reasons.Count} runtime reason{(runtimeStatus.Reasons.Count == 1 ? string.Empty : "s")}";
-        }
-
-        return "No recent runtime issues";
-    }
+    private string GetMspOrganizationName(string? organizationId) => string.IsNullOrWhiteSpace(organizationId)
+        ? "Self-managed"
+        : organizations.FirstOrDefault(org => string.Equals(org.Id, organizationId, StringComparison.OrdinalIgnoreCase))?.Name ?? organizationId;
 
     private string GetOrchestrationTenantDisplayName(OrganizationDto organization)
     {
-        if (organization.OrchestrationTenantId is { } tenantId)
-        {
-            var catalogName = orchestrationTenants.FirstOrDefault(x => x.TenantId == tenantId)?.Name;
-            if (!string.IsNullOrWhiteSpace(catalogName))
-            {
-                return catalogName;
-            }
-
-            return string.IsNullOrWhiteSpace(organization.OrchestrationTenantName)
-                ? $"Tenant {tenantId}"
-                : organization.OrchestrationTenantName;
-        }
-
-        return "Not linked";
-    }
-
-    private string GetMspOrganizationName(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            return "Self-managed";
-        }
-
-        return organizations.FirstOrDefault(x => string.Equals(x.Id, organizationId, StringComparison.OrdinalIgnoreCase))?.Name
-            ?? organizationId;
-    }
-
-    private Color GetRuntimeEvidenceActionColor(string orgId)
-    {
-        if (!_runtimeStatuses.TryGetValue(orgId, out var runtimeStatus))
-        {
-            return Color.Default;
-        }
-
-        return runtimeStatus.RecentEvidence.Count > 0 || runtimeStatus.Reasons.Count > 0
-            ? GetRuntimeColor(runtimeStatus.Status)
-            : Color.Default;
-    }
-
-    private bool IsRuntimeEvidenceOpen(string orgId)
-        => string.Equals(runtimeEvidencePopoverOrgId, orgId, StringComparison.OrdinalIgnoreCase);
-
-    private void ShowRuntimeEvidence(string orgId, bool pinned)
-    {
-        runtimeEvidencePopoverOrgId = orgId;
-        runtimeEvidencePinned = pinned;
-    }
-
-    private void HideRuntimeEvidence(string orgId)
-    {
-        if (runtimeEvidencePinned || !IsRuntimeEvidenceOpen(orgId))
-        {
-            return;
-        }
-
-        runtimeEvidencePopoverOrgId = null;
-    }
-
-    private void ToggleRuntimeEvidence(string orgId)
-    {
-        if (IsRuntimeEvidenceOpen(orgId) && runtimeEvidencePinned)
-        {
-            CloseRuntimeEvidence();
-            return;
-        }
-
-        runtimeEvidencePopoverOrgId = orgId;
-        runtimeEvidencePinned = true;
-    }
-
-    private void CloseRuntimeEvidence()
-    {
-        runtimeEvidencePopoverOrgId = null;
-        runtimeEvidencePinned = false;
-    }
-
-    private void ToggleAiReadyFilter()
-        => filterAiReadyOnly = !filterAiReadyOnly;
-
-    private void ToggleRuntimeDegradedFilter()
-        => filterRuntimeDegradedOnly = !filterRuntimeDegradedOnly;
-
-    private void ToggleRuntimeUnavailableFilter()
-        => filterRuntimeUnavailableOnly = !filterRuntimeUnavailableOnly;
-
-    private void ToggleRecentEvidenceFilter()
-        => filterRecentEvidenceOnly = !filterRecentEvidenceOnly;
-
-    private bool IsExpanded(string orgId)
-        => expandedOrganizationIds.Contains(orgId);
-
-    private void ToggleExpanded(string orgId)
-    {
-        if (!expandedOrganizationIds.Add(orgId))
-        {
-            expandedOrganizationIds.Remove(orgId);
-        }
+        if (organization.OrchestrationTenantId is not { } tenantId) return "Not linked";
+        return orchestrationTenants.FirstOrDefault(tenant => tenant.TenantId == tenantId)?.Name
+            ?? organization.OrchestrationTenantName
+            ?? $"Tenant {tenantId}";
     }
 
     private async Task OpenCreateDialog()
     {
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<CreateOrganizationDialog>("Create Organization", options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-            await LoadOrganizations();
+        var dialog = await DialogService.ShowAsync<CreateOrganizationDialog>("Create Organization", new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true });
+        if (!(await dialog.Result).Canceled) await LoadOrganizations();
     }
 
-    private async Task OpenEditDialog(OrganizationDto org)
+    private async Task OpenEditDialog(OrganizationDto organization)
     {
-        var parameters = new DialogParameters
-        {
-            ["Organization"] = org,
-            ["Organizations"] = organizations
-        };
-        var options = new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true };
-        var dialog = await DialogService.ShowAsync<EditOrganizationDialog>("Edit Organization", parameters, options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-            await LoadOrganizations();
+        var dialog = await DialogService.ShowAsync<EditOrganizationDialog>("Edit Organization", new DialogParameters { ["Organization"] = organization, ["Organizations"] = organizations }, new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true });
+        if (!(await dialog.Result).Canceled) await LoadOrganizations();
     }
 
-    private async Task OpenDeleteDialog(OrganizationDto org)
+    private async Task OpenDeleteDialog(OrganizationDto organization)
     {
-        var parameters = new DialogParameters { ["Organization"] = org };
-        var options = new DialogOptions { MaxWidth = MaxWidth.ExtraSmall };
-        var dialog = await DialogService.ShowAsync<DeleteOrganizationDialog>("Delete Organization", parameters, options);
-        var result = await dialog.Result;
-        if (!result.Canceled)
-            await LoadOrganizations();
+        var dialog = await DialogService.ShowAsync<DeleteOrganizationDialog>("Delete Organization", new DialogParameters { ["Organization"] = organization }, new DialogOptions { MaxWidth = MaxWidth.ExtraSmall });
+        if (!(await dialog.Result).Canceled) await LoadOrganizations();
     }
 
-    private void OpenSupportRouting(OrganizationDto org)
-        => NavigationManager.NavigateTo($"/admin/support-routing?organizationId={Uri.EscapeDataString(org.Id)}");
+    private void OpenSupportRouting(OrganizationDto organization)
+        => NavigationManager.NavigateTo($"/admin/support-routing?organizationId={Uri.EscapeDataString(organization.Id)}");
 }
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeDetail.razor b/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeDetail.razor
index b7b84208..f4c363aa 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeDetail.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeDetail.razor
@@ -15,8 +15,6 @@
 @using System.Diagnostics
 @using System.Text.Json
 
-@implements IDisposable
-
 @inject IHttpClientFactory HttpClientFactory
 @inject ISnackbar Snackbar
 @inject NavigationManager NavigationManager
@@ -65,38 +63,6 @@
                 CategoryIds="@selectedCategoryIds"
                 AllCategories="@categories"
                 CategoryRemoved="OnCategoryRemoved" ReadOnly="@(!CanManage)">
-                <MetadataContent>
-                    @if (aiRuntimeStatus is not null)
-                    {
-                        <MudTooltip Placement="Placement.Bottom">
-                            <ChildContent>
-                                <MudChip T="string"
-                                         Size="Size.Small"
-                                         Color="@GetRuntimeColor(aiRuntimeStatus.Status)"
-                                         Variant="Variant.Outlined">
-                                    AI Runtime: @aiRuntimeStatus.Status
-                                </MudChip>
-                            </ChildContent>
-                            <TooltipContent>
-                                <MudStack Spacing="0">
-                                    <MudText Typo="Typo.caption">
-                                        Fallback: @(aiRuntimeStatus.FallbackEnabled ? $"enabled ({aiRuntimeStatus.FallbackProviderCount} alternate providers)" : "disabled")
-                                    </MudText>
-                                    @foreach (var provider in aiRuntimeStatus.Providers)
-                                    {
-                                        <MudText Typo="Typo.caption">
-                                            @provider.Channel: @provider.Status via @provider.ProviderName / @provider.ModelId
-                                        </MudText>
-                                    }
-                                    @foreach (var reason in aiRuntimeStatus.Reasons.Take(2))
-                                    {
-                                        <MudText Typo="Typo.caption">@reason</MudText>
-                                    }
-                                </MudStack>
-                            </TooltipContent>
-                        </MudTooltip>
-                    }
-                </MetadataContent>
                 <SecondaryMetadataContent>
                     @if (change.ImplementationStartAt.HasValue)
                     {
@@ -120,8 +86,6 @@
                 PublicMode="false" CanContribute="@CanContribute" CanManage="@CanManage"
                 OnWorklogAdded="HandleWorklogAdded"
                 MessagesTabText="Change Template"
-                ShowAiStatusSummary="false"
-                InitialAiCount="@change.AiSuggestionCount"
                 Class="flex-grow-1">
                 <MessagesContent>
                     <MudStack Spacing="2">
@@ -291,81 +255,6 @@
                                     </MudStack>
                                 </MudItem>
                             }
-                            @if (change.AiSuggestionCount > 0 || change.AiAuditCount > 0 || change.LastAiActivityAt.HasValue)
-                            {
-                                <MudItem xs="12">
-                                    <MudDivider Class="my-2" />
-                                    <MudText Typo="Typo.subtitle2" Class="mb-1">AI Summary</MudText>
-                                    <MudStack Spacing="1">
-                                        @if (change.AiSuggestionCount > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Suggestions available: @change.AiSuggestionCount
-                                            </MudText>
-                                        }
-                                        @if (change.AiAuditCount > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                AI events recorded: @change.AiAuditCount
-                                            </MudText>
-                                        }
-                                        @if (change.LastAiActivityAt.HasValue)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Last AI activity: @change.LastAiActivityAt.Value.ToLocalTime().ToString("g")
-                                            </MudText>
-                                        }
-                                    </MudStack>
-                                </MudItem>
-                            }
-                            <MudItem xs="12">
-                                <MudDivider Class="my-2" />
-                                <MudText Typo="Typo.subtitle2" Class="mb-1">AI Peer Review</MudText>
-                                <MudStack Spacing="1">
-                                    <MudChip T="string"
-                                             Size="Size.Small"
-                                             Color="@GetReviewStatusColor(change.AiReviewStatus, change.AiReviewGateState)"
-                                             Variant="Variant.Outlined">
-                                        @GetReviewStatusLabel(change.AiReviewStatus, change.AiReviewGateState)
-                                    </MudChip>
-                                    @if (!string.IsNullOrWhiteSpace(change.LatestAiReviewSummary))
-                                    {
-                                        <MudText Typo="Typo.caption" Class="d-block">
-                                            @change.LatestAiReviewSummary
-                                        </MudText>
-                                    }
-                                    @if (change.LastAiReviewAt.HasValue)
-                                    {
-                                        <MudText Typo="Typo.caption" Class="d-block">
-                                            Last review: @change.LastAiReviewAt.Value.ToLocalTime().ToString("g")
-                                        </MudText>
-                                    }
-                                    <MudStack Row="true" Spacing="1">
-                                        <MudButton Variant="Variant.Outlined"
-                                                   Size="Size.Small"
-                                                   Disabled="@(!CanManage || !change.IsTemplateComplete || aiReviewBusy)"
-                                                   OnClick="() => RunAiReviewAsync(false)">
-                                            @(aiReviewBusy ? "Running..." : "Run AI Review")
-                                        </MudButton>
-                                        <MudButton Variant="Variant.Text"
-                                                   Size="Size.Small"
-                                                   Disabled="@(!CanManage || !change.IsTemplateComplete || aiReviewBusy)"
-                                                   OnClick="() => RunAiReviewAsync(true)">
-                                            Re-run
-                                        </MudButton>
-                                    </MudStack>
-                                    @if (change.RequiresAiReviewAcknowledgement)
-                                    {
-                                        <MudButton Variant="Variant.Filled"
-                                                   Color="Color.Warning"
-                                                   Size="Size.Small"
-                                                   Disabled="@(!CanManage || aiReviewBusy)"
-                                                   OnClick="AcknowledgeAiReviewAsync">
-                                            Acknowledge Warnings
-                                        </MudButton>
-                                    }
-                                </MudStack>
-                            </MudItem>
                             @if (change.Sla is not null)
                             {
                                 <MudItem xs="12">
@@ -446,21 +335,12 @@
     private List<OrganizationDto> organizations = new();
     private List<TicketCategoryDto> categories = new();
     private HashSet<Guid> selectedCategoryIds = new();
-    private List<KnowledgeSuggestion> suggestions = new();
     private bool loading = true;
     private bool hasLoaded;
     private bool isUpdating;
-    private bool aiReviewBusy;
     private bool hasChanges;
-    private string? articleId;
-    private bool kbWorking;
-    private bool suggestionsDisabled;
-    private OrganizationAiReadinessDto? aiReadiness;
-    private OrganizationAiRuntimeStatusDto? aiRuntimeStatus;
-    private ChangeAiReviewDto? aiReview;
     private string? loadError;
     private List<string> templateErrors = new();
-    private CancellationTokenSource? pollCts;
     private DateTime? implementationStartDate;
     private TimeSpan? implementationStartTime;
     private DateTime? implementationEndDate;
@@ -518,8 +398,6 @@
                 change.ChangeTemplate ??= new ChangeTemplateDto();
                 SyncImplementationWindowEditors(change);
                 selectedCategoryIds = change.CategoryIds.ToHashSet();
-                _ = SafeLoadAiMetadataAsync(change.OrganizationId);
-                await LoadAiReviewAsync();
                 templateErrors = change.TemplateValidationErrors.ToList();
             }
 
@@ -644,14 +522,6 @@
             IsTemplateComplete = source.IsTemplateComplete,
             TemplateValidationErrors = (source.TemplateValidationErrors ?? new()).ToList(),
             CategoryIds = (source.CategoryIds ?? new()).ToList(),
-            AiSuggestionCount = source.AiSuggestionCount,
-            AiAuditCount = source.AiAuditCount,
-            LastAiActivityAt = source.LastAiActivityAt,
-            AiReviewStatus = source.AiReviewStatus,
-            AiReviewGateState = source.AiReviewGateState,
-            LatestAiReviewSummary = source.LatestAiReviewSummary,
-            LastAiReviewAt = source.LastAiReviewAt,
-            RequiresAiReviewAcknowledgement = source.RequiresAiReviewAcknowledgement,
             Sla = source.Sla is null ? null : new TicketSlaDto
             {
                 StartedAt = source.Sla.StartedAt,
@@ -671,133 +541,6 @@
         };
     }
 
-    private async Task LoadAiReviewAsync()
-    {
-        try
-        {
-            aiReview = await HelpdeskApi.GetFromJsonAsync<ChangeAiReviewDto>($"api/v1/changes/{Id}/ai-review");
-        }
-        catch
-        {
-            aiReview = null;
-        }
-    }
-
-    private async Task LoadAiReadinessAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiReadiness = null;
-            return;
-        }
-
-        try
-        {
-            aiReadiness = await HelpdeskApi.GetFromJsonAsync<OrganizationAiReadinessDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/readiness");
-        }
-        catch
-        {
-            aiReadiness = null;
-        }
-    }
-
-    private async Task LoadAiRuntimeStatusAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiRuntimeStatus = null;
-            return;
-        }
-
-        try
-        {
-            aiRuntimeStatus = await HelpdeskApi.GetFromJsonAsync<OrganizationAiRuntimeStatusDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/runtime-status?timeoutMs=1500");
-        }
-        catch
-        {
-            aiRuntimeStatus = null;
-        }
-    }
-
-    private async Task LoadAiMetadataAsync(string? organizationId)
-    {
-        await LoadAiReadinessAsync(organizationId);
-        await LoadAiRuntimeStatusAsync(organizationId);
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private async Task SafeLoadAiMetadataAsync(string? organizationId)
-    {
-        try
-        {
-            await LoadAiMetadataAsync(organizationId);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning(
-                ex,
-                "Failed to load change AI metadata. ChangeId={ChangeId} OrganizationId={OrganizationId}",
-                Id,
-                organizationId);
-        }
-    }
-
-    private static Color GetRuntimeColor(string? status) =>
-        string.Equals(status, "Ready", StringComparison.OrdinalIgnoreCase)
-            ? Color.Success
-            : string.Equals(status, "Degraded", StringComparison.OrdinalIgnoreCase)
-                ? Color.Warning
-                : Color.Error;
-
-    private async Task EnqueueSuggestionsAndPoll()
-    {
-        try
-        {
-            kbWorking = true;
-
-            var postResp = await HelpdeskApi.PostAsJsonAsync($"api/v1/tickets/{Id}/suggest-knowledge", new { });
-            if (postResp.StatusCode == System.Net.HttpStatusCode.NoContent)
-            {
-                suggestionsDisabled = true;
-                return;
-            }
-
-            pollCts?.Cancel();
-            pollCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-            while (!pollCts.IsCancellationRequested)
-            {
-                var resp = await HelpdeskApi.GetAsync($"api/v1/tickets/{Id}/suggest-knowledge", pollCts.Token);
-
-                if (resp.StatusCode == System.Net.HttpStatusCode.NoContent)
-                {
-                    await Task.Delay(600, pollCts.Token);
-                    continue;
-                }
-
-                if (resp.IsSuccessStatusCode)
-                {
-                    suggestions = await resp.Content.ReadFromJsonAsync<List<KnowledgeSuggestion>>() ?? new();
-                    break;
-                }
-
-                break;
-            }
-        }
-        catch { }
-        finally
-        {
-            kbWorking = false;
-            StateHasChanged();
-        }
-    }
-
-    public void Dispose()
-    {
-        pollCts?.Cancel();
-        pollCts?.Dispose();
-    }
-
     private void OnStateChanged(TicketState newState)
     {
         if (change is null) return;
@@ -993,7 +736,6 @@
                 templateErrors = updated.TemplateValidationErrors.ToList();
                 hasChanges = false;
             }
-            await LoadAiReviewAsync();
         }
         catch (Exception ex)
         {
@@ -1041,60 +783,6 @@
         };
     }
 
-    private Task GenerateKnowledge() => GenerateOrRegenerate(false);
-    private Task RegenerateKnowledge() => GenerateOrRegenerate(true);
-
-    private async Task GenerateOrRegenerate(bool regenerate)
-    {
-        try
-        {
-            kbWorking = true;
-            var url = $"api/v1/tickets/{Id}/generate-knowledge" + (regenerate ? "?regenerate=true" : string.Empty);
-            var response = await HelpdeskApi.PostAsJsonAsync(url, new { });
-            if (response.IsSuccessStatusCode)
-            {
-                var article = await response.Content.ReadFromJsonAsync<ArticleDto>();
-                if (article is not null)
-                {
-                    articleId = article.Id;
-                    Snackbar.Add(regenerate ? "Article regenerated." : "Draft article generated.", Severity.Success);
-                    NavigationManager.NavigateTo($"/kb/{article.Id}");
-                }
-            }
-            else
-            {
-                Snackbar.Add("Knowledge generation failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
-    private async Task ApproveKnowledge()
-    {
-        if (articleId is null) return;
-        try
-        {
-            kbWorking = true;
-            var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-            var response = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{articleId}/state", dto);
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Article approved.", Severity.Success);
-            }
-            else
-            {
-                Snackbar.Add("Approval failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
     private async Task PauseSlaAsync()
     {
         var dialog = await DialogService.ShowAsync<HelpDesk.NewWeb.Components.Shared.SlaPauseDialog>(
@@ -1137,95 +825,6 @@
         return $"{Math.Max(1, span.Minutes)}m";
     }
 
-    private async Task RunAiReviewAsync(bool force)
-    {
-        if (change is null)
-        {
-            return;
-        }
-
-        aiReviewBusy = true;
-        try
-        {
-            if (hasChanges)
-            {
-                await SaveChangesAsync();
-                if (hasChanges)
-                {
-                    return;
-                }
-            }
-
-            var response = await HelpdeskApi.PostAsJsonAsync(
-                $"api/v1/changes/{Id}/ai-review",
-                new RunChangeAiReviewRequestDto { Force = force });
-            if (!response.IsSuccessStatusCode)
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add($"AI review failed: {error}", Severity.Error);
-                return;
-            }
-
-            aiReview = await response.Content.ReadFromJsonAsync<ChangeAiReviewDto>();
-            await HandleWorklogAdded();
-            await LoadAiReviewAsync();
-            Snackbar.Add(force ? "AI review re-ran successfully." : "AI review completed successfully.", Severity.Success);
-        }
-        finally
-        {
-            aiReviewBusy = false;
-        }
-    }
-
-    private async Task AcknowledgeAiReviewAsync()
-    {
-        aiReviewBusy = true;
-        try
-        {
-            var response = await HelpdeskApi.PostAsJsonAsync(
-                $"api/v1/changes/{Id}/ai-review/acknowledge",
-                new AcknowledgeChangeAiReviewDto());
-            if (!response.IsSuccessStatusCode)
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add($"Could not acknowledge AI review warnings: {error}", Severity.Error);
-                return;
-            }
-
-            await HandleWorklogAdded();
-            await LoadAiReviewAsync();
-            Snackbar.Add("AI review warnings acknowledged.", Severity.Success);
-        }
-        finally
-        {
-            aiReviewBusy = false;
-        }
-    }
-
-    private static Color GetReviewStatusColor(ChangeReviewStatus status, ChangeReviewGateState gateState) =>
-        status switch
-        {
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Pass => Color.Success,
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Acknowledged => Color.Info,
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Warning => Color.Warning,
-            ChangeReviewStatus.Pending => Color.Info,
-            ChangeReviewStatus.Failed => Color.Error,
-            ChangeReviewStatus.Stale => Color.Warning,
-            _ => Color.Default
-        };
-
-    private static string GetReviewStatusLabel(ChangeReviewStatus status, ChangeReviewGateState gateState) =>
-        status switch
-        {
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Pass => "AI Review Passed",
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Acknowledged => "Warnings Acknowledged",
-            ChangeReviewStatus.Complete when gateState == ChangeReviewGateState.Warning => "AI Review Warning",
-            ChangeReviewStatus.Pending => "AI Review Pending",
-            ChangeReviewStatus.Failed => "AI Review Failed",
-            ChangeReviewStatus.Stale => "AI Review Stale",
-            _ => "AI Review Not Run"
-        };
-
     private static async Task<List<string>> ReadErrorsAsync(HttpResponseMessage response)
     {
         try
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeList.razor b/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeList.razor
index 0c6ca385..166c2784 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeList.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Changes/ChangeList.razor
@@ -66,29 +66,6 @@
         <SubjectTemplate Context="change">
             <MudStack Spacing="0">
                 <MudText Typo="Typo.body2">@change.Title</MudText>
-                @if (change.AiSuggestionCount > 0 || change.AiAuditCount > 0 || change.LastAiActivityAt.HasValue)
-                {
-                    <MudStack Row="true" Spacing="1" Class="mt-1">
-                        @if (change.AiSuggestionCount > 0)
-                        {
-                            <MudChip T="string" Size="Size.Small" Color="Color.Info" Variant="Variant.Outlined">
-                                @($"{change.AiSuggestionCount} AI suggestion{(change.AiSuggestionCount == 1 ? string.Empty : "s")}")
-                            </MudChip>
-                        }
-                        @if (change.AiAuditCount > 0)
-                        {
-                            <MudChip T="string" Size="Size.Small" Color="Color.Secondary" Variant="Variant.Outlined">
-                                @($"{change.AiAuditCount} AI event{(change.AiAuditCount == 1 ? string.Empty : "s")}")
-                            </MudChip>
-                        }
-                        @if (change.LastAiActivityAt.HasValue)
-                        {
-                            <MudChip T="string" Size="Size.Small" Variant="Variant.Outlined">
-                                @($"AI active {change.LastAiActivityAt.Value.ToLocalTime():g}")
-                            </MudChip>
-                        }
-                    </MudStack>
-                }
             </MudStack>
         </SubjectTemplate>
         <AssigneeTemplate Context="change">
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentDetail.razor b/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentDetail.razor
index 7ddfe0e8..bdefba45 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentDetail.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentDetail.razor
@@ -8,7 +8,6 @@
 @inject NavigationManager NavigationManager
 @inject IDialogService DialogService
 
-@using Helpdesk.Shared.DTOs.Article
 @using Helpdesk.Shared.DTOs.Category
 @using Helpdesk.Shared.DTOs.Incident
 @using Helpdesk.Shared.DTOs.Organization
@@ -17,8 +16,6 @@
 @using Helpdesk.Shared.Enums
 @using Helpdesk.Shared.Models
 
-@implements IDisposable
-
 <PageTitle>Incident: @(incident?.Subject ?? "...")</PageTitle>
 
 @if (loading)
@@ -46,38 +43,6 @@ else
                 CategoryIds="@selectedCategoryIds"
                 AllCategories="@categories"
                 CategoryRemoved="OnCategoryRemoved" ReadOnly="@(!CanManage)">
-                <MetadataContent>
-                    @if (aiRuntimeStatus is not null)
-                    {
-                        <MudTooltip Placement="Placement.Bottom">
-                            <ChildContent>
-                                <MudChip T="string"
-                                         Size="Size.Small"
-                                         Color="@GetRuntimeColor(aiRuntimeStatus.Status)"
-                                         Variant="Variant.Outlined">
-                                    AI Runtime: @aiRuntimeStatus.Status
-                                </MudChip>
-                            </ChildContent>
-                            <TooltipContent>
-                                <MudStack Spacing="0">
-                                    <MudText Typo="Typo.caption">
-                                        Fallback: @(aiRuntimeStatus.FallbackEnabled ? $"enabled ({aiRuntimeStatus.FallbackProviderCount} alternate providers)" : "disabled")
-                                    </MudText>
-                                    @foreach (var provider in aiRuntimeStatus.Providers)
-                                    {
-                                        <MudText Typo="Typo.caption">
-                                            @provider.Channel: @provider.Status via @provider.ProviderName / @provider.ModelId
-                                        </MudText>
-                                    }
-                                    @foreach (var reason in aiRuntimeStatus.Reasons.Take(2))
-                                    {
-                                        <MudText Typo="Typo.caption">@reason</MudText>
-                                    }
-                                </MudStack>
-                            </TooltipContent>
-                        </MudTooltip>
-                    }
-                </MetadataContent>
             </HelpDesk.NewWeb.Components.Shared.TicketHeader>
 
             <TicketActivityTabs
@@ -87,8 +52,6 @@ else
                 OrganizationId="@incident.OrganizationId"
                 PublicMode="false" CanContribute="@CanContribute" CanManage="@CanManage"
                 OnWorklogAdded="HandleWorklogAdded"
-                ShowAiStatusSummary="false"
-                InitialAiCount="@incident.AiSuggestionCount"
                 Class="flex-grow-1" />
         </MudItem>
 
@@ -138,33 +101,6 @@ else
                             <MudItem xs="12">
                                 <MudTextField T="string" Label="Updated" Variant="Variant.Outlined" Dense="true" Margin="Margin.Dense" ReadOnly="true" Value="@incident.UpdatedAt?.ToString("g")" />
                             </MudItem>
-                            @if (incident.AiSuggestionCount > 0 || incident.AiAutomationRunCount > 0 || incident.LastAiActivityAt.HasValue)
-                            {
-                                <MudItem xs="12">
-                                    <MudDivider Class="my-2" />
-                                    <MudText Typo="Typo.subtitle2" Class="mb-1">AI Summary</MudText>
-                                    <MudStack Spacing="1">
-                                        @if (incident.AiSuggestionCount > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Suggestions available: @incident.AiSuggestionCount
-                                            </MudText>
-                                        }
-                                        @if (incident.AiAutomationRunCount > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                AI-started automation runs: @incident.AiAutomationRunCount
-                                            </MudText>
-                                        }
-                                        @if (incident.LastAiActivityAt.HasValue)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Last AI activity: @incident.LastAiActivityAt.Value.ToLocalTime().ToString("g")
-                                            </MudText>
-                                        }
-                                    </MudStack>
-                                </MudItem>
-                            }
                             <MudItem xs="12">
                                 <MudSelect T="string" Label="Assignee" Variant="Variant.Outlined" Dense="true" Margin="Margin.Dense" Value="@GetAssigneeSelectValue(incident.AssignedToId)" ValueChanged="OnAssigneeChanged" Disabled="@(!CanManage)">
                                     <MudSelectItem Value="@UnassignedAssigneeValue">Unassigned</MudSelectItem>
@@ -244,16 +180,9 @@ else
     private IncidentDto? originalIncident;
     private List<TicketCategoryDto> categories = new();
     private HashSet<Guid> selectedCategoryIds = new();
-    private List<KnowledgeSuggestion> suggestions = new();
     private bool loading = true;
     private bool isUpdating;
     private bool hasChanges;
-    private string? articleId;
-    private bool kbWorking;
-    private bool suggestionsDisabled;
-    private OrganizationAiReadinessDto? aiReadiness;
-    private OrganizationAiRuntimeStatusDto? aiRuntimeStatus;
-    private CancellationTokenSource? pollCts;
     private int activityTabsKey;
     private const string UnassignedAssigneeValue = "__unassigned__";
     private List<UserDto> teamMembers = new();
@@ -294,7 +223,6 @@ else
             {
                 incident = CloneIncident(originalIncident);
                 selectedCategoryIds = incident.CategoryIds.ToHashSet();
-                _ = LoadAiMetadataAsync(incident.OrganizationId);
             }
 
             if (CanManage && incident?.OrganizationId is not null)
@@ -333,9 +261,6 @@ else
             CcRecipients = source.CcRecipients.ToList(),
             AssignedToId = source.AssignedToId,
             CategoryIds = source.CategoryIds.ToList(),
-            AiSuggestionCount = source.AiSuggestionCount,
-            AiAutomationRunCount = source.AiAutomationRunCount,
-            LastAiActivityAt = source.LastAiActivityAt,
             Sla = source.Sla is null ? null : new TicketSlaDto
             {
                 StartedAt = source.Sla.StartedAt,
@@ -355,105 +280,6 @@ else
         };
     }
 
-    private async Task LoadAiReadinessAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiReadiness = null;
-            return;
-        }
-
-        try
-        {
-            aiReadiness = await HelpdeskApi.GetFromJsonAsync<OrganizationAiReadinessDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/readiness");
-        }
-        catch
-        {
-            aiReadiness = null;
-        }
-    }
-
-    private async Task LoadAiRuntimeStatusAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiRuntimeStatus = null;
-            return;
-        }
-
-        try
-        {
-            aiRuntimeStatus = await HelpdeskApi.GetFromJsonAsync<OrganizationAiRuntimeStatusDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/runtime-status?timeoutMs=1500");
-        }
-        catch
-        {
-            aiRuntimeStatus = null;
-        }
-    }
-
-    private async Task LoadAiMetadataAsync(string? organizationId)
-    {
-        await LoadAiReadinessAsync(organizationId);
-        await LoadAiRuntimeStatusAsync(organizationId);
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private static Color GetRuntimeColor(string? status) =>
-        string.Equals(status, "Ready", StringComparison.OrdinalIgnoreCase)
-            ? Color.Success
-            : string.Equals(status, "Degraded", StringComparison.OrdinalIgnoreCase)
-                ? Color.Warning
-                : Color.Error;
-
-    private async Task EnqueueSuggestionsAndPoll()
-    {
-        try
-        {
-            kbWorking = true;
-
-            var postResp = await HelpdeskApi.PostAsJsonAsync($"api/v1/tickets/{Id}/suggest-knowledge", new { });
-            if (postResp.StatusCode == System.Net.HttpStatusCode.NoContent)
-            {
-                suggestionsDisabled = true;
-                return;
-            }
-
-            pollCts?.Cancel();
-            pollCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-            while (!pollCts.IsCancellationRequested)
-            {
-                var resp = await HelpdeskApi.GetAsync($"api/v1/tickets/{Id}/suggest-knowledge", pollCts.Token);
-
-                if (resp.StatusCode == System.Net.HttpStatusCode.NoContent)
-                {
-                    await Task.Delay(600, pollCts.Token);
-                    continue;
-                }
-
-                if (resp.IsSuccessStatusCode)
-                {
-                    suggestions = await resp.Content.ReadFromJsonAsync<List<KnowledgeSuggestion>>() ?? new();
-                    break;
-                }
-
-                break;
-            }
-        }
-        catch { }
-        finally
-        {
-            kbWorking = false;
-            StateHasChanged();
-        }
-    }
-
-    public void Dispose()
-    {
-        pollCts?.Cancel();
-        pollCts?.Dispose();
-    }
-
     private void OnStateChanged(TicketState newState)
     {
         if (incident is null) return;
@@ -638,60 +464,6 @@ else
         }
     }
 
-    private Task GenerateKnowledge() => GenerateOrRegenerate(false);
-    private Task RegenerateKnowledge() => GenerateOrRegenerate(true);
-
-    private async Task GenerateOrRegenerate(bool regenerate)
-    {
-        try
-        {
-            kbWorking = true;
-            var url = $"api/v1/tickets/{Id}/generate-knowledge" + (regenerate ? "?regenerate=true" : string.Empty);
-            var response = await HelpdeskApi.PostAsJsonAsync(url, new { });
-            if (response.IsSuccessStatusCode)
-            {
-                var article = await response.Content.ReadFromJsonAsync<ArticleDto>();
-                if (article is not null)
-                {
-                    articleId = article.Id;
-                    Snackbar.Add(regenerate ? "Article regenerated." : "Draft article generated.", Severity.Success);
-                    NavigationManager.NavigateTo($"/kb/{article.Id}");
-                }
-            }
-            else
-            {
-                Snackbar.Add("Knowledge generation failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
-    private async Task ApproveKnowledge()
-    {
-        if (articleId is null) return;
-        try
-        {
-            kbWorking = true;
-            var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-            var response = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{articleId}/state", dto);
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Article approved.", Severity.Success);
-            }
-            else
-            {
-                Snackbar.Add("Approval failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
     private async Task PauseSlaAsync()
     {
         var dialog = await DialogService.ShowAsync<HelpDesk.NewWeb.Components.Shared.SlaPauseDialog>(
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentList.razor b/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentList.razor
index fe5ade49..60eb0e28 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentList.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Incidents/IncidentList.razor
@@ -64,29 +64,6 @@
             <MudStack Spacing="0">
                 <IncidentSubjectWithPeek IncidentId="@incident.Id"
                                          Subject="@incident.Subject" />
-                @if (incident.AiSuggestionCount > 0 || incident.AiAutomationRunCount > 0 || incident.LastAiActivityAt.HasValue)
-                {
-                    <MudStack Row="true" Spacing="1" Class="mt-1">
-                        @if (incident.AiSuggestionCount > 0)
-                        {
-                            <MudChip T="string" Size="Size.Small" Color="Color.Info" Variant="Variant.Outlined">
-                                @($"{incident.AiSuggestionCount} AI suggestion{(incident.AiSuggestionCount == 1 ? string.Empty : "s")}")
-                            </MudChip>
-                        }
-                        @if (incident.AiAutomationRunCount > 0)
-                        {
-                            <MudChip T="string" Size="Size.Small" Color="Color.Secondary" Variant="Variant.Outlined">
-                                @($"{incident.AiAutomationRunCount} AI automation run{(incident.AiAutomationRunCount == 1 ? string.Empty : "s")}")
-                            </MudChip>
-                        }
-                        @if (incident.LastAiActivityAt.HasValue)
-                        {
-                            <MudChip T="string" Size="Size.Small" Variant="Variant.Outlined">
-                                @($"AI active {incident.LastAiActivityAt.Value.ToLocalTime():g}")
-                            </MudChip>
-                        }
-                    </MudStack>
-                }
             </MudStack>
         </SubjectTemplate>
         <AssigneeTemplate Context="incident">
diff --git a/src/HelpDesk.NewWeb/Components/Pages/KB/Article.razor b/src/HelpDesk.NewWeb/Components/Pages/KB/Article.razor
deleted file mode 100644
index 2311efb3..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/KB/Article.razor
+++ /dev/null
@@ -1,395 +0,0 @@
-@page "/kb/{Id}"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject NavigationManager NavigationManager
-
-@using System.Text.RegularExpressions
-@using Helpdesk.Shared.DTOs.Article
-@using Helpdesk.Shared.DTOs.Orchestration
-@using Helpdesk.Shared.Models
-
-<PageTitle>@(article?.Title ?? "Article")</PageTitle>
-
-@if (loading)
-{
-    <MudProgressCircular Color="Color.Primary" Indeterminate="true" />
-}
-else if (article == null)
-{
-    <MudAlert Severity="Severity.Error">Could not load the article.</MudAlert>
-}
-else
-{
-    <MudGrid>
-        <!-- LEFT COLUMN: Title, Info, and Content -->
-        <MudItem xs="12" md="8">
-            <MudPaper Class="pa-4" Height="100%">
-                <!-- Title -->
-                <MudText Typo="Typo.h4" GutterBottom="true">@article.Title</MudText>
-
-                <!-- Info Chips (Compact) -->
-                <MudStack Row="true" Spacing="2" Class="mb-4">
-                    @if (!string.IsNullOrWhiteSpace(article.LinkedTicketId))
-                    {
-                        <MudChip T="string" Icon="@Icons.Material.Filled.Link" Color="Color.Primary" Href="@($"/incidents/{article.LinkedTicketId}")" Target="_blank">Linked Ticket</MudChip>
-                    }
-                    <MudChip T="string" Icon="@Icons.Material.Filled.Dns" Color="@(articleStats?.ChunkCount > 0 ? Color.Success : Color.Warning)">@(articleStats?.ChunkCount > 0 ? $"Indexed Chunks ({articleStats.ChunkCount})" : "Not Indexed")</MudChip>
-                    <MudChip T="string" Icon="@Icons.Material.Filled.Category" Color="Color.Info">@article.CategoryId</MudChip>
-                    <MudChip T="string" Icon="@Icons.Material.Filled.CalendarToday" Color="Color.Default">Created: @article.CreatedAt.ToLocalTime().ToString("g")</MudChip>
-                    @if (articleStats?.LastIndexedAt is not null)
-                    {
-                        <MudChip T="string" Icon="@Icons.Material.Filled.Schedule" Color="Color.Default">Indexed: @articleStats.LastIndexedAt.Value.ToLocalTime().ToString("g")</MudChip>
-                    }
-                </MudStack>
-                <MudDivider Class="mb-4" />
-
-                <!-- Compact Article Body -->
-                <div class="article-body">
-                    @foreach (var contentSection in parsedContent)
-                    {
-                        <MudGrid Class="mb-3">
-                            <MudItem xs="12" sm="3">
-                                <MudText><strong>@contentSection.Key</strong></MudText>
-                            </MudItem>
-                            <MudItem xs="12" sm="9">
-                                @if (contentSection.Value.listItems.Any())
-                                {
-                                    <MudList T="string" Clickable="false" Dense="true">
-                                        @foreach (var item in contentSection.Value.listItems)
-                                        {
-                                            <MudListItem T="string" Icon="@Icons.Material.Filled.ChevronRight">
-                                                @item
-                                            </MudListItem>
-                                        }
-                                    </MudList>
-                                }
-                                else
-                                {
-                                    <MudText>@contentSection.Value.content</MudText>
-                                }
-                            </MudItem>
-                        </MudGrid>
-                    }
-                </div>
-
-                <!-- Disclaimer -->
-                @if (parsedContent.ContainsKey("Disclaimer"))
-                {
-                    <MudAlert Severity="Severity.Info" Class="mt-6">
-                        @parsedContent["Disclaimer"].content
-                    </MudAlert>
-                }
-            </MudPaper>
-        </MudItem>
-
-        <!-- RIGHT COLUMN: Admin Actions -->
-        <MudItem xs="12" md="4">
-            <MudPaper Class="pa-4" Height="100%">
-                <MudText Typo="Typo.h6" GutterBottom="true">Admin Actions</MudText>
-                <MudStack Spacing="2">
-                    @if (articleAuditEntries.Count > 0)
-                    {
-                        <MudPaper Class="pa-3" Outlined="true">
-                            <MudText Typo="Typo.subtitle2">AI Lineage</MudText>
-                            <MudText Typo="Typo.caption" Class="d-block mb-2">
-                                Generation audit for this article and its linked resolved-ticket draft path.
-                            </MudText>
-                            <MudStack Spacing="1">
-                                @foreach (var audit in articleAuditEntries)
-                                {
-                                    <MudPaper Class="pa-2" Outlined="true">
-                                        <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
-                                            <MudText Typo="Typo.body2">@audit.OperationName</MudText>
-                                            <MudText Typo="Typo.caption">@audit.CreatedAt.ToLocalTime().ToString("g")</MudText>
-                                        </MudStack>
-                                        <MudText Typo="Typo.caption" Class="d-block">
-                                            Provider: @audit.ProviderName / @audit.ModelId
-                                        </MudText>
-                                        @if (!string.IsNullOrWhiteSpace(audit.SourceSubjectId))
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Source subject: @audit.SourceSubjectId
-                                            </MudText>
-                                        }
-                                        @if (!string.IsNullOrWhiteSpace(audit.Notes))
-                                        {
-                                            <MudText Typo="Typo.caption" Class="d-block">
-                                                Notes: @audit.Notes
-                                            </MudText>
-                                        }
-                                    </MudPaper>
-                                }
-                            </MudStack>
-                        </MudPaper>
-                    }
-                    <MudPaper Class="pa-3" Outlined="true">
-                        <MudText Typo="Typo.subtitle2">Automation Target</MudText>
-                        <MudText Typo="Typo.caption" Class="d-block mb-2">
-                            Link this KB article to an approved External orchestration automation binding before exposing automation actions in AI assist.
-                        </MudText>
-                        <MudSelect T="string"
-                                   Value="selectedAutomationBindingId"
-                                   ValueChanged="OnAutomationBindingChanged"
-                                   Label="External orchestration Binding"
-                                   Dense="true"
-                                   Disabled="@automationSaving">
-                            <MudSelectItem T="string" Value="@string.Empty">No automation target</MudSelectItem>
-                            @foreach (var binding in automationBindings)
-                            {
-                                <MudSelectItem T="string" Value="@binding.Id">
-                                    @binding.RequestFormTitle / @binding.TaskTemplateName
-                                </MudSelectItem>
-                            }
-                        </MudSelect>
-                        @if (article.AutomationTarget is not null)
-                        {
-                            <MudAlert Severity="Severity.Info" Dense="true" Class="mt-2">
-                                Active target:
-                                <strong>@(article.AutomationTarget.TaskTemplateName ?? article.AutomationTarget.OrchestrationJobDefinitionId ?? article.AutomationTarget.OrchestrationRequestDefinitionId)</strong>
-                            </MudAlert>
-                        }
-                        <MudStack Row="true" Spacing="1" Class="mt-2">
-                            <MudButton Variant="Variant.Filled"
-                                       Color="Color.Primary"
-                                       Disabled="@automationSaving"
-                                       OnClick="SaveAutomationTarget">
-                                @(automationSaving ? "Saving..." : "Save Target")
-                            </MudButton>
-                            <MudButton Variant="Variant.Outlined"
-                                       Disabled="@(automationSaving || article.AutomationTarget is null)"
-                                       OnClick="ClearAutomationTarget">
-                                Clear
-                            </MudButton>
-                        </MudStack>
-                    </MudPaper>
-                    <MudButton Variant="Variant.Filled"
-                               Color="Color.Success"
-                               StartIcon="@Icons.Material.Filled.Check"
-                               OnClick="Approve"
-                               Disabled="@(article.State == KnowledgeBaseArticleState.Published)">
-                        Approve & Publish
-                    </MudButton>
-                    <MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Autorenew" OnClick="Regenerate">Regenerate</MudButton>
-                    <MudButton Variant="Variant.Outlined" StartIcon="@Icons.Material.Filled.Archive" OnClick="Archive">Archive (Unpublish)</MudButton>
-                    <MudDivider Class="my-2" />
-                    <MudButton Variant="Variant.Outlined" Color="Color.Error" StartIcon="@Icons.Material.Filled.Delete" OnClick="Delete">Delete Article</MudButton>
-                </MudStack>
-            </MudPaper>
-        </MudItem>
-    </MudGrid>
-}
-
-
-@code {
-    [Parameter] public string Id { get; set; } = string.Empty;
-    private ArticleDto? article;
-    private KnowledgeBaseArticleStatsDto? articleStats;
-    private List<KnowledgeArticleAiAuditEntryDto> articleAuditEntries = new();
-    private List<AutomationBindingDto> automationBindings = new();
-    private string selectedAutomationBindingId = string.Empty;
-    private bool automationSaving;
-    private bool loading = true;
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
-    private Dictionary<string, (string content, List<string> listItems)> parsedContent = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            var resp = await HelpdeskApi.GetFromJsonAsync<ArticleResponse>($"api/v1/kb/{Id}");
-            if (resp is not null)
-            {
-                article = resp.Article;
-                articleStats = resp.Stats;
-                articleAuditEntries = resp.AuditEntries;
-                selectedAutomationBindingId = article.AutomationTarget?.BindingId ?? string.Empty;
-                ParseArticleContent();
-            }
-
-            automationBindings = await HelpdeskApi.GetFromJsonAsync<List<AutomationBindingDto>>("api/v1/admin/orchestration/orchestration/bindings") ?? new();
-        }
-        finally
-        {
-            loading = false;
-        }
-    }
-
-    private void ParseArticleContent()
-    {
-        if (string.IsNullOrWhiteSpace(article?.Content)) return;
-
-        parsedContent.Clear();
-        var content = article.Content;
-        var result = new Dictionary<string, (string content, List<string> listItems)>();
-
-        // This new parser is more robust and handles the format seen in your latest screenshot.
-        // It finds all known keys, orders them by their position in the text, and extracts the content between them.
-        var knownKeys = new List<string>
-        {
-            "Title:", "Article ID:", "Summary:", "Problem Description:", "Resolution:",
-            "Steps to Reproduce & Fix:", "Root Cause (Inferred):", "User Feedback:", "Notes:", "Disclaimer:"
-        };
-
-        var keyPositions = knownKeys
-            .Select(k => new { Key = k.TrimEnd(':'), Index = content.IndexOf(k, StringComparison.OrdinalIgnoreCase) })
-            .Where(p => p.Index != -1)
-            .OrderBy(p => p.Index)
-            .ToList();
-
-        // If the procedural parser fails, fall back to the original **Title** parser
-        if (keyPositions.Count == 0)
-        {
-            var parts = Regex.Split(content, @"\s*\*\*(.*?)\*\*\s*").Where(s => !string.IsNullOrWhiteSpace(s)).ToList();
-            for (int i = 0; i < parts.Count; i += 2)
-            {
-                var title = parts[i].TrimEnd(':');
-                var value = (i + 1 < parts.Count) ? parts[i + 1] : string.Empty;
-                var listItems = Regex.Split(value, @"\s*\*\s*").Select(s => s.Trim()).Where(s => Regex.IsMatch(s, @"^\d+\.")).ToList();
-                if (listItems.Any()) result[title] = (string.Empty, listItems);
-                else result[title] = (value.Trim(), new List<string>());
-            }
-            parsedContent = result;
-            return;
-        }
-
-        // --- Main Procedural Parser ---
-        for (int i = 0; i < keyPositions.Count; i++)
-        {
-            var currentKeyPos = keyPositions[i];
-            var nextKeyPos = (i + 1 < keyPositions.Count) ? keyPositions[i + 1] : null;
-
-            var start = currentKeyPos.Index + currentKeyPos.Key.Length + 1;
-            var end = nextKeyPos?.Index ?? content.Length;
-            var value = content.Substring(start, end - start).Trim();
-
-            var listItems = value.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                                 .Select(s => s.Trim())
-                                 .Where(s => Regex.IsMatch(s, @"^\d+\.\s*"))
-                                 .Select(s => Regex.Replace(s, @"^\d+\.\s*", "")) // Remove the "1. " part
-                                 .ToList();
-
-            if (listItems.Any())
-            {
-                result[currentKeyPos.Key] = (string.Empty, listItems);
-            }
-            else
-            {
-                result[currentKeyPos.Key] = (value, new List<string>());
-            }
-        }
-
-        parsedContent = result;
-    }
-
-    private async Task Approve()
-    {
-        if (article is null) return;
-        if (article.State == KnowledgeBaseArticleState.Published)
-        {
-            Snackbar.Add("Article is already published.", Severity.Info);
-            return;
-        }
-
-        var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-        var resp = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{article.Id}/state", dto);
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article approved", Severity.Success);
-            article.State = KnowledgeBaseArticleState.Published; // Update local state to reflect change
-        }
-        else
-        {
-            Snackbar.Add("Approve failed", Severity.Error);
-        }
-    }
-
-    private async Task Archive()
-    {
-        if (article is null) return;
-        var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Draft };
-        var resp = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{article.Id}/state", dto);
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article archived", Severity.Success);
-            article.State = KnowledgeBaseArticleState.Draft; // Update local state
-        }
-        else
-        {
-            Snackbar.Add("Archive failed", Severity.Error);
-        }
-    }
-
-    private async Task Regenerate()
-    {
-        if (article is null) return;
-        var resp = await HelpdeskApi.PostAsJsonAsync($"api/v1/kb/{article.Id}/regenerate", new { });
-        if (resp.IsSuccessStatusCode) Snackbar.Add("Article regenerated", Severity.Success); else Snackbar.Add("Regenerate failed", Severity.Error);
-    }
-
-    private async Task Delete()
-    {
-        if (article is null) return;
-        var resp = await HelpdeskApi.DeleteAsync($"api/v1/kb/{article.Id}");
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article deleted", Severity.Success);
-            NavigationManager.NavigateTo("/kb");
-        }
-        else Snackbar.Add("Delete failed", Severity.Error);
-    }
-
-    private Task OnAutomationBindingChanged(string? value)
-    {
-        selectedAutomationBindingId = value ?? string.Empty;
-        return Task.CompletedTask;
-    }
-
-    private async Task SaveAutomationTarget()
-    {
-        if (article is null)
-        {
-            return;
-        }
-
-        try
-        {
-            automationSaving = true;
-            var response = await HelpdeskApi.PutAsJsonAsync(
-                $"api/v1/kb/{article.Id}/automation-target",
-                new UpdateKnowledgeArticleAutomationTargetDto
-                {
-                    BindingId = string.IsNullOrWhiteSpace(selectedAutomationBindingId) ? null : selectedAutomationBindingId,
-                    ClearTarget = string.IsNullOrWhiteSpace(selectedAutomationBindingId)
-                });
-
-            if (!response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Failed to save automation target.", Severity.Error);
-                return;
-            }
-
-            article.AutomationTarget = await response.Content.ReadFromJsonAsync<KnowledgeArticleAutomationTargetDto>();
-            selectedAutomationBindingId = article.AutomationTarget?.BindingId ?? string.Empty;
-            Snackbar.Add("Automation target updated.", Severity.Success);
-        }
-        finally
-        {
-            automationSaving = false;
-        }
-    }
-
-    private async Task ClearAutomationTarget()
-    {
-        selectedAutomationBindingId = string.Empty;
-        await SaveAutomationTarget();
-    }
-
-    private class ArticleResponse
-    {
-        public ArticleDto Article { get; set; } = new();
-        public KnowledgeBaseArticleStatsDto Stats { get; set; } = new();
-        public List<KnowledgeArticleAiAuditEntryDto> AuditEntries { get; set; } = new();
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/KB/Health.razor b/src/HelpDesk.NewWeb/Components/Pages/KB/Health.razor
deleted file mode 100644
index de9bdaab..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/KB/Health.razor
+++ /dev/null
@@ -1,163 +0,0 @@
-@page "/kb/health"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@using Helpdesk.Shared.DTOs.Article
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-
-<PageTitle>Knowledge Base Health</PageTitle>
-
-@if (metrics is null)
-{
-    <MudPaper Class="pa-4 d-flex justify-center">
-        <MudProgressCircular Color="Color.Primary" Indeterminate="true" />
-    </MudPaper>
-}
-else
-{
-    <MudStack Spacing="3">
-        <MudPaper Class="pa-4">
-            <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
-                <MudText Typo="Typo.h6">Knowledge Base Index Health</MudText>
-                <MudButton Variant="Variant.Filled" Color="Color.Primary" Disabled="@reindexing" OnClick="ReindexAsync">
-                    @(reindexing ? "Reindexing..." : "Reindex KB")
-                </MudButton>
-            </MudStack>
-        </MudPaper>
-
-        <MudGrid Spacing="2">
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudList T="string">
-                        <MudListItem T="string">Total Articles: @metrics.TotalArticles</MudListItem>
-                        <MudListItem T="string">Draft Articles: @metrics.DraftArticles</MudListItem>
-                        <MudListItem T="string">Published Articles: @metrics.PublishedArticles</MudListItem>
-                        <MudListItem T="string">Unresolved Tickets Without KB: @metrics.UnresolvedTicketsWithoutKb</MudListItem>
-                    </MudList>
-                </MudPaper>
-            </MudItem>
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudList T="string">
-                        <MudListItem T="string">Indexed Articles: @metrics.IndexedArticles</MudListItem>
-                        <MudListItem T="string">Indexed Chunks: @metrics.IndexedChunkCount</MudListItem>
-                        <MudListItem T="string">Orphaned Chunks: @metrics.OrphanedChunkCount</MudListItem>
-                        <MudListItem T="string">Email Chunks: @metrics.EmailChunkCount</MudListItem>
-                        <MudListItem T="string">Indexed Article Coverage: @metrics.IndexedArticleCoverage.ToString("P0")</MudListItem>
-                    </MudList>
-                </MudPaper>
-            </MudItem>
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudText Typo="Typo.subtitle1" Class="mb-2">Suggestion Feedback</MudText>
-                    <MudList T="string">
-                        <MudListItem T="string">Total Suggestion Feedback: @metrics.SuggestionFeedbackCount</MudListItem>
-                        <MudListItem T="string">Helpful Suggestions: @metrics.HelpfulSuggestionCount</MudListItem>
-                        <MudListItem T="string">Not Helpful Suggestions: @metrics.NotHelpfulSuggestionCount</MudListItem>
-                        <MudListItem T="string">Suggestion Helpful Rate: @metrics.SuggestionHelpfulRate.ToString("P0")</MudListItem>
-                    </MudList>
-                </MudPaper>
-            </MudItem>
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudText Typo="Typo.subtitle1" Class="mb-2">Automation Outcomes</MudText>
-                    <MudList T="string">
-                        <MudListItem T="string">Total Automation Feedback: @metrics.AutomationFeedbackCount</MudListItem>
-                        <MudListItem T="string">Resolved Outcomes: @metrics.AutomationResolvedCount</MudListItem>
-                        <MudListItem T="string">Not Resolved Outcomes: @metrics.AutomationNotResolvedCount</MudListItem>
-                        <MudListItem T="string">Automation Resolved Rate: @metrics.AutomationResolvedRate.ToString("P0")</MudListItem>
-                    </MudList>
-                </MudPaper>
-            </MudItem>
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudText Typo="Typo.subtitle1" Class="mb-2">AI Audit Trail</MudText>
-                    <MudList T="string">
-                        <MudListItem T="string">Total AI Audit Records: @metrics.AiAuditCount</MudListItem>
-                        <MudListItem T="string">KB Build Operations: @metrics.KnowledgeBuildAuditCount</MudListItem>
-                        <MudListItem T="string">Resolved Ticket Drafts: @metrics.KnowledgeDraftFromTicketAuditCount</MudListItem>
-                        <MudListItem T="string">Requester Draft Generations: @metrics.RequesterReplyAuditCount</MudListItem>
-                        <MudListItem T="string">Requester Draft Approvals: @metrics.RequesterReplyApprovedAuditCount</MudListItem>
-                        <MudListItem T="string">Automation Approvals: @metrics.AutomationApprovedAuditCount</MudListItem>
-                        <MudListItem T="string">Last AI Audit Activity: @(metrics.LastAiAuditAt?.ToLocalTime().ToString("g") ?? "None")</MudListItem>
-                    </MudList>
-                </MudPaper>
-            </MudItem>
-            <MudItem xs="12" md="6">
-                <MudPaper Class="pa-4">
-                    <MudText Typo="Typo.subtitle1" Class="mb-2">AI Runtime Health</MudText>
-                    <MudList T="string">
-                        <MudListItem T="string">Runtime Fallback Events: @metrics.RuntimeFallbackAuditCount</MudListItem>
-                        <MudListItem T="string">Runtime Failure Events: @metrics.RuntimeFailureAuditCount</MudListItem>
-                        <MudListItem T="string">Last Runtime Event: @(metrics.LastRuntimeAuditAt?.ToLocalTime().ToString("g") ?? "None")</MudListItem>
-                        <MudListItem T="string">
-                            Top Fallback Provider: @(string.IsNullOrWhiteSpace(metrics.TopRuntimeFallbackProvider)
-                                ? "None"
-                                : $"{metrics.TopRuntimeFallbackProvider} ({metrics.TopRuntimeFallbackCount})")
-                        </MudListItem>
-                        <MudListItem T="string">
-                            Top Failure Path: @(string.IsNullOrWhiteSpace(metrics.TopRuntimeFailureProvider)
-                                ? "None"
-                                : $"{metrics.TopRuntimeFailureProvider} ({metrics.TopRuntimeFailureCount})")
-                        </MudListItem>
-                    </MudList>
-                    @if (metrics.RecentRuntimeEvidence.Count > 0)
-                    {
-                        <MudText Typo="Typo.caption" Class="d-block mt-2 mb-1">Recent Runtime Evidence</MudText>
-                        <MudList T="string" Dense="true">
-                            @foreach (var evidence in metrics.RecentRuntimeEvidence)
-                            {
-                                <MudListItem T="string">@evidence</MudListItem>
-                            }
-                        </MudList>
-                    }
-                </MudPaper>
-            </MudItem>
-        </MudGrid>
-
-        @if (lastReindexResult is not null)
-        {
-            <MudAlert Severity="Severity.Success" Variant="Variant.Outlined">
-                Reindex complete. Requested: @lastReindexResult.RequestedArticles, reindexed: @lastReindexResult.ReindexedArticles, skipped: @lastReindexResult.SkippedArticles.
-            </MudAlert>
-        }
-    </MudStack>
-}
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    private KnowledgeBaseHealthDto? metrics;
-    private KnowledgeBaseReindexResultDto? lastReindexResult;
-    private bool reindexing;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadMetricsAsync();
-    }
-
-    private async Task LoadMetricsAsync()
-    {
-        metrics = await HelpdeskApi.GetFromJsonAsync<KnowledgeBaseHealthDto>("api/v1/kb/health");
-    }
-
-    private async Task ReindexAsync()
-    {
-        try
-        {
-            reindexing = true;
-            var response = await HelpdeskApi.PostAsJsonAsync("api/v1/kb/reindex", new { });
-            if (!response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("KB reindex failed.", Severity.Error);
-                return;
-            }
-
-            lastReindexResult = await response.Content.ReadFromJsonAsync<KnowledgeBaseReindexResultDto>();
-            await LoadMetricsAsync();
-            Snackbar.Add("KB reindex completed.", Severity.Success);
-        }
-        finally
-        {
-            reindexing = false;
-        }
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/KB/KnowledgeBase.razor b/src/HelpDesk.NewWeb/Components/Pages/KB/KnowledgeBase.razor
deleted file mode 100644
index 29d55aef..00000000
--- a/src/HelpDesk.NewWeb/Components/Pages/KB/KnowledgeBase.razor
+++ /dev/null
@@ -1,132 +0,0 @@
-@page "/kb"
-@attribute [Authorize(Roles = "HelpdeskAdmin")]
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject NavigationManager NavigationManager
-
-@using Helpdesk.Shared.DTOs
-@using Helpdesk.Shared.DTOs.Article
-@using Helpdesk.Shared.Models
-
-<PageTitle>Knowledge Base</PageTitle>
-
-<MudPaper Class="pa-4">
-    <MudGrid Class="mb-2">
-        <MudItem xs="12" md="6">
-            <MudTextField @bind-Value="search" @bind-Value:after="Reload" Placeholder="Search" Adornment="Adornment.Start" Icon="@Icons.Material.Filled.Search" Immediate="true" />
-        </MudItem>
-        <MudItem xs="12" md="3">
-            <MudSelect T="KnowledgeBaseArticleState?" Label="State" @bind-Value="state" @bind-Value:after="Reload" Clearable="true">
-                <MudSelectItem T="KnowledgeBaseArticleState?" Value="@(null)">All</MudSelectItem>
-                @foreach (var s in Enum.GetValues<KnowledgeBaseArticleState>())
-                {
-                    <MudSelectItem T="KnowledgeBaseArticleState?" Value="@(s)">@s</MudSelectItem>
-                }
-            </MudSelect>
-        </MudItem>
-    </MudGrid>
-
-    <MudTable @ref="table" ServerData="LoadArticles" Hover="true" Dense="true" T="ArticleDto">
-        <HeaderContent>
-            <MudTh>Title</MudTh>
-            <MudTh>State</MudTh>
-            <MudTh>Linked Ticket</MudTh>
-            <MudTh>Created</MudTh>
-            <MudTh></MudTh>
-        </HeaderContent>
-        <RowTemplate>
-            <MudTd DataLabel="Title"><MudLink Href="@($"/kb/{context.Id}")">@context.Title</MudLink></MudTd>
-            <MudTd DataLabel="State">@context.State</MudTd>
-            <MudTd DataLabel="Linked Ticket">@context.LinkedTicketId</MudTd>
-            <MudTd DataLabel="Created">@context.CreatedAt.ToLocalTime().ToString("g")</MudTd>
-            <MudTd>
-                <MudMenu>
-                    <ActivatorContent Context="menuContext">
-                        <MudIconButton Icon="@Icons.Material.Filled.MoreVert" />
-                    </ActivatorContent>
-                    <ChildContent>
-                        <MudMenuItem OnClick="@(() => View(context.Id))">View</MudMenuItem>
-                        <MudMenuItem OnClick="@(() => Approve(context.Id))">Approve</MudMenuItem>
-                        <MudMenuItem OnClick="@(() => Archive(context.Id))">Archive</MudMenuItem>
-                        <MudMenuItem OnClick="@(() => Regenerate(context.Id))">Regenerate</MudMenuItem>
-                        <MudMenuItem OnClick="@(() => Delete(context.Id))">Delete</MudMenuItem>
-                    </ChildContent>
-                </MudMenu>
-            </MudTd>
-        </RowTemplate>
-    </MudTable>
-</MudPaper>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-    private MudTable<ArticleDto>? table;
-    private string? search;
-    private KnowledgeBaseArticleState? state;
-
-    protected override async Task OnInitializedAsync()
-    {
-        state = KnowledgeBaseArticleState.Draft;
-        await Reload();
-    }
-
-    private async Task<TableData<ArticleDto>> LoadArticles(TableState tableState, CancellationToken token)
-    {
-        var page = tableState.Page + 1;
-        var pageSize = tableState.PageSize;
-        var url = $"api/v1/kb?page={page}&pageSize={pageSize}";
-        if (state.HasValue) url += $"&state={state}";
-        if (!string.IsNullOrWhiteSpace(search)) url += $"&search={Uri.EscapeDataString(search)}";
-
-        var resp = await HelpdeskApi.GetFromJsonAsync<PagedResponse<ArticleDto>>(url) ?? new PagedResponse<ArticleDto>();
-        return new TableData<ArticleDto> { Items = resp.Items, TotalItems = resp.TotalCount };
-    }
-
-    private Task Reload() => table?.ReloadServerData() ?? Task.CompletedTask;
-
-    private void View(string id) => NavigationManager.NavigateTo($"/kb/{id}");
-
-    private async Task Approve(string id)
-    {
-        var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-        var resp = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{id}/state", dto);
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article approved", Severity.Success);
-            await table!.ReloadServerData();
-        }
-        else Snackbar.Add("Approve failed", Severity.Error);
-    }
-
-    private async Task Archive(string id)
-    {
-        var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Draft };
-        var resp = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{id}/state", dto);
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article archived", Severity.Success);
-            await table!.ReloadServerData();
-        }
-        else Snackbar.Add("Archive failed", Severity.Error);
-    }
-
-    private async Task Delete(string id)
-    {
-        var resp = await HelpdeskApi.DeleteAsync($"api/v1/kb/{id}");
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article deleted", Severity.Success);
-            await table!.ReloadServerData();
-        }
-        else Snackbar.Add("Delete failed", Severity.Error);
-    }
-
-    private async Task Regenerate(string id)
-    {
-        var resp = await HelpdeskApi.PostAsJsonAsync($"api/v1/kb/{id}/regenerate", new { });
-        if (resp.IsSuccessStatusCode)
-        {
-            Snackbar.Add("Article regenerated", Severity.Success);
-        }
-        else Snackbar.Add("Regenerate failed", Severity.Error);
-    }
-}
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestDetail.razor b/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestDetail.razor
index 29e42eca..52de0790 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestDetail.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestDetail.razor
@@ -10,7 +10,6 @@
 
 @using System.Net.Http.Json
 @using System.Security.Claims
-@using Helpdesk.Shared.DTOs.Article
 @using Helpdesk.Shared.DTOs.Category
 @using Helpdesk.Shared.DTOs.Request
 @using Helpdesk.Shared.DTOs.Organization
@@ -20,8 +19,6 @@
 @using Helpdesk.Shared.Models
 @using Microsoft.AspNetCore.Components.Authorization
 
-@implements IDisposable
-
 <PageTitle>Request: @(request?.Title ?? "...")</PageTitle>
 
 @if (loading)
@@ -49,38 +46,6 @@ else
                 CategoryIds="@selectedCategoryIds"
                 AllCategories="@categories"
                 CategoryRemoved="OnCategoryRemoved" ReadOnly="@(!CanManage)">
-                <MetadataContent>
-                    @if (aiRuntimeStatus is not null)
-                    {
-                        <MudTooltip Placement="Placement.Bottom">
-                            <ChildContent>
-                                <MudChip T="string"
-                                         Size="Size.Small"
-                                         Color="@GetRuntimeColor(aiRuntimeStatus.Status)"
-                                         Variant="Variant.Outlined">
-                                    AI Runtime: @aiRuntimeStatus.Status
-                                </MudChip>
-                            </ChildContent>
-                            <TooltipContent>
-                                <MudStack Spacing="0">
-                                    <MudText Typo="Typo.caption">
-                                        Fallback: @(aiRuntimeStatus.FallbackEnabled ? $"enabled ({aiRuntimeStatus.FallbackProviderCount} alternate providers)" : "disabled")
-                                    </MudText>
-                                    @foreach (var provider in aiRuntimeStatus.Providers)
-                                    {
-                                        <MudText Typo="Typo.caption">
-                                            @provider.Channel: @provider.Status via @provider.ProviderName / @provider.ModelId
-                                        </MudText>
-                                    }
-                                    @foreach (var reason in aiRuntimeStatus.Reasons.Take(2))
-                                    {
-                                        <MudText Typo="Typo.caption">@reason</MudText>
-                                    }
-                                </MudStack>
-                            </TooltipContent>
-                        </MudTooltip>
-                    }
-                </MetadataContent>
             </HelpDesk.NewWeb.Components.Shared.TicketHeader>
 
             @if (!string.IsNullOrWhiteSpace(request.WorkflowStatus))
@@ -109,8 +74,6 @@ else
                         OrganizationId="@request.OrganizationId"
                         PublicMode="false" CanContribute="@CanContribute" CanManage="@CanManage"
                         OnWorklogAdded="HandleWorklogAdded"
-                        ShowAiStatusSummary="false"
-                        InitialAiCount="0"
                         Class="flex-grow-1" />
                 </MudTabPanel>
                 <MudTabPanel Text="Tasks">
@@ -330,7 +293,7 @@ else
                             <MudItem xs="12">
                                 <MudTextField T="string" Label="Created" Variant="Variant.Outlined" Dense="true" Margin="Margin.Dense" ReadOnly="true" Value="@request.CreatedAt.ToString("g")" />
                             </MudItem>
-                            @if (!string.IsNullOrWhiteSpace(request.SourceTicketId) || !string.IsNullOrWhiteSpace(request.SourceKnowledgeArticleId))
+                            @if (!string.IsNullOrWhiteSpace(request.SourceTicketId))
                             {
                                 <MudItem xs="12">
                                     <MudDivider Class="my-2" />
@@ -344,15 +307,6 @@ else
                                             </MudLink>
                                         </MudText>
                                     }
-                                    @if (!string.IsNullOrWhiteSpace(request.SourceKnowledgeArticleId))
-                                    {
-                                        <MudText Typo="Typo.caption" Class="d-block">
-                                            KB article:
-                                            <MudLink Href="@($"/kb/articles/{request.SourceKnowledgeArticleId}")">
-                                                @(request.SourceKnowledgeArticleTitle ?? request.SourceKnowledgeArticleId)
-                                            </MudLink>
-                                        </MudText>
-                                    }
                                     @if (!string.IsNullOrWhiteSpace(request.SourceAutomationBindingId))
                                     {
                                         <MudText Typo="Typo.caption" Class="d-block">
@@ -361,26 +315,6 @@ else
                                     }
                                 </MudItem>
                             }
-                            @if (auditEntries.Count > 0)
-                            {
-                                <MudItem xs="12">
-                                    <MudDivider Class="my-2" />
-                                    <MudText Typo="Typo.subtitle2" Class="mb-1">AI Activity</MudText>
-                                    <MudStack Spacing="1">
-                                        @foreach (var auditEntry in auditEntries.Take(5))
-                                        {
-                                            <MudPaper Class="pa-2" Outlined="true">
-                                                <MudText Typo="Typo.caption" Class="d-block">@auditEntry.OperationName</MudText>
-                                                <MudText Typo="Typo.caption" Class="d-block">@auditEntry.CreatedAt.ToLocalTime().ToString("g")</MudText>
-                                                @if (!string.IsNullOrWhiteSpace(auditEntry.Notes))
-                                                {
-                                                    <MudText Typo="Typo.caption" Class="d-block">Notes: @auditEntry.Notes</MudText>
-                                                }
-                                            </MudPaper>
-                                        }
-                                    </MudStack>
-                                </MudItem>
-                            }
                             @if (request.Sla is not null)
                             {
                                 <MudItem xs="12">
@@ -445,13 +379,9 @@ else
     private RequestDto? request;
     private RequestDto? originalRequest;
     private List<RequestTaskDto> tasks = new();
-    private List<TicketAiAuditEntryDto> auditEntries = new();
-    private OrganizationAiReadinessDto? aiReadiness;
-    private OrganizationAiRuntimeStatusDto? aiRuntimeStatus;
     private Dictionary<string, string> userDisplayNames = new(StringComparer.OrdinalIgnoreCase);
     private List<TicketCategoryDto> categories = new();
     private HashSet<Guid> selectedCategoryIds = new();
-    private List<KnowledgeSuggestion> suggestions = new();
     private bool loading = true;
     private bool tasksLoading;
     private bool taskActionInProgress;
@@ -460,10 +390,6 @@ else
     private bool canViewWorkflowPayload;
     private bool isUpdating;
     private bool hasChanges;
-    private string? articleId;
-    private bool kbWorking;
-    private bool suggestionsDisabled;
-    private CancellationTokenSource? pollCts;
     private readonly List<WorkflowTimelineItemDto> workflowTimeline = new();
     private bool workflowTimelineLoading;
     private bool workflowHasMore;
@@ -488,12 +414,11 @@ else
             var requestTask = HelpdeskApi.GetFromJsonAsync<RequestDto>($"api/v1/requests/{Id}");
             var categoriesTask = HelpdeskApi.GetFromJsonAsync<List<TicketCategoryDto>>($"api/v1/categories?type={(int)TicketCategoryType.Request}");
             var requestTasksTask = LoadTasksAsync();
-            var requestAuditTask = LoadAiAuditAsync();
             var workflowTimelineTask = LoadWorkflowTimelineAsync(reset: true);
             var rolesTask = ResolveRolesAsync();
             accessProfile = CurrentUserAccessProfile.FromClaims((await AccessAuthenticationState.GetAuthenticationStateAsync()).User);
 
-            await Task.WhenAll(requestTask, categoriesTask, requestTasksTask, requestAuditTask, workflowTimelineTask, rolesTask);
+            await Task.WhenAll(requestTask, categoriesTask, requestTasksTask, workflowTimelineTask, rolesTask);
 
             originalRequest = await requestTask;
             categories = await categoriesTask ?? new();
@@ -509,7 +434,6 @@ else
                 request = CloneRequest(originalRequest);
                 selectedCategoryIds = request.CategoryIds.ToHashSet();
                 if (CanManage) await LoadTeamMembersAsync();
-                _ = LoadAiMetadataAsync(request.OrganizationId);
             }
 
         }
@@ -546,8 +470,6 @@ else
             PayloadJson = source.PayloadJson,
             SourceTicketId = source.SourceTicketId,
             SourceTicketTrackingId = source.SourceTicketTrackingId,
-            SourceKnowledgeArticleId = source.SourceKnowledgeArticleId,
-            SourceKnowledgeArticleTitle = source.SourceKnowledgeArticleTitle,
             SourceAutomationBindingId = source.SourceAutomationBindingId,
             WorkflowStatus = source.WorkflowStatus,
             WorkflowBlockReason = source.WorkflowBlockReason,
@@ -571,117 +493,6 @@ else
         };
     }
 
-    private async Task LoadAiAuditAsync()
-    {
-        try
-        {
-            auditEntries = await HelpdeskApi.GetFromJsonAsync<List<TicketAiAuditEntryDto>>($"api/v1/requests/{Id}/ai-audit") ?? new();
-        }
-        catch
-        {
-            auditEntries = new();
-        }
-    }
-
-    private async Task LoadAiReadinessAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiReadiness = null;
-            return;
-        }
-
-        try
-        {
-            aiReadiness = await HelpdeskApi.GetFromJsonAsync<OrganizationAiReadinessDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/readiness");
-        }
-        catch
-        {
-            aiReadiness = null;
-        }
-    }
-
-    private async Task LoadAiRuntimeStatusAsync(string? organizationId)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            aiRuntimeStatus = null;
-            return;
-        }
-
-        try
-        {
-            aiRuntimeStatus = await HelpdeskApi.GetFromJsonAsync<OrganizationAiRuntimeStatusDto>($"api/v1/organizations/{organizationId}/ai-kb-settings/runtime-status?timeoutMs=1500");
-        }
-        catch
-        {
-            aiRuntimeStatus = null;
-        }
-    }
-
-    private async Task LoadAiMetadataAsync(string? organizationId)
-    {
-        await LoadAiReadinessAsync(organizationId);
-        await LoadAiRuntimeStatusAsync(organizationId);
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private static Color GetRuntimeColor(string? status) =>
-        string.Equals(status, "Ready", StringComparison.OrdinalIgnoreCase)
-            ? Color.Success
-            : string.Equals(status, "Degraded", StringComparison.OrdinalIgnoreCase)
-                ? Color.Warning
-                : Color.Error;
-
-    private async Task EnqueueSuggestionsAndPoll()
-    {
-        try
-        {
-            kbWorking = true;
-
-            var postResp = await HelpdeskApi.PostAsJsonAsync($"api/v1/tickets/{Id}/suggest-knowledge", new { });
-            if (postResp.StatusCode == System.Net.HttpStatusCode.NoContent)
-            {
-                suggestionsDisabled = true;
-                return;
-            }
-
-            pollCts?.Cancel();
-            pollCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-            while (!pollCts.IsCancellationRequested)
-            {
-                var resp = await HelpdeskApi.GetAsync($"api/v1/tickets/{Id}/suggest-knowledge", pollCts.Token);
-
-                if (resp.StatusCode == System.Net.HttpStatusCode.NoContent)
-                {
-                    await Task.Delay(600, pollCts.Token);
-                    continue;
-                }
-
-                if (resp.IsSuccessStatusCode)
-                {
-                    suggestions = await resp.Content.ReadFromJsonAsync<List<KnowledgeSuggestion>>() ?? new();
-                    break;
-                }
-
-                break;
-            }
-        }
-        catch { }
-        finally
-        {
-            kbWorking = false;
-            StateHasChanged();
-        }
-    }
-
-    public void Dispose()
-    {
-        pollCts?.Cancel();
-        pollCts?.Dispose();
-    }
-
     private void OnStateChanged(TicketState newState)
     {
         if (request is null) return;
@@ -787,60 +598,6 @@ else
         }
     }
 
-    private Task GenerateKnowledge() => GenerateOrRegenerate(false);
-    private Task RegenerateKnowledge() => GenerateOrRegenerate(true);
-
-    private async Task GenerateOrRegenerate(bool regenerate)
-    {
-        try
-        {
-            kbWorking = true;
-            var url = $"api/v1/tickets/{Id}/generate-knowledge" + (regenerate ? "?regenerate=true" : string.Empty);
-            var response = await HelpdeskApi.PostAsJsonAsync(url, new { });
-            if (response.IsSuccessStatusCode)
-            {
-                var article = await response.Content.ReadFromJsonAsync<ArticleDto>();
-                if (article is not null)
-                {
-                    articleId = article.Id;
-                    Snackbar.Add(regenerate ? "Article regenerated." : "Draft article generated.", Severity.Success);
-                    NavigationManager.NavigateTo($"/kb/{article.Id}");
-                }
-            }
-            else
-            {
-                Snackbar.Add("Knowledge generation failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
-    private async Task ApproveKnowledge()
-    {
-        if (articleId is null) return;
-        try
-        {
-            kbWorking = true;
-            var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-            var response = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{articleId}/state", dto);
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Article approved.", Severity.Success);
-            }
-            else
-            {
-                Snackbar.Add("Approval failed.", Severity.Error);
-            }
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
     private async Task PauseSlaAsync()
     {
         var dialog = await DialogService.ShowAsync<HelpDesk.NewWeb.Components.Shared.SlaPauseDialog>(
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestList.razor b/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestList.razor
index ae435653..81cf7fc5 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestList.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Requests/RequestList.razor
@@ -63,11 +63,11 @@
         <SubjectTemplate Context="request">
             <MudStack Spacing="0">
                 <MudText Typo="Typo.body2">@request.Title</MudText>
-                @if (!string.IsNullOrWhiteSpace(request.SourceTicketId) || !string.IsNullOrWhiteSpace(request.SourceKnowledgeArticleId))
+                @if (!string.IsNullOrWhiteSpace(request.SourceTicketId))
                 {
                     <MudStack Row="true" Spacing="1" Class="mt-1">
                         <MudChip T="string" Size="Size.Small" Color="Color.Info" Variant="Variant.Outlined">
-                            AI Origin
+                            Ticket origin
                         </MudChip>
                         @if (!string.IsNullOrWhiteSpace(request.SourceTicketTrackingId))
                         {
diff --git a/src/HelpDesk.NewWeb/Components/Pages/Setup.razor b/src/HelpDesk.NewWeb/Components/Pages/Setup.razor
index 3c2cf8ae..368c88e7 100644
--- a/src/HelpDesk.NewWeb/Components/Pages/Setup.razor
+++ b/src/HelpDesk.NewWeb/Components/Pages/Setup.razor
@@ -122,7 +122,7 @@
                             <MudTextField T="string" @bind-Value="_username" Label="Username" Required="true" FullWidth="true" />
                             <MudTextField T="string" @bind-Value="_databasePassword" Label="Password" InputType="InputType.Password" Required="true" FullWidth="true" />
                             <MudCheckBox T="bool" @bind-Value="_useTls" Label="Require TLS" />
-                            <MudText Typo="Typo.caption">RatelDesk validates the connection and required vector and pg_trgm extensions before continuing.</MudText>
+                            <MudText Typo="Typo.caption">RatelDesk validates connectivity and database permissions before continuing.</MudText>
                         }
                     </MudStep>
                     <MudStep Title="Instance">
diff --git a/src/HelpDesk.NewWeb/Components/Shared/TicketActivityTabs.razor b/src/HelpDesk.NewWeb/Components/Shared/TicketActivityTabs.razor
index 6aec3392..d6eb93c0 100644
--- a/src/HelpDesk.NewWeb/Components/Shared/TicketActivityTabs.razor
+++ b/src/HelpDesk.NewWeb/Components/Shared/TicketActivityTabs.razor
@@ -1,4 +1,3 @@
-@using Helpdesk.Shared.DTOs.Article
 @using Helpdesk.Shared.DTOs.Attachment
 @using Helpdesk.Shared.DTOs.Worklog
 @using Helpdesk.Shared.Enums
@@ -71,7 +70,6 @@
     {
     <MudTabPanel Text="AI Assistant"
                  Icon="@Icons.Material.Filled.AutoAwesome"
-                 BadgeData="@AiBadge"
                  BadgeColor="Color.Secondary">
         @if (IsPanelActive(4))
         {
@@ -107,34 +105,22 @@
     [Parameter] public bool CanManage { get; set; }
     [Parameter] public EventCallback OnWorklogAdded { get; set; }
     [Parameter] public string Class { get; set; } = string.Empty;
-    [Parameter] public bool ShowAiStatusSummary { get; set; } = true;
     [Parameter] public string MessagesTabText { get; set; } = "Messages";
     [Parameter] public RenderFragment? MessagesContent { get; set; }
-    [Parameter] public int InitialAiCount { get; set; }
 
     private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
     private int TimelineCount;
     private int AttachmentCount;
-    private int AiCount;
     private int ListenersCount;
     private int RelationsCount;
     private int activePanelIndex;
 
     private string TimelineBadge => TimelineCount.ToString();
     private string AttachmentBadge => AttachmentCount.ToString();
-    private string AiBadge => AiCount.ToString();
     private string ListenersBadge => ListenersCount.ToString();
     private string RelationsBadge => RelationsCount.ToString();
     private bool IsIncidentType => string.Equals(TicketType, "incidents", StringComparison.OrdinalIgnoreCase);
 
-    protected override void OnParametersSet()
-    {
-        if (AiCount == 0 && InitialAiCount > 0)
-        {
-            AiCount = InitialAiCount;
-        }
-    }
-
     protected override async Task OnInitializedAsync()
     {
         await PreloadBadgeCountsAsync();
@@ -230,12 +216,6 @@
         StateHasChanged();
     }
 
-    private void OnSuggestionsLoaded(List<KnowledgeSuggestion> suggestions)
-    {
-        AiCount = suggestions.Count;
-        StateHasChanged();
-    }
-
     private void OnListenersLoaded(int count)
     {
         ListenersCount = count;
diff --git a/src/HelpDesk.NewWeb/Components/Shared/TicketAiSuggestions.razor b/src/HelpDesk.NewWeb/Components/Shared/TicketAiSuggestions.razor
deleted file mode 100644
index 9eba05b0..00000000
--- a/src/HelpDesk.NewWeb/Components/Shared/TicketAiSuggestions.razor
+++ /dev/null
@@ -1,907 +0,0 @@
-@using Helpdesk.Shared.DTOs.Article
-@using Helpdesk.Shared.DTOs.Change
-@using Helpdesk.Shared.DTOs.Organization
-@using Helpdesk.Shared.Models
-
-@inject IHttpClientFactory HttpClientFactory
-@inject ISnackbar Snackbar
-@inject NavigationManager NavigationManager
-
-<MudStack Spacing="2">
-    @if (ShowStatusSummary && aiReadiness is not null)
-    {
-        <MudAlert Severity="@(aiReadiness.ProductionReady ? Severity.Success : Severity.Warning)"
-                  Dense="true"
-                  Variant="Variant.Outlined">
-            <MudText Typo="Typo.subtitle2">
-                AI rollout: @(aiReadiness.ProductionReady ? "Ready" : "Blocked")
-            </MudText>
-            <MudText Typo="Typo.caption" Class="d-block">
-                Suggestion gate: @(aiReadiness.SuggestionGateMet ? "met" : "blocked") |
-                Automation gate: @(aiReadiness.AutomationGateMet ? "met" : "blocked")
-            </MudText>
-            @if (aiReadiness.LastAiAuditAt.HasValue)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">
-                    Last AI activity: @aiReadiness.LastAiAuditAt.Value.ToLocalTime().ToString("g")
-                </MudText>
-            }
-            @if (aiReadiness.BlockingReasons.Count > 0)
-            {
-                <MudList T="string" Dense="true" Class="mt-1">
-                    @foreach (var reason in aiReadiness.BlockingReasons)
-                    {
-                        <MudListItem T="string">@reason</MudListItem>
-                    }
-                </MudList>
-            }
-        </MudAlert>
-    }
-
-    @if (ShowStatusSummary && aiRuntimeStatus is not null)
-    {
-        <MudAlert Severity="@GetRuntimeSeverity(aiRuntimeStatus.Status)"
-                  Dense="true"
-                  Variant="Variant.Outlined">
-            <MudText Typo="Typo.subtitle2">AI runtime: @aiRuntimeStatus.Status</MudText>
-            <MudText Typo="Typo.caption" Class="d-block">
-                Fallback: @(aiRuntimeStatus.FallbackEnabled ? $"enabled ({aiRuntimeStatus.FallbackProviderCount} alternate providers)" : "disabled")
-            </MudText>
-            @foreach (var provider in aiRuntimeStatus.Providers)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">
-                    @provider.Channel: @provider.Status
-                    @if (!string.IsNullOrWhiteSpace(provider.ProviderName))
-                    {
-                        <span> via @provider.ProviderName</span>
-                    }
-                    @if (!string.IsNullOrWhiteSpace(provider.ModelId))
-                    {
-                        <span> / @provider.ModelId</span>
-                    }
-                </MudText>
-            }
-            @if (aiRuntimeStatus.Reasons.Count > 0)
-            {
-                <MudList T="string" Dense="true" Class="mt-1">
-                    @foreach (var reason in aiRuntimeStatus.Reasons)
-                    {
-                        <MudListItem T="string">@reason</MudListItem>
-                    }
-                </MudList>
-            }
-            @if (aiRuntimeStatus.RecentEvidence.Count > 0)
-            {
-                <MudText Typo="Typo.caption" Class="d-block mt-1">Recent runtime evidence</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var evidence in aiRuntimeStatus.RecentEvidence.Take(3))
-                    {
-                        <MudListItem T="string">@evidence</MudListItem>
-                    }
-                </MudList>
-            }
-        </MudAlert>
-    }
-
-    @if (changeAiReview is not null && !string.Equals(TicketType, "incidents", StringComparison.OrdinalIgnoreCase) && !string.Equals(TicketType, "requests", StringComparison.OrdinalIgnoreCase))
-    {
-        <MudPaper Class="pa-3" Outlined="true">
-            <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-2">
-                <MudText Typo="Typo.subtitle2">Change AI Review</MudText>
-                <MudChip T="string"
-                         Color="@GetChangeReviewColor(changeAiReview)"
-                         Variant="Variant.Outlined"
-                         Size="Size.Small">
-                    @GetChangeReviewLabel(changeAiReview)
-                </MudChip>
-            </MudStack>
-            @if (!string.IsNullOrWhiteSpace(changeAiReview.Summary))
-            {
-                <MudText Typo="Typo.body2" Class="mb-2">@changeAiReview.Summary</MudText>
-            }
-            @if (changeAiReview.IssuesFound.Count > 0)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">Issues Found</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var item in changeAiReview.IssuesFound)
-                    {
-                        <MudListItem T="string">@item</MudListItem>
-                    }
-                </MudList>
-            }
-            @if (changeAiReview.RisksIdentified.Count > 0)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">Risks Identified</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var item in changeAiReview.RisksIdentified)
-                    {
-                        <MudListItem T="string">@item</MudListItem>
-                    }
-                </MudList>
-            }
-            @if (changeAiReview.MissingInformation.Count > 0)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">Missing Information</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var item in changeAiReview.MissingInformation)
-                    {
-                        <MudListItem T="string">@item</MudListItem>
-                    }
-                </MudList>
-            }
-            @if (changeAiReview.Recommendations.Count > 0)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">Recommendations</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var item in changeAiReview.Recommendations)
-                    {
-                        <MudListItem T="string">@item</MudListItem>
-                    }
-                </MudList>
-            }
-            @if (changeAiReview.CompletedAt.HasValue)
-            {
-                <MudText Typo="Typo.caption" Class="d-block">
-                    Completed: @changeAiReview.CompletedAt.Value.ToLocalTime().ToString("g")
-                </MudText>
-            }
-        </MudPaper>
-    }
-
-    @if (kbWorking)
-    {
-        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
-            <MudProgressLinear Indeterminate="true" Class="flex-grow-1" />
-            <MudText Typo="Typo.caption" Class="ml-2">Preparing suggestions...</MudText>
-        </MudStack>
-    }
-
-    @if (!kbWorking && suggestions.Count == 0)
-    {
-        @if (suggestionsDisabled)
-        {
-            <MudText Typo="Typo.body2">Suggestions disabled by admin.</MudText>
-        }
-        else
-        {
-            <MudText Typo="Typo.body2">No AI suggestions yet.</MudText>
-        }
-    }
-    else
-    {
-        @foreach (var suggestion in suggestions)
-        {
-            automationValidationResults.TryGetValue(suggestion.ArticleId, out var automationValidation);
-            var suggestionFeedback = GetLatestFeedback("suggestion", articleId: suggestion.ArticleId);
-            <MudPaper Class="pa-3 mb-2" Outlined="true">
-                <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-1">
-                    <MudText Typo="Typo.subtitle2">
-                        <MudLink Href="@suggestion.Link" Target="_blank">@suggestion.Title</MudLink>
-                    </MudText>
-                    <MudChip T="string"
-                             Color="@GetConfidenceColor(suggestion)"
-                             Variant="Variant.Outlined"
-                             Size="Size.Small">
-                        @suggestion.ConfidenceLabel
-                    </MudChip>
-                </MudStack>
-                <MudText Typo="Typo.caption">@suggestion.Excerpt</MudText>
-                <MudProgressLinear Class="mt-1" Value="@(suggestion.Score * 100)" Color="Color.Info" />
-                @if (suggestion.RequiresClarification && !string.IsNullOrWhiteSpace(suggestion.ClarificationPrompt))
-                {
-                    <MudAlert Severity="Severity.Warning" Dense="true" Variant="Variant.Outlined" Class="mt-2">
-                        @suggestion.ClarificationPrompt
-                    </MudAlert>
-                }
-                @if (suggestion.Evidence?.Count > 0)
-                {
-                    <MudStack Spacing="1" Class="mt-2">
-                        @foreach (var evidence in suggestion.Evidence.Take(2))
-                        {
-                            <MudPaper Class="pa-2" Outlined="true">
-                                <MudText Typo="Typo.caption">@evidence.Excerpt</MudText>
-                            </MudPaper>
-                        }
-                    </MudStack>
-                }
-                @if (suggestion.AutomationTarget is not null)
-                {
-                    <MudAlert Severity="@(automationValidation?.CanApprove == false ? Severity.Warning : Severity.Info)"
-                              Dense="true"
-                              Variant="Variant.Outlined"
-                              Class="mt-2">
-                        @if (automationValidation?.CanApprove == false)
-                        {
-                            <span>
-                                Automation target blocked:
-                                <strong>@(suggestion.AutomationTarget.TaskTemplateName ?? suggestion.AutomationTarget.OrchestrationJobDefinitionId ?? suggestion.AutomationTarget.OrchestrationRequestDefinitionId)</strong>
-                            </span>
-                        }
-                        else
-                        {
-                            <span>
-                                Automation target ready:
-                                <strong>@(suggestion.AutomationTarget.TaskTemplateName ?? suggestion.AutomationTarget.OrchestrationJobDefinitionId ?? suggestion.AutomationTarget.OrchestrationRequestDefinitionId)</strong>
-                            </span>
-                        }
-                    </MudAlert>
-                    @if (automationValidation?.Errors?.Count > 0)
-                    {
-                        <MudList T="string" Dense="true" Class="mt-1">
-                            @foreach (var error in automationValidation.Errors)
-                            {
-                                <MudListItem T="string">@error</MudListItem>
-                            }
-                        </MudList>
-                    }
-                    @if (string.Equals(TicketType, "incidents", StringComparison.OrdinalIgnoreCase))
-                    {
-                        <MudButton Variant="Variant.Filled"
-                                   Color="Color.Secondary"
-                                   Class="mt-2"
-                                   Disabled="@(automationApprovalRunning || automationValidationLoading.Contains(suggestion.ArticleId) || automationValidation?.CanApprove == false)"
-                                   OnClick="() => ApproveAutomationAsync(suggestion)">
-                            @(automationValidationLoading.Contains(suggestion.ArticleId)
-                                ? "Validating..."
-                                : automationApprovalRunning
-                                    ? "Starting..."
-                                    : "Approve Automation")
-                        </MudButton>
-                    }
-                }
-                <MudStack Row="true" Spacing="1" Class="mt-2">
-                    <MudButton Variant="Variant.Outlined"
-                               Size="Size.Small"
-                               Disabled="@feedbackSubmitting"
-                               OnClick='@(() => SubmitSuggestionFeedbackAsync(suggestion, "helpful"))'>
-                        Helpful
-                    </MudButton>
-                    <MudButton Variant="Variant.Outlined"
-                               Size="Size.Small"
-                               Disabled="@feedbackSubmitting"
-                               OnClick='@(() => SubmitSuggestionFeedbackAsync(suggestion, "not_helpful"))'>
-                        Not Helpful
-                    </MudButton>
-                </MudStack>
-                @if (suggestionFeedback is not null)
-                {
-                    <MudText Typo="Typo.caption" Class="d-block mt-1">
-                        Feedback: @suggestionFeedback.FeedbackValue.Replace('_', ' ') by @(suggestionFeedback.CreatedByName ?? "operator")
-                    </MudText>
-                }
-            </MudPaper>
-        }
-    }
-
-    @if (automationRuns.Count > 0)
-    {
-        <MudPaper Class="pa-3" Outlined="true">
-            <MudText Typo="Typo.subtitle2" Class="mb-2">Automation Runs</MudText>
-            <MudStack Spacing="1">
-                @foreach (var run in automationRuns)
-                {
-                    var automationFeedback = GetLatestFeedback("automation", requestId: run.RequestId);
-                    <MudPaper Class="pa-2" Outlined="true">
-                        <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2">
-                                <MudLink Href="@($"/requests/{run.RequestId}")">@run.RequestTrackingId</MudLink>
-                            </MudText>
-                            <MudChip T="string" Variant="Variant.Outlined" Size="Size.Small">
-                                @(run.LastAutomationStatus ?? run.RequestTaskStatus ?? run.WorkflowStatus ?? run.RequestState ?? "Pending")
-                            </MudChip>
-                        </MudStack>
-                        @if (!string.IsNullOrWhiteSpace(run.ArticleTitle))
-                        {
-                            <MudText Typo="Typo.caption" Class="d-block">
-                                From KB article: @run.ArticleTitle
-                            </MudText>
-                        }
-                        <MudText Typo="Typo.caption" Class="d-block">
-                            Task: @(run.RequestTaskTitle ?? "Automation task")
-                        </MudText>
-                        <MudText Typo="Typo.caption" Class="d-block">
-                            Created: @run.CreatedAt.ToLocalTime().ToString("g")
-                        </MudText>
-                        @if (!string.IsNullOrWhiteSpace(run.OrchestrationRunId))
-                        {
-                            <MudText Typo="Typo.caption" Class="d-block">
-                                External orchestration run: @run.OrchestrationRunId
-                            </MudText>
-                        }
-                        <MudStack Row="true" Spacing="1" Class="mt-2">
-                            <MudButton Variant="Variant.Outlined"
-                                       Size="Size.Small"
-                                       Disabled="@feedbackSubmitting"
-                                       OnClick='@(() => SubmitAutomationFeedbackAsync(run, "resolved"))'>
-                                Resolved Issue
-                            </MudButton>
-                            <MudButton Variant="Variant.Outlined"
-                                       Size="Size.Small"
-                                       Disabled="@feedbackSubmitting"
-                                       OnClick='@(() => SubmitAutomationFeedbackAsync(run, "not_resolved"))'>
-                                Did Not Resolve
-                            </MudButton>
-                        </MudStack>
-                        @if (automationFeedback is not null)
-                        {
-                            <MudText Typo="Typo.caption" Class="d-block mt-1">
-                                Outcome: @automationFeedback.FeedbackValue.Replace('_', ' ') by @(automationFeedback.CreatedByName ?? "operator")
-                            </MudText>
-                        }
-                    </MudPaper>
-                }
-            </MudStack>
-        </MudPaper>
-    }
-
-    @if (auditEntries.Count > 0)
-    {
-        <MudPaper Class="pa-3" Outlined="true">
-            <MudText Typo="Typo.subtitle2" Class="mb-2">AI Audit</MudText>
-            <MudStack Spacing="1">
-                @foreach (var auditEntry in auditEntries.Take(10))
-                {
-                    <MudPaper Class="pa-2" Outlined="true">
-                        <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2">@auditEntry.OperationName</MudText>
-                            <MudText Typo="Typo.caption">@auditEntry.CreatedAt.ToLocalTime().ToString("g")</MudText>
-                        </MudStack>
-                        <MudText Typo="Typo.caption" Class="d-block">
-                            Provider: @auditEntry.ProviderName / @auditEntry.ModelId
-                        </MudText>
-                        @if (!string.IsNullOrWhiteSpace(auditEntry.Notes))
-                        {
-                            <MudText Typo="Typo.caption" Class="d-block">
-                                Notes: @auditEntry.Notes
-                            </MudText>
-                        }
-                        @if (!string.IsNullOrWhiteSpace(auditEntry.CorrelationId))
-                        {
-                            <MudText Typo="Typo.caption" Class="d-block">
-                                Correlation: @auditEntry.CorrelationId
-                            </MudText>
-                        }
-                    </MudPaper>
-                }
-            </MudStack>
-        </MudPaper>
-    }
-
-    @if (requesterDraft is not null)
-    {
-        <MudPaper Class="pa-3" Outlined="true">
-            <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-2">
-                <MudText Typo="Typo.subtitle2">Requester Draft</MudText>
-                <MudChip T="string"
-                         Color="@(requesterDraft.RequiresClarification ? Color.Warning : Color.Success)"
-                         Variant="Variant.Outlined"
-                         Size="Size.Small">
-                    @(requesterDraft.RequiresClarification ? "Clarification Needed" : requesterDraft.ConfidenceLabel)
-                </MudChip>
-            </MudStack>
-
-            @if (!string.IsNullOrWhiteSpace(requesterDraft.SuggestedArticleTitle))
-            {
-                <MudText Typo="Typo.caption" Class="d-block mb-2">
-                    Grounded on
-                    <MudLink Href="@requesterDraft.SuggestedArticleLink" Target="_blank">@requesterDraft.SuggestedArticleTitle</MudLink>
-                </MudText>
-            }
-
-            <MudTextField T="string"
-                          @bind-Value="requesterDraftBody"
-                          Label="Draft Reply"
-                          Lines="8"
-                          Variant="Variant.Outlined"
-                          FullWidth="true"
-                          Class="mb-2" />
-
-            @if (requesterDraft.FollowUpQuestions.Count > 0)
-            {
-                <MudCheckBox T="bool"
-                             @bind-Value="includeRequesterFollowUpQuestions"
-                             Color="Color.Primary"
-                             Class="mb-1">
-                    Include follow-up questions
-                </MudCheckBox>
-                <MudText Typo="Typo.caption" Class="mb-1">Suggested Follow-up Questions</MudText>
-                <MudList T="string" Dense="true">
-                    @foreach (var question in requesterDraft.FollowUpQuestions)
-                    {
-                        <MudListItem T="string">@question</MudListItem>
-                    }
-                </MudList>
-            }
-
-            @if (string.Equals(TicketType, "incidents", StringComparison.OrdinalIgnoreCase))
-            {
-                <MudStack Row="true" Spacing="1" Class="mt-2">
-                    <MudButton Variant="Variant.Filled"
-                               Color="Color.Primary"
-                               Disabled="@requesterDraftSending"
-                               OnClick="ApproveAndSendRequesterDraftAsync">
-                        @(requesterDraftSending ? "Sending..." : "Approve And Send")
-                    </MudButton>
-                </MudStack>
-            }
-        </MudPaper>
-    }
-
-    <MudStack Row="true" Wrap="Wrap.Wrap" Spacing="1">
-        <MudButton OnClick="GenerateKnowledge" Disabled="kbWorking">Generate Knowledge</MudButton>
-        <MudButton OnClick="RegenerateKnowledge" Disabled="kbWorking || articleId is null">Regenerate</MudButton>
-        <MudButton OnClick="ApproveKnowledge" Disabled="kbWorking || articleId is null">Approve</MudButton>
-    </MudStack>
-</MudStack>
-
-@code {
-    private HttpClient HelpdeskApi => HttpClientFactory.CreateClient("HelpdeskApi");
-
-    [Parameter] public string TicketId { get; set; } = string.Empty;
-    [Parameter] public string TicketType { get; set; } = "incidents";
-    [Parameter] public string? OrganizationId { get; set; }
-    [Parameter] public EventCallback<List<KnowledgeSuggestion>> OnSuggestionsLoaded { get; set; }
-    [Parameter] public bool ShowStatusSummary { get; set; } = true;
-
-    private List<KnowledgeSuggestion> suggestions = new();
-    private List<TicketAutomationRunDto> automationRuns = new();
-    private List<TicketAiFeedbackDto> feedbackEntries = new();
-    private List<TicketAiAuditEntryDto> auditEntries = new();
-    private Dictionary<string, TicketAutomationValidationDto> automationValidationResults = new(StringComparer.OrdinalIgnoreCase);
-    private HashSet<string> automationValidationLoading = new(StringComparer.OrdinalIgnoreCase);
-    private RequesterReplyDraftDto? requesterDraft;
-    private ChangeAiReviewDto? changeAiReview;
-    private OrganizationAiReadinessDto? aiReadiness;
-    private OrganizationAiRuntimeStatusDto? aiRuntimeStatus;
-    private bool kbWorking;
-    private bool requesterDraftSending;
-    private bool automationApprovalRunning;
-    private bool feedbackSubmitting;
-    private string requesterDraftBody = string.Empty;
-    private bool includeRequesterFollowUpQuestions;
-    private bool suggestionsDisabled;
-    private string? articleId;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadSuggestionsAsync();
-    }
-
-    private async Task LoadSuggestionsAsync()
-    {
-        try
-        {
-            kbWorking = true;
-            await LoadAiReadinessAsync();
-            await LoadChangeReviewAsync();
-
-            var postResp = await HelpdeskApi.PostAsJsonAsync($"api/v1/tickets/{TicketId}/suggest-knowledge", new { });
-            if (postResp.StatusCode == System.Net.HttpStatusCode.NoContent)
-            {
-                suggestionsDisabled = true;
-                suggestions = new List<KnowledgeSuggestion>();
-                await OnSuggestionsLoaded.InvokeAsync(suggestions);
-                return;
-            }
-
-            for (var i = 0; i < 10; i++)
-            {
-                var resp = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/suggest-knowledge");
-
-                if (resp.StatusCode == System.Net.HttpStatusCode.NoContent)
-                {
-                    await Task.Delay(600);
-                    continue;
-                }
-
-                if (resp.IsSuccessStatusCode)
-                {
-                    suggestions = await resp.Content.ReadFromJsonAsync<List<KnowledgeSuggestion>>() ?? new();
-                }
-                else
-                {
-                    suggestions = new List<KnowledgeSuggestion>();
-                }
-
-                break;
-            }
-
-            await LoadAutomationValidationAsync();
-            await LoadFeedbackAsync();
-
-            var auditResponse = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/ai-audit");
-            if (auditResponse.IsSuccessStatusCode)
-            {
-                auditEntries = await auditResponse.Content.ReadFromJsonAsync<List<TicketAiAuditEntryDto>>() ?? new();
-            }
-            else
-            {
-                auditEntries = new List<TicketAiAuditEntryDto>();
-            }
-
-            var automationRunsResponse = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/automation-approvals");
-            if (automationRunsResponse.IsSuccessStatusCode)
-            {
-                automationRuns = await automationRunsResponse.Content.ReadFromJsonAsync<List<TicketAutomationRunDto>>() ?? new();
-            }
-            else
-            {
-                automationRuns = new List<TicketAutomationRunDto>();
-            }
-
-            var requesterReplyResponse = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/requester-reply-draft");
-            if (requesterReplyResponse.IsSuccessStatusCode)
-            {
-                requesterDraft = await requesterReplyResponse.Content.ReadFromJsonAsync<RequesterReplyDraftDto>();
-                requesterDraftBody = requesterDraft?.DraftReply ?? string.Empty;
-                includeRequesterFollowUpQuestions = requesterDraft?.RequiresClarification == true
-                    && requesterDraft.FollowUpQuestions.Count > 0;
-            }
-            else
-            {
-                requesterDraft = null;
-                requesterDraftBody = string.Empty;
-                includeRequesterFollowUpQuestions = false;
-            }
-        }
-        catch
-        {
-            suggestions = new List<KnowledgeSuggestion>();
-            automationRuns = new List<TicketAutomationRunDto>();
-            feedbackEntries = new List<TicketAiFeedbackDto>();
-            auditEntries = new List<TicketAiAuditEntryDto>();
-            automationValidationResults = new Dictionary<string, TicketAutomationValidationDto>(StringComparer.OrdinalIgnoreCase);
-            automationValidationLoading.Clear();
-            requesterDraft = null;
-            requesterDraftBody = string.Empty;
-            includeRequesterFollowUpQuestions = false;
-            changeAiReview = null;
-            aiReadiness = null;
-            aiRuntimeStatus = null;
-        }
-        finally
-        {
-            kbWorking = false;
-            await OnSuggestionsLoaded.InvokeAsync(suggestions);
-            StateHasChanged();
-        }
-    }
-
-    private Task GenerateKnowledge() => GenerateOrRegenerate(false);
-
-    private async Task LoadChangeReviewAsync()
-    {
-        if (!string.Equals(TicketType, "changes", StringComparison.OrdinalIgnoreCase))
-        {
-            changeAiReview = null;
-            return;
-        }
-
-        var response = await HelpdeskApi.GetAsync($"api/v1/changes/{TicketId}/ai-review");
-        changeAiReview = response.IsSuccessStatusCode
-            ? await response.Content.ReadFromJsonAsync<ChangeAiReviewDto>()
-            : null;
-    }
-
-    private Task RegenerateKnowledge() => GenerateOrRegenerate(true);
-
-    private async Task GenerateOrRegenerate(bool regenerate)
-    {
-        try
-        {
-            kbWorking = true;
-            var url = $"api/v1/tickets/{TicketId}/generate-knowledge" + (regenerate ? "?regenerate=true" : string.Empty);
-            var response = await HelpdeskApi.PostAsJsonAsync(url, new { });
-
-            if (response.IsSuccessStatusCode)
-            {
-                var article = await response.Content.ReadFromJsonAsync<ArticleDto>();
-                if (article is not null)
-                {
-                    articleId = article.Id;
-                    Snackbar.Add(regenerate ? "Article regenerated." : "Draft article generated.", Severity.Success);
-                    NavigationManager.NavigateTo($"/kb/{article.Id}");
-                }
-            }
-            else
-            {
-                Snackbar.Add("Knowledge generation failed.", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Knowledge generation failed: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
-    private async Task ApproveKnowledge()
-    {
-        if (articleId is null)
-            return;
-
-        try
-        {
-            kbWorking = true;
-            var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-            var response = await HelpdeskApi.PutAsJsonAsync($"api/v1/kb/{articleId}/state", dto);
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Article approved.", Severity.Success);
-            }
-            else
-            {
-                Snackbar.Add("Approval failed.", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Approval failed: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            kbWorking = false;
-        }
-    }
-
-    private static Color GetConfidenceColor(KnowledgeSuggestion suggestion) =>
-        suggestion.IsHighConfidence
-            ? Color.Success
-            : string.Equals(suggestion.ConfidenceLabel, "Medium", StringComparison.OrdinalIgnoreCase)
-                ? Color.Warning
-                : Color.Default;
-
-    private async Task ApproveAndSendRequesterDraftAsync()
-    {
-        if (requesterDraft is null)
-            return;
-
-        try
-        {
-            requesterDraftSending = true;
-            var response = await HelpdeskApi.PostAsJsonAsync(
-                $"api/v1/tickets/{TicketId}/requester-reply-draft/approve-send",
-                new ApproveRequesterReplyDraftDto
-                {
-                    EditedReply = requesterDraftBody,
-                    IncludeFollowUpQuestions = includeRequesterFollowUpQuestions
-                });
-
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Requester draft sent through the incident notification flow.", Severity.Success);
-            }
-            else
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add(string.IsNullOrWhiteSpace(error) ? "Failed to send requester draft." : error, Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Failed to send requester draft: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            requesterDraftSending = false;
-        }
-    }
-
-    private async Task ApproveAutomationAsync(KnowledgeSuggestion suggestion)
-    {
-        try
-        {
-            automationApprovalRunning = true;
-            var response = await HelpdeskApi.PostAsJsonAsync(
-                $"api/v1/tickets/{TicketId}/automation-approvals",
-                new ApproveTicketAutomationDto
-                {
-                    ArticleId = suggestion.ArticleId
-                });
-
-            if (response.IsSuccessStatusCode)
-            {
-                var result = await response.Content.ReadFromJsonAsync<TicketAutomationApprovalResultDto>();
-                await RefreshAutomationRunsAsync();
-                Snackbar.Add(
-                    result is null
-                        ? "Automation request created."
-                        : $"Automation request {result.RequestTrackingId} created.",
-                    Severity.Success);
-            }
-            else
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add(string.IsNullOrWhiteSpace(error) ? "Failed to approve automation." : error, Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Failed to approve automation: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            automationApprovalRunning = false;
-        }
-    }
-
-    private async Task RefreshAutomationRunsAsync()
-    {
-        var response = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/automation-approvals");
-        automationRuns = response.IsSuccessStatusCode
-            ? await response.Content.ReadFromJsonAsync<List<TicketAutomationRunDto>>() ?? new()
-            : new List<TicketAutomationRunDto>();
-    }
-
-    private async Task LoadFeedbackAsync()
-    {
-        var response = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/ai-feedback");
-        feedbackEntries = response.IsSuccessStatusCode
-            ? await response.Content.ReadFromJsonAsync<List<TicketAiFeedbackDto>>() ?? new()
-            : new List<TicketAiFeedbackDto>();
-    }
-
-    private async Task LoadAutomationValidationAsync()
-    {
-        automationValidationResults = new Dictionary<string, TicketAutomationValidationDto>(StringComparer.OrdinalIgnoreCase);
-        automationValidationLoading.Clear();
-
-        if (!string.Equals(TicketType, "incidents", StringComparison.OrdinalIgnoreCase))
-        {
-            return;
-        }
-
-        var articleIds = suggestions
-            .Where(x => x.AutomationTarget is not null && !string.IsNullOrWhiteSpace(x.ArticleId))
-            .Select(x => x.ArticleId)
-            .Distinct(StringComparer.OrdinalIgnoreCase)
-            .ToList();
-
-        foreach (var articleId in articleIds)
-        {
-            automationValidationLoading.Add(articleId);
-            try
-            {
-                var response = await HelpdeskApi.GetAsync($"api/v1/tickets/{TicketId}/automation-approvals/{articleId}/validation");
-                var result = await response.Content.ReadFromJsonAsync<TicketAutomationValidationDto>();
-                if (result is not null)
-                {
-                    automationValidationResults[articleId] = result;
-                }
-                else if (!response.IsSuccessStatusCode)
-                {
-                    automationValidationResults[articleId] = new TicketAutomationValidationDto
-                    {
-                        ArticleId = articleId,
-                        CanApprove = false,
-                        Summary = "Automation validation failed.",
-                        Errors = ["Automation validation failed."]
-                    };
-                }
-            }
-            catch
-            {
-                automationValidationResults[articleId] = new TicketAutomationValidationDto
-                {
-                    ArticleId = articleId,
-                    CanApprove = false,
-                    Summary = "Automation validation failed.",
-                    Errors = ["Automation validation failed."]
-                };
-            }
-            finally
-            {
-                automationValidationLoading.Remove(articleId);
-            }
-        }
-    }
-
-    private TicketAiFeedbackDto? GetLatestFeedback(string feedbackType, string? articleId = null, string? requestId = null)
-    {
-        return feedbackEntries.FirstOrDefault(x =>
-            string.Equals(x.FeedbackType, feedbackType, StringComparison.OrdinalIgnoreCase)
-            && (articleId is null || string.Equals(x.ArticleId, articleId, StringComparison.OrdinalIgnoreCase))
-            && (requestId is null || string.Equals(x.RequestId, requestId, StringComparison.OrdinalIgnoreCase)));
-    }
-
-    private async Task SubmitSuggestionFeedbackAsync(KnowledgeSuggestion suggestion, string feedbackValue)
-    {
-        await SubmitFeedbackAsync(new SubmitTicketAiFeedbackDto
-        {
-            FeedbackType = "suggestion",
-            FeedbackValue = feedbackValue,
-            ArticleId = suggestion.ArticleId
-        });
-    }
-
-    private async Task SubmitAutomationFeedbackAsync(TicketAutomationRunDto run, string feedbackValue)
-    {
-        await SubmitFeedbackAsync(new SubmitTicketAiFeedbackDto
-        {
-            FeedbackType = "automation",
-            FeedbackValue = feedbackValue,
-            RequestId = run.RequestId,
-            ArticleId = run.ArticleId
-        });
-    }
-
-    private async Task SubmitFeedbackAsync(SubmitTicketAiFeedbackDto dto)
-    {
-        try
-        {
-            feedbackSubmitting = true;
-            var response = await HelpdeskApi.PostAsJsonAsync($"api/v1/tickets/{TicketId}/ai-feedback", dto);
-            if (response.IsSuccessStatusCode)
-            {
-                await LoadFeedbackAsync();
-                Snackbar.Add("AI feedback recorded.", Severity.Success);
-            }
-            else
-            {
-                var error = await response.Content.ReadAsStringAsync();
-                Snackbar.Add(string.IsNullOrWhiteSpace(error) ? "Failed to record AI feedback." : error, Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Failed to record AI feedback: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            feedbackSubmitting = false;
-        }
-    }
-
-    private async Task LoadAiReadinessAsync()
-    {
-        if (string.IsNullOrWhiteSpace(OrganizationId))
-        {
-            aiReadiness = null;
-            return;
-        }
-
-        var response = await HelpdeskApi.GetAsync($"api/v1/organizations/{OrganizationId}/ai-kb-settings/readiness");
-        aiReadiness = response.IsSuccessStatusCode
-            ? await response.Content.ReadFromJsonAsync<OrganizationAiReadinessDto>()
-            : null;
-
-        var runtimeResponse = await HelpdeskApi.GetAsync($"api/v1/organizations/{OrganizationId}/ai-kb-settings/runtime-status");
-        aiRuntimeStatus = runtimeResponse.IsSuccessStatusCode
-            ? await runtimeResponse.Content.ReadFromJsonAsync<OrganizationAiRuntimeStatusDto>()
-            : null;
-    }
-
-    private static Severity GetRuntimeSeverity(string? status) =>
-        string.Equals(status, "Ready", StringComparison.OrdinalIgnoreCase)
-            ? Severity.Success
-            : string.Equals(status, "Degraded", StringComparison.OrdinalIgnoreCase)
-                ? Severity.Warning
-                : Severity.Error;
-
-    private static Color GetChangeReviewColor(ChangeAiReviewDto review) =>
-        review.Status switch
-        {
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Pass => Color.Success,
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Acknowledged => Color.Info,
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Warning => Color.Warning,
-            ChangeReviewStatus.Pending => Color.Info,
-            ChangeReviewStatus.Failed => Color.Error,
-            ChangeReviewStatus.Stale => Color.Warning,
-            _ => Color.Default
-        };
-
-    private static string GetChangeReviewLabel(ChangeAiReviewDto review) =>
-        review.Status switch
-        {
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Pass => "Passed",
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Acknowledged => "Acknowledged",
-            ChangeReviewStatus.Complete when review.GateState == ChangeReviewGateState.Warning => "Warning",
-            ChangeReviewStatus.Pending => "Pending",
-            ChangeReviewStatus.Failed => "Failed",
-            ChangeReviewStatus.Stale => "Stale",
-            _ => "Not Run"
-        };
-}
diff --git a/src/HelpDesk.NewWeb/Program.cs b/src/HelpDesk.NewWeb/Program.cs
index c263ba94..add1ad00 100644
--- a/src/HelpDesk.NewWeb/Program.cs
+++ b/src/HelpDesk.NewWeb/Program.cs
@@ -105,7 +105,6 @@
 builder.Services.AddScoped<IRequestService, RequestService>();
 builder.Services.AddScoped<IRequestFormService, RequestFormService>();
 builder.Services.AddScoped<IResourceDatasetService, ResourceDatasetService>();
-builder.Services.AddScoped<IAiAdminClient, AiAdminClient>();
 builder.Services.AddScoped<IInboundEmailRuleAdminClient, InboundEmailRuleAdminClient>();
 builder.Services.AddScoped<ISupportNotificationAdminClient, SupportNotificationAdminClient>();
 builder.Services.AddScoped<ISystemNotificationApiClient, SystemNotificationApiClient>();
diff --git a/src/HelpDesk.NewWeb/Services/AiAdminClient.cs b/src/HelpDesk.NewWeb/Services/AiAdminClient.cs
deleted file mode 100644
index 1c1c0220..00000000
--- a/src/HelpDesk.NewWeb/Services/AiAdminClient.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Json;
-using Helpdesk.Shared.DTOs;
-using Helpdesk.Shared.DTOs.AI;
-
-namespace HelpDesk.NewWeb.Services;
-
-public interface IAiAdminClient
-{
-    Task<PagedResponse<AiProviderSummaryDto>> GetProvidersAsync(int page, int pageSize);
-    Task<AiProviderSummaryDto?> GetProviderAsync(string id);
-    Task<AiProviderSummaryDto?> CreateProviderAsync(AiProviderCreateDto dto);
-    Task<AiProviderSummaryDto?> UpdateProviderAsync(string id, AiProviderUpdateDto dto);
-    Task<bool> DeleteProviderAsync(string id);
-    Task<AiProviderTestResultDto> TestAsync(string id);
-    Task<IEnumerable<AiModelDto>> GetModelsAsync(string id);
-    Task<string?> ChatTestAsync(AiTestChatRequest request);
-}
-
-public class AiAdminClient : IAiAdminClient
-{
-    private readonly HttpClient _httpClient;
-
-    public AiAdminClient(IHttpClientFactory httpClientFactory)
-    {
-        _httpClient = httpClientFactory.CreateClient("HelpdeskApi");
-    }
-
-    public async Task<PagedResponse<AiProviderSummaryDto>> GetProvidersAsync(int page, int pageSize)
-    {
-        var result = await _httpClient.GetFromJsonAsync<PagedResponse<AiProviderSummaryDto>>($"/api/v1/ai/providers?page={page}&pageSize={pageSize}");
-        return result ?? new PagedResponse<AiProviderSummaryDto> { Page = page, PageSize = pageSize };
-    }
-
-    public async Task<AiProviderSummaryDto?> GetProviderAsync(string id)
-    {
-        return await _httpClient.GetFromJsonAsync<AiProviderSummaryDto>($"/api/v1/ai/providers/{id}");
-    }
-
-    public async Task<AiProviderSummaryDto?> CreateProviderAsync(AiProviderCreateDto dto)
-    {
-        var response = await _httpClient.PostAsJsonAsync("/api/v1/ai/providers", dto);
-        if (!response.IsSuccessStatusCode)
-            return null;
-        return await response.Content.ReadFromJsonAsync<AiProviderSummaryDto>();
-    }
-
-    public async Task<AiProviderSummaryDto?> UpdateProviderAsync(string id, AiProviderUpdateDto dto)
-    {
-        var response = await _httpClient.PutAsJsonAsync($"/api/v1/ai/providers/{id}", dto);
-        if (!response.IsSuccessStatusCode)
-            return null;
-        return await response.Content.ReadFromJsonAsync<AiProviderSummaryDto>();
-    }
-
-    public async Task<bool> DeleteProviderAsync(string id)
-    {
-        var response = await _httpClient.DeleteAsync($"/api/v1/ai/providers/{id}");
-        return response.IsSuccessStatusCode;
-    }
-
-    public async Task<AiProviderTestResultDto> TestAsync(string id)
-    {
-        var response = await _httpClient.PostAsync($"/api/v1/ai/providers/{id}/test", null);
-        if (!response.IsSuccessStatusCode)
-        {
-            return new AiProviderTestResultDto
-            {
-                Success = false,
-                Message = $"Provider test request failed with HTTP {(int)response.StatusCode}."
-            };
-        }
-
-        var result = await response.Content.ReadFromJsonAsync<AiProviderTestResultDto>();
-        return result ?? new AiProviderTestResultDto { Success = false, Message = "Provider test returned no result." };
-    }
-
-    public async Task<IEnumerable<AiModelDto>> GetModelsAsync(string id)
-    {
-        var response = await _httpClient.GetAsync($"/api/v1/ai/providers/{id}/models");
-        if (!response.IsSuccessStatusCode)
-        {
-            var body = await response.Content.ReadAsStringAsync();
-            throw new InvalidOperationException(string.IsNullOrWhiteSpace(body)
-                ? $"Model refresh failed with HTTP {(int)response.StatusCode}."
-                : body);
-        }
-
-        var models = await response.Content.ReadFromJsonAsync<IEnumerable<AiModelDto>>();
-        return models ?? Enumerable.Empty<AiModelDto>();
-    }
-
-    public async Task<string?> ChatTestAsync(AiTestChatRequest request)
-    {
-        var dto = new AiChatRequestDto { Prompt = request.Prompt, Model = request.Model };
-        var response = await _httpClient.PostAsJsonAsync($"/api/v1/ai/providers/{request.ProviderId}/chat-test", dto);
-        if (!response.IsSuccessStatusCode)
-        {
-            var body = await response.Content.ReadAsStringAsync();
-            throw new InvalidOperationException(string.IsNullOrWhiteSpace(body)
-                ? $"Chat test failed with HTTP {(int)response.StatusCode}."
-                : body);
-        }
-
-        var result = await response.Content.ReadFromJsonAsync<ChatResponse>();
-        return result?.Response;
-    }
-
-    private record ChatResponse(string Response);
-}
diff --git a/src/HelpDesk.NewWeb/Services/SetupInitializationError.cs b/src/HelpDesk.NewWeb/Services/SetupInitializationError.cs
index b08adc0e..5e4d6c97 100644
--- a/src/HelpDesk.NewWeb/Services/SetupInitializationError.cs
+++ b/src/HelpDesk.NewWeb/Services/SetupInitializationError.cs
@@ -43,7 +43,7 @@ public static async Task<string> ReadAsync(HttpResponseMessage response, Cancell
             {
                 "setup_not_ready" => "The saved setup state changed. Check setup status, then unlock the wizard again if initialization is still incomplete.",
                 "setup_database_in_use" => "The selected database already contains installation data. Check the API setup status and confirm that this is the intended database.",
-                "setup_storage_preflight_failed" => "PostgreSQL did not pass setup checks. Verify connectivity, database permissions, and the vector and pg_trgm extensions.",
+                "setup_storage_preflight_failed" => "PostgreSQL did not pass setup checks. Verify connectivity and database permissions.",
                 _ => fallback
             }) + reference;
         }
diff --git a/src/Helpdesk.API/Background/AiSuggestionWorker.cs b/src/Helpdesk.API/Background/AiSuggestionWorker.cs
deleted file mode 100644
index 72b18069..00000000
--- a/src/Helpdesk.API/Background/AiSuggestionWorker.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Helpdesk.Shared.DTOs.Article;
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.API.Background;
-
-public sealed class AiSuggestionWorker : BackgroundService
-{
-    private readonly IAiSuggestionQueue _queue;
-    private readonly IServiceScopeFactory _scopeFactory;
-    private readonly ILogger<AiSuggestionWorker> _logger;
-
-    public AiSuggestionWorker(IAiSuggestionQueue queue, IServiceScopeFactory scopeFactory, ILogger<AiSuggestionWorker> logger)
-    {
-        _queue = queue;
-        _scopeFactory = scopeFactory;
-        _logger = logger;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        await foreach (var ticketId in _queue.DequeueAsync(stoppingToken))
-        {
-            try
-            {
-                using var scope = _scopeFactory.CreateScope();
-                var db = scope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-                var sugg = scope.ServiceProvider.GetRequiredService<KnowledgeSuggestionService>();
-                var retrieval = scope.ServiceProvider.GetRequiredService<IKnowledgeRetrievalService>();
-
-                var ticket = await db.Tickets.OfType<Incident>().FirstOrDefaultAsync(t => t.Id == ticketId, stoppingToken);
-                if (ticket is null) continue;
-
-                var orgSettings = await db.OrganizationAiKbSettings
-                    .AsNoTracking()
-                    .FirstOrDefaultAsync(o => o.OrganizationId == ticket.OrganizationId, stoppingToken);
-
-                if (orgSettings is null || orgSettings.EnableAiSearch == false)
-                {
-                    _logger.LogInformation("AI search disabled for org {Org}. Skipping suggestions for {Ticket}", ticket.OrganizationId, ticketId);
-                    continue;
-                }
-
-                if (string.IsNullOrWhiteSpace(ticket.OrganizationId))
-                {
-                    _logger.LogInformation("Ticket {TicketId} has no organization. Skipping AI suggestions.", ticketId);
-                    continue;
-                }
-
-                var retrievalResults = await retrieval.RetrieveAsync(ticket.OrganizationId, ticket.Description, 5, stoppingToken);
-                await sugg.SuggestAsync(ticket, stoppingToken);
-                var items = retrievalResults
-                    .Select(result => new KnowledgeSuggestion(
-                        result.Article.Id.ToString(),
-                        result.Article.Title,
-                        result.Evidence.FirstOrDefault()?.Text ?? result.Article.Summary ?? string.Empty,
-                        $"/kb/{result.Article.Id}",
-                        result.Score,
-                        result.ConfidenceLabel,
-                        result.IsHighConfidence,
-                        !result.IsHighConfidence,
-                        result.IsHighConfidence
-                            ? null
-                            : "Ask the requester to confirm the affected service, exact error text, and when the issue started before applying this guidance.",
-                        result.Evidence
-                            .Select(evidence => new KnowledgeSuggestionEvidence(
-                                evidence.ChunkId,
-                                evidence.SourceId,
-                                evidence.Text,
-                                evidence.Score))
-                            .ToList(),
-                        string.IsNullOrWhiteSpace(result.Article.AutomationBindingId)
-                            ? null
-                            : new KnowledgeArticleAutomationTargetDto
-                            {
-                                BindingId = result.Article.AutomationBindingId,
-                                RequestFormId = result.Article.AutomationRequestFormId,
-                                TaskTemplateId = result.Article.AutomationTaskTemplateId,
-                                TaskTemplateName = result.Article.AutomationTaskTemplateName,
-                                OrchestrationRequestDefinitionId = result.Article.AutomationOrchestrationRequestDefinitionId,
-                                OrchestrationJobDefinitionId = result.Article.AutomationOrchestrationJobDefinitionId,
-                                Enabled = true
-                            }))
-                    .ToList();
-
-                var row = await db.TicketAiSuggestions.FindAsync(new object?[] { ticketId }, cancellationToken: stoppingToken);
-                if (row is null)
-                {
-                    row = new TicketAiSuggestions { TicketId = ticketId };
-                    db.TicketAiSuggestions.Add(row);
-                }
-
-                row.CreatedAt = DateTimeOffset.UtcNow;
-                row.ItemsJson = System.Text.Json.JsonSerializer.Serialize(items);
-
-                await db.SaveChangesAsync(stoppingToken);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "AI suggestion job failed for ticket {TicketId}", ticketId);
-                try
-                {
-                    using var scope = _scopeFactory.CreateScope();
-                    var repo = scope.ServiceProvider.GetRequiredService<IErrorLogRepository>();
-                    await repo.SaveAsync(new ErrorLog { Message = ex.ToString(), Page = "ai-suggestions", Timestamp = DateTime.UtcNow });
-                }
-                catch { }
-            }
-        }
-    }
-}
diff --git a/src/Helpdesk.API/Background/IAiSuggestionQueue.cs b/src/Helpdesk.API/Background/IAiSuggestionQueue.cs
deleted file mode 100644
index 56659421..00000000
--- a/src/Helpdesk.API/Background/IAiSuggestionQueue.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Runtime.CompilerServices;
-using System.Threading.Channels;
-
-namespace Helpdesk.API.Background;
-
-public interface IAiSuggestionQueue
-{
-    ValueTask QueueAsync(string ticketId, CancellationToken ct = default);
-    IAsyncEnumerable<string> DequeueAsync(CancellationToken ct);
-}
-
-public sealed class AiSuggestionQueue : IAiSuggestionQueue
-{
-    private readonly Channel<string> _channel = Channel.CreateBounded<string>(
-        new BoundedChannelOptions(256) { SingleReader = true, SingleWriter = false });
-
-    public ValueTask QueueAsync(string ticketId, CancellationToken ct = default)
-        => _channel.Writer.WriteAsync(ticketId, ct);
-
-    public async IAsyncEnumerable<string> DequeueAsync([EnumeratorCancellation] CancellationToken ct)
-    {
-        while (await _channel.Reader.WaitToReadAsync(ct))
-            while (_channel.Reader.TryRead(out var id))
-                yield return id;
-    }
-}
diff --git a/src/Helpdesk.API/Bootstrap/PostgreSqlSetupPreflightService.cs b/src/Helpdesk.API/Bootstrap/PostgreSqlSetupPreflightService.cs
index af05d794..d4c7c3de 100644
--- a/src/Helpdesk.API/Bootstrap/PostgreSqlSetupPreflightService.cs
+++ b/src/Helpdesk.API/Bootstrap/PostgreSqlSetupPreflightService.cs
@@ -32,23 +32,13 @@ public async Task<PostgreSqlPreflightResult> CheckAsync(string? connectionString
             await connection.OpenAsync(cancellationToken);
             await using var command = connection.CreateCommand();
             command.CommandText = """
-                SELECT
-                    EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'vector'),
-                    EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'pg_trgm'),
-                    COUNT(*)
+                SELECT COUNT(*)
                 FROM information_schema.tables
                 WHERE table_schema = 'public';
                 """;
             await using var reader = await command.ExecuteReaderAsync(cancellationToken);
             await reader.ReadAsync(cancellationToken);
-            var hasVector = reader.GetBoolean(0);
-            var hasTrigram = reader.GetBoolean(1);
-            var publicTableCount = reader.GetInt64(2);
-
-            if (!hasVector || !hasTrigram)
-            {
-                return PostgreSqlPreflightResult.MissingExtensions;
-            }
+            var publicTableCount = reader.GetInt64(0);
 
             if (publicTableCount == 0)
             {
@@ -72,8 +62,6 @@ FROM information_schema.tables
             if (!hasMigrationHistory)
             {
                 return Classify(
-                    hasVector,
-                    hasTrigram,
                     publicTableCount,
                     hasMigrationHistory,
                     hasOrganizationsTable,
@@ -89,8 +77,6 @@ SELECT 1
                 """;
             var hasInitialRatelDeskMigration = (bool)(await command.ExecuteScalarAsync(cancellationToken))!;
             return Classify(
-                hasVector,
-                hasTrigram,
                 publicTableCount,
                 hasMigrationHistory,
                 hasOrganizationsTable,
@@ -104,19 +90,12 @@ SELECT 1
     }
 
     public static PostgreSqlPreflightResult Classify(
-        bool hasVector,
-        bool hasTrigram,
         long publicTableCount,
         bool hasMigrationHistory,
         bool hasOrganizationsTable,
         bool hasUsersTable,
         bool hasInitialRatelDeskMigration)
     {
-        if (!hasVector || !hasTrigram)
-        {
-            return PostgreSqlPreflightResult.MissingExtensions;
-        }
-
         if (publicTableCount == 0)
         {
             return PostgreSqlPreflightResult.EmptyTarget;
@@ -141,7 +120,6 @@ public enum PostgreSqlTargetKind
 public sealed record PostgreSqlPreflightResult(bool Succeeded, string? Error, PostgreSqlTargetKind? Target)
 {
     public static PostgreSqlPreflightResult InvalidConnection { get; } = new(false, "A valid PostgreSQL connection string is required.", null);
-    public static PostgreSqlPreflightResult MissingExtensions { get; } = new(false, "The target PostgreSQL database must have the vector and pg_trgm extensions installed.", null);
     public static PostgreSqlPreflightResult EmptyTarget { get; } = new(true, null, PostgreSqlTargetKind.Empty);
     public static PostgreSqlPreflightResult EstablishedRatelDesk { get; } = new(false, "The selected PostgreSQL database is an established RatelDesk installation. Configure it at deployment instead of running first-time setup.", PostgreSqlTargetKind.EstablishedRatelDesk);
     public static PostgreSqlPreflightResult UnrelatedTarget { get; } = new(false, "The selected PostgreSQL database is non-empty and is not recognized as a RatelDesk database.", PostgreSqlTargetKind.UnrelatedOrUnrecognized);
diff --git a/src/Helpdesk.API/Endpoints/AI/AiProvidersEndpoints.cs b/src/Helpdesk.API/Endpoints/AI/AiProvidersEndpoints.cs
deleted file mode 100644
index 68916d60..00000000
--- a/src/Helpdesk.API/Endpoints/AI/AiProvidersEndpoints.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using FluentValidation;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.DTOs;
-using Helpdesk.Shared.DTOs.AI;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Helpdesk.API.Endpoints.AI;
-
-public static class AiProvidersEndpoints
-{
-    public static void MapAiProviderEndpoints(this IEndpointRouteBuilder app)
-    {
-        var group = app.MapGroup("/api/v1/ai/providers")
-            .WithTags("AI Providers")
-            .RequireAuthorization("HelpdeskAdmin");
-
-        group.MapGet("/", async ([FromServices] IAiProviderService service, int page, int pageSize, CancellationToken token) =>
-        {
-            var all = (await service.ListAsync(token)).Select(ToDto).ToList();
-            var paged = all.Skip((page - 1) * pageSize).Take(pageSize).ToList();
-            return Results.Ok(new PagedResponse<AiProviderSummaryDto>
-            {
-                Items = paged,
-                Page = page,
-                PageSize = pageSize,
-                TotalCount = all.Count
-            });
-        })
-        .WithName("GetAiProviders")
-        .WithSummary("List AI providers")
-        .WithDescription("Gets a paginated list of AI providers.");
-
-        group.MapGet("/{id}", async (Guid id, IAiProviderService service, CancellationToken token) =>
-        {
-            var provider = await service.GetAsync(id, token);
-            return provider is not null
-                ? Results.Ok(ToDto(provider))
-                : Results.Problem("Provider not found", statusCode: 404);
-        })
-        .WithName("GetAiProvider")
-        .WithSummary("Get AI provider")
-        .WithDescription("Gets details for an AI provider.");
-
-        group.MapPost("/", async (AiProviderCreateDto dto, IAiProviderService service, IValidator<AiProviderCreateDto> validator, CancellationToken token) =>
-        {
-            var validation = await validator.ValidateAsync(dto, token);
-            if (!validation.IsValid)
-                return Results.ValidationProblem(validation.ToDictionary());
-            var entity = new AiProvider
-            {
-                Name = dto.Name,
-                ProviderType = dto.ProviderType,
-                BaseUrl = dto.BaseUrl,
-                IsEnabled = dto.IsEnabled,
-                DefaultModel = dto.DefaultModel,
-                ExtraHeadersJson = dto.ExtraHeadersJson
-            };
-            var created = await service.CreateAsync(entity, dto.ApiKey, token);
-            return Results.Created($"/api/v1/ai/providers/{created.Id}", ToDto(created));
-        })
-        .WithName("CreateAiProvider")
-        .WithSummary("Create AI provider")
-        .WithDescription("Creates a new AI provider.");
-
-        group.MapPut("/{id}", async (Guid id, AiProviderUpdateDto dto, IAiProviderService service, IValidator<AiProviderUpdateDto> validator, CancellationToken token) =>
-        {
-            var validation = await validator.ValidateAsync(dto, token);
-            if (!validation.IsValid)
-                return Results.ValidationProblem(validation.ToDictionary());
-            var entity = new AiProvider
-            {
-                Id = id,
-                Name = dto.Name,
-                ProviderType = dto.ProviderType,
-                BaseUrl = dto.BaseUrl,
-                IsEnabled = dto.IsEnabled,
-                DefaultModel = dto.DefaultModel,
-                ExtraHeadersJson = dto.ExtraHeadersJson
-            };
-            var updated = await service.UpdateAsync(entity, dto.ApiKey, token);
-            return updated is not null
-                ? Results.Ok(ToDto(updated))
-                : Results.Problem("Provider not found", statusCode: 404);
-        })
-        .WithName("UpdateAiProvider")
-        .WithSummary("Update AI provider")
-        .WithDescription("Updates an existing AI provider.");
-
-        group.MapDelete("/{id}", async (Guid id, IAiProviderService service, CancellationToken token) =>
-            await service.DeleteAsync(id, token)
-                ? Results.NoContent()
-                : Results.Problem("Provider not found", statusCode: 404))
-        .WithName("DeleteAiProvider")
-        .WithSummary("Delete AI provider")
-        .WithDescription("Deletes an AI provider.");
-
-        group.MapPost("/{id}/test", async (Guid id, IAiProviderService service, CancellationToken token) =>
-        {
-            var provider = await service.GetAsync(id, token);
-            if (provider is null) return Results.Problem("Provider not found", statusCode: 404);
-            var result = await service.TestAsync(id, token);
-            return Results.Ok(new AiProviderTestResultDto
-            {
-                Success = result.Success,
-                AttemptedUrl = result.AttemptedUrl,
-                StatusCode = result.StatusCode,
-                Message = result.Message,
-                ErrorBody = result.ErrorBody
-            });
-        })
-        .WithName("TestAiProvider")
-        .WithSummary("Test AI provider connectivity")
-        .WithDescription("Tests connectivity to the AI provider.");
-
-        group.MapGet("/{id}/models", async (Guid id, IAiProviderService service, CancellationToken token) =>
-        {
-            var provider = await service.GetAsync(id, token);
-            if (provider is null) return Results.Problem("Provider not found", statusCode: 404);
-
-            // Refresh models from upstream + persist new ones
-            await service.ListModelsAsync(id, token);
-
-            // Re-load to get up-to-date Models (IDs, IsEnabled, etc.)
-            provider = await service.GetAsync(id, token);
-            if (provider is null) return Results.Problem("Provider not found after refresh", statusCode: 404);
-
-            var dtos = provider.Models
-                .OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase)
-                .Select(m => new AiModelDto
-                {
-                    Id = m.Id.ToString(),
-                    Name = m.Name,
-                    IsEnabled = m.IsEnabled,
-                    ExtraHeadersJson = m.ExtraHeadersJson
-                })
-                .ToList();
-
-            return Results.Ok(dtos);
-        })
-        .WithName("ListAiProviderModels")
-        .WithSummary("List AI provider models")
-        .WithDescription("Lists available models for the AI provider.");
-
-        group.MapPost("/{id}/chat-test", async (Guid id, AiChatRequestDto dto, IAiProviderService service, IValidator<AiChatRequestDto> validator, CancellationToken token) =>
-        {
-            var validation = await validator.ValidateAsync(dto, token);
-            if (!validation.IsValid)
-                return Results.ValidationProblem(validation.ToDictionary());
-            var provider = await service.GetAsync(id, token);
-            if (provider is null) return Results.Problem("Provider not found", statusCode: 404);
-            try
-            {
-                var response = await service.ChatTestAsync(id, dto.Prompt, dto.Model, token);
-                return Results.Ok(new { Response = response });
-            }
-            catch (InvalidOperationException ex)
-            {
-                return Results.BadRequest(new { Error = ex.Message });
-            }
-        })
-        .WithName("ChatTestAiProvider")
-        .WithSummary("Chat test AI provider")
-        .WithDescription("Sends a prompt to the AI provider to test chat functionality.");
-    }
-
-    private static AiProviderSummaryDto ToDto(AiProvider provider) => new()
-    {
-        Id = provider.Id.ToString(),
-        Name = provider.Name,
-        ProviderType = provider.ProviderType,
-        BaseUrl = provider.BaseUrl,
-        IsEnabled = provider.IsEnabled,
-        DefaultModel = provider.DefaultModel,
-        Models = provider.Models.Select(m => new AiModelDto
-        {
-            Id = m.Id.ToString(),
-            Name = m.Name,
-            IsEnabled = m.IsEnabled,
-            ExtraHeadersJson = m.ExtraHeadersJson
-        }).ToList()
-    };
-}
diff --git a/src/Helpdesk.API/Endpoints/Changes/ChangeEndpoints.cs b/src/Helpdesk.API/Endpoints/Changes/ChangeEndpoints.cs
index 247348b0..32a6ed36 100644
--- a/src/Helpdesk.API/Endpoints/Changes/ChangeEndpoints.cs
+++ b/src/Helpdesk.API/Endpoints/Changes/ChangeEndpoints.cs
@@ -1,7 +1,6 @@
 using Helpdesk.Application.Events;
 using Helpdesk.Application.Messaging;
 using Helpdesk.Application.Services.Changes;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.Sla;
 using Helpdesk.Application.Tickets;
@@ -9,7 +8,6 @@
 using Helpdesk.Application.WorkLogs;
 using Helpdesk.Infrastructure.Persistence;
 using Helpdesk.Shared.DTOs;
-using Helpdesk.Shared.DTOs.Article;
 using Helpdesk.Shared.DTOs.Change;
 using Helpdesk.Shared.DTOs.Sla;
 using Helpdesk.Shared.DTOs.Worklog;
@@ -96,7 +94,7 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
             [FromServices] IDomainEventPublisher domainEvents,
             [FromServices] ICorrelationContext correlationContext,
             [FromServices] ILoggerFactory loggerFactory,
-            [FromServices] IChangeReviewService changeReviewService,
+            [FromServices] IChangeTemplateService changeTemplateService,
             [FromServices] ICurrentUserAccessService accessService,
             ClaimsPrincipal user,
             CancellationToken token) =>
@@ -140,22 +138,8 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
                 domainEvents,
                 correlationContext,
                 loggerFactory.CreateLogger("ChangeSla"));
-            var suggestionItemsJson = await db.TicketAiSuggestions
-                .AsNoTracking()
-                .Where(x => x.TicketId == entity.Id)
-                .Select(x => x.ItemsJson)
-                .FirstOrDefaultAsync();
-            var aiAuditCount = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .CountAsync(x => x.SubjectId == entity.Id);
-            var lastAiActivityAt = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == entity.Id)
-                .Select(x => x.CreatedAt)
-                .ToListAsync();
-            var template = changeReviewService.DeserializeTemplate(entity.ChangeTemplateJson);
-            var templateValidation = changeReviewService.ValidateTemplate(entity.ChangeType, template);
-            var latestReview = changeReviewService.BuildReviewDto(entity);
+            var template = changeTemplateService.DeserializeTemplate(entity.ChangeTemplateJson);
+            var templateValidation = changeTemplateService.ValidateTemplate(entity.ChangeType, template);
             var participantLookup = await BuildParticipantLookupAsync(db, [entity], CancellationToken.None);
             var approvals = (await db.ChangeApprovals
                     .AsNoTracking()
@@ -201,14 +185,6 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
                 IsTemplateComplete = templateValidation.IsComplete,
                 TemplateValidationErrors = templateValidation.Errors,
                 CategoryIds = categoryIds,
-                AiSuggestionCount = ParseKnowledgeSuggestionCount(suggestionItemsJson),
-                AiAuditCount = aiAuditCount,
-                LastAiActivityAt = lastAiActivityAt.Count > 0 ? lastAiActivityAt.Max() : null,
-                AiReviewStatus = entity.AiReviewStatus,
-                AiReviewGateState = entity.AiReviewGateState,
-                LatestAiReviewSummary = latestReview.Summary,
-                LastAiReviewAt = entity.AiReviewCompletedAt,
-                RequiresAiReviewAcknowledgement = entity.AiReviewGateState == ChangeReviewGateState.Warning,
                 Sla = ToSlaDto(slaSnapshot)
             };
             return Results.Ok(dto);
@@ -220,7 +196,7 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
             [FromServices] IRepository<Change> repo,
             [FromServices] ITicketSlaInitializer ticketSlaInitializer,
             [FromServices] Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService refs,
-            [FromServices] IChangeReviewService changeReviewService,
+            [FromServices] IChangeTemplateService changeTemplateService,
             [FromServices] ITicketNotificationService notificationService,
             [FromServices] ITimelineEventBus timelineEventBus,
             [FromServices] IDomainEventPublisher domainEvents,
@@ -230,7 +206,7 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
             ClaimsPrincipal user,
             CancellationToken token) =>
         {
-            var normalizedChangeType = changeReviewService.NormalizeChangeType(dto.ChangeType);
+            var normalizedChangeType = changeTemplateService.NormalizeChangeType(dto.ChangeType);
             if (string.IsNullOrWhiteSpace(normalizedChangeType))
             {
                 return Results.BadRequest("ChangeType must be Standard, Normal, or Emergency.");
@@ -274,7 +250,7 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
                 return participantValidation;
             }
 
-            var templateValidation = changeReviewService.ValidateTemplate(normalizedChangeType, dto.ChangeTemplate);
+            var templateValidation = changeTemplateService.ValidateTemplate(normalizedChangeType, dto.ChangeTemplate);
             var lifecycleState = ResolveInitialLifecycleState(templateValidation.IsComplete, dto.ApproverUserIds, access.CanApproveChange(organization.Id));
 
             var categoryIds = NormalizeCategoryIds(dto.CategoryIds);
@@ -305,9 +281,7 @@ public static void MapChangeEndpoints(this IEndpointRouteBuilder app)
                 LifecycleState = lifecycleState,
                 ImplementationStartAt = dto.ImplementationStartAt,
                 ImplementationEndAt = dto.ImplementationEndAt,
-                ChangeTemplateJson = changeReviewService.SerializeTemplate(dto.ChangeTemplate),
-                AiReviewStatus = ChangeReviewStatus.NotRequested,
-                AiReviewGateState = ChangeReviewGateState.NotRequired
+                ChangeTemplateJson = changeTemplateService.SerializeTemplate(dto.ChangeTemplate)
             };
             var participantLookup = await BuildParticipantLookupAsync(db, [entity], token);
             AddChangeListeners(entity, participantLookup);
@@ -398,17 +372,10 @@ await domainEvents.PublishAsync(
                 CcRecipients = created.CcRecipients.ToList(),
                 ImplementationStartAt = created.ImplementationStartAt,
                 ImplementationEndAt = created.ImplementationEndAt,
-                ChangeTemplate = changeReviewService.DeserializeTemplate(created.ChangeTemplateJson),
+                ChangeTemplate = changeTemplateService.DeserializeTemplate(created.ChangeTemplateJson),
                 IsTemplateComplete = templateValidation.IsComplete,
                 TemplateValidationErrors = templateValidation.Errors,
                 CategoryIds = categoryIds,
-                AiSuggestionCount = 0,
-                AiAuditCount = 0,
-                AiReviewStatus = created.AiReviewStatus,
-                AiReviewGateState = created.AiReviewGateState,
-                LatestAiReviewSummary = null,
-                LastAiReviewAt = created.AiReviewCompletedAt,
-                RequiresAiReviewAcknowledgement = false
             };
             return Results.Created($"/api/v1/changes/{created.Id}", responseDto);
         });
@@ -420,8 +387,6 @@ await domainEvents.PublishAsync(
             [FromServices] ICurrentUserAccessService accessService,
             [FromServices] HelpdeskDbContext db,
             [FromServices] IRepository<Change> repo,
-            [FromServices] IRepository<KnowledgeBaseArticle> kbRepo,
-            [FromServices] IKnowledgeBuilderService kbService,
             [FromServices] ITicketSlaCompletionService ticketSlaCompletionService,
             [FromServices] ITicketSlaService ticketSlaService,
             [FromServices] ITicketSlaRepository ticketSlaRepository,
@@ -430,7 +395,7 @@ await domainEvents.PublishAsync(
             [FromServices] IDomainEventPublisher domainEvents,
             [FromServices] ICorrelationContext correlationContext,
             [FromServices] ILoggerFactory loggerFactory,
-            [FromServices] IChangeReviewService changeReviewService,
+            [FromServices] IChangeTemplateService changeTemplateService,
             [FromServices] ITicketNotificationService notificationService,
             [FromServices] ITimelineEventBus timelineEventBus,
             CancellationToken token) =>
@@ -460,7 +425,7 @@ previousLifecycleState is not (ChangeLifecycleState.ApprovedForImplementation or
             }
 
             if (previousLifecycleState != ChangeLifecycleState.Draft &&
-                await HasLockedChangeFieldUpdatesAsync(db, existing, dto, changeReviewService, token))
+                await HasLockedChangeFieldUpdatesAsync(db, existing, dto, changeTemplateService, token))
             {
                 return Results.BadRequest("Change details are locked unless the change is moved back to Draft.");
             }
@@ -538,7 +503,7 @@ await HasLockedChangeFieldUpdatesAsync(db, existing, dto, changeReviewService, t
 
             if (!string.IsNullOrWhiteSpace(dto.ChangeType))
             {
-                var normalizedChangeType = changeReviewService.NormalizeChangeType(dto.ChangeType);
+                var normalizedChangeType = changeTemplateService.NormalizeChangeType(dto.ChangeType);
                 if (string.IsNullOrWhiteSpace(normalizedChangeType))
                 {
                     return Results.BadRequest("ChangeType must be Standard, Normal, or Emergency.");
@@ -549,7 +514,7 @@ await HasLockedChangeFieldUpdatesAsync(db, existing, dto, changeReviewService, t
 
             if (dto.ChangeTemplate is not null)
             {
-                existing.ChangeTemplateJson = changeReviewService.SerializeTemplate(dto.ChangeTemplate);
+                existing.ChangeTemplateJson = changeTemplateService.SerializeTemplate(dto.ChangeTemplate);
             }
 
             if (dto.ImplementationStartAt.HasValue)
@@ -573,16 +538,6 @@ await HasLockedChangeFieldUpdatesAsync(db, existing, dto, changeReviewService, t
 
             var templateChanged = !string.Equals(previousTemplateJson, existing.ChangeTemplateJson, StringComparison.Ordinal)
                 || !string.Equals(previousChangeType, existing.ChangeType, StringComparison.Ordinal);
-            if (templateChanged)
-            {
-                changeReviewService.MarkReviewStale(existing);
-            }
-
-            if (dto.AcknowledgeAiReviewWarnings && existing.AiReviewGateState == ChangeReviewGateState.Warning)
-            {
-                existing.AiReviewGateState = ChangeReviewGateState.Acknowledged;
-                existing.AiReviewAcknowledgedAt = DateTimeOffset.UtcNow;
-            }
 
             if (dto.LifecycleState.HasValue)
             {
@@ -601,8 +556,8 @@ await db.ChangeApprovals.AnyAsync(
 
             ApplyTicketStateForLifecycle(existing, previousState);
 
-            var currentTemplate = changeReviewService.DeserializeTemplate(existing.ChangeTemplateJson);
-            var currentTemplateValidation = changeReviewService.ValidateTemplate(existing.ChangeType, currentTemplate);
+            var currentTemplate = changeTemplateService.DeserializeTemplate(existing.ChangeTemplateJson);
+            var currentTemplateValidation = changeTemplateService.ValidateTemplate(existing.ChangeType, currentTemplate);
             var movedBackToDraft = previousLifecycleState != ChangeLifecycleState.Draft &&
                 EffectiveLifecycleState(existing) == ChangeLifecycleState.Draft;
             var submittedFromDraft = previousLifecycleState == ChangeLifecycleState.Draft &&
@@ -779,29 +734,6 @@ await domainEvents.PublishAsync(
                 correlationContext,
                 loggerFactory.CreateLogger("ChangeSla"));
 
-            if (previousState != TicketState.Resolved && updated!.State == TicketState.Resolved)
-            {
-                var hasDraft = await kbRepo.Query().AnyAsync(a => a.LinkedTicketId == id, token);
-                if (!hasDraft)
-                {
-                    await kbService.GenerateDraftFromResolvedTicketAsync(id, token);
-                }
-            }
-
-            var suggestionItemsJson = await db.TicketAiSuggestions
-                .AsNoTracking()
-                .Where(x => x.TicketId == updated.Id)
-                .Select(x => x.ItemsJson)
-                .FirstOrDefaultAsync(token);
-            var aiAuditCount = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .CountAsync(x => x.SubjectId == updated.Id, token);
-            var lastAiActivityAt = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == updated.Id)
-                .Select(x => x.CreatedAt)
-                .ToListAsync(token);
-            var latestReview = changeReviewService.BuildReviewDto(updated);
             var updatedParticipantLookup = await BuildParticipantLookupAsync(db, [updated], token);
             var updatedApprovals = (await db.ChangeApprovals
                     .AsNoTracking()
@@ -870,195 +802,12 @@ await domainEvents.PublishAsync(
                     .Where(x => x.ChangeId == updated.Id)
                     .Select(x => x.TicketCategoryId)
                     .ToListAsync(token),
-                AiSuggestionCount = ParseKnowledgeSuggestionCount(suggestionItemsJson),
-                AiAuditCount = aiAuditCount,
-                LastAiActivityAt = lastAiActivityAt.Count > 0 ? lastAiActivityAt.Max() : null,
-                AiReviewStatus = updated.AiReviewStatus,
-                AiReviewGateState = updated.AiReviewGateState,
-                LatestAiReviewSummary = latestReview.Summary,
-                LastAiReviewAt = updated.AiReviewCompletedAt,
-                RequiresAiReviewAcknowledgement = updated.AiReviewGateState == ChangeReviewGateState.Warning,
                 Sla = ToSlaDto(slaSnapshot)
             };
             return Results.Ok(resultDto);
         })
         .RequireAuthorization("ChangeManager");
 
-        group.MapGet("/{id}/ai-review", async (
-            [FromRoute] string id,
-            [FromServices] IRepository<Change> repo,
-            [FromServices] IChangeReviewService changeReviewService,
-            [FromServices] ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken token) =>
-        {
-            var change = await repo.GetAsync(id);
-            if (change is null)
-            {
-                return Results.NotFound();
-            }
-
-            var access = await accessService.ResolveAsync(user, token);
-            return access.CanViewChange(change.OrganizationId, change.CustomerId, change.RequesterEmail)
-                ? Results.Ok(changeReviewService.BuildReviewDto(change))
-                : Results.Forbid();
-        });
-
-        group.MapPost("/{id}/ai-review", async (
-            [FromRoute] string id,
-            [FromBody] RunChangeAiReviewRequestDto? dto,
-            [FromServices] IRepository<Change> repo,
-            [FromServices] IChangeReviewService changeReviewService,
-            [FromServices] IRequestSender sender,
-            [FromServices] IDomainEventPublisher domainEvents,
-            [FromServices] ICorrelationContext correlationContext,
-            [FromServices] ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken token) =>
-        {
-            var change = await repo.GetAsync(id);
-            if (change is null)
-            {
-                return Results.NotFound();
-            }
-
-            var access = await accessService.ResolveAsync(user, token);
-            if (!access.CanManageChange(change.OrganizationId))
-            {
-                return Results.Forbid();
-            }
-
-            ChangeAiReviewDto review;
-            try
-            {
-                review = await changeReviewService.RunReviewAsync(change, token);
-            }
-            catch (InvalidOperationException ex)
-            {
-                await domainEvents.PublishAsync(
-                    new ChangeAiReviewFailedDomainEvent(
-                        change.Id,
-                        change.TrackingId,
-                        change.OrganizationId,
-                        ex.Message,
-                        DateTimeOffset.UtcNow,
-                        GetCorrelationId(correlationContext)),
-                    token);
-                return Results.BadRequest(ex.Message);
-            }
-            catch (Exception ex)
-            {
-                await domainEvents.PublishAsync(
-                    new ChangeAiReviewFailedDomainEvent(
-                        change.Id,
-                        change.TrackingId,
-                        change.OrganizationId,
-                        ex.Message,
-                        DateTimeOffset.UtcNow,
-                        GetCorrelationId(correlationContext)),
-                    token);
-                throw;
-            }
-
-            var techId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            var techName = user.Identity?.Name;
-            var reviewVerb = dto?.Force == true ? "re-ran" : "ran";
-            await sender.Send(
-                new CreateWorkLogCommand(
-                    change.Id,
-                    0,
-                    $"Operator {reviewVerb} AI peer review for change {change.TrackingId}. Summary: {review.Summary}",
-                    techId,
-                    techName,
-                    NotifyCustomer: false),
-                token);
-            await domainEvents.PublishAsync(
-                new ChangeAiReviewCompletedDomainEvent(
-                    change.Id,
-                    change.TrackingId,
-                    change.OrganizationId,
-                    review.GateState,
-                    review.RequiresAcknowledgement,
-                    review.Summary,
-                    review.CompletedAt ?? DateTimeOffset.UtcNow,
-                    GetCorrelationId(correlationContext)),
-                token);
-            return Results.Ok(review);
-        });
-
-        group.MapPost("/{id}/ai-review/acknowledge", async (
-            [FromRoute] string id,
-            [FromBody] AcknowledgeChangeAiReviewDto? dto,
-            [FromServices] IRepository<Change> repo,
-            [FromServices] IRequestSender sender,
-            [FromServices] IDomainEventPublisher domainEvents,
-            [FromServices] ICorrelationContext correlationContext,
-            [FromServices] ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken token) =>
-        {
-            var change = await repo.GetAsync(id);
-            if (change is null)
-            {
-                return Results.NotFound();
-            }
-
-            var access = await accessService.ResolveAsync(user, token);
-            if (!access.CanManageChange(change.OrganizationId))
-            {
-                return Results.Forbid();
-            }
-
-            if (change.AiReviewStatus != ChangeReviewStatus.Complete)
-            {
-                return Results.BadRequest("AI peer review must complete before it can be acknowledged.");
-            }
-
-            if (change.AiReviewGateState != ChangeReviewGateState.Warning)
-            {
-                return Results.BadRequest("There are no outstanding AI review warnings to acknowledge.");
-            }
-
-            change.AiReviewGateState = ChangeReviewGateState.Acknowledged;
-            change.AiReviewAcknowledgedAt = DateTimeOffset.UtcNow;
-            change.AiReviewAcknowledgedByUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            change.AiReviewAcknowledgedByName = user.Identity?.Name;
-            change.AiReviewAcknowledgementNotes = string.IsNullOrWhiteSpace(dto?.Notes) ? null : dto!.Notes.Trim();
-            await repo.UpdateAsync(change);
-
-            await sender.Send(
-                new CreateWorkLogCommand(
-                    change.Id,
-                    0,
-                    string.IsNullOrWhiteSpace(change.AiReviewAcknowledgementNotes)
-                        ? "Operator acknowledged AI peer review warnings and allowed the change to proceed."
-                        : $"Operator acknowledged AI peer review warnings. Notes: {change.AiReviewAcknowledgementNotes}",
-                    change.AiReviewAcknowledgedByUserId,
-                    change.AiReviewAcknowledgedByName,
-                    NotifyCustomer: false),
-                token);
-            await domainEvents.PublishAsync(
-                new ChangeAiReviewAcknowledgedDomainEvent(
-                    change.Id,
-                    change.TrackingId,
-                    change.OrganizationId,
-                    change.AiReviewAcknowledgedByUserId,
-                    change.AiReviewAcknowledgedByName,
-                    change.AiReviewAcknowledgementNotes,
-                    change.AiReviewAcknowledgedAt ?? DateTimeOffset.UtcNow,
-                    GetCorrelationId(correlationContext)),
-                token);
-
-            return Results.Ok(new
-            {
-                change.AiReviewGateState,
-                change.AiReviewAcknowledgedAt,
-                change.AiReviewAcknowledgedByName,
-                change.AiReviewAcknowledgementNotes
-            });
-        })
-        .RequireAuthorization("ChangeManager");
-
         group.MapPost("/bulk/state", async (
             [FromBody] BulkStateChangeRequest req,
             [FromServices] IRepository<Change> repo,
@@ -1118,7 +867,7 @@ await domainEvents.PublishAsync(
             ClaimsPrincipal user,
             [FromServices] ICurrentUserAccessService accessService,
             [FromServices] HelpdeskDbContext db,
-            [FromServices] IChangeReviewService changeReviewService,
+            [FromServices] IChangeTemplateService changeTemplateService,
             [FromServices] ITicketSlaCompletionService ticketSlaCompletionService,
             [FromServices] ITicketNotificationService notificationService,
             [FromServices] ITimelineEventBus timelineEventBus,
@@ -1156,8 +905,8 @@ await domainEvents.PublishAsync(
                 return Results.Ok(ToQuickLifecycleDto(change, previousLifecycleState, null, null));
             }
 
-            var currentTemplate = changeReviewService.DeserializeTemplate(change.ChangeTemplateJson);
-            var currentTemplateValidation = changeReviewService.ValidateTemplate(change.ChangeType, currentTemplate);
+            var currentTemplate = changeTemplateService.DeserializeTemplate(change.ChangeTemplateJson);
+            var currentTemplateValidation = changeTemplateService.ValidateTemplate(change.ChangeType, currentTemplate);
             var nextLifecycleState = requestedLifecycleState;
             if (previousLifecycleState == ChangeLifecycleState.Draft &&
                 requestedLifecycleState == ChangeLifecycleState.Submitted)
@@ -1745,7 +1494,6 @@ private static async Task<IResult> GetChanges(
         [FromQuery] ChangeLifecycleState? lifecycleState = null,
         [FromQuery] bool activeOnly = false,
         [FromQuery] bool historicOnly = false,
-        [FromQuery] bool aiInvolved = false,
         [FromQuery] bool includeTotal = true,
         [FromQuery] bool summaryOnly = false,
         [FromQuery] string? q = null)
@@ -1815,13 +1563,6 @@ private static async Task<IResult> GetChanges(
                 x.Change.LifecycleState != ChangeLifecycleState.ImplementedBackedOut);
         }
 
-        if (aiInvolved)
-        {
-            query = query.Where(x =>
-                db.TicketAiSuggestions.Any(s => s.TicketId == x.Change.Id) ||
-                db.AiOperationAuditRecords.Any(a => a.SubjectId == x.Change.Id));
-        }
-
         if (!string.IsNullOrWhiteSpace(q))
         {
             var like = $"%{q.Trim()}%";
@@ -1871,11 +1612,7 @@ private static async Task<IResult> GetChanges(
                 x.Change.CcRecipients,
                 x.Change.ImplementationStartAt,
                 x.Change.ImplementationEndAt,
-                x.Change.ChangeTemplateJson,
-                x.Change.AiReviewStatus,
-                x.Change.AiReviewGateState,
-                x.Change.AiReviewOutputJson,
-                x.Change.AiReviewCompletedAt
+                x.Change.ChangeTemplateJson
             });
 
         var rawItems = page.HasValue
@@ -1928,12 +1665,7 @@ private static async Task<IResult> GetChanges(
                 CcRecipients = x.CcRecipients.ToList(),
                 ImplementationStartAt = x.ImplementationStartAt,
                 ImplementationEndAt = x.ImplementationEndAt,
-                IsTemplateComplete = !string.IsNullOrWhiteSpace(x.ChangeTemplateJson),
-                AiReviewStatus = x.AiReviewStatus,
-                AiReviewGateState = x.AiReviewGateState,
-                LatestAiReviewSummary = ParseLatestReviewSummary(x.AiReviewOutputJson),
-                LastAiReviewAt = x.AiReviewCompletedAt,
-                RequiresAiReviewAcknowledgement = x.AiReviewGateState == ChangeReviewGateState.Warning
+                IsTemplateComplete = !string.IsNullOrWhiteSpace(x.ChangeTemplateJson)
             }).ToList();
 
             return Results.Ok(new PagedResponse<ChangeDto>
@@ -1951,26 +1683,6 @@ private static async Task<IResult> GetChanges(
             .ToDictionaryAsync(
                 g => g.Key,
                 g => g.Select(link => link.TicketCategoryId).ToList());
-        var suggestionRows = await db.TicketAiSuggestions
-            .AsNoTracking()
-            .Where(x => changeIds.Contains(x.TicketId))
-            .Select(x => new { x.TicketId, x.ItemsJson })
-            .ToListAsync();
-        var suggestionCountLookup = suggestionRows.ToDictionary(
-            x => x.TicketId,
-            x => ParseKnowledgeSuggestionCount(x.ItemsJson),
-            StringComparer.OrdinalIgnoreCase);
-        var aiAuditCountLookup = await db.AiOperationAuditRecords
-            .AsNoTracking()
-            .Where(x => x.SubjectId != null && changeIds.Contains(x.SubjectId))
-            .GroupBy(x => x.SubjectId!)
-            .ToDictionaryAsync(g => g.Key, g => g.Count(), StringComparer.OrdinalIgnoreCase);
-        var aiActivityLookup = await db.AiOperationAuditRecords
-            .AsNoTracking()
-            .Where(x => x.SubjectId != null && changeIds.Contains(x.SubjectId))
-            .GroupBy(x => x.SubjectId!)
-            .ToDictionaryAsync(g => g.Key, g => g.Max(x => x.CreatedAt), StringComparer.OrdinalIgnoreCase);
-
         var items = rawItems.Select(i => new ChangeDto
         {
             OrganizationId = i.OrganizationId,
@@ -2003,15 +1715,7 @@ private static async Task<IResult> GetChanges(
             ImplementationStartAt = i.ImplementationStartAt,
             ImplementationEndAt = i.ImplementationEndAt,
             IsTemplateComplete = !string.IsNullOrWhiteSpace(i.ChangeTemplateJson),
-            CategoryIds = categoryLookup.TryGetValue(i.Id, out var ids) ? ids : new List<Guid>(),
-            AiSuggestionCount = suggestionCountLookup.TryGetValue(i.Id, out var suggestionCount) ? suggestionCount : 0,
-            AiAuditCount = aiAuditCountLookup.TryGetValue(i.Id, out var aiAuditCount) ? aiAuditCount : 0,
-            LastAiActivityAt = aiActivityLookup.TryGetValue(i.Id, out var lastAiActivityAt) ? lastAiActivityAt : null,
-            AiReviewStatus = i.AiReviewStatus,
-            AiReviewGateState = i.AiReviewGateState,
-            LatestAiReviewSummary = ParseLatestReviewSummary(i.AiReviewOutputJson),
-            LastAiReviewAt = i.AiReviewCompletedAt,
-            RequiresAiReviewAcknowledgement = i.AiReviewGateState == ChangeReviewGateState.Warning
+            CategoryIds = categoryLookup.TryGetValue(i.Id, out var ids) ? ids : new List<Guid>()
         }).ToList();
 
         var response = new PagedResponse<ChangeDto>
@@ -2141,7 +1845,7 @@ private static async Task<bool> HasLockedChangeFieldUpdatesAsync(
         HelpdeskDbContext db,
         Change existing,
         UpdateChangeDto dto,
-        IChangeReviewService changeReviewService,
+        IChangeTemplateService changeTemplateService,
         CancellationToken token)
     {
         if (dto.State != existing.State ||
@@ -2161,7 +1865,7 @@ private static async Task<bool> HasLockedChangeFieldUpdatesAsync(
 
         if (!string.IsNullOrWhiteSpace(dto.ChangeType))
         {
-            var normalizedChangeType = changeReviewService.NormalizeChangeType(dto.ChangeType);
+            var normalizedChangeType = changeTemplateService.NormalizeChangeType(dto.ChangeType);
             if (!string.Equals(normalizedChangeType, existing.ChangeType, StringComparison.Ordinal))
             {
                 return true;
@@ -2170,7 +1874,7 @@ private static async Task<bool> HasLockedChangeFieldUpdatesAsync(
 
         if (dto.ChangeTemplate is not null &&
             !string.Equals(
-                changeReviewService.SerializeTemplate(dto.ChangeTemplate),
+                changeTemplateService.SerializeTemplate(dto.ChangeTemplate),
                 existing.ChangeTemplateJson,
                 StringComparison.Ordinal))
         {
@@ -2788,40 +2492,6 @@ private static void ApplyClosedAtTransition(Ticket ticket, TicketState previousS
         }
     }
 
-    private static int ParseKnowledgeSuggestionCount(string? itemsJson)
-    {
-        if (string.IsNullOrWhiteSpace(itemsJson))
-        {
-            return 0;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize<List<KnowledgeSuggestion>>(itemsJson)?.Count ?? 0;
-        }
-        catch
-        {
-            return 0;
-        }
-    }
-
-    private static string? ParseLatestReviewSummary(string? reviewJson)
-    {
-        if (string.IsNullOrWhiteSpace(reviewJson))
-        {
-            return null;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize<ChangeAiReviewDto>(reviewJson)?.Summary;
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
     private static async Task<IResult?> ValidateCategorySelectionAsync(
         HelpdeskDbContext db,
         IReadOnlyCollection<Guid> categoryIds,
diff --git a/src/Helpdesk.API/Endpoints/Incidents/IncidentEndpoints.cs b/src/Helpdesk.API/Endpoints/Incidents/IncidentEndpoints.cs
index 365e65bd..f6378928 100644
--- a/src/Helpdesk.API/Endpoints/Incidents/IncidentEndpoints.cs
+++ b/src/Helpdesk.API/Endpoints/Incidents/IncidentEndpoints.cs
@@ -5,7 +5,6 @@
 using Helpdesk.Application.Messaging;
 using Helpdesk.Application.Observability;
 using Helpdesk.Application.Sla;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.Services.SupportNotifications;
 using Helpdesk.Application.WorkLogs;
@@ -29,7 +28,6 @@
 using Microsoft.Extensions.Options;
 using System.Net;
 using System.Security.Claims;
-using System.Text.Json;
 
 namespace Helpdesk.API.Endpoints.Incidents;
 
@@ -53,7 +51,6 @@ public static void MapIncidentEndpoints(this IEndpointRouteBuilder app)
             [FromQuery] TicketState? state = null,
             [FromQuery] bool activeOnly = false,
             [FromQuery] bool historicOnly = false,
-            [FromQuery] bool aiInvolved = false,
             [FromQuery] bool includeTotal = true,
             [FromQuery] bool summaryOnly = false,
             string? organizationId = null,
@@ -129,14 +126,6 @@ from o in co.DefaultIfEmpty()
                 query = query.Where(x => x.Incident.State != TicketState.Resolved);
             }
 
-            if (aiInvolved)
-            {
-                query = query.Where(x =>
-                    db.TicketAiSuggestions.Any(s => s.TicketId == x.Incident.Id) ||
-                    db.Requests.Any(r => r.SourceTicketId == x.Incident.Id) ||
-                    db.AiOperationAuditRecords.Any(a => a.SubjectId == x.Incident.Id));
-            }
-
             if (!string.IsNullOrWhiteSpace(q))
             {
                 var like = $"%{q.Trim()}%";
@@ -221,26 +210,6 @@ from o in co.DefaultIfEmpty()
                 .ToDictionaryAsync(
                     g => g.Key,
                     g => g.Select(link => link.TicketCategoryId).ToList());
-            var suggestionRows = await db.TicketAiSuggestions
-                .AsNoTracking()
-                .Where(x => incidentIds.Contains(x.TicketId))
-                .Select(x => new { x.TicketId, x.ItemsJson })
-                .ToListAsync();
-            var suggestionCountLookup = suggestionRows.ToDictionary(
-                x => x.TicketId,
-                x => ParseKnowledgeSuggestionCount(x.ItemsJson),
-                StringComparer.OrdinalIgnoreCase);
-            var automationRunCountLookup = await db.Requests
-                .AsNoTracking()
-                .Where(x => x.SourceTicketId != null && incidentIds.Contains(x.SourceTicketId))
-                .GroupBy(x => x.SourceTicketId!)
-                .ToDictionaryAsync(g => g.Key, g => g.Count(), StringComparer.OrdinalIgnoreCase);
-            var aiActivityLookup = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId != null && incidentIds.Contains(x.SubjectId))
-                .GroupBy(x => x.SubjectId!)
-                .ToDictionaryAsync(g => g.Key, g => g.Max(x => x.CreatedAt), StringComparer.OrdinalIgnoreCase);
-
             var items = rawItems.Select(x => new IncidentDto
             {
                 OrganizationId = x.OrganizationId,
@@ -257,10 +226,7 @@ from o in co.DefaultIfEmpty()
                 RequesterEmail = x.RequesterEmail,
                 LastReplierName = x.LastReplierName,
                 AssignedToId = x.AssignedToId,
-                CategoryIds = categoryLookup.TryGetValue(x.Id, out var ids) ? ids : new List<Guid>(),
-                AiSuggestionCount = suggestionCountLookup.TryGetValue(x.Id, out var suggestionCount) ? suggestionCount : 0,
-                AiAutomationRunCount = automationRunCountLookup.TryGetValue(x.Id, out var automationRunCount) ? automationRunCount : 0,
-                LastAiActivityAt = aiActivityLookup.TryGetValue(x.Id, out var lastAiActivityAt) ? lastAiActivityAt : null
+                CategoryIds = categoryLookup.TryGetValue(x.Id, out var ids) ? ids : new List<Guid>()
             }).ToList();
 
             return Results.Ok(new PagedResponse<IncidentDto>
@@ -324,22 +290,6 @@ from o in co.DefaultIfEmpty()
                 domainEvents,
                 correlationContext,
                 loggerFactory.CreateLogger("IncidentSla"));
-            var suggestionItemsJson = await db.TicketAiSuggestions
-                .AsNoTracking()
-                .Where(x => x.TicketId == incident.Id)
-                .Select(x => x.ItemsJson)
-                .FirstOrDefaultAsync();
-            var automationRunCount = await db.Requests
-                .AsNoTracking()
-                .CountAsync(x => x.SourceTicketId == incident.Id);
-            var aiActivityDates = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == incident.Id)
-                .Select(x => x.CreatedAt)
-                .ToListAsync();
-            var lastAiActivityAt = aiActivityDates.Count == 0
-                ? null
-                : (DateTimeOffset?)aiActivityDates.Max();
             var incidentDto = new IncidentDto
             {
                 OrganizationId = incident.OrganizationId,
@@ -358,9 +308,6 @@ from o in co.DefaultIfEmpty()
                 CcRecipients = incident.CcRecipients,
                 AssignedToId = incident.AssignedToId,
                 CategoryIds = categoryIds,
-                AiSuggestionCount = ParseKnowledgeSuggestionCount(suggestionItemsJson),
-                AiAutomationRunCount = automationRunCount,
-                LastAiActivityAt = lastAiActivityAt,
                 Sla = ToSlaDto(slaSnapshot)
             };
             return Results.Ok(incidentDto);
@@ -470,9 +417,7 @@ from o in co.DefaultIfEmpty()
                 RequesterEmail = created.RequesterEmail,
                 CcRecipients = created.CcRecipients,
                 AssignedToId = created.AssignedToId,
-                CategoryIds = categoryIds,
-                AiSuggestionCount = 0,
-                AiAutomationRunCount = 0
+                CategoryIds = categoryIds
             };
             return Results.Created($"/api/v1/incidents/{created.Id}", createdDto);
         });
@@ -598,41 +543,6 @@ await db.IncidentCategoryLinks
 
             if (previousState != TicketState.Resolved && updatedIncident!.State == TicketState.Resolved)
             {
-                var ticketId = updatedIncident.Id;
-                var trackingId = updatedIncident.TrackingId;
-                var organizationId = updatedIncident.OrganizationId;
-                var postProcessCorrelationId = GetCorrelationId(correlationContext);
-                jobs.Queue(async (sp, ct) =>
-                {
-                    var logger = sp.GetRequiredService<ILoggerFactory>().CreateLogger("IncidentPostProcess");
-                    try
-                    {
-                        var kb = sp.GetRequiredService<IKnowledgeBuilderService>();
-                        await kb.GenerateDraftFromResolvedTicketAsync(ticketId, ct);
-                        HelpdeskTelemetry.RecordAiPostProcessOutcome("completed", "success");
-                        logger.LogInformation("KB draft/embeddings generated for ticket {TicketId}", ticketId);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (IsExpectedAiProviderOutage(ex))
-                        {
-                            HelpdeskTelemetry.RecordAiPostProcessOutcome("skipped", "ai_provider_unavailable");
-                            logger.LogWarning(
-                                ex,
-                                "Optional incident post-processing skipped because AI providers are unavailable. TicketId={TicketId} TrackingId={TrackingId} OrganizationId={OrganizationId} CorrelationId={CorrelationId} Reason={Reason}",
-                                ticketId,
-                                trackingId,
-                                organizationId,
-                                postProcessCorrelationId,
-                                SummarizeException(ex));
-                            return;
-                        }
-
-                        HelpdeskTelemetry.RecordAiPostProcessOutcome("failed", "unexpected_error");
-                        logger.LogError(ex, "Post-processing failed for ticket {TicketId}", ticketId);
-                    }
-                });
-
                 await SendResolvedNotificationAsync(updatedIncident, ticketNotificationService, token);
             }
 
@@ -643,22 +553,6 @@ await SendAssignmentNotificationSafelyAsync(
                 supportNotificationService,
                 token);
 
-            var updatedSuggestionItemsJson = await db.TicketAiSuggestions
-                .AsNoTracking()
-                .Where(x => x.TicketId == updatedIncident.Id)
-                .Select(x => x.ItemsJson)
-                .FirstOrDefaultAsync(token);
-            var updatedAutomationRunCount = await db.Requests
-                .AsNoTracking()
-                .CountAsync(x => x.SourceTicketId == updatedIncident.Id, token);
-            var updatedAiActivityDates = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == updatedIncident.Id)
-                .Select(x => x.CreatedAt)
-                .ToListAsync(token);
-            var updatedLastAiActivityAt = updatedAiActivityDates.Count == 0
-                ? null
-                : (DateTimeOffset?)updatedAiActivityDates.Max();
             var updatedCustomer = !string.IsNullOrWhiteSpace(updatedIncident.CustomerId)
                 ? await db.Customers
                     .AsNoTracking()
@@ -693,9 +587,6 @@ await SendAssignmentNotificationSafelyAsync(
                     .Where(x => x.IncidentId == updatedIncident.Id)
                     .Select(x => x.TicketCategoryId)
                     .ToListAsync(token),
-                AiSuggestionCount = ParseKnowledgeSuggestionCount(updatedSuggestionItemsJson),
-                AiAutomationRunCount = updatedAutomationRunCount,
-                LastAiActivityAt = updatedLastAiActivityAt,
                 Sla = ToSlaDto(slaSnapshot)
             };
 
@@ -1789,54 +1680,11 @@ await domainEvents.PublishAsync(
         };
     }
 
-    private static int ParseKnowledgeSuggestionCount(string? itemsJson)
-    {
-        if (string.IsNullOrWhiteSpace(itemsJson))
-        {
-            return 0;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize<List<KnowledgeSuggestion>>(itemsJson)?.Count ?? 0;
-        }
-        catch
-        {
-            return 0;
-        }
-    }
-
     private static string GetCorrelationId(ICorrelationContext correlationContext)
     {
         return correlationContext.GetCorrelationId() ?? $"corr-{Guid.NewGuid():N}";
     }
 
-    private static bool IsExpectedAiProviderOutage(Exception ex)
-    {
-        for (var current = ex; current is not null; current = current.InnerException)
-        {
-            if (current is InvalidOperationException &&
-                current.Message.Contains("All configured AI chat providers failed", StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            if (current is InvalidOperationException &&
-                current.Message.Contains("All configured embedding providers failed", StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            if (current.Message.Contains("Connection refused", StringComparison.OrdinalIgnoreCase) ||
-                current.Message.Contains("operation didn't complete within the allowed timeout", StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private static string SummarizeException(Exception ex)
     {
         var messages = new List<string>();
diff --git a/src/Helpdesk.API/Endpoints/KB/KBEndpoints.cs b/src/Helpdesk.API/Endpoints/KB/KBEndpoints.cs
deleted file mode 100644
index 694e1917..00000000
--- a/src/Helpdesk.API/Endpoints/KB/KBEndpoints.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Application.Orchestration;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs;
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.DTOs.Orchestration;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Helpdesk.Application.Services.AI;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace Helpdesk.API.Endpoints.KB;
-
-public static class KBEndpoints
-{
-    public static void MapKbEndpoints(this IEndpointRouteBuilder app)
-    {
-        var group = app.MapGroup("/api/v1/kb")
-            .WithTags("Knowledge Base")
-            .RequireAuthorization("HelpdeskAdmin");
-
-        group.MapGet("/", async (
-            [FromServices] HelpdeskDbContext db,
-            [FromQuery] int? page,
-            [FromQuery] int? pageSize,
-            [FromQuery] KnowledgeBaseArticleState? state,
-            [FromQuery] string? search,
-            CancellationToken token) =>
-        {
-            var query = db.KnowledgeBaseArticles.AsNoTracking();
-
-            if (state.HasValue)
-            {
-                query = query.Where(a => a.State == state.Value);
-            }
-
-            if (!string.IsNullOrWhiteSpace(search))
-            {
-                var like = $"%{search}%";
-                query = query.Where(a => EF.Functions.Like(a.Title, like) ||
-                                          (a.Summary != null && EF.Functions.Like(a.Summary, like)));
-            }
-
-            var totalCount = await query.CountAsync(token);
-            var effectivePage = page ?? 1;
-            var effectivePageSize = pageSize ?? 10;
-            var items = await query
-                .OrderByDescending(a => a.PublishedAt ?? a.UpdatedAt ?? a.CreatedAt)
-                .Skip((effectivePage - 1) * effectivePageSize)
-                .Take(effectivePageSize)
-                .Select(a => new ArticleDto
-                {
-                    Id = a.Id.ToString(),
-                    Title = a.Title,
-                    Content = a.Summary,
-                    CategoryId = a.Service,
-                    IsPublic = a.IsPublished,
-                    State = a.State,
-                    LinkedTicketId = a.LinkedTicketId,
-                    CreatedAt = a.CreatedAt,
-                    AutomationTarget = string.IsNullOrWhiteSpace(a.AutomationBindingId)
-                        && string.IsNullOrWhiteSpace(a.AutomationRequestFormId)
-                        && a.AutomationTaskTemplateId == null
-                        ? null
-                        : new KnowledgeArticleAutomationTargetDto
-                        {
-                            BindingId = a.AutomationBindingId,
-                            RequestFormId = a.AutomationRequestFormId,
-                            TaskTemplateId = a.AutomationTaskTemplateId,
-                            TaskTemplateName = a.AutomationTaskTemplateName,
-                            OrchestrationRequestDefinitionId = a.AutomationOrchestrationRequestDefinitionId,
-                            OrchestrationJobDefinitionId = a.AutomationOrchestrationJobDefinitionId,
-                            Enabled = !string.IsNullOrWhiteSpace(a.AutomationBindingId)
-                        }
-                })
-                .ToListAsync(token);
-
-            return Results.Ok(new PagedResponse<ArticleDto>
-            {
-                Items = items,
-                Page = effectivePage,
-                PageSize = effectivePageSize,
-                TotalCount = totalCount
-            });
-        })
-        .WithName("GetKnowledgeBase")
-        .WithSummary("List knowledge base articles");
-
-        group.MapGet("/{id}", async (
-            [FromRoute] Guid id,
-            [FromServices] HelpdeskDbContext db,
-            CancellationToken token) =>
-        {
-            var article = await db.KnowledgeBaseArticles
-                .AsNoTracking()
-                .FirstOrDefaultAsync(a => a.Id == id, token);
-            if (article is null) return Results.NotFound();
-
-            var articleChunks = await db.KnowledgeEmbeddings
-                .AsNoTracking()
-                .Where(e => e.KnowledgeBaseArticleId == id)
-                .OrderByDescending(e => e.CreatedAt)
-                .ToListAsync(token);
-
-            var dto = new ArticleDto
-            {
-                Id = article.Id.ToString(),
-                Title = article.Title,
-                Content = article.Summary,
-                CategoryId = article.Service,
-                IsPublic = article.IsPublished,
-                State = article.State,
-                LinkedTicketId = article.LinkedTicketId,
-                CreatedAt = article.CreatedAt,
-                AutomationTarget = MapAutomationTarget(article, false)
-            };
-
-            if (!string.IsNullOrWhiteSpace(article.AutomationBindingId))
-            {
-                var binding = await db.AutomationBindings
-                    .AsNoTracking()
-                    .FirstOrDefaultAsync(x => x.Id == article.AutomationBindingId, token);
-                if (binding is not null)
-                {
-                    dto.AutomationTarget = MapAutomationTarget(article, binding.Enabled);
-                }
-            }
-
-            var stats = new KnowledgeBaseArticleStatsDto
-            {
-                ChunkCount = articleChunks.Count,
-                SourceType = articleChunks.FirstOrDefault()?.SourceType ?? "KB",
-                SourceId = articleChunks.FirstOrDefault()?.SourceId ?? article.Id.ToString(),
-                DocumentTitle = articleChunks.FirstOrDefault()?.DocumentTitle ?? article.Title,
-                LastIndexedAt = articleChunks.FirstOrDefault()?.CreatedAt
-            };
-
-            var articleIdText = article.Id.ToString();
-            var linkedTicketId = article.LinkedTicketId;
-            var auditEntries = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x =>
-                    (x.SubjectId == articleIdText && x.OperationName == "kb-build") ||
-                    (!string.IsNullOrWhiteSpace(linkedTicketId) &&
-                     x.SubjectId == linkedTicketId &&
-                     x.OperationName == "kb-draft-from-ticket"))
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => new KnowledgeArticleAiAuditEntryDto
-                {
-                    Id = x.Id,
-                    OperationName = x.OperationName,
-                    ProviderName = x.ProviderName,
-                    ModelId = x.ModelId,
-                    CorrelationId = x.CorrelationId,
-                    Notes = x.Notes,
-                    SourceSubjectId = x.SubjectId,
-                    CreatedAt = x.CreatedAt
-                })
-                .ToListAsync(token);
-
-            return Results.Ok(new { Article = dto, Stats = stats, AuditEntries = auditEntries });
-        })
-        .WithName("GetKnowledgeBaseArticle")
-        .WithSummary("Get knowledge base article details");
-
-        group.MapPut("/{id}/state", async (
-            [FromRoute] Guid id,
-            [FromBody] UpdateKbStateDto dto,
-            [FromServices] IRepository<KnowledgeBaseArticle> repo,
-            CancellationToken token) =>
-        {
-            var article = await repo.GetAsync(id.ToString());
-            if (article is null) return Results.NotFound();
-
-            article.State = dto.State;
-            article.IsPublished = dto.State == KnowledgeBaseArticleState.Published;
-            article.PublishedAt = article.IsPublished ? DateTime.UtcNow : null;
-            article.UpdatedAt = DateTime.UtcNow;
-
-            var updated = await repo.UpdateAsync(article);
-            return Results.Ok(updated);
-        })
-        .WithName("UpdateKnowledgeBaseState")
-        .WithSummary("Update article state");
-
-        group.MapPut("/{id}/automation-target", async (
-            [FromRoute] Guid id,
-            [FromBody] UpdateKnowledgeArticleAutomationTargetDto dto,
-            [FromServices] HelpdeskDbContext db,
-            [FromServices] IAutomationBindingService automationBindings,
-            CancellationToken token) =>
-        {
-            var article = await db.KnowledgeBaseArticles
-                .FirstOrDefaultAsync(x => x.Id == id, token);
-            if (article is null)
-            {
-                return Results.NotFound();
-            }
-
-            if (dto.ClearTarget)
-            {
-                ClearAutomationTarget(article);
-                article.UpdatedAt = DateTime.UtcNow;
-                await db.SaveChangesAsync(token);
-                return Results.Ok(MapAutomationTarget(article, false));
-            }
-
-            if (string.IsNullOrWhiteSpace(dto.BindingId))
-            {
-                return Results.BadRequest("BindingId is required when assigning an automation target.");
-            }
-
-            var binding = await automationBindings.GetAsync(dto.BindingId.Trim(), token);
-            if (binding is null)
-            {
-                return Results.NotFound();
-            }
-
-            if (!binding.Enabled)
-            {
-                return Results.BadRequest("The selected automation binding is disabled.");
-            }
-
-            if (!string.Equals(article.OrganizationId, binding.OrganizationId, StringComparison.Ordinal))
-            {
-                return Results.BadRequest("The selected automation binding belongs to a different organization.");
-            }
-
-            article.AutomationBindingId = binding.Id;
-            article.AutomationRequestFormId = binding.RequestFormId;
-            article.AutomationTaskTemplateId = binding.TaskTemplateId;
-            article.AutomationTaskTemplateName = binding.TaskTemplateName;
-            article.AutomationOrchestrationRequestDefinitionId = binding.OrchestrationRequestDefinitionId;
-            article.AutomationOrchestrationJobDefinitionId = binding.OrchestrationJobDefinitionId;
-            article.UpdatedAt = DateTime.UtcNow;
-
-            await db.SaveChangesAsync(token);
-
-            return Results.Ok(MapAutomationTarget(article, binding.Enabled));
-        })
-        .WithName("UpdateKnowledgeBaseArticleAutomationTarget")
-        .WithSummary("Assign or clear the External orchestration automation target for a knowledge article");
-
-        group.MapDelete("/{id}", async (
-            [FromRoute] Guid id,
-            [FromServices] IRepository<KnowledgeBaseArticle> articleRepo,
-            [FromServices] IRepository<KnowledgeEmbedding> embeddingRepo,
-            CancellationToken token) =>
-        {
-            var embeddings = await embeddingRepo.Query()
-                .Where(e => e.KnowledgeBaseArticleId == id)
-                .Select(e => e.Id.ToString())
-                .ToListAsync(token);
-            foreach (var eid in embeddings)
-            {
-                await embeddingRepo.DeleteAsync(eid);
-            }
-
-            var ok = await articleRepo.DeleteAsync(id.ToString());
-            return ok ? Results.NoContent() : Results.NotFound();
-        })
-        .WithName("DeleteKnowledgeBaseArticle")
-        .WithSummary("Delete article and embeddings");
-
-        group.MapPost("/{id}/regenerate", async (
-            [FromRoute] Guid id,
-            [FromServices] IRepository<KnowledgeBaseArticle> repo,
-            [FromServices] IKnowledgeBuilderService kbService,
-            CancellationToken token) =>
-        {
-            var article = await repo.GetAsync(id.ToString());
-            if (article is null) return Results.NotFound();
-            if (string.IsNullOrWhiteSpace(article.LinkedTicketId))
-                return Results.Problem("Article not linked to ticket", statusCode: 400);
-
-            var regenerated = await kbService.GenerateDraftFromResolvedTicketAsync(article.LinkedTicketId, token, true);
-            return regenerated is not null ? Results.Ok(regenerated) : Results.Problem("Regeneration failed", statusCode: 500);
-        })
-        .WithName("RegenerateKnowledgeBaseArticle")
-        .WithSummary("Regenerate article from linked ticket");
-
-        group.MapGet("/health", async (
-            [FromServices] HelpdeskDbContext db,
-            CancellationToken token) =>
-        {
-            var total = await db.KnowledgeBaseArticles.CountAsync(token);
-            var draft = await db.KnowledgeBaseArticles.CountAsync(a => a.State == KnowledgeBaseArticleState.Draft, token);
-            var published = await db.KnowledgeBaseArticles.CountAsync(a => a.State == KnowledgeBaseArticleState.Published, token);
-            var unresolvedTickets = await db.Tickets
-                .Where(t => t.State != TicketState.Resolved)
-                .CountAsync(t => !db.KnowledgeBaseArticles.Any(a => a.LinkedTicketId == t.Id), token);
-            var orphanedChunks = await db.KnowledgeEmbeddings
-                .CountAsync(e => e.KnowledgeBaseArticleId == null ||
-                                  !db.KnowledgeBaseArticles.Any(a => a.Id == e.KnowledgeBaseArticleId), token);
-            var indexedArticles = await db.KnowledgeBaseArticles
-                .CountAsync(a => db.KnowledgeEmbeddings.Any(e => e.KnowledgeBaseArticleId == a.Id), token);
-            var indexedChunkCount = await db.KnowledgeEmbeddings
-                .CountAsync(e => e.SourceType == "KB", token);
-            var emailChunkCount = await db.KnowledgeEmbeddings
-                .CountAsync(e => e.SourceType == "Email", token);
-            var coverage = total == 0 ? 0 : (double)indexedArticles / total;
-            var suggestionFeedbackCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "suggestion", token);
-            var helpfulSuggestionCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "suggestion" && x.FeedbackValue == "helpful", token);
-            var notHelpfulSuggestionCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "suggestion" && x.FeedbackValue == "not_helpful", token);
-            var suggestionHelpfulRate = suggestionFeedbackCount == 0
-                ? 0
-                : (double)helpfulSuggestionCount / suggestionFeedbackCount;
-            var automationFeedbackCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "automation", token);
-            var automationResolvedCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "automation" && x.FeedbackValue == "resolved", token);
-            var automationNotResolvedCount = await db.TicketAiFeedback
-                .CountAsync(x => x.FeedbackType == "automation" && x.FeedbackValue == "not_resolved", token);
-            var automationResolvedRate = automationFeedbackCount == 0
-                ? 0
-                : (double)automationResolvedCount / automationFeedbackCount;
-            var aiAuditCount = await db.AiOperationAuditRecords.CountAsync(token);
-            var lastAiAuditAt = await db.AiOperationAuditRecords
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => (DateTimeOffset?)x.CreatedAt)
-                .FirstOrDefaultAsync(token);
-            var knowledgeBuildAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "kb-build", token);
-            var knowledgeDraftFromTicketAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "kb-draft-from-ticket", token);
-            var requesterReplyAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "ticket-requester-reply", token);
-            var requesterReplyApprovedAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "ticket-requester-reply-approved", token);
-            var automationApprovedAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "ticket-automation-approved", token);
-            var runtimeFallbackAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "runtime-chat-fallback", token);
-            var runtimeFailureAuditCount = await db.AiOperationAuditRecords
-                .CountAsync(x => x.OperationName == "runtime-chat-failure", token);
-            var lastRuntimeAuditAt = await db.AiOperationAuditRecords
-                .Where(x => x.OperationName == "runtime-chat-fallback" || x.OperationName == "runtime-chat-failure")
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => (DateTimeOffset?)x.CreatedAt)
-                .FirstOrDefaultAsync(token);
-            var topRuntimeFallback = await db.AiOperationAuditRecords
-                .Where(x => x.OperationName == "runtime-chat-fallback")
-                .GroupBy(x => x.ProviderName)
-                .Select(g => new { ProviderName = g.Key, Count = g.Count() })
-                .OrderByDescending(x => x.Count)
-                .ThenBy(x => x.ProviderName)
-                .FirstOrDefaultAsync(token);
-            var topRuntimeFailure = await db.AiOperationAuditRecords
-                .Where(x => x.OperationName == "runtime-chat-failure")
-                .GroupBy(x => x.ProviderName)
-                .Select(g => new { ProviderName = g.Key, Count = g.Count() })
-                .OrderByDescending(x => x.Count)
-                .ThenBy(x => x.ProviderName)
-                .FirstOrDefaultAsync(token);
-            var recentRuntimeEvidence = await db.AiOperationAuditRecords
-                .Where(x => x.OperationName == "runtime-chat-fallback" || x.OperationName == "runtime-chat-failure")
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Take(5)
-                .Select(x => $"{x.CreatedAt.LocalDateTime:g}: {x.OperationName} - {x.ProviderName} - {x.Notes}")
-                .ToListAsync(token);
-
-            return Results.Ok(new KnowledgeBaseHealthDto
-            {
-                TotalArticles = total,
-                DraftArticles = draft,
-                PublishedArticles = published,
-                UnresolvedTicketsWithoutKb = unresolvedTickets,
-                IndexedArticles = indexedArticles,
-                IndexedChunkCount = indexedChunkCount,
-                OrphanedChunkCount = orphanedChunks,
-                EmailChunkCount = emailChunkCount,
-                IndexedArticleCoverage = coverage,
-                SuggestionFeedbackCount = suggestionFeedbackCount,
-                HelpfulSuggestionCount = helpfulSuggestionCount,
-                NotHelpfulSuggestionCount = notHelpfulSuggestionCount,
-                SuggestionHelpfulRate = suggestionHelpfulRate,
-                AutomationFeedbackCount = automationFeedbackCount,
-                AutomationResolvedCount = automationResolvedCount,
-                AutomationNotResolvedCount = automationNotResolvedCount,
-                AutomationResolvedRate = automationResolvedRate,
-                AiAuditCount = aiAuditCount,
-                LastAiAuditAt = lastAiAuditAt,
-                KnowledgeBuildAuditCount = knowledgeBuildAuditCount,
-                KnowledgeDraftFromTicketAuditCount = knowledgeDraftFromTicketAuditCount,
-                RequesterReplyAuditCount = requesterReplyAuditCount,
-                RequesterReplyApprovedAuditCount = requesterReplyApprovedAuditCount,
-                AutomationApprovedAuditCount = automationApprovedAuditCount,
-                RuntimeFallbackAuditCount = runtimeFallbackAuditCount,
-                RuntimeFailureAuditCount = runtimeFailureAuditCount,
-                LastRuntimeAuditAt = lastRuntimeAuditAt,
-                TopRuntimeFallbackProvider = topRuntimeFallback?.ProviderName,
-                TopRuntimeFallbackCount = topRuntimeFallback?.Count ?? 0,
-                TopRuntimeFailureProvider = topRuntimeFailure?.ProviderName,
-                TopRuntimeFailureCount = topRuntimeFailure?.Count ?? 0,
-                RecentRuntimeEvidence = recentRuntimeEvidence
-            });
-        })
-        .WithName("GetKnowledgeBaseHealth")
-        .WithSummary("Knowledge base health stats");
-
-        group.MapPost("/reindex", async (
-            [FromServices] HelpdeskDbContext db,
-            [FromServices] IEmbeddingService embeddingService,
-            [FromServices] IKnowledgeVectorStore vectorStore,
-            CancellationToken token) =>
-        {
-            var articles = await db.KnowledgeBaseArticles
-                .AsNoTracking()
-                .Where(a => !string.IsNullOrWhiteSpace(a.OrganizationId))
-                .ToListAsync(token);
-
-            var result = new KnowledgeBaseReindexResultDto
-            {
-                RequestedArticles = articles.Count
-            };
-
-            foreach (var article in articles)
-            {
-                var content = article.Summary ?? article.Resolution ?? article.Problem;
-                if (string.IsNullOrWhiteSpace(content))
-                {
-                    result.SkippedArticles++;
-                    continue;
-                }
-
-                var chunks = TextChunker.Split(content).ToList();
-                if (chunks.Count == 0)
-                {
-                    result.SkippedArticles++;
-                    continue;
-                }
-
-                var vectors = await embeddingService.CreateEmbeddingsAsync(
-                    article.OrganizationId,
-                    chunks.Select(chunk => chunk.Text),
-                    token);
-
-                var now = DateTime.UtcNow;
-                var records = vectors
-                    .Select((vector, index) => new KnowledgeVectorRecord(
-                        article.Id,
-                        article.OrganizationId,
-                        "KB",
-                        article.Id.ToString(),
-                        article.Title,
-                        index,
-                        index < chunks.Count ? chunks[index].ChunkId : index.ToString(),
-                        index < chunks.Count ? chunks[index].Text : content,
-                        new Dictionary<string, string>
-                        {
-                            ["articleId"] = article.Id.ToString(),
-                            ["ticketId"] = article.LinkedTicketId ?? string.Empty,
-                            ["state"] = article.State.ToString()
-                        },
-                        vector,
-                        now))
-                    .ToList();
-
-                await vectorStore.ReplaceArticleChunksAsync(
-                    article.Id,
-                    article.OrganizationId,
-                    "KB",
-                    article.Id.ToString(),
-                    records,
-                    token);
-
-                result.ReindexedArticles++;
-            }
-
-            await db.SaveChangesAsync(token);
-            return Results.Ok(result);
-        })
-        .WithName("ReindexKnowledgeBase")
-        .WithSummary("Rebuild KB article chunk/vector records");
-    }
-
-    private static KnowledgeArticleAutomationTargetDto? MapAutomationTarget(KnowledgeBaseArticle article, bool enabled)
-    {
-        if (string.IsNullOrWhiteSpace(article.AutomationBindingId)
-            && string.IsNullOrWhiteSpace(article.AutomationRequestFormId)
-            && article.AutomationTaskTemplateId is null)
-        {
-            return null;
-        }
-
-        return new KnowledgeArticleAutomationTargetDto
-        {
-            BindingId = article.AutomationBindingId,
-            RequestFormId = article.AutomationRequestFormId,
-            TaskTemplateId = article.AutomationTaskTemplateId,
-            TaskTemplateName = article.AutomationTaskTemplateName,
-            OrchestrationRequestDefinitionId = article.AutomationOrchestrationRequestDefinitionId,
-            OrchestrationJobDefinitionId = article.AutomationOrchestrationJobDefinitionId,
-            Enabled = enabled
-        };
-    }
-
-    private static void ClearAutomationTarget(KnowledgeBaseArticle article)
-    {
-        article.AutomationBindingId = null;
-        article.AutomationRequestFormId = null;
-        article.AutomationTaskTemplateId = null;
-        article.AutomationTaskTemplateName = null;
-        article.AutomationOrchestrationRequestDefinitionId = null;
-        article.AutomationOrchestrationJobDefinitionId = null;
-    }
-}
diff --git a/src/Helpdesk.API/Endpoints/Organizations/OrganizationAiKbSettingsEndpoints.cs b/src/Helpdesk.API/Endpoints/Organizations/OrganizationAiKbSettingsEndpoints.cs
deleted file mode 100644
index 92c83d25..00000000
--- a/src/Helpdesk.API/Endpoints/Organizations/OrganizationAiKbSettingsEndpoints.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-using FluentValidation;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Organization;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Security.Claims;
-
-namespace Helpdesk.API.Endpoints.Organization;
-
-public static class OrganizationAiKbSettingsEndpoints
-{
-    public static void MapOrganizationAiKbSettingsEndpoints(this IEndpointRouteBuilder app)
-    {
-        var group = app.MapGroup("/api/v1/organizations/{id}/ai-kb-settings")
-            .WithTags("Organizations")
-            .RequireAuthorization("HelpdeskAdmin");
-        var operatorGroup = app.MapGroup("/api/v1/organizations/{id}/ai-kb-settings")
-            .WithTags("Organizations")
-            .RequireAuthorization(policy => policy.RequireAssertion(ctx =>
-                ctx.User.Claims.Any(c =>
-                    (c.Type == "roles" || c.Type == ClaimTypes.Role) &&
-                    (string.Equals(c.Value, "HelpdeskAdmin", StringComparison.OrdinalIgnoreCase)
-                     || string.Equals(c.Value, "Technician", StringComparison.OrdinalIgnoreCase)))));
-
-        group.MapGet("/", async (string id, IRepository<OrganizationAiKbSettings> repo) =>
-        {
-            var settings = (await repo.GetAllAsync()).FirstOrDefault(s => s.OrganizationId == id);
-            if (settings is null) return Results.NotFound();
-
-            var dto = new OrganizationAiKbSettingsDto
-            {
-                EnableAiSearch = settings.EnableAiSearch,
-                EnableAiAnswers = settings.EnableAiAnswers,
-                SearchThreshold = settings.SearchThreshold,
-                AnswerThreshold = settings.AnswerThreshold,
-                EmbeddingProviderId = settings.EmbeddingProviderId,
-                EmbeddingModel = settings.EmbeddingModel,
-                EmbeddingDimensions = settings.EmbeddingDimensions,
-                KnowledgeProviderId = settings.KnowledgeProviderId,
-                KnowledgeModelName = settings.KnowledgeModelName,
-                SuggestionLimit = settings.SuggestionLimit,
-                AllowedServicesCsv = settings.AllowedServicesCsv,
-                EnableProviderFallback = settings.EnableProviderFallback,
-                MaxProviderAttempts = settings.MaxProviderAttempts,
-                MinimumSuggestionFeedbackCount = settings.MinimumSuggestionFeedbackCount,
-                MinimumSuggestionHelpfulRate = settings.MinimumSuggestionHelpfulRate,
-                MinimumAutomationFeedbackCount = settings.MinimumAutomationFeedbackCount,
-                MinimumAutomationResolvedRate = settings.MinimumAutomationResolvedRate
-            };
-
-            return Results.Ok(dto);
-        })
-        .WithName("GetOrganizationAiKbSettings")
-        .WithSummary("Get AI KB settings for an organization");
-
-        operatorGroup.MapGet("/readiness", async (string id, HelpdeskDbContext db) =>
-        {
-            var settings = await db.OrganizationAiKbSettings
-                .AsNoTracking()
-                .FirstOrDefaultAsync(s => s.OrganizationId == id);
-            if (settings is null) return Results.NotFound();
-
-            var ticketIds = db.Tickets
-                .AsNoTracking()
-                .Where(t => t.OrganizationId == id)
-                .Select(t => t.Id);
-
-            var suggestionFeedbackCount = await db.TicketAiFeedback
-                .AsNoTracking()
-                .Where(x => x.FeedbackType == "suggestion" && ticketIds.Contains(x.TicketId))
-                .CountAsync();
-            var helpfulSuggestionCount = await db.TicketAiFeedback
-                .AsNoTracking()
-                .Where(x => x.FeedbackType == "suggestion" && x.FeedbackValue == "helpful" && ticketIds.Contains(x.TicketId))
-                .CountAsync();
-            var suggestionHelpfulRate = suggestionFeedbackCount == 0 ? 0 : (double)helpfulSuggestionCount / suggestionFeedbackCount;
-
-            var automationFeedbackCount = await db.TicketAiFeedback
-                .AsNoTracking()
-                .Where(x => x.FeedbackType == "automation" && ticketIds.Contains(x.TicketId))
-                .CountAsync();
-            var automationResolvedCount = await db.TicketAiFeedback
-                .AsNoTracking()
-                .Where(x => x.FeedbackType == "automation" && x.FeedbackValue == "resolved" && ticketIds.Contains(x.TicketId))
-                .CountAsync();
-            var automationResolvedRate = automationFeedbackCount == 0 ? 0 : (double)automationResolvedCount / automationFeedbackCount;
-
-            var aiAuditCount = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.OrganizationId == id)
-                .CountAsync();
-            var lastAiAuditAt = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.OrganizationId == id)
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => (DateTimeOffset?)x.CreatedAt)
-                .FirstOrDefaultAsync();
-
-            var blockingReasons = new List<string>();
-            var suggestionGateMet =
-                suggestionFeedbackCount >= settings.MinimumSuggestionFeedbackCount &&
-                suggestionHelpfulRate >= settings.MinimumSuggestionHelpfulRate;
-            if (!suggestionGateMet)
-            {
-                blockingReasons.Add(
-                    $"Suggestion quality gate not met ({suggestionFeedbackCount}/{settings.MinimumSuggestionFeedbackCount} feedback, {suggestionHelpfulRate:P0}/{settings.MinimumSuggestionHelpfulRate:P0} helpful rate).");
-            }
-
-            var automationGateMet =
-                automationFeedbackCount >= settings.MinimumAutomationFeedbackCount &&
-                automationResolvedRate >= settings.MinimumAutomationResolvedRate;
-            if (!automationGateMet)
-            {
-                blockingReasons.Add(
-                    $"Automation quality gate not met ({automationFeedbackCount}/{settings.MinimumAutomationFeedbackCount} feedback, {automationResolvedRate:P0}/{settings.MinimumAutomationResolvedRate:P0} resolved rate).");
-            }
-
-            return Results.Ok(new OrganizationAiReadinessDto
-            {
-                SuggestionFeedbackCount = suggestionFeedbackCount,
-                HelpfulSuggestionCount = helpfulSuggestionCount,
-                SuggestionHelpfulRate = suggestionHelpfulRate,
-                AutomationFeedbackCount = automationFeedbackCount,
-                AutomationResolvedCount = automationResolvedCount,
-                AutomationResolvedRate = automationResolvedRate,
-                SuggestionGateMet = suggestionGateMet,
-                AutomationGateMet = automationGateMet,
-                ProductionReady = suggestionGateMet && automationGateMet,
-                BlockingReasons = blockingReasons,
-                AiAuditCount = aiAuditCount,
-                LastAiAuditAt = lastAiAuditAt
-            });
-        })
-        .WithName("GetOrganizationAiKbReadiness")
-        .WithSummary("Get AI rollout readiness for an organization");
-
-        operatorGroup.MapGet("/runtime-status", async (
-            string id,
-            [FromQuery] int timeoutMs,
-            HelpdeskDbContext db,
-            IAiProviderService providerService,
-            CancellationToken token) =>
-        {
-            var providerTimeout = TimeSpan.FromMilliseconds(Math.Clamp(timeoutMs <= 0 ? 1500 : timeoutMs, 250, 5000));
-            var settings = await db.OrganizationAiKbSettings
-                .AsNoTracking()
-                .FirstOrDefaultAsync(s => s.OrganizationId == id, token);
-            if (settings is null) return Results.NotFound();
-
-            var enabledProviders = await db.AiProviders
-                .AsNoTracking()
-                .Where(x => x.IsEnabled)
-                .CountAsync(token);
-
-            var providerStatuses = new List<OrganizationAiRuntimeProviderStatusDto>();
-            var runtimeReasons = new List<string>();
-            var recentRuntimeRecords = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x =>
-                    x.OrganizationId == id &&
-                    (x.OperationName == "runtime-chat-fallback" || x.OperationName == "runtime-chat-failure"))
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Take(10)
-                .ToListAsync(token);
-
-            if (settings.EnableAiSearch)
-            {
-                providerStatuses.Add(await BuildProviderStatusAsync(
-                    "Search",
-                    settings.EmbeddingProviderId,
-                    settings.EmbeddingModel,
-                    providerService,
-                    providerTimeout,
-                    token));
-            }
-
-            if (settings.EnableAiAnswers)
-            {
-                providerStatuses.Add(await BuildProviderStatusAsync(
-                    "Answers",
-                    settings.KnowledgeProviderId,
-                    settings.KnowledgeModelName,
-                    providerService,
-                    providerTimeout,
-                    token));
-            }
-
-            foreach (var providerStatus in providerStatuses.Where(x => !string.Equals(x.Status, "Ready", StringComparison.OrdinalIgnoreCase)))
-            {
-                runtimeReasons.AddRange(providerStatus.Reasons.Select(reason => $"{providerStatus.Channel}: {reason}"));
-            }
-
-            var fallbackProviderCount = Math.Max(0, enabledProviders - providerStatuses
-                .Where(x => !string.IsNullOrWhiteSpace(x.ProviderId) && x.Enabled)
-                .Select(x => x.ProviderId!)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .Count());
-
-            var requiredChannelCount = providerStatuses.Count;
-            var readyChannelCount = providerStatuses.Count(x => string.Equals(x.Status, "Ready", StringComparison.OrdinalIgnoreCase));
-            var hasDegradedChannel = providerStatuses.Any(x => string.Equals(x.Status, "Degraded", StringComparison.OrdinalIgnoreCase));
-
-            var overallStatus = requiredChannelCount == 0
-                ? "Disabled"
-                : readyChannelCount == requiredChannelCount
-                    ? "Ready"
-                    : hasDegradedChannel || (settings.EnableProviderFallback && fallbackProviderCount > 0)
-                        ? "Degraded"
-                        : "Unavailable";
-
-            if (requiredChannelCount == 0)
-            {
-                runtimeReasons.Add("AI search and AI answers are both disabled for this organization.");
-            }
-            else if (!runtimeReasons.Any() && string.Equals(overallStatus, "Degraded", StringComparison.OrdinalIgnoreCase))
-            {
-                runtimeReasons.Add("Configured runtime is degraded, but fallback capacity exists.");
-            }
-
-            foreach (var providerStatus in providerStatuses)
-            {
-                providerStatus.RecentEvidence = recentRuntimeRecords
-                    .Where(x =>
-                        (!string.IsNullOrWhiteSpace(x.ProviderName) && string.Equals(x.ProviderName, providerStatus.ProviderName, StringComparison.OrdinalIgnoreCase))
-                        || (!string.IsNullOrWhiteSpace(x.ProviderName)
-                            && !string.IsNullOrWhiteSpace(providerStatus.ProviderName)
-                            && x.ProviderName.Contains(providerStatus.ProviderName, StringComparison.OrdinalIgnoreCase)))
-                    .Take(3)
-                    .Select(x => $"{x.CreatedAt.LocalDateTime:g}: {x.OperationName} - {x.Notes}")
-                    .ToList();
-            }
-
-            return Results.Ok(new OrganizationAiRuntimeStatusDto
-            {
-                Status = overallStatus,
-                RuntimeReady = string.Equals(overallStatus, "Ready", StringComparison.OrdinalIgnoreCase),
-                FallbackEnabled = settings.EnableProviderFallback,
-                MaxProviderAttempts = settings.MaxProviderAttempts,
-                EnabledProviderCount = enabledProviders,
-                FallbackProviderCount = fallbackProviderCount,
-                Reasons = runtimeReasons,
-                RecentEvidence = recentRuntimeRecords
-                    .Take(5)
-                    .Select(x => $"{x.CreatedAt.LocalDateTime:g}: {x.OperationName} - {x.Notes}")
-                    .ToList(),
-                Providers = providerStatuses
-            });
-        })
-        .WithName("GetOrganizationAiKbRuntimeStatus")
-        .WithSummary("Get AI provider/runtime status for an organization");
-
-        group.MapPut("/", async (string id, OrganizationAiKbSettingsDto dto, IRepository<OrganizationAiKbSettings> repo, IValidator<OrganizationAiKbSettingsDto> validator) =>
-        {
-            dto.EmbeddingModel = NormalizeEmbeddingModel(dto.EmbeddingModel);
-            dto.EmbeddingDimensions = dto.EmbeddingDimensions > 0 ? dto.EmbeddingDimensions : 768;
-            dto.SuggestionLimit = dto.SuggestionLimit > 0 ? dto.SuggestionLimit : 3;
-            dto.MaxProviderAttempts = dto.MaxProviderAttempts > 0 ? dto.MaxProviderAttempts : 2;
-
-            var validation = await validator.ValidateAsync(dto);
-            if (!validation.IsValid) return Results.ValidationProblem(validation.ToDictionary());
-
-            var settings = (await repo.GetAllAsync()).FirstOrDefault(s => s.OrganizationId == id);
-            if (settings is null) return Results.NotFound();
-
-            settings.EnableAiSearch = dto.EnableAiSearch;
-            settings.EnableAiAnswers = dto.EnableAiAnswers;
-            settings.SearchThreshold = dto.SearchThreshold;
-            settings.AnswerThreshold = dto.AnswerThreshold;
-            settings.EmbeddingProviderId = dto.EmbeddingProviderId;
-            settings.EmbeddingModel = dto.EmbeddingModel;
-            settings.EmbeddingDimensions = dto.EmbeddingDimensions;
-            settings.KnowledgeProviderId = dto.KnowledgeProviderId;
-            settings.KnowledgeModelName = dto.KnowledgeModelName;
-            settings.SuggestionLimit = dto.SuggestionLimit;
-            settings.AllowedServicesCsv = dto.AllowedServicesCsv;
-            settings.EnableProviderFallback = dto.EnableProviderFallback;
-            settings.MaxProviderAttempts = dto.MaxProviderAttempts;
-            settings.MinimumSuggestionFeedbackCount = dto.MinimumSuggestionFeedbackCount;
-            settings.MinimumSuggestionHelpfulRate = dto.MinimumSuggestionHelpfulRate;
-            settings.MinimumAutomationFeedbackCount = dto.MinimumAutomationFeedbackCount;
-            settings.MinimumAutomationResolvedRate = dto.MinimumAutomationResolvedRate;
-
-            await repo.UpdateAsync(settings);
-            return Results.Ok(dto);
-        })
-        .WithName("UpdateOrganizationAiKbSettings")
-        .WithSummary("Update AI KB settings for an organization");
-    }
-
-    private static string NormalizeEmbeddingModel(string? embeddingModel)
-        => string.IsNullOrWhiteSpace(embeddingModel) ? "embeddinggemma" : embeddingModel.Trim();
-
-    private static async Task<OrganizationAiRuntimeProviderStatusDto> BuildProviderStatusAsync(
-        string channel,
-        string? providerId,
-        string? modelId,
-        IAiProviderService providerService,
-        TimeSpan providerTimeout,
-        CancellationToken token)
-    {
-        var dto = new OrganizationAiRuntimeProviderStatusDto
-        {
-            Channel = channel,
-            ProviderId = providerId,
-            ModelId = modelId
-        };
-
-        if (string.IsNullOrWhiteSpace(providerId))
-        {
-            dto.Status = "Unavailable";
-            dto.Reasons.Add("No provider is configured.");
-            return dto;
-        }
-
-        if (!Guid.TryParse(providerId, out var parsedProviderId))
-        {
-            dto.Status = "Unavailable";
-            dto.Reasons.Add("Configured provider id is invalid.");
-            return dto;
-        }
-
-        var provider = await providerService.GetAsync(parsedProviderId, token);
-        if (provider is null)
-        {
-            dto.Status = "Unavailable";
-            dto.Reasons.Add("Configured provider no longer exists.");
-            return dto;
-        }
-
-        dto.ProviderName = provider.Name;
-        dto.Enabled = provider.IsEnabled;
-        dto.Configured = true;
-
-        if (!provider.IsEnabled)
-        {
-            dto.Status = "Unavailable";
-            dto.Reasons.Add("Configured provider is disabled.");
-            return dto;
-        }
-
-        if (string.IsNullOrWhiteSpace(modelId))
-        {
-            dto.Status = "Unavailable";
-            dto.Reasons.Add("No model is configured.");
-            return dto;
-        }
-
-        try
-        {
-            using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(token);
-            timeoutCts.CancelAfter(providerTimeout);
-            var result = await providerService.TestAsync(parsedProviderId, timeoutCts.Token);
-            dto.ConnectivityOk = result.Success;
-            if (!result.Success && !string.IsNullOrWhiteSpace(result.Message))
-            {
-                dto.Reasons.Add(result.Message);
-            }
-        }
-        catch (OperationCanceledException) when (!token.IsCancellationRequested)
-        {
-            dto.ConnectivityOk = false;
-            dto.Reasons.Add($"Connectivity test timed out after {(int)providerTimeout.TotalMilliseconds}ms.");
-        }
-        catch
-        {
-            dto.ConnectivityOk = false;
-        }
-
-        if (dto.ConnectivityOk)
-        {
-            dto.Status = "Ready";
-            return dto;
-        }
-
-        dto.Status = "Degraded";
-        if (!dto.Reasons.Any())
-        {
-            dto.Reasons.Add("Connectivity test failed.");
-        }
-        return dto;
-    }
-}
diff --git a/src/Helpdesk.API/Endpoints/Requests/RequestEndpoints.cs b/src/Helpdesk.API/Endpoints/Requests/RequestEndpoints.cs
index b3254f1a..85a18124 100644
--- a/src/Helpdesk.API/Endpoints/Requests/RequestEndpoints.cs
+++ b/src/Helpdesk.API/Endpoints/Requests/RequestEndpoints.cs
@@ -1,7 +1,6 @@
 using Helpdesk.Application.Events;
 using Helpdesk.Application.Messaging;
 using AppTicketServices = Helpdesk.Application.Services.Tickets;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.RequestTasks;
 using Helpdesk.Application.Sla;
@@ -94,13 +93,6 @@ public static void MapRequestEndpoints(this IEndpointRouteBuilder app)
                     .Select(x => x.TrackingId)
                     .FirstOrDefaultAsync();
 
-            var sourceKnowledgeArticleTitle = entity.SourceKnowledgeArticleId.HasValue
-                ? await db.KnowledgeBaseArticles
-                    .AsNoTracking()
-                    .Where(x => x.Id == entity.SourceKnowledgeArticleId.Value)
-                    .Select(x => x.Title)
-                    .FirstOrDefaultAsync()
-                : null;
             var dto = new RequestDto
             {
                 OrganizationId = entity.OrganizationId,
@@ -123,8 +115,6 @@ public static void MapRequestEndpoints(this IEndpointRouteBuilder app)
                 PayloadJson = entity.PayloadJson,
                 SourceTicketId = entity.SourceTicketId,
                 SourceTicketTrackingId = sourceTicketTrackingId,
-                SourceKnowledgeArticleId = entity.SourceKnowledgeArticleId?.ToString(),
-                SourceKnowledgeArticleTitle = sourceKnowledgeArticleTitle,
                 SourceAutomationBindingId = entity.SourceAutomationBindingId,
                 WorkflowStatus = entity.WorkflowStatus,
                 WorkflowBlockReason = entity.WorkflowBlockReason,
@@ -203,47 +193,6 @@ public static void MapRequestEndpoints(this IEndpointRouteBuilder app)
             }).ToList());
         });
 
-        group.MapGet("/{id}/ai-audit", async (
-            [FromRoute] string id,
-            HttpContext context,
-            [FromServices] ICurrentUserAccessService accessService,
-            [FromServices] HelpdeskDbContext db,
-            [FromServices] IRepository<Request> repo,
-            CancellationToken token) =>
-        {
-            var authorization = await AuthorizeRequestAsync(id, context.User, accessService, db, requireManager: true, token);
-            if (authorization.Failure is not null)
-            {
-                return authorization.Failure;
-            }
-
-            var request = await repo.GetAsync(id);
-            if (request is null)
-            {
-                return Results.Problem("Request not found", statusCode: 404);
-            }
-
-            var items = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == id)
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => new TicketAiAuditEntryDto
-                {
-                    Id = x.Id,
-                    OperationName = x.OperationName,
-                    OrganizationId = x.OrganizationId,
-                    ProviderName = x.ProviderName,
-                    ModelId = x.ModelId,
-                    CorrelationId = x.CorrelationId,
-                    SubjectId = x.SubjectId,
-                    Notes = x.Notes,
-                    CreatedAt = x.CreatedAt
-                })
-                .ToListAsync(token);
-
-            return Results.Ok(items);
-        });
-
         group.MapPost("/", async (
             [FromBody] CreateRequestDto dto,
             [FromServices] HelpdeskDbContext db,
@@ -388,7 +337,6 @@ public static void MapRequestEndpoints(this IEndpointRouteBuilder app)
                 RequestFormId = created.RequestFormId,
                 PayloadJson = created.PayloadJson,
                 SourceTicketId = created.SourceTicketId,
-                SourceKnowledgeArticleId = created.SourceKnowledgeArticleId?.ToString(),
                 SourceAutomationBindingId = created.SourceAutomationBindingId,
                 WorkflowStatus = created.WorkflowStatus,
                 WorkflowBlockReason = created.WorkflowBlockReason,
@@ -404,8 +352,6 @@ public static void MapRequestEndpoints(this IEndpointRouteBuilder app)
             [FromServices] ICurrentUserAccessService accessService,
             [FromServices] HelpdeskDbContext db,
             [FromServices] IRepository<Request> repo,
-            [FromServices] IRepository<KnowledgeBaseArticle> kbRepo,
-            [FromServices] IKnowledgeBuilderService kbService,
             [FromServices] ITicketSlaCompletionService ticketSlaCompletionService,
             [FromServices] ITicketSlaService ticketSlaService,
             [FromServices] ITicketSlaRepository ticketSlaRepository,
@@ -482,12 +428,6 @@ await db.RequestCategoryLinks
 
             if (previousState != TicketState.Resolved && updated!.State == TicketState.Resolved)
             {
-                var hasDraft = await kbRepo.Query().AnyAsync(a => a.LinkedTicketId == id, token);
-                if (!hasDraft)
-                {
-                    await kbService.GenerateDraftFromResolvedTicketAsync(id, token);
-                }
-
                 if (string.IsNullOrWhiteSpace(updated.RequestFormId))
                 {
                     await SendResolvedNotificationAsync(updated, ticketNotificationService, token);
@@ -517,7 +457,6 @@ await db.RequestCategoryLinks
                 RequestFormId = updated.RequestFormId,
                 PayloadJson = updated.PayloadJson,
                 SourceTicketId = updated.SourceTicketId,
-                SourceKnowledgeArticleId = updated.SourceKnowledgeArticleId?.ToString(),
                 SourceAutomationBindingId = updated.SourceAutomationBindingId,
                 WorkflowStatus = updated.WorkflowStatus,
                 WorkflowBlockReason = updated.WorkflowBlockReason,
@@ -887,9 +826,7 @@ from o in co.DefaultIfEmpty()
         {
             query = query.Where(x =>
                 x.Request.SourceTicketId != null ||
-                x.Request.SourceKnowledgeArticleId != null ||
-                x.Request.SourceAutomationBindingId != null ||
-                db.AiOperationAuditRecords.Any(a => a.SubjectId == x.Request.Id));
+                x.Request.SourceAutomationBindingId != null);
         }
 
         if (!string.IsNullOrWhiteSpace(q))
@@ -937,7 +874,6 @@ from o in co.DefaultIfEmpty()
                 x.Request.RequestFormId,
                 x.Request.PayloadJson,
                 x.Request.SourceTicketId,
-                x.Request.SourceKnowledgeArticleId,
                 x.Request.SourceAutomationBindingId,
                 x.Request.WorkflowStatus,
                 x.Request.WorkflowBlockReason,
@@ -976,7 +912,6 @@ from o in co.DefaultIfEmpty()
                 RequestFormId = i.RequestFormId,
                 PayloadJson = i.PayloadJson,
                 SourceTicketId = i.SourceTicketId,
-                SourceKnowledgeArticleId = i.SourceKnowledgeArticleId.HasValue ? i.SourceKnowledgeArticleId.Value.ToString() : null,
                 SourceAutomationBindingId = i.SourceAutomationBindingId,
                 WorkflowStatus = i.WorkflowStatus,
                 WorkflowBlockReason = i.WorkflowBlockReason,
@@ -1035,7 +970,6 @@ from o in co.DefaultIfEmpty()
             SourceTicketTrackingId = !string.IsNullOrWhiteSpace(i.SourceTicketId) && sourceTicketLookup.TryGetValue(i.SourceTicketId, out var trackingId)
                 ? trackingId
                 : null,
-            SourceKnowledgeArticleId = i.SourceKnowledgeArticleId.HasValue ? i.SourceKnowledgeArticleId.Value.ToString() : null,
             SourceAutomationBindingId = i.SourceAutomationBindingId,
             WorkflowStatus = i.WorkflowStatus,
             WorkflowBlockReason = i.WorkflowBlockReason,
diff --git a/src/Helpdesk.API/Endpoints/Search/GlobalSearchLookupEndpoints.cs b/src/Helpdesk.API/Endpoints/Search/GlobalSearchLookupEndpoints.cs
index 3a6f1de3..b7f937e3 100644
--- a/src/Helpdesk.API/Endpoints/Search/GlobalSearchLookupEndpoints.cs
+++ b/src/Helpdesk.API/Endpoints/Search/GlobalSearchLookupEndpoints.cs
@@ -119,7 +119,6 @@ from organization in organizations.DefaultIfEmpty()
                     Name = x.Name,
                     DnsName = x.DnsName,
                     ContactInfo = x.ContactInfo,
-                    EnableAiIntake = x.EnableAiIntake,
                     ItSupportOrganizationId = x.ItSupportOrganizationId,
                     OrchestrationTenantId = x.OrchestrationTenantId,
                     OrchestrationTenantName = x.OrchestrationTenantName,
diff --git a/src/Helpdesk.API/Endpoints/Tickets/TicketEndpoints.cs b/src/Helpdesk.API/Endpoints/Tickets/TicketEndpoints.cs
index 1c9f7e66..0aa42459 100644
--- a/src/Helpdesk.API/Endpoints/Tickets/TicketEndpoints.cs
+++ b/src/Helpdesk.API/Endpoints/Tickets/TicketEndpoints.cs
@@ -1,25 +1,11 @@
 using System.Security.Claims;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Helpdesk.API.Background;
 using Helpdesk.Application.Messaging;
-using Helpdesk.Application.Orchestration;
-using Helpdesk.Application.RequestTasks;
-using Helpdesk.Application.Sla;
 using Helpdesk.Application.Tickets;
-using Helpdesk.Application.Workflow;
 using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.DTOs.RequestForm;
 using Helpdesk.Shared.Models;
 using Helpdesk.Shared.Services;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.WorkLogs;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Net;
 using TicketRequest = Helpdesk.Shared.Models.Request;
 
 namespace Helpdesk.API.Endpoints.Tickets;
@@ -28,1324 +14,113 @@ public static class TicketEndpoints
 {
     public static void MapTicketEndpoints(this IEndpointRouteBuilder app)
     {
-        var group = app.MapGroup("/api/v1/tickets")
-            .WithTags("Tickets")
-            .RequireAuthorization();
+        var group = app.MapGroup("/api/v1/tickets").WithTags("Tickets").RequireAuthorization();
+        var ticketGroup = app.MapGroup("/api/v1/{ticketType}/{ticketId}").WithTags("Tickets").RequireAuthorization();
 
-        var ticketAiFeedbackGroup = app.MapGroup("/api/v1/tickets/{id:guid}")
-            .WithTags("Tickets")
-            .RequireAuthorization();
-
-        var ticketCountGroup = app.MapGroup("/api/v1/{ticketType}/{ticketId}")
-            .WithTags("Tickets")
-            .RequireAuthorization();
-
-        ticketCountGroup.MapGet("/timeline/count", async (
-            [FromRoute] string ticketType,
-            [FromRoute] string ticketId,
-            HttpContext context,
-            [FromServices] ICurrentUserAccessService accessService,
-            [FromServices] HelpdeskDbContext dbContext,
-            CancellationToken ct) =>
+        ticketGroup.MapGet("/timeline/count", async (string ticketType, string ticketId, HttpContext context, ICurrentUserAccessService access, HelpdeskDbContext db, CancellationToken ct) =>
         {
-            var authorizationFailure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, accessService, dbContext, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var count = await dbContext.TicketTimelineEvents
-                .AsNoTracking()
-                .Where(x => x.TicketId == ticketId)
-                .CountAsync(ct);
-
-            return Results.Ok(count);
+            var failure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, access, db, ct);
+            return failure ?? Results.Ok(await db.TicketTimelineEvents.AsNoTracking().CountAsync(x => x.TicketId == ticketId, ct));
         });
 
-        ticketCountGroup.MapGet("/attachments/count", async (
-            [FromRoute] string ticketType,
-            [FromRoute] string ticketId,
-            HttpContext context,
-            [FromServices] ICurrentUserAccessService accessService,
-            [FromServices] HelpdeskDbContext dbContext,
-            CancellationToken ct) =>
+        ticketGroup.MapGet("/attachments/count", async (string ticketType, string ticketId, HttpContext context, ICurrentUserAccessService access, HelpdeskDbContext db, CancellationToken ct) =>
         {
-            var authorizationFailure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, accessService, dbContext, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var count = await dbContext.Attachments
-                .AsNoTracking()
-                .Where(x => x.TicketId == ticketId)
-                .CountAsync(ct);
-
-            return Results.Ok(count);
+            var failure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, access, db, ct);
+            return failure ?? Results.Ok(await db.Attachments.AsNoTracking().CountAsync(x => x.TicketId == ticketId, ct));
         });
 
-        ticketCountGroup.MapGet("/listeners/count", async (
-            [FromRoute] string ticketType,
-            [FromRoute] string ticketId,
-            HttpContext context,
-            [FromServices] ICurrentUserAccessService accessService,
-            [FromServices] HelpdeskDbContext dbContext,
-            CancellationToken ct) =>
+        ticketGroup.MapGet("/listeners/count", async (string ticketType, string ticketId, HttpContext context, ICurrentUserAccessService access, HelpdeskDbContext db, CancellationToken ct) =>
         {
-            var authorizationFailure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, accessService, dbContext, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
+            var failure = await AuthorizeTicketViewAsync(ticketType, ticketId, context.User, access, db, ct);
+            if (failure is not null) return failure;
             var count = ticketType.ToLowerInvariant() switch
             {
-                "incidents" => await dbContext.Incidents
-                    .AsNoTracking()
-                    .Where(x => x.Id == ticketId)
-                    .Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count)
-                    .SingleOrDefaultAsync(ct),
-                "requests" => await dbContext.Requests
-                    .AsNoTracking()
-                    .Where(x => x.Id == ticketId)
-                    .Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count)
-                    .SingleOrDefaultAsync(ct),
-                "changes" => await dbContext.Changes
-                    .AsNoTracking()
-                    .Where(x => x.Id == ticketId)
-                    .Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count)
-                    .SingleOrDefaultAsync(ct),
+                "incidents" => await db.Incidents.AsNoTracking().Where(x => x.Id == ticketId).Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count).SingleOrDefaultAsync(ct),
+                "requests" => await db.Requests.AsNoTracking().Where(x => x.Id == ticketId).Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count).SingleOrDefaultAsync(ct),
+                "changes" => await db.Changes.AsNoTracking().Where(x => x.Id == ticketId).Select(x => (x.RequesterEmail != null ? 1 : 0) + x.CcRecipients.Count).SingleOrDefaultAsync(ct),
                 _ => 0
             };
-
             return Results.Ok(count);
         });
 
-        MapTicketCustomerEndpoint(ticketCountGroup);
-
-        group.MapPost("/{ticketId}/mark-as-seen", async (
-            [FromRoute] string ticketId,
-            HttpContext context,
-            ICurrentUserAccessService accessService,
-            [FromServices] HelpdeskDbContext db,
-            [FromServices] IRequestSender sender,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-            {
-                var authorizationFailure = await AuthorizeTicketViewAsync("incidents", ticketId, context.User, accessService, db, ct);
-                if (authorizationFailure is not null)
-                {
-                    return authorizationFailure;
-                }
-
-                await sender.Send(new MarkTicketAsSeenCommand(ticketId), ct);
-                return Results.NoContent();
-            })
-        .WithName("MarkTicketAsSeen")
-        .WithSummary("Marks a ticket as viewed")
-        .WithDescription("Sets LastViewedByCustomerAt and worklog read receipts.");
-
-        group.MapPost("/{id:guid}/suggest-knowledge", async (
-            Guid id,
-            HttpContext context,
-            ICurrentUserAccessService accessService,
-            IAiSuggestionQueue queue,
-            HelpdeskDbContext db,
-            CancellationToken ct) =>
-        {
-            var ticketId = id.ToString();
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticketId, context.User, accessService, db, ct);
-            if (authorizationFailure is not null) return authorizationFailure;
-
-            var orgId = await db.Tickets.Where(t => t.Id == ticketId).Select(t => t.OrganizationId).FirstAsync(ct);
-            var org = await db.OrganizationAiKbSettings.AsNoTracking()
-                        .FirstOrDefaultAsync(o => o.OrganizationId == orgId, ct);
-
-            if (org is null || org.EnableAiSearch == false)
-                return Results.StatusCode(StatusCodes.Status204NoContent);
-
-            await queue.QueueAsync(ticketId, ct);
-            return Results.Accepted($"/api/v1/tickets/{id}/suggest-knowledge");
-        })
-        .WithSummary("Queue knowledge suggestions for a ticket")
-        .WithDescription("Non-blocking. Returns 202 and processes in background.");
-
-        group.MapGet("/{id:guid}/suggest-knowledge", async (
-            Guid id,
-            HttpContext context,
-            ICurrentUserAccessService accessService,
-            HelpdeskDbContext db,
-            CancellationToken ct) =>
-        {
-            var authorizationFailure = await AuthorizeTicketViewAsync("incidents", id.ToString(), context.User, accessService, db, ct);
-            if (authorizationFailure is not null) return authorizationFailure;
-            var row = await db.TicketAiSuggestions.AsNoTracking().FirstOrDefaultAsync(x => x.TicketId == id.ToString(), ct);
-            if (row is null) return Results.NoContent();
-
-            var items = JsonSerializer.Deserialize<List<KnowledgeSuggestion>>(row.ItemsJson) ?? new();
-            return Results.Ok(items);
-        });
-
-        group.MapGet("/{id:guid}/ai-feedback", async (
-            Guid id,
-            ICurrentUserAccessService accessService,
-            HelpdeskDbContext db,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var ticketId = id.ToString();
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticketId, user, accessService, db, ct);
-            if (authorizationFailure is not null) return authorizationFailure;
-
-            var items = await db.TicketAiFeedback
-                .AsNoTracking()
-                .Where(x => x.TicketId == ticketId)
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => new TicketAiFeedbackDto
-                {
-                    Id = x.Id,
-                    FeedbackType = x.FeedbackType,
-                    FeedbackValue = x.FeedbackValue,
-                    ArticleId = x.ArticleId,
-                    RequestId = x.RequestId,
-                    Notes = x.Notes,
-                    CreatedByUserId = x.CreatedByUserId,
-                    CreatedByName = x.CreatedByName,
-                    CreatedAt = x.CreatedAt
-                })
-                .ToListAsync(ct);
-
-            return Results.Ok(items);
-        })
-        .WithSummary("List AI feedback for a ticket")
-        .WithDescription("Returns operator feedback entries for AI suggestions and automation outcomes on the ticket.");
-
-        group.MapGet("/{id:guid}/ai-audit", async (
-            Guid id,
-            ICurrentUserAccessService accessService,
-            HelpdeskDbContext db,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var ticketId = id.ToString();
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticketId, user, accessService, db, ct);
-            if (authorizationFailure is not null) return authorizationFailure;
-
-            var items = await db.AiOperationAuditRecords
-                .AsNoTracking()
-                .Where(x => x.SubjectId == ticketId)
-                .OrderByUtc(db, x => x.CreatedAt, descending: true)
-                .Select(x => new TicketAiAuditEntryDto
-                {
-                    Id = x.Id,
-                    OperationName = x.OperationName,
-                    OrganizationId = x.OrganizationId,
-                    ProviderName = x.ProviderName,
-                    ModelId = x.ModelId,
-                    CorrelationId = x.CorrelationId,
-                    SubjectId = x.SubjectId,
-                    Notes = x.Notes,
-                    CreatedAt = x.CreatedAt
-                })
-                .ToListAsync(ct);
-
-            return Results.Ok(items);
-        })
-        .WithSummary("List AI audit activity for a ticket")
-        .WithDescription("Returns persisted AI operation audit records for the ticket, including generation, approval, and automation actions.");
-
-        MapTicketAiFeedbackEndpoint(ticketAiFeedbackGroup);
-
-        group.MapGet("/{id:guid}/requester-reply-draft", async (
-            Guid id,
-            IRepository<Ticket> tickets,
-            IRequesterReplyDraftService requesterReplyDraftService,
-            ICurrentUserAccessService accessService,
-            HelpdeskDbContext db,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var authorizationFailure = await AuthorizeTicketManageAsync(id.ToString(), user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var ticket = await tickets.GetAsync(id.ToString());
-            if (ticket is null)
-            {
-                return Results.NotFound();
-            }
-
-            var draft = await requesterReplyDraftService.GenerateAsync(ticket, ct);
-            return draft is null ? Results.NoContent() : Results.Ok(draft);
-        })
-        .WithSummary("Generate requester-facing reply draft for a ticket")
-        .WithDescription("Returns a requester-safe reply or clarification draft grounded in KB retrieval results.");
-
-        group.MapPost("/{id:guid}/requester-reply-draft/approve-send", async (
-            Guid id,
-            [FromBody] ApproveRequesterReplyDraftDto dto,
-            HelpdeskDbContext db,
-            IRepository<Ticket> tickets,
-            IRequesterReplyDraftService requesterReplyDraftService,
-            IAiOperationAuditService aiAudit,
-            IRequestSender sender,
-            ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var authorizationFailure = await AuthorizeTicketManageAsync(id.ToString(), user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var ticket = await tickets.GetAsync(id.ToString());
-            if (ticket is null)
-            {
-                return Results.NotFound();
-            }
-
-            var incidentExists = await db.Incidents.AsNoTracking().AnyAsync(x => x.Id == ticket.Id, ct);
-            if (!incidentExists)
-            {
-                return Results.Problem("Requester draft send is currently supported for incidents only.", statusCode: 400);
-            }
-
-            if (string.IsNullOrWhiteSpace(ticket.RequesterEmail))
-            {
-                return Results.Problem("Ticket has no requester email.", statusCode: 400);
-            }
-
-            var draft = await requesterReplyDraftService.GenerateAsync(ticket, ct);
-            if (draft is null || string.IsNullOrWhiteSpace(draft.DraftReply))
-            {
-                return Results.Problem("No requester draft is available for this ticket.", statusCode: 400);
-            }
-
-            var replyBody = string.IsNullOrWhiteSpace(dto.EditedReply)
-                ? draft.DraftReply
-                : dto.EditedReply.Trim();
-
-            if (dto.IncludeFollowUpQuestions && draft.FollowUpQuestions.Count > 0)
-            {
-                replyBody = string.Join(
-                    Environment.NewLine,
-                    [
-                        replyBody,
-                        string.Empty,
-                        "Please confirm the following:",
-                        ..draft.FollowUpQuestions.Select(question => $"- {question}")
-                    ]);
-            }
-
-            var techId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            var techName = user.Identity?.Name;
-            var created = await sender.Send(new CreateWorkLogCommand(ticket.Id, 0, replyBody, techId, techName), ct);
-            var requesterDraftNote = string.IsNullOrWhiteSpace(draft.SuggestedArticleTitle)
-                ? $"Approved AI requester draft ({draft.ConfidenceLabel})."
-                : $"Approved AI requester draft grounded on KB article '{draft.SuggestedArticleTitle}' ({draft.ConfidenceLabel}).";
-            await sender.Send(
-                new CreateWorkLogCommand(
-                    ticket.Id,
-                    0,
-                    requesterDraftNote,
-                    techId,
-                    techName,
-                    NotifyCustomer: false),
-                ct);
-
-            await aiAudit.RecordAsync(
-                new AiOperationAuditEntry(
-                    "ticket-requester-reply-approved",
-                    ticket.OrganizationId,
-                    "human-approved",
-                    draft.ConfidenceLabel,
-                    SubjectId: ticket.Id,
-                    Notes: draft.RequiresClarification ? "clarification-draft" : "reply-draft"),
-                ct);
-
-            return Results.Ok(new
-            {
-                WorklogId = created.Id,
-                SentTo = ticket.RequesterEmail,
-                draft.RequiresClarification
-            });
-        })
-        .WithSummary("Approve and send requester-facing reply draft")
-        .WithDescription("Sends the current requester draft through the standard incident worklog/email notification path.");
-
-        group.MapPost("/{id:guid}/automation-approvals", async (
-            Guid id,
-            [FromBody] ApproveTicketAutomationDto dto,
-            HelpdeskDbContext db,
-            IRepository<Ticket> tickets,
-            IRepository<Request> requestRepo,
-            IRepository<RequestTask> requestTaskRepo,
-            IRequestFormSchemaParser requestFormSchemaParser,
-            IAutomationBindingPayloadContractService automationPayloadContractService,
-            ITicketSlaInitializer ticketSlaInitializer,
-            IRequestTaskGenerationService requestTaskGenerationService,
-            IWorkflowEngine workflowEngine,
-            IAiOperationAuditService aiAudit,
-            IRequestSender sender,
-            ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var authorizationFailure = await AuthorizeTicketManageAsync(id.ToString(), user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var ticket = await tickets.GetAsync(id.ToString());
-            if (ticket is not Incident incident)
-            {
-                return Results.BadRequest("Automation approval is currently supported for incidents only.");
-            }
-
-            var validation = await ValidateTicketAutomationApprovalAsync(
-                db,
-                requestFormSchemaParser,
-                automationPayloadContractService,
-                incident,
-                dto.ArticleId,
-                ct);
-
-            if (!validation.Success)
-            {
-                return validation.ToHttpResult();
-            }
-
-            var article = validation.Article!;
-            var requestForm = validation.RequestForm!;
-
-            Request created;
-            await using (var tx = await db.Database.BeginTransactionAsync(ct))
-            {
-                created = await requestRepo.CreateAsync(new Request
-                {
-                    Title = $"Automation: {article.Title}",
-                    Description = incident.Description,
-                    Priority = incident.Priority,
-                    CustomerId = incident.CustomerId,
-                    OrganizationId = incident.OrganizationId,
-                    DueDate = incident.DueDate,
-                    ServiceId = incident.ServiceId ?? requestForm.ServiceId,
-                    RequestFormId = requestForm.Id,
-                    PayloadJson = validation.PayloadJson!,
-                    SourceTicketId = incident.Id,
-                    SourceKnowledgeArticleId = article.Id,
-                    SourceAutomationBindingId = article.AutomationBindingId,
-                    LinkedAssetIds = [.. incident.LinkedAssetIds],
-                    Attachments = [.. incident.Attachments],
-                    RequesterEmail = incident.RequesterEmail
-                });
-
-                try
-                {
-                    await ticketSlaInitializer.InitializeAsync(created);
-                }
-                catch
-                {
-                }
-
-                await requestTaskGenerationService.GenerateForRequestAsync(created, ct);
-                await tx.CommitAsync(ct);
-            }
-
-            await workflowEngine.RunAsync(created.Id, WorkflowRunReason.RequestCreated, ct);
-
-            var createdTask = await requestTaskRepo.Query()
-                .AsNoTracking()
-                .Where(x => x.RequestId == created.Id)
-                .OrderBy(x => x.Order)
-                .FirstOrDefaultAsync(ct);
-
-            var techId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            var techName = user.Identity?.Name;
-            var worklogNote = $"Approved AI automation using KB article '{article.Title}'. Created request {created.TrackingId}.";
-            await sender.Send(new CreateWorkLogCommand(incident.Id, 0, worklogNote, techId, techName, NotifyCustomer: false), ct);
-            var requestProvenanceNote =
-                $"Created from AI-approved automation on incident {incident.TrackingId} using KB article '{article.Title}'.";
-            await sender.Send(
-                new CreateWorkLogCommand(
-                    created.Id,
-                    0,
-                    requestProvenanceNote,
-                    techId,
-                    techName,
-                    NotifyCustomer: false),
-                ct);
-
-            await aiAudit.RecordAsync(
-                new AiOperationAuditEntry(
-                    "ticket-automation-approved",
-                    incident.OrganizationId,
-                    "human-approved",
-                    article.AutomationBindingId,
-                    SubjectId: incident.Id,
-                    Notes: created.Id),
-                ct);
-
-            await aiAudit.RecordAsync(
-                new AiOperationAuditEntry(
-                    "request-created-from-ticket-ai-automation",
-                    created.OrganizationId,
-                    "ticket-ai-approval",
-                    article.AutomationBindingId ?? "automation-binding",
-                    SubjectId: created.Id,
-                    Notes: $"sourceTicket:{incident.Id};article:{article.Id}"),
-                ct);
-
-            return Results.Ok(new TicketAutomationApprovalResultDto
-            {
-                RequestId = created.Id,
-                RequestTrackingId = created.TrackingId,
-                RequestTaskId = createdTask?.Id,
-                RequestTaskStatus = createdTask?.Status.ToString(),
-                AutomationBindingId = article.AutomationBindingId!,
-                ArticleId = article.Id.ToString()
-            });
-        })
-        .WithSummary("Approve and start KB-linked automation for a ticket")
-        .WithDescription("Creates a dedicated automation request/task from an incident only when the linked KB article has an approved automation binding and the request-form payload contract validates.");
-
-        group.MapGet("/{id:guid}/automation-approvals/{articleId:guid}/validation", async (
-            Guid id,
-            Guid articleId,
-            HelpdeskDbContext db,
-            IRepository<Ticket> tickets,
-            IRequestFormSchemaParser requestFormSchemaParser,
-            IAutomationBindingPayloadContractService automationPayloadContractService,
-            ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var authorizationFailure = await AuthorizeTicketManageAsync(id.ToString(), user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var ticket = await tickets.GetAsync(id.ToString());
-            if (ticket is not Incident incident)
-            {
-                return Results.BadRequest(new TicketAutomationValidationDto
-                {
-                    ArticleId = articleId.ToString(),
-                    CanApprove = false,
-                    Summary = "Automation approval is currently supported for incidents only.",
-                    Errors = ["Automation approval is currently supported for incidents only."]
-                });
-            }
-
-            var validation = await ValidateTicketAutomationApprovalAsync(
-                db,
-                requestFormSchemaParser,
-                automationPayloadContractService,
-                incident,
-                articleId.ToString(),
-                ct);
-
-            if (validation.Success)
-            {
-                return Results.Ok(new TicketAutomationValidationDto
-                {
-                    ArticleId = articleId.ToString(),
-                    CanApprove = true,
-                    Summary = "Automation target is ready for approval.",
-                    Errors = []
-                });
-            }
-
-            return Results.Json(
-                new TicketAutomationValidationDto
-                {
-                    ArticleId = articleId.ToString(),
-                    CanApprove = false,
-                    Summary = validation.ErrorMessage ?? "Automation target is not ready for approval.",
-                    Errors = validation.Errors.ToList()
-                },
-                statusCode: (int)validation.StatusCode);
-        })
-        .WithSummary("Preview KB-linked automation approval readiness")
-        .WithDescription("Returns whether a KB-linked automation can be approved for the incident and includes any blocking validation errors.");
-
-        group.MapGet("/{id:guid}/automation-approvals", async (
-            Guid id,
-            HelpdeskDbContext db,
-            ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
-        {
-            var ticketId = id.ToString();
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticketId, user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var runs = await db.Requests
-                .AsNoTracking()
-                .Where(x => x.SourceTicketId == ticketId)
-                .OrderByDescending(x => x.CreatedAt)
-                .Select(x => new TicketAutomationRunDto
-                {
-                    RequestId = x.Id,
-                    RequestTrackingId = x.TrackingId,
-                    RequestState = x.State.ToString(),
-                    WorkflowStatus = x.WorkflowStatus,
-                    CreatedAt = x.CreatedAt,
-                    ArticleId = x.SourceKnowledgeArticleId.HasValue ? x.SourceKnowledgeArticleId.Value.ToString() : null,
-                    AutomationBindingId = x.SourceAutomationBindingId,
-                    ArticleTitle = db.KnowledgeBaseArticles
-                        .Where(article => x.SourceKnowledgeArticleId.HasValue && article.Id == x.SourceKnowledgeArticleId.Value)
-                        .Select(article => article.Title)
-                        .FirstOrDefault(),
-                    RequestTaskId = db.RequestTasks
-                        .Where(task => task.RequestId == x.Id)
-                        .OrderBy(task => task.Order)
-                        .ThenBy(task => task.CreatedAt)
-                        .Select(task => task.Id)
-                        .FirstOrDefault(),
-                    RequestTaskTitle = db.RequestTasks
-                        .Where(task => task.RequestId == x.Id)
-                        .OrderBy(task => task.Order)
-                        .ThenBy(task => task.CreatedAt)
-                        .Select(task => task.Title)
-                        .FirstOrDefault(),
-                    RequestTaskStatus = db.RequestTasks
-                        .Where(task => task.RequestId == x.Id)
-                        .OrderBy(task => task.Order)
-                        .ThenBy(task => task.CreatedAt)
-                        .Select(task => task.Status.ToString())
-                        .FirstOrDefault(),
-                    LastAutomationStatus = db.RequestTasks
-                        .Where(task => task.RequestId == x.Id)
-                        .OrderBy(task => task.Order)
-                        .ThenBy(task => task.CreatedAt)
-                        .Select(task => task.LastAutomationStatus)
-                        .FirstOrDefault(),
-                    OrchestrationRunId = db.RequestTasks
-                        .Where(task => task.RequestId == x.Id)
-                        .OrderBy(task => task.Order)
-                        .ThenBy(task => task.CreatedAt)
-                        .Select(task => task.OrchestrationExternalRunId ?? task.OrchestratorExecutionId)
-                        .FirstOrDefault()
-                })
-                .ToListAsync(ct);
-
-            return Results.Ok(runs);
-        })
-        .WithSummary("List AI-started automation runs for a ticket")
-        .WithDescription("Returns automation requests/tasks that were started from AI approval for the selected ticket.");
-
-        group.MapPost("/{id:guid}/generate-knowledge", async (
-            Guid id,
-            IRepository<Ticket> tickets,
-            IKnowledgeBuilderService kbService,
-            ICurrentUserAccessService accessService,
-            HelpdeskDbContext db,
-            ClaimsPrincipal user,
-            CancellationToken token,
-            bool regenerate = false) =>
-        {
-            var authorizationFailure = await AuthorizeTicketManageAsync(id.ToString(), user, accessService, db, token);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var ticket = await tickets.GetAsync(id.ToString());
-            if (ticket is null)
-                return Results.NotFound();
-
-            var article = await kbService.GenerateDraftFromResolvedTicketAsync(id.ToString(), token, regenerate);
-            if (article is null)
-                return Results.Problem("Ticket must be resolved before generating knowledge.", statusCode: 400);
-
-            return Results.Ok(article);
-        })
-        .WithName("GenerateTicketKnowledge")
-        .WithSummary("Generate knowledge base article from ticket")
-        .WithDescription("Generates or regenerates a knowledge base article draft from a resolved ticket.");
-    }
+        MapTicketCustomerEndpoint(ticketGroup);
 
-    internal static RouteHandlerBuilder MapTicketAiFeedbackEndpoint(RouteGroupBuilder ticketGroup)
-    {
-        return ticketGroup.MapPost("/ai-feedback", async (
-            [FromRoute] Guid id,
-            [FromBody] SubmitTicketAiFeedbackDto dto,
-            HelpdeskDbContext db,
-            ICurrentUserAccessService accessService,
-            IRequestSender sender,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
+        group.MapPost("/{ticketId}/mark-as-seen", async (string ticketId, HttpContext context, ICurrentUserAccessService access, HelpdeskDbContext db, IRequestSender sender, CancellationToken ct) =>
         {
-            var ticketId = id.ToString();
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticketId, user, accessService, db, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            var feedbackType = dto.FeedbackType?.Trim().ToLowerInvariant();
-            var feedbackValue = dto.FeedbackValue?.Trim().ToLowerInvariant();
-            if (string.IsNullOrWhiteSpace(feedbackType) || string.IsNullOrWhiteSpace(feedbackValue))
-            {
-                return Results.BadRequest("FeedbackType and FeedbackValue are required.");
-            }
-
-            if (feedbackType is not ("suggestion" or "automation"))
-            {
-                return Results.BadRequest("FeedbackType must be 'suggestion' or 'automation'.");
-            }
-
-            if (feedbackType == "suggestion" && string.IsNullOrWhiteSpace(dto.ArticleId))
-            {
-                return Results.BadRequest("ArticleId is required for suggestion feedback.");
-            }
-
-            if (feedbackType == "automation" && string.IsNullOrWhiteSpace(dto.RequestId))
-            {
-                return Results.BadRequest("RequestId is required for automation feedback.");
-            }
-
-            var ticketOrganizationId = await db.Tickets.IgnoreQueryFilters().AsNoTracking()
-                .Where(ticket => ticket.Id == ticketId)
-                .Select(ticket => ticket.OrganizationId)
-                .FirstOrDefaultAsync(ct);
-            if (ticketOrganizationId is null)
-            {
-                return Results.NotFound();
-            }
-
-            if (feedbackType == "automation")
-            {
-                var requestOrganizationId = await db.Requests.IgnoreQueryFilters().AsNoTracking()
-                    .Where(request => request.Id == dto.RequestId)
-                    .Select(request => request.OrganizationId)
-                    .FirstOrDefaultAsync(ct);
-                if (!string.Equals(ticketOrganizationId, requestOrganizationId, StringComparison.OrdinalIgnoreCase))
-                {
-                    return Results.BadRequest("Automation feedback must reference a request in the ticket organization.");
-                }
-            }
-
-            var entry = new TicketAiFeedback
-            {
-                TicketId = ticketId,
-                FeedbackType = feedbackType,
-                FeedbackValue = feedbackValue,
-                ArticleId = string.IsNullOrWhiteSpace(dto.ArticleId) ? null : dto.ArticleId.Trim(),
-                RequestId = string.IsNullOrWhiteSpace(dto.RequestId) ? null : dto.RequestId.Trim(),
-                Notes = string.IsNullOrWhiteSpace(dto.Notes) ? null : dto.Notes.Trim(),
-                CreatedByUserId = user.FindFirstValue(ClaimTypes.NameIdentifier),
-                CreatedByName = user.Identity?.Name
-            };
-
-            db.TicketAiFeedback.Add(entry);
-            await db.SaveChangesAsync(ct);
-
-            var techId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            var techName = user.Identity?.Name;
-            string feedbackNote;
-            if (feedbackType == "suggestion")
-            {
-                var articleTitle = string.IsNullOrWhiteSpace(entry.ArticleId)
-                    ? null
-                    : await db.KnowledgeBaseArticles
-                        .AsNoTracking()
-                        .Where(x => x.Id.ToString() == entry.ArticleId)
-                        .Select(x => x.Title)
-                        .FirstOrDefaultAsync(ct);
-                feedbackNote = string.IsNullOrWhiteSpace(articleTitle)
-                    ? $"Recorded AI suggestion feedback: {feedbackValue.Replace('_', ' ')}."
-                    : $"Recorded AI suggestion feedback: {feedbackValue.Replace('_', ' ')} for KB article '{articleTitle}'.";
-            }
-            else
-            {
-                var requestTrackingId = string.IsNullOrWhiteSpace(entry.RequestId)
-                    ? null
-                    : await db.Requests.AsNoTracking()
-                        .Where(x => x.Id == entry.RequestId && x.OrganizationId == ticketOrganizationId)
-                        .Select(x => x.TrackingId)
-                        .FirstOrDefaultAsync(ct);
-                feedbackNote = string.IsNullOrWhiteSpace(requestTrackingId)
-                    ? $"Recorded AI automation outcome: {feedbackValue.Replace('_', ' ')}."
-                    : $"Recorded AI automation outcome: {feedbackValue.Replace('_', ' ')} for request {requestTrackingId}.";
-            }
-
-            if (!string.IsNullOrWhiteSpace(entry.Notes))
-            {
-                feedbackNote = $"{feedbackNote} Notes: {entry.Notes}";
-            }
-
-            await sender.Send(
-                new CreateWorkLogCommand(ticketId, 0, feedbackNote, techId, techName, NotifyCustomer: false),
-                ct);
-
-            return Results.Ok(new TicketAiFeedbackDto
-            {
-                Id = entry.Id,
-                FeedbackType = entry.FeedbackType,
-                FeedbackValue = entry.FeedbackValue,
-                ArticleId = entry.ArticleId,
-                RequestId = entry.RequestId,
-                Notes = entry.Notes,
-                CreatedByUserId = entry.CreatedByUserId,
-                CreatedByName = entry.CreatedByName,
-                CreatedAt = entry.CreatedAt
-            });
-        })
-        .WithSummary("Submit AI feedback for a ticket")
-        .WithDescription("Persists operator feedback for AI KB suggestions and automation outcomes.");
+            var failure = await AuthorizeTicketViewAsync("incidents", ticketId, context.User, access, db, ct);
+            if (failure is not null) return failure;
+            await sender.Send(new MarkTicketAsSeenCommand(ticketId), ct);
+            return Results.NoContent();
+        }).WithName("MarkTicketAsSeen").WithSummary("Marks a ticket as viewed");
     }
 
-    public static RouteHandlerBuilder MapTicketCustomerEndpoint(RouteGroupBuilder ticketGroup)
-    {
-        return ticketGroup.MapPost("/customer", async (
-            [FromRoute] string ticketType,
-            [FromRoute] string ticketId,
-            [FromBody] UpdateTicketCustomerRequest req,
-            [FromServices] IRepository<Incident> incidents,
-            [FromServices] IRepository<TicketRequest> requests,
-            [FromServices] IRepository<Change> changes,
-            [FromServices] IRepository<Customer> customers,
-            ICurrentUserAccessService accessService,
-            ClaimsPrincipal user,
-            CancellationToken ct) =>
+    public static RouteHandlerBuilder MapTicketCustomerEndpoint(RouteGroupBuilder ticketGroup) =>
+        ticketGroup.MapPost("/customer", async ([FromRoute] string ticketType, [FromRoute] string ticketId, [FromBody] UpdateTicketCustomerRequest request, IRepository<Incident> incidents, IRepository<TicketRequest> requests, IRepository<Change> changes, IRepository<Customer> customers, ICurrentUserAccessService access, ClaimsPrincipal user, CancellationToken ct) =>
         {
             var ticket = await GetTicketAsync(ticketType, ticketId, incidents, requests, changes);
-            if (ticket is null)
-            {
-                return Results.Problem("Ticket not found", statusCode: 404);
-            }
-
-            var authorizationFailure = await AuthorizeTicketManageAsync(ticket, user, accessService, ct);
-            if (authorizationFailure is not null)
-            {
-                return authorizationFailure;
-            }
-
-            if (!string.IsNullOrWhiteSpace(ticket.CustomerId))
-            {
-                return Results.BadRequest("Ticket already has a requester.");
-            }
-
-            var validation = await ValidateCustomerAsync(customers, ticket.OrganizationId, req.CustomerId);
-            if (validation.Result is not null)
-            {
-                return validation.Result;
-            }
-
-            var customer = validation.Customer!;
+            if (ticket is null) return Results.NotFound();
+            var failure = await AuthorizeTicketManageAsync(ticket, user, access, ct);
+            if (failure is not null) return failure;
+            if (!string.IsNullOrWhiteSpace(ticket.CustomerId)) return Results.BadRequest("Ticket already has a requester.");
+            var customer = await customers.GetAsync(request.CustomerId ?? string.Empty);
+            if (customer is null || !customer.IsEnabled || !string.Equals(customer.OrganizationId, ticket.OrganizationId, StringComparison.OrdinalIgnoreCase))
+                return Results.BadRequest("Customer must be enabled and belong to the selected organization.");
             ticket.CustomerId = customer.Id;
             ticket.RequesterEmail = customer.Email;
             ticket.UpdatedAt = DateTime.UtcNow;
-
             var updated = await UpdateTicketAsync(ticketType, ticket, incidents, requests, changes);
-            if (!updated)
-            {
-                return Results.Problem("Ticket not found", statusCode: 404);
-            }
+            return updated ? Results.Ok(new { customer.Id, customer.Name, customer.Email }) : Results.NotFound();
+        }).WithName("SetTicketCustomer").WithSummary("Set the requester customer for a ticket");
 
-            return Results.Ok(new
-            {
-                CustomerId = customer.Id,
-                CustomerName = customer.Name,
-                CustomerEmail = customer.Email
-            });
-        })
-        .WithName("SetTicketCustomer")
-        .WithSummary("Set the requester customer for a ticket")
-        .WithDescription("Sets the customer user a ticket is for when the ticket has no requester yet.");
-    }
-
-    private static bool IsSupportedTicketType(string ticketType) =>
-        string.Equals(ticketType, "incidents", StringComparison.OrdinalIgnoreCase) ||
-        string.Equals(ticketType, "requests", StringComparison.OrdinalIgnoreCase) ||
-        string.Equals(ticketType, "changes", StringComparison.OrdinalIgnoreCase);
-
-    internal static async Task<IResult?> AuthorizeTicketViewAsync(
-        string ticketType,
-        string ticketId,
-        ClaimsPrincipal user,
-        ICurrentUserAccessService accessService,
-        HelpdeskDbContext db,
-        CancellationToken cancellationToken)
+    internal static async Task<IResult?> AuthorizeTicketViewAsync(string ticketType, string ticketId, ClaimsPrincipal user, ICurrentUserAccessService accessService, HelpdeskDbContext db, CancellationToken ct)
     {
-        if (!IsSupportedTicketType(ticketType))
-        {
-            return Results.BadRequest("Unsupported ticketType. Use incidents, requests, or changes.");
-        }
-
-        var ticket = await db.Tickets.IgnoreQueryFilters().AsNoTracking()
-            .SingleOrDefaultAsync(candidate => candidate.Id == ticketId, cancellationToken);
-        if (ticket is null)
-        {
-            return Results.NotFound();
-        }
-
-        var customer = !string.IsNullOrWhiteSpace(ticket.CustomerId)
-            ? await db.Customers.AsNoTracking()
-                .Where(candidate => candidate.Id == ticket.CustomerId)
-                .Select(candidate => new { candidate.Id, candidate.Email })
-                .FirstOrDefaultAsync(cancellationToken)
-            : null;
-        var access = await accessService.ResolveAsync(user, cancellationToken);
+        if (ticketType.ToLowerInvariant() is not ("incidents" or "requests" or "changes")) return Results.BadRequest("Unsupported ticketType. Use incidents, requests, or changes.");
+        var ticket = await db.Tickets.IgnoreQueryFilters().AsNoTracking().SingleOrDefaultAsync(x => x.Id == ticketId, ct);
+        if (ticket is null) return Results.NotFound();
+        var profile = await accessService.ResolveAsync(user, ct);
         var canView = ticket switch
         {
-            Incident => access.CanViewIncident(ticket.OrganizationId, customer?.Id ?? ticket.CustomerId, customer?.Email ?? ticket.RequesterEmail),
-            TicketRequest => access.CanViewRequest(ticket.OrganizationId, customer?.Id ?? ticket.CustomerId, customer?.Email ?? ticket.RequesterEmail),
-            Change => access.CanViewChange(ticket.OrganizationId, customer?.Id ?? ticket.CustomerId, customer?.Email ?? ticket.RequesterEmail),
+            Incident => profile.CanViewIncident(ticket.OrganizationId, ticket.CustomerId, ticket.RequesterEmail),
+            TicketRequest => profile.CanViewRequest(ticket.OrganizationId, ticket.CustomerId, ticket.RequesterEmail),
+            Change => profile.CanViewChange(ticket.OrganizationId, ticket.CustomerId, ticket.RequesterEmail),
             _ => false
         };
         return canView ? null : Results.Forbid();
     }
 
-    internal static async Task<IResult?> AuthorizeTicketManageAsync(
-        string ticketId,
-        ClaimsPrincipal user,
-        ICurrentUserAccessService accessService,
-        HelpdeskDbContext db,
-        CancellationToken cancellationToken)
-    {
-        var ticket = await db.Tickets.IgnoreQueryFilters().AsNoTracking()
-            .SingleOrDefaultAsync(candidate => candidate.Id == ticketId, cancellationToken);
-        if (ticket is null)
-        {
-            return Results.NotFound();
-        }
-
-        return await AuthorizeTicketManageAsync(ticket, user, accessService, cancellationToken);
-    }
-
-    private static async Task<IResult?> AuthorizeTicketManageAsync(
-        Ticket ticket,
-        ClaimsPrincipal user,
-        ICurrentUserAccessService accessService,
-        CancellationToken cancellationToken)
-    {
-        var access = await accessService.ResolveAsync(user, cancellationToken);
-        var canManage = ticket switch
-        {
-            Incident => access.CanManageIncident(ticket.OrganizationId),
-            TicketRequest => access.CanManageRequest(ticket.OrganizationId),
-            Change => access.CanManageChange(ticket.OrganizationId),
-            _ => false
-        };
-        return canManage ? null : Results.Forbid();
-    }
-
-    private static async Task<Ticket?> GetTicketAsync(
-        string ticketType,
-        string ticketId,
-        IRepository<Incident> incidents,
-        IRepository<TicketRequest> requests,
-        IRepository<Change> changes) =>
-        ticketType.ToLowerInvariant() switch
-        {
-            "incidents" => await incidents.GetAsync(ticketId),
-            "requests" => await requests.GetAsync(ticketId),
-            "changes" => await changes.GetAsync(ticketId),
-            _ => null
-        };
-
-    private static async Task<bool> UpdateTicketAsync(
-        string ticketType,
-        Ticket ticket,
-        IRepository<Incident> incidents,
-        IRepository<TicketRequest> requests,
-        IRepository<Change> changes) =>
-        ticketType.ToLowerInvariant() switch
-        {
-            "incidents" when ticket is Incident incident => await incidents.UpdateAsync(incident) is not null,
-            "requests" when ticket is TicketRequest request => await requests.UpdateAsync(request) is not null,
-            "changes" when ticket is Change change => await changes.UpdateAsync(change) is not null,
-            _ => false
-        };
-
-    private static async Task<(IResult? Result, Customer? Customer)> ValidateCustomerAsync(
-        IRepository<Customer> customers,
-        string? organizationId,
-        string? customerId)
-    {
-        if (string.IsNullOrWhiteSpace(customerId))
-        {
-            return (Results.BadRequest("Customer is required."), null);
-        }
-
-        if (string.IsNullOrWhiteSpace(organizationId))
-        {
-            return (Results.BadRequest("Organization is required."), null);
-        }
-
-        var customer = await customers.GetAsync(customerId);
-        if (customer is null)
-        {
-            return (Results.BadRequest("Customer was not found."), null);
-        }
-
-        if (!customer.IsEnabled)
-        {
-            return (Results.BadRequest("Customer is disabled."), null);
-        }
-
-        if (!string.Equals(customer.OrganizationId, organizationId, StringComparison.OrdinalIgnoreCase))
-        {
-            return (Results.BadRequest("Customer must belong to the selected organization."), null);
-        }
-
-        return (null, customer);
-    }
-
-    public sealed record UpdateTicketCustomerRequest(string? CustomerId);
-
-    private static async Task<TicketAutomationApprovalValidation> ValidateTicketAutomationApprovalAsync(
-        HelpdeskDbContext db,
-        IRequestFormSchemaParser requestFormSchemaParser,
-        IAutomationBindingPayloadContractService automationPayloadContractService,
-        Incident incident,
-        string articleId,
-        CancellationToken ct)
+    internal static async Task<IResult?> AuthorizeTicketManageAsync(string ticketId, ClaimsPrincipal user, ICurrentUserAccessService accessService, HelpdeskDbContext db, CancellationToken ct)
     {
-        if (!Guid.TryParse(articleId, out var articleGuid))
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.BadRequest, "ArticleId is required.");
-        }
-
-        var article = await db.KnowledgeBaseArticles
-            .AsNoTracking()
-            .FirstOrDefaultAsync(x => x.Id == articleGuid, ct);
-        if (article is null)
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.NotFound, "Knowledge article not found.");
-        }
-
-        if (!string.Equals(article.OrganizationId, incident.OrganizationId, StringComparison.Ordinal))
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.BadRequest, "The selected knowledge article belongs to a different organization.");
-        }
-
-        if (string.IsNullOrWhiteSpace(article.AutomationBindingId)
-            || string.IsNullOrWhiteSpace(article.AutomationRequestFormId)
-            || article.AutomationTaskTemplateId is null)
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.BadRequest, "This knowledge article does not have an approved automation target.");
-        }
-
-        var binding = await db.AutomationBindings
-            .AsNoTracking()
-            .FirstOrDefaultAsync(x => x.Id == article.AutomationBindingId, ct);
-        if (binding is null || !binding.Enabled)
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.BadRequest, "The linked automation binding is unavailable.");
-        }
-
-        var requestForm = await db.RequestForms
-            .AsNoTracking()
-            .FirstOrDefaultAsync(x => x.Id == article.AutomationRequestFormId, ct);
-        if (requestForm is null)
-        {
-            return TicketAutomationApprovalValidation.Failed(HttpStatusCode.BadRequest, "The linked request form is unavailable.");
-        }
-
-        var schema = requestFormSchemaParser.Parse(requestForm.JsonSchema);
-        var automationTasks = schema.Tasks
-            .Where(x => string.Equals(x.Type, "automation", StringComparison.OrdinalIgnoreCase))
-            .ToList();
-
-        if (schema.Tasks.Count != 1
-            || automationTasks.Count != 1
-            || automationTasks[0].Id != article.AutomationTaskTemplateId.Value)
-        {
-            return TicketAutomationApprovalValidation.Failed(
-                HttpStatusCode.BadRequest,
-                "AI automation approval currently supports only dedicated single-step automation request forms.");
-        }
-
-        var payloadJson = BuildIncidentAutomationPayloadJson(incident, schema.Fields);
-        var payloadValidation = await automationPayloadContractService.ValidateBoundRequestPayloadAsync(requestForm, payloadJson, ct);
-        if (!payloadValidation.Success)
-        {
-            return TicketAutomationApprovalValidation.Failed(
-                HttpStatusCode.BadRequest,
-                "Automation payload validation failed for the linked request form.",
-                payloadValidation.Errors);
-        }
-
-        return TicketAutomationApprovalValidation.Passed(article, requestForm, payloadJson);
+        var ticket = await db.Tickets.IgnoreQueryFilters().AsNoTracking().SingleOrDefaultAsync(x => x.Id == ticketId, ct);
+        return ticket is null ? Results.NotFound() : await AuthorizeTicketManageAsync(ticket, user, accessService, ct);
     }
 
-    private static string BuildIncidentAutomationPayloadJson(
-        Incident incident,
-        IReadOnlyCollection<FormField> fields)
+    private static async Task<IResult?> AuthorizeTicketManageAsync(Ticket ticket, ClaimsPrincipal user, ICurrentUserAccessService accessService, CancellationToken ct)
     {
-        var payload = new JsonObject
+        var profile = await accessService.ResolveAsync(user, ct);
+        return ticket switch
         {
-            ["ticketId"] = incident.Id,
-            ["ticket_id"] = incident.Id,
-            ["incidentId"] = incident.Id,
-            ["incident_id"] = incident.Id,
-            ["trackingId"] = incident.TrackingId,
-            ["tracking_id"] = incident.TrackingId,
-            ["ticketNumber"] = incident.TrackingId,
-            ["ticket_number"] = incident.TrackingId,
-            ["incidentNumber"] = incident.TrackingId,
-            ["incident_number"] = incident.TrackingId,
-            ["title"] = incident.Title,
-            ["summary"] = incident.Title,
-            ["subject"] = incident.Title,
-            ["description"] = incident.Description,
-            ["details"] = incident.Description,
-            ["issue"] = incident.Description,
-            ["requesterEmail"] = incident.RequesterEmail,
-            ["requester_email"] = incident.RequesterEmail,
-            ["requestorEmail"] = incident.RequesterEmail,
-            ["requestor_email"] = incident.RequesterEmail,
-            ["userEmail"] = incident.RequesterEmail,
-            ["user_email"] = incident.RequesterEmail,
-            ["organizationId"] = incident.OrganizationId,
-            ["organization_id"] = incident.OrganizationId,
-            ["tenantId"] = incident.OrganizationId,
-            ["tenant_id"] = incident.OrganizationId,
-            ["customerId"] = incident.CustomerId,
-            ["customer_id"] = incident.CustomerId,
-            ["serviceId"] = incident.ServiceId,
-            ["service_id"] = incident.ServiceId,
-            ["priority"] = incident.Priority.ToString(),
-            ["severity"] = incident.Priority.ToString(),
-            ["impact"] = incident.Impact,
-            ["emailFrom"] = incident.EmailFrom,
-            ["email_from"] = incident.EmailFrom,
-            ["senderEmail"] = incident.EmailFrom,
-            ["sender_email"] = incident.EmailFrom,
-            ["assignedToId"] = incident.AssignedToId,
-            ["assigned_to_id"] = incident.AssignedToId,
-            ["linkedAssetIds"] = new JsonArray([.. incident.LinkedAssetIds.Select(x => JsonValue.Create(x))]),
-            ["linked_asset_ids"] = new JsonArray([.. incident.LinkedAssetIds.Select(x => JsonValue.Create(x))])
+            Incident when profile.CanManageIncident(ticket.OrganizationId) => null,
+            TicketRequest when profile.CanManageRequest(ticket.OrganizationId) => null,
+            Change when profile.CanManageChange(ticket.OrganizationId) => null,
+            _ => Results.Forbid()
         };
-
-        if (incident.EmailReceivedUtc.HasValue)
-        {
-            payload["emailReceivedUtc"] = incident.EmailReceivedUtc.Value.ToString("O");
-            payload["email_received_utc"] = incident.EmailReceivedUtc.Value.ToString("O");
-            payload["receivedAt"] = incident.EmailReceivedUtc.Value.ToString("O");
-            payload["received_at"] = incident.EmailReceivedUtc.Value.ToString("O");
-        }
-
-        if (incident.DueDate.HasValue)
-        {
-            payload["dueDate"] = incident.DueDate.Value.ToString("O");
-            payload["due_date"] = incident.DueDate.Value.ToString("O");
-            payload["dueAt"] = incident.DueDate.Value.ToString("O");
-            payload["due_at"] = incident.DueDate.Value.ToString("O");
-        }
-
-        if (incident.ClosedAt.HasValue)
-        {
-            payload["closedAt"] = incident.ClosedAt.Value.ToString("O");
-            payload["closed_at"] = incident.ClosedAt.Value.ToString("O");
-            payload["resolvedAt"] = incident.ClosedAt.Value.ToString("O");
-            payload["resolved_at"] = incident.ClosedAt.Value.ToString("O");
-        }
-
-        var fieldLookup = fields
-            .Select((field, index) => new { Key = FormFieldKeyResolver.Resolve(field, index), Field = field })
-            .ToDictionary(x => x.Key, x => x.Field, StringComparer.OrdinalIgnoreCase);
-
-        foreach (var entry in fieldLookup)
-        {
-            var key = entry.Key;
-            if (payload.ContainsKey(key))
-            {
-                continue;
-            }
-
-            var mappedValue = ResolveIncidentFieldValue(key, entry.Value, incident);
-            if (mappedValue is not null)
-            {
-                payload[key] = mappedValue;
-            }
-        }
-
-        return payload.ToJsonString(new JsonSerializerOptions(JsonSerializerDefaults.Web));
-    }
-
-    private static JsonNode? ResolveIncidentFieldValue(string key, FormField field, Incident incident)
-    {
-        var normalizedKey = NormalizeAutomationFieldKey(key);
-        var normalizedLabel = NormalizeAutomationFieldKey(field.Label);
-
-        return ResolveIncidentFieldValueCore(normalizedKey, incident)
-            ?? ResolveIncidentFieldValueCore(normalizedLabel, incident);
-    }
-
-    private static JsonNode? ResolveIncidentFieldValueCore(string normalizedKey, Incident incident)
-    {
-        if (string.IsNullOrWhiteSpace(normalizedKey))
-        {
-            return null;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "ticketid", "incidentid", "caseid"))
-        {
-            return incident.Id;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "trackingid", "ticketnumber", "incidentnumber", "reference", "referencenumber"))
-        {
-            return incident.TrackingId;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "title", "summary", "subject", "shortdescription", "incidenttitle"))
-        {
-            return incident.Title;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "description", "details", "issue", "problemdescription", "incidentdescription", "body"))
-        {
-            return incident.Description;
-        }
-
-        if (MatchesAutomationField(
-            normalizedKey,
-            "requesteremail",
-            "requestoremail",
-            "useremail",
-            "employeeemail",
-            "calleremail",
-            "email",
-            "mail",
-            "upn",
-            "userprincipalname"))
-        {
-            return incident.RequesterEmail;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "organizationid", "tenantid", "companyid", "businessunitid"))
-        {
-            return incident.OrganizationId;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "customerid", "customer", "requestercustomerid"))
-        {
-            return incident.CustomerId;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "serviceid", "service", "serviceofferingid"))
-        {
-            return incident.ServiceId;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "priority", "severity"))
-        {
-            return incident.Priority.ToString();
-        }
-
-        if (MatchesAutomationField(normalizedKey, "impact"))
-        {
-            return incident.Impact;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "emailfrom", "senderemail", "sourceemail", "fromemail"))
-        {
-            return incident.EmailFrom;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "emailreceivedutc", "receivedat", "emailreceivedat", "messageReceivedAt"))
-        {
-            return incident.EmailReceivedUtc?.ToString("O");
-        }
-
-        if (MatchesAutomationField(normalizedKey, "assignedtoid", "assigneeid", "technicianid", "ownerid"))
-        {
-            return incident.AssignedToId;
-        }
-
-        if (MatchesAutomationField(normalizedKey, "duedate", "dueat", "targetdate"))
-        {
-            return incident.DueDate?.ToString("O");
-        }
-
-        if (MatchesAutomationField(normalizedKey, "closedat", "resolvedat", "completedat"))
-        {
-            return incident.ClosedAt?.ToString("O");
-        }
-
-        if (MatchesAutomationField(normalizedKey, "linkedassetids", "assetids", "linkedassets"))
-        {
-            return new JsonArray([.. incident.LinkedAssetIds.Select(x => JsonValue.Create(x))]);
-        }
-
-        return null;
     }
 
-    private static string NormalizeAutomationFieldKey(string? key)
+    private static async Task<Ticket?> GetTicketAsync(string type, string id, IRepository<Incident> incidents, IRepository<TicketRequest> requests, IRepository<Change> changes) => type.ToLowerInvariant() switch
     {
-        if (string.IsNullOrWhiteSpace(key))
-        {
-            return string.Empty;
-        }
-
-        return new string(key
-            .Trim()
-            .ToLowerInvariant()
-            .Where(char.IsLetterOrDigit)
-            .ToArray());
-    }
-
-    private static bool MatchesAutomationField(string normalizedKey, params string[] aliases)
-    {
-        return aliases.Any(alias => string.Equals(normalizedKey, alias, StringComparison.Ordinal));
-    }
+        "incidents" => await incidents.GetAsync(id),
+        "requests" => await requests.GetAsync(id),
+        "changes" => await changes.GetAsync(id),
+        _ => null
+    };
 
-    private sealed class TicketAutomationApprovalValidation
+    private static async Task<bool> UpdateTicketAsync(string type, Ticket ticket, IRepository<Incident> incidents, IRepository<TicketRequest> requests, IRepository<Change> changes) => type.ToLowerInvariant() switch
     {
-        public bool Success { get; init; }
-        public HttpStatusCode StatusCode { get; init; }
-        public string? ErrorMessage { get; init; }
-        public IReadOnlyList<string> Errors { get; init; } = [];
-        public KnowledgeBaseArticle? Article { get; init; }
-        public RequestForm? RequestForm { get; init; }
-        public string? PayloadJson { get; init; }
-
-        public IResult ToHttpResult()
-        {
-            var message = Errors.Count > 0
-                ? string.Join(Environment.NewLine, Errors)
-                : ErrorMessage ?? "Automation approval validation failed.";
+        "incidents" when ticket is Incident incident => await incidents.UpdateAsync(incident) is not null,
+        "requests" when ticket is TicketRequest request => await requests.UpdateAsync(request) is not null,
+        "changes" when ticket is Change change => await changes.UpdateAsync(change) is not null,
+        _ => false
+    };
 
-            return StatusCode == HttpStatusCode.NotFound
-                ? Results.NotFound(message)
-                : Results.BadRequest(message);
-        }
-
-        public static TicketAutomationApprovalValidation Passed(
-            KnowledgeBaseArticle article,
-            RequestForm requestForm,
-            string payloadJson) => new()
-            {
-                Success = true,
-                StatusCode = HttpStatusCode.OK,
-                Article = article,
-                RequestForm = requestForm,
-                PayloadJson = payloadJson
-            };
-
-        public static TicketAutomationApprovalValidation Failed(
-            HttpStatusCode statusCode,
-            string errorMessage,
-            IReadOnlyList<string>? errors = null) => new()
-            {
-                Success = false,
-                StatusCode = statusCode,
-                ErrorMessage = errorMessage,
-                Errors = errors ?? [errorMessage]
-            };
-    }
+    public sealed record UpdateTicketCustomerRequest(string? CustomerId);
 }
diff --git a/src/Helpdesk.API/Program.cs b/src/Helpdesk.API/Program.cs
index c0a6287b..c7753959 100644
--- a/src/Helpdesk.API/Program.cs
+++ b/src/Helpdesk.API/Program.cs
@@ -16,7 +16,6 @@
 using Helpdesk.API.Endpoints.Email;
 using Helpdesk.API.Endpoints.Errors;
 using Helpdesk.API.Endpoints.Incidents;
-using Helpdesk.API.Endpoints.KB;
 using Helpdesk.API.Endpoints.Notifications;
 using Helpdesk.API.Endpoints.Organization;
 using Helpdesk.API.Endpoints.Orchestration;
@@ -36,7 +35,6 @@
 using Helpdesk.API.Endpoints.Timeline;
 using Helpdesk.API.Endpoints.Users;
 using Helpdesk.API.Endpoints.WorkLogs;
-using Helpdesk.API.Endpoints.AI;
 using Helpdesk.API.Endpoints.AiAssistant;
 using Helpdesk.API.Hubs;
 using Helpdesk.API.Services;
@@ -49,8 +47,6 @@
 using Helpdesk.Application.Incidents;
 using Helpdesk.Application.Events;
 using Helpdesk.Application.Notifications;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Sla;
 using Helpdesk.Application.WorkLogs;
 using Helpdesk.Infrastructure;
@@ -428,11 +424,9 @@ await BootstrapStartupService.ReconcileSelectedMarkerAsync(
 
 // Background jobs
 builder.Services.AddSingleton<IBackgroundJobQueue, BackgroundJobQueue>();
-builder.Services.AddSingleton<IAiSuggestionQueue, AiSuggestionQueue>();
 if (!skipDatabaseStartup)
 {
     builder.Services.AddHostedService<BackgroundJobRunner>();
-    builder.Services.AddHostedService<AiSuggestionWorker>();
     builder.Services.AddHostedService<EmailIngestionWorker>();
 }
 builder.Services.AddScoped<ISelfServiceAudienceService, SelfServiceAudienceService>();
@@ -1234,8 +1228,6 @@ IResult WriteDebugLog(ILoggerFactory loggerFactory)
 app.MapAttachmentEndpoints();
 app.MapErrorLoggingEndpoints();
 app.MapWorkLogEndpoints();
-app.MapAiProviderEndpoints();
-app.MapOrganizationAiKbSettingsEndpoints();
 app.MapOrganizationChangeParticipantEndpoints();
 app.MapAdminTenantEndpoints();
 app.MapTenantBrandingEndpoints();
@@ -1276,30 +1268,10 @@ IResult WriteDebugLog(ILoggerFactory loggerFactory)
     .WithDescription("Returns 200 when the database is reachable.")
     .WithTags("Health");
 
-app.MapGet("/health/vector", async ([FromServices] HelpdeskDbContext db, CancellationToken token) =>
-    {
-        await using var conn = db.Database.GetDbConnection();
-        await conn.OpenAsync(token);
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText =
-            "SELECT 1 FROM pg_indexes WHERE indexname = 'ix_embedding_org_hnsw'";
-        var result = await cmd.ExecuteScalarAsync(token);
-        return result is not null
-            ? Results.Ok()
-            : Results.Problem("Vector index missing", statusCode: 503);
-    })
-    .WithName("GetVectorHealth")
-    .WithSummary("Vector index health check")
-    .WithDescription("Checks for the ix_embedding_org_hnsw index.")
-    .WithTags("Health");
-
-app.MapKbEndpoints();
 app.MapGlobalSearchLookupEndpoints();
 app.MapRoleDefinitionEndpoints();
 MapCrudEndpoints<Organization>(app, "/api/v1/organizations");
 MapCrudEndpoints<Customer>(app, "/api/v1/customers");
-MapCrudEndpoints<KnowledgeBaseCategory>(app, "/api/v1/knowledgebase/categories");
-MapCrudEndpoints<KnowledgeBaseArticle>(app, "/api/v1/knowledgebase/articles");
 MapCrudEndpoints<Asset>(app, "/api/v1/assets");
 MapCrudEndpoints<AutomationRule>(app, "/api/v1/automation/rules");
 
@@ -1359,7 +1331,7 @@ await logs.CreateAsync(new ActivityLog
 {
     app.MapGet("/_diag/dp", (IDataProtectionProvider p) =>
     {
-        var prot = p.CreateProtector("AIProviderKeys");
+        var prot = p.CreateProtector("DevelopmentDiagnostics");
         var s = prot.Protect("ok");
         var u = prot.Unprotect(s);
         return Results.Ok(new { protectedLength = s.Length, unprotected = u });
@@ -1487,30 +1459,6 @@ static void MapCrudEndpoints<T>(WebApplication app, string route) where T : clas
 
         var created = await repo.CreateAsync(entity);
 
-        if (typeof(T) == typeof(Organization) && idProperty.GetValue(created) is string orgId)
-        {
-            var settingsRepo = services.GetRequiredService<SharedServices.IRepository<OrganizationAiKbSettings>>();
-            var defaults = new OrganizationAiKbSettings
-            {
-                OrganizationId = orgId,
-                EnableAiSearch = false,
-                EnableAiAnswers = false,
-                SearchThreshold = 0.5,
-                AnswerThreshold = 0.5,
-                EmbeddingModel = "embeddinggemma",
-                EmbeddingDimensions = 768,
-                AllowedServicesCsv = string.Empty,
-                EnableProviderFallback = true,
-                MaxProviderAttempts = 2,
-                MinimumSuggestionFeedbackCount = 5,
-                MinimumSuggestionHelpfulRate = 0.6,
-                MinimumAutomationFeedbackCount = 3,
-                MinimumAutomationResolvedRate = 0.5
-            };
-            await settingsRepo.CreateAsync(defaults);
-            return Results.Created($"{route}/{orgId}", created);
-        }
-
         if (idProperty.GetValue(created) is string idValue)
         {
             return Results.Created($"{route}/{idValue}", created);
@@ -1544,7 +1492,6 @@ static async Task SeedAdminUserAsync(WebApplication app)
     var users = scope.ServiceProvider.GetRequiredService<SharedServices.IRepository<User>>();
     var roles = scope.ServiceProvider.GetRequiredService<SharedServices.IRepository<Role>>();
     var orgs = scope.ServiceProvider.GetRequiredService<SharedServices.IRepository<Organization>>();
-    var aiSettings = scope.ServiceProvider.GetRequiredService<SharedServices.IRepository<OrganizationAiKbSettings>>();
 
     // --- START OF FIX ---
     // Check for and create the 'HelpdeskAdmin' role to match the policy and the user.
@@ -1561,23 +1508,6 @@ static async Task SeedAdminUserAsync(WebApplication app)
     {
         devOrg = new Organization { Id = Uuid.CreateVersion7().ToString(), Name = "DevOrg", State = Helpdesk.Shared.Models.EntityState.Enabled };
         await orgs.CreateAsync(devOrg);
-        await aiSettings.CreateAsync(new OrganizationAiKbSettings
-        {
-            OrganizationId = devOrg.Id,
-            EnableAiSearch = false,
-            EnableAiAnswers = false,
-            SearchThreshold = 0.5,
-            AnswerThreshold = 0.5,
-            EmbeddingModel = "embeddinggemma",
-            EmbeddingDimensions = 768,
-            AllowedServicesCsv = string.Empty,
-            EnableProviderFallback = true,
-            MaxProviderAttempts = 2,
-            MinimumSuggestionFeedbackCount = 5,
-            MinimumSuggestionHelpfulRate = 0.6,
-            MinimumAutomationFeedbackCount = 3,
-            MinimumAutomationResolvedRate = 0.5
-        });
     }
 
     var allUsers = await users.GetAllAsync();
diff --git a/src/Helpdesk.API/Validators/AiProviderCreateDtoValidator.cs b/src/Helpdesk.API/Validators/AiProviderCreateDtoValidator.cs
deleted file mode 100644
index 4c0cd693..00000000
--- a/src/Helpdesk.API/Validators/AiProviderCreateDtoValidator.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using FluentValidation;
-using Helpdesk.Shared.DTOs.AI;
-
-namespace Helpdesk.API.Validators;
-
-public class AiProviderCreateDtoValidator : AbstractValidator<AiProviderCreateDto>
-{
-    public AiProviderCreateDtoValidator()
-    {
-        RuleFor(x => x.Name).NotEmpty();
-        RuleFor(x => x.BaseUrl).NotEmpty();
-        RuleFor(x => x.ApiKey).NotEmpty();
-    }
-}
-
diff --git a/src/Helpdesk.API/Validators/AiProviderUpdateDtoValidator.cs b/src/Helpdesk.API/Validators/AiProviderUpdateDtoValidator.cs
deleted file mode 100644
index 37d51e70..00000000
--- a/src/Helpdesk.API/Validators/AiProviderUpdateDtoValidator.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using FluentValidation;
-using Helpdesk.Shared.DTOs.AI;
-
-namespace Helpdesk.API.Validators;
-
-public class AiProviderUpdateDtoValidator : AbstractValidator<AiProviderUpdateDto>
-{
-    public AiProviderUpdateDtoValidator()
-    {
-        RuleFor(x => x.Name).NotEmpty();
-        RuleFor(x => x.BaseUrl).NotEmpty();
-    }
-}
-
diff --git a/src/Helpdesk.API/Validators/OrganizationAiKbSettingsDtoValidator.cs b/src/Helpdesk.API/Validators/OrganizationAiKbSettingsDtoValidator.cs
deleted file mode 100644
index 109cb1ca..00000000
--- a/src/Helpdesk.API/Validators/OrganizationAiKbSettingsDtoValidator.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using FluentValidation;
-using Helpdesk.Shared.DTOs.Organization;
-
-namespace Helpdesk.API.Validators;
-
-public class OrganizationAiKbSettingsDtoValidator : AbstractValidator<OrganizationAiKbSettingsDto>
-{
-    public OrganizationAiKbSettingsDtoValidator()
-    {
-        RuleFor(x => x.SearchThreshold).InclusiveBetween(0, 1);
-        RuleFor(x => x.AnswerThreshold).InclusiveBetween(0, 1);
-        RuleFor(x => x.MaxProviderAttempts).InclusiveBetween(1, 5);
-        RuleFor(x => x.MinimumSuggestionHelpfulRate).InclusiveBetween(0, 1);
-        RuleFor(x => x.MinimumAutomationResolvedRate).InclusiveBetween(0, 1);
-        RuleFor(x => x.MinimumSuggestionFeedbackCount).GreaterThanOrEqualTo(0);
-        RuleFor(x => x.MinimumAutomationFeedbackCount).GreaterThanOrEqualTo(0);
-    }
-}
diff --git a/src/Helpdesk.Application/Events/ChangeDomainEvents.cs b/src/Helpdesk.Application/Events/ChangeDomainEvents.cs
index 267f4c0d..b6a9d7b3 100644
--- a/src/Helpdesk.Application/Events/ChangeDomainEvents.cs
+++ b/src/Helpdesk.Application/Events/ChangeDomainEvents.cs
@@ -8,9 +8,6 @@ public static class ChangeDomainEventTypes
     public const string Created = "DomainEvent.Change.Created";
     public const string Updated = "DomainEvent.Change.Updated";
     public const string StateChanged = "DomainEvent.Change.StateChanged";
-    public const string AiReviewCompleted = "DomainEvent.Change.AiReviewCompleted";
-    public const string AiReviewFailed = "DomainEvent.Change.AiReviewFailed";
-    public const string AiReviewAcknowledged = "DomainEvent.Change.AiReviewAcknowledged";
 }
 
 public sealed record ChangeCreatedDomainEvent(
@@ -66,55 +63,3 @@ public sealed record ChangeStateChangedDomainEvent(
         CorrelationId: CorrelationId,
         Reference: TrackingId,
         OccurredUtc: Timestamp.UtcDateTime);
-
-public sealed record ChangeAiReviewCompletedDomainEvent(
-    string ChangeId,
-    string TrackingId,
-    string? TenantId,
-    ChangeReviewGateState GateState,
-    bool RequiresAcknowledgement,
-    string Summary,
-    DateTimeOffset Timestamp,
-    string CorrelationId)
-    : DomainEvent(
-        EventType: ChangeDomainEventTypes.AiReviewCompleted,
-        Source: "Change",
-        TenantId: TenantId,
-        EntityId: ChangeId,
-        CorrelationId: CorrelationId,
-        Reference: TrackingId,
-        OccurredUtc: Timestamp.UtcDateTime);
-
-public sealed record ChangeAiReviewFailedDomainEvent(
-    string ChangeId,
-    string TrackingId,
-    string? TenantId,
-    string FailureReason,
-    DateTimeOffset Timestamp,
-    string CorrelationId)
-    : DomainEvent(
-        EventType: ChangeDomainEventTypes.AiReviewFailed,
-        Source: "Change",
-        TenantId: TenantId,
-        EntityId: ChangeId,
-        CorrelationId: CorrelationId,
-        Reference: TrackingId,
-        OccurredUtc: Timestamp.UtcDateTime);
-
-public sealed record ChangeAiReviewAcknowledgedDomainEvent(
-    string ChangeId,
-    string TrackingId,
-    string? TenantId,
-    string? AcknowledgedByUserId,
-    string? AcknowledgedByName,
-    string? Notes,
-    DateTimeOffset Timestamp,
-    string CorrelationId)
-    : DomainEvent(
-        EventType: ChangeDomainEventTypes.AiReviewAcknowledged,
-        Source: "Change",
-        TenantId: TenantId,
-        EntityId: ChangeId,
-        CorrelationId: CorrelationId,
-        Reference: TrackingId,
-        OccurredUtc: Timestamp.UtcDateTime);
diff --git a/src/Helpdesk.Application/Helpdesk.Application.csproj b/src/Helpdesk.Application/Helpdesk.Application.csproj
index 9aa985c9..d1a4c2a8 100644
--- a/src/Helpdesk.Application/Helpdesk.Application.csproj
+++ b/src/Helpdesk.Application/Helpdesk.Application.csproj
@@ -6,8 +6,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Dodo.Primitives" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.10.0" />
-    <PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.10.0" />
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
diff --git a/src/Helpdesk.Application/Incidents/CreateIncidentCommand.cs b/src/Helpdesk.Application/Incidents/CreateIncidentCommand.cs
index 3ccd3c30..ac29b2cd 100644
--- a/src/Helpdesk.Application/Incidents/CreateIncidentCommand.cs
+++ b/src/Helpdesk.Application/Incidents/CreateIncidentCommand.cs
@@ -42,22 +42,13 @@ public record CreateIncidentCommand(
 /// <summary>
 /// Handles the creation of a new incident based on the provided command.
 /// </summary>
-/// <remarks>This handler processes the <see cref="CreateIncidentCommand"/> to create a new incident,  including
-/// setting its properties, generating a tracking ID, and optionally performing AI-based  understanding and knowledge
-/// suggestion generation if the associated organization has AI intake enabled.</remarks>
+/// <remarks>This handler creates a deterministic service-desk incident, assigns its tracking ID,
+/// initializes its SLA state, and publishes the normal ticket events.</remarks>
 /// <param name="incidents">The repository used to persist incidents.</param>
 /// <param name="refGenerator">The service used to generate unique tracking references for incidents.</param>
-/// <param name="orgRepo">The repository used to retrieve organization details.</param>
-/// <param name="understanding">The AI service used to analyze and understand the incident.</param>
-/// <param name="suggestions">The service used to generate knowledge suggestions for the incident.</param>
-/// <param name="suggestionRepo">The repository used to persist knowledge suggestions.</param>
 public class CreateIncidentCommandHandler(
     IRepository<Incident> incidents,
     AppServices.Tickets.ITicketRefGeneratorService refGenerator,
-    IRepository<Organization> orgRepo,
-    AppServices.AI.ITicketUnderstandingService understanding,
-    AppServices.KB.IKnowledgeSuggestionService suggestions,
-    IRepository<TicketKnowledgeSuggestion> suggestionRepo,
     ISupportNotificationService supportNotificationService,
     ITicketSlaInitializer? ticketSlaInitializer = null,
     IDomainEventPublisher? domainEvents = null,
@@ -132,23 +123,6 @@ await _domainEvents.PublishAsync(
             }
         }
 
-        var org = incident.OrganizationId is not null
-            ? await orgRepo.GetAsync(incident.OrganizationId)
-            : null;
-
-        if (org?.EnableAiIntake == true)
-        {
-            incident.AiUnderstanding = await understanding.UnderstandAsync(incident, cancellationToken);
-            await incidents.UpdateAsync(incident);
-
-            var suggs = await suggestions.SuggestAsync(incident, cancellationToken);
-            foreach (var s in suggs)
-            {
-                s.TicketId = incident.Id;
-                await suggestionRepo.CreateAsync(s);
-            }
-        }
-
         return incident;
     }
 
diff --git a/src/Helpdesk.Application/Services/AI/AiProviderConnectionTestResult.cs b/src/Helpdesk.Application/Services/AI/AiProviderConnectionTestResult.cs
deleted file mode 100644
index 438f600c..00000000
--- a/src/Helpdesk.Application/Services/AI/AiProviderConnectionTestResult.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Helpdesk.Application.Services.AI;
-
-public sealed record AiProviderConnectionTestResult(
-    bool Success,
-    string? AttemptedUrl = null,
-    int? StatusCode = null,
-    string? Message = null,
-    string? ErrorBody = null);
diff --git a/src/Helpdesk.Application/Services/AI/AiRuntimeRequest.cs b/src/Helpdesk.Application/Services/AI/AiRuntimeRequest.cs
deleted file mode 100644
index 0a15028e..00000000
--- a/src/Helpdesk.Application/Services/AI/AiRuntimeRequest.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.AI;
-
-namespace Helpdesk.Application.Services.AI;
-
-public sealed record AiChatRuntimeRequest(
-    string? OrganizationId,
-    Guid? ProviderId = null,
-    string? ModelId = null,
-    string? Scenario = null,
-    string? SubjectId = null,
-    string? CorrelationId = null);
-
-public sealed record AiEmbeddingRuntimeRequest(
-    string OrganizationId,
-    Guid? ProviderId = null,
-    string? ModelId = null,
-    int? Dimensions = null,
-    string? Scenario = null);
-
-public sealed record AiResolvedChatClient(
-    IChatClient Client,
-    string ProviderName,
-    string ModelId);
-
-public sealed record AiResolvedEmbeddingGenerator(
-    IEmbeddingGenerator<string, Embedding<float>> Generator,
-    string ProviderName,
-    string ModelId,
-    int? Dimensions);
diff --git a/src/Helpdesk.Application/Services/AI/EmbeddingUnavailableException.cs b/src/Helpdesk.Application/Services/AI/EmbeddingUnavailableException.cs
deleted file mode 100644
index 79d83271..00000000
--- a/src/Helpdesk.Application/Services/AI/EmbeddingUnavailableException.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Helpdesk.Application.Services.AI;
-
-public class EmbeddingUnavailableException : Exception
-{
-    public EmbeddingUnavailableException(string message) : base(message) { }
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAiClient.cs b/src/Helpdesk.Application/Services/AI/IAiClient.cs
deleted file mode 100644
index 5d416c0d..00000000
--- a/src/Helpdesk.Application/Services/AI/IAiClient.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface IAiClient
-{
-    Task<IEnumerable<string>> ListModelsAsync(AiProvider provider, CancellationToken token);
-    Task<AiProviderConnectionTestResult> TestAsync(AiProvider provider, CancellationToken token);
-    Task<string> ChatAsync(AiProvider provider, string prompt, string? model, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAiOperationAuditService.cs b/src/Helpdesk.Application/Services/AI/IAiOperationAuditService.cs
deleted file mode 100644
index 81f4d475..00000000
--- a/src/Helpdesk.Application/Services/AI/IAiOperationAuditService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Helpdesk.Application.Services.AI;
-
-public sealed record AiOperationAuditEntry(
-    string OperationName,
-    string? OrganizationId,
-    string ProviderName,
-    string ModelId,
-    string? CorrelationId = null,
-    string? SubjectId = null,
-    string? Notes = null);
-
-public interface IAiOperationAuditService
-{
-    Task RecordAsync(AiOperationAuditEntry entry, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAiPromptTemplateService.cs b/src/Helpdesk.Application/Services/AI/IAiPromptTemplateService.cs
deleted file mode 100644
index 29a7289a..00000000
--- a/src/Helpdesk.Application/Services/AI/IAiPromptTemplateService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Helpdesk.Application.Services.AI;
-
-public interface IAiPromptTemplateService
-{
-    string Render(string templateName, IReadOnlyDictionary<string, string?> values);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAiProviderService.cs b/src/Helpdesk.Application/Services/AI/IAiProviderService.cs
deleted file mode 100644
index a00253f2..00000000
--- a/src/Helpdesk.Application/Services/AI/IAiProviderService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface IAiProviderService
-{
-    Task<IEnumerable<AiProvider>> ListAsync(CancellationToken token);
-    Task<AiProvider?> GetAsync(Guid id, CancellationToken token);
-    Task<AiProvider> CreateAsync(AiProvider provider, string apiKey, CancellationToken token);
-    Task<AiProvider?> UpdateAsync(AiProvider provider, string? apiKey, CancellationToken token);
-    Task<bool> DeleteAsync(Guid id, CancellationToken token);
-    Task<IEnumerable<string>> ListModelsAsync(Guid providerId, CancellationToken token);
-    Task<AiProviderConnectionTestResult> TestAsync(Guid providerId, CancellationToken token);
-    Task<string> ChatTestAsync(Guid providerId, string prompt, string? model, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAiRuntime.cs b/src/Helpdesk.Application/Services/AI/IAiRuntime.cs
deleted file mode 100644
index d72a610a..00000000
--- a/src/Helpdesk.Application/Services/AI/IAiRuntime.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Helpdesk.Application.Services.AI;
-
-public interface IAiRuntime
-{
-    Task<AiResolvedChatClient> CreateChatClientAsync(AiChatRuntimeRequest request, CancellationToken token);
-    Task<AiResolvedEmbeddingGenerator> CreateEmbeddingGeneratorAsync(AiEmbeddingRuntimeRequest request, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IAutoReplyService.cs b/src/Helpdesk.Application/Services/AI/IAutoReplyService.cs
deleted file mode 100644
index 10d53bb0..00000000
--- a/src/Helpdesk.Application/Services/AI/IAutoReplyService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface IAutoReplyService
-{
-    Task<string> PrepareReplyAsync(Ticket ticket, KnowledgeBaseArticle article, CancellationToken token);
-}
-
diff --git a/src/Helpdesk.Application/Services/AI/IEmbeddingService.cs b/src/Helpdesk.Application/Services/AI/IEmbeddingService.cs
deleted file mode 100644
index 19085ac5..00000000
--- a/src/Helpdesk.Application/Services/AI/IEmbeddingService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface IEmbeddingService
-{
-    Task<float[]> CreateEmbeddingAsync(string orgId, string text, CancellationToken token);
-    Task<IReadOnlyList<float[]>> CreateEmbeddingsAsync(string orgId, IEnumerable<string> texts, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/IRequesterReplyDraftService.cs b/src/Helpdesk.Application/Services/AI/IRequesterReplyDraftService.cs
deleted file mode 100644
index 7f1cf49a..00000000
--- a/src/Helpdesk.Application/Services/AI/IRequesterReplyDraftService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface IRequesterReplyDraftService
-{
-    Task<RequesterReplyDraftDto?> GenerateAsync(Ticket ticket, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/AI/ITicketUnderstandingService.cs b/src/Helpdesk.Application/Services/AI/ITicketUnderstandingService.cs
deleted file mode 100644
index 47bd55ec..00000000
--- a/src/Helpdesk.Application/Services/AI/ITicketUnderstandingService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public interface ITicketUnderstandingService
-{
-    Task<string> UnderstandAsync(Ticket ticket, CancellationToken token);
-    Task<TicketKnowledgeSuggestion?> AnalyzeTicketAsync(Ticket ticket, CancellationToken token);
-}
-
diff --git a/src/Helpdesk.Application/Services/AI/NoOpTicketUnderstandingService.cs b/src/Helpdesk.Application/Services/AI/NoOpTicketUnderstandingService.cs
deleted file mode 100644
index 71e2734a..00000000
--- a/src/Helpdesk.Application/Services/AI/NoOpTicketUnderstandingService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class NoOpTicketUnderstandingService : ITicketUnderstandingService
-{
-    public Task<string> UnderstandAsync(Ticket ticket, CancellationToken token) => Task.FromResult(string.Empty);
-
-    public Task<TicketKnowledgeSuggestion?> AnalyzeTicketAsync(Ticket ticket, CancellationToken token) => Task.FromResult<TicketKnowledgeSuggestion?>(null);
-}
diff --git a/src/Helpdesk.Application/Services/AI/TextChunker.cs b/src/Helpdesk.Application/Services/AI/TextChunker.cs
deleted file mode 100644
index fb9ae313..00000000
--- a/src/Helpdesk.Application/Services/AI/TextChunker.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace Helpdesk.Application.Services.AI;
-
-public static class TextChunker
-{
-    public static IEnumerable<(string ChunkId, string Text)> Split(string text, int chunkSize = 500)
-    {
-        if (string.IsNullOrWhiteSpace(text)) yield break;
-        var index = 0;
-        for (var i = 0; i < text.Length; i += chunkSize)
-        {
-            var chunk = text.Substring(i, Math.Min(chunkSize, text.Length - i));
-            yield return ($"{index++}", chunk);
-        }
-    }
-}
diff --git a/src/Helpdesk.Application/Services/Changes/IChangeReviewService.cs b/src/Helpdesk.Application/Services/Changes/IChangeTemplateService.cs
similarity index 54%
rename from src/Helpdesk.Application/Services/Changes/IChangeReviewService.cs
rename to src/Helpdesk.Application/Services/Changes/IChangeTemplateService.cs
index 5d99260b..e505d106 100644
--- a/src/Helpdesk.Application/Services/Changes/IChangeReviewService.cs
+++ b/src/Helpdesk.Application/Services/Changes/IChangeTemplateService.cs
@@ -1,16 +1,12 @@
 using Helpdesk.Shared.DTOs.Change;
-using Helpdesk.Shared.Models;
 
 namespace Helpdesk.Application.Services.Changes;
 
-public interface IChangeReviewService
+/// <summary>Validates and serializes the deterministic ITIL change template.</summary>
+public interface IChangeTemplateService
 {
     string NormalizeChangeType(string? changeType);
     ChangeTemplateDto? DeserializeTemplate(string? templateJson);
     string SerializeTemplate(ChangeTemplateDto? template);
     ChangeTemplateValidationDto ValidateTemplate(string? changeType, ChangeTemplateDto? template);
-    ChangeAiReviewDto BuildReviewDto(Change change);
-    bool RequiresReviewBeforeProgress(Change change);
-    void MarkReviewStale(Change change);
-    Task<ChangeAiReviewDto> RunReviewAsync(Change change, CancellationToken token);
 }
diff --git a/src/Helpdesk.Application/Services/KB/IKnowledgeBuilderService.cs b/src/Helpdesk.Application/Services/KB/IKnowledgeBuilderService.cs
deleted file mode 100644
index 9808c098..00000000
--- a/src/Helpdesk.Application/Services/KB/IKnowledgeBuilderService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.KB;
-
-public interface IKnowledgeBuilderService
-{
-    Task<KnowledgeBaseArticle> BuildArticleAsync(string prompt, CancellationToken token);
-    Task<KnowledgeBaseArticle?> GenerateDraftFromResolvedTicketAsync(string ticketId, CancellationToken token, bool regenerate = false);
-}
-
diff --git a/src/Helpdesk.Application/Services/KB/IKnowledgeRetrievalService.cs b/src/Helpdesk.Application/Services/KB/IKnowledgeRetrievalService.cs
deleted file mode 100644
index 2c93a7eb..00000000
--- a/src/Helpdesk.Application/Services/KB/IKnowledgeRetrievalService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Helpdesk.Application.Services.KB;
-
-public interface IKnowledgeRetrievalService
-{
-    Task<IReadOnlyList<KnowledgeRetrievalResult>> RetrieveAsync(
-        string organizationId,
-        string query,
-        int limit,
-        CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/KB/IKnowledgeSuggestionService.cs b/src/Helpdesk.Application/Services/KB/IKnowledgeSuggestionService.cs
deleted file mode 100644
index 114fc048..00000000
--- a/src/Helpdesk.Application/Services/KB/IKnowledgeSuggestionService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-using System.Collections.Generic;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.KB;
-
-public interface IKnowledgeSuggestionService
-{
-    Task<IEnumerable<TicketKnowledgeSuggestion>> SuggestAsync(Ticket ticket, CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/KB/IKnowledgeVectorStore.cs b/src/Helpdesk.Application/Services/KB/IKnowledgeVectorStore.cs
deleted file mode 100644
index b2279c8b..00000000
--- a/src/Helpdesk.Application/Services/KB/IKnowledgeVectorStore.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Helpdesk.Application.Services.KB;
-
-public interface IKnowledgeVectorStore
-{
-    Task ReplaceArticleChunksAsync(
-        Guid articleId,
-        string organizationId,
-        string sourceType,
-        string sourceId,
-        IReadOnlyList<KnowledgeVectorRecord> chunks,
-        CancellationToken token);
-
-    Task<IReadOnlyList<KnowledgeVectorMatch>> SearchAsync(
-        string organizationId,
-        IReadOnlyList<float> vector,
-        int limit,
-        KnowledgeVectorFilter? filter,
-        CancellationToken token);
-}
diff --git a/src/Helpdesk.Application/Services/KB/KnowledgeRetrievalResult.cs b/src/Helpdesk.Application/Services/KB/KnowledgeRetrievalResult.cs
deleted file mode 100644
index 06e1cc51..00000000
--- a/src/Helpdesk.Application/Services/KB/KnowledgeRetrievalResult.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.KB;
-
-public sealed record KnowledgeEvidenceChunk(
-    Guid KnowledgeBaseArticleId,
-    string ChunkId,
-    string SourceId,
-    string DocumentTitle,
-    int ChunkIndex,
-    string Text,
-    IReadOnlyDictionary<string, string> Metadata,
-    double Score);
-
-public sealed record KnowledgeRetrievalResult(
-    KnowledgeBaseArticle Article,
-    double Score,
-    IReadOnlyList<KnowledgeEvidenceChunk> Evidence,
-    bool IsHighConfidence,
-    string ConfidenceLabel);
diff --git a/src/Helpdesk.Application/Services/KB/KnowledgeVectorRecord.cs b/src/Helpdesk.Application/Services/KB/KnowledgeVectorRecord.cs
deleted file mode 100644
index 66e27ff9..00000000
--- a/src/Helpdesk.Application/Services/KB/KnowledgeVectorRecord.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Helpdesk.Application.Services.KB;
-
-public sealed record KnowledgeVectorRecord(
-    Guid KnowledgeBaseArticleId,
-    string OrganizationId,
-    string SourceType,
-    string SourceId,
-    string DocumentTitle,
-    int ChunkIndex,
-    string ChunkId,
-    string Text,
-    IReadOnlyDictionary<string, string> Metadata,
-    IReadOnlyList<float> Vector,
-    DateTime CreatedAt);
-
-public sealed record KnowledgeVectorFilter(
-    IReadOnlyList<Guid>? ArticleIds = null,
-    IReadOnlyList<string>? SourceTypes = null,
-    IReadOnlyList<string>? SourceIds = null);
-
-public sealed record KnowledgeVectorMatch(
-    Guid KnowledgeBaseArticleId,
-    string OrganizationId,
-    string SourceId,
-    string DocumentTitle,
-    int ChunkIndex,
-    string ChunkId,
-    string Text,
-    IReadOnlyDictionary<string, string> Metadata,
-    double Score);
diff --git a/src/Helpdesk.Application/Services/KB/NoOpKnowledgeSuggestionService.cs b/src/Helpdesk.Application/Services/KB/NoOpKnowledgeSuggestionService.cs
deleted file mode 100644
index ab658ae3..00000000
--- a/src/Helpdesk.Application/Services/KB/NoOpKnowledgeSuggestionService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.KB;
-
-public class NoOpKnowledgeSuggestionService : IKnowledgeSuggestionService
-{
-    public Task<IEnumerable<TicketKnowledgeSuggestion>> SuggestAsync(Ticket ticket, CancellationToken token) =>
-        Task.FromResult<IEnumerable<TicketKnowledgeSuggestion>>(Array.Empty<TicketKnowledgeSuggestion>());
-}
diff --git a/src/Helpdesk.Application/Services/Tenants/TenantProvisioningService.cs b/src/Helpdesk.Application/Services/Tenants/TenantProvisioningService.cs
index ad17b444..d6d955d9 100644
--- a/src/Helpdesk.Application/Services/Tenants/TenantProvisioningService.cs
+++ b/src/Helpdesk.Application/Services/Tenants/TenantProvisioningService.cs
@@ -7,7 +7,6 @@ namespace Helpdesk.Application.Services.Tenants;
 public class TenantProvisioningService(
     IRepository<Organization> organizationRepository,
     IRepository<Customer> customerRepository,
-    IRepository<OrganizationAiKbSettings> aiKbSettingsRepository,
     IDomainEventPublisher? domainEvents = null,
     ICorrelationContext? correlationContext = null)
     : ITenantProvisioningService
@@ -27,7 +26,6 @@ public async Task<Organization> GetOrCreateOrganizationByDomainAsync(string doma
                 await organizationRepository.UpdateAsync(existingOrganization);
             }
 
-            await EnsureAiKbSettingsAsync(existingOrganization.Id);
             return existingOrganization;
         }
 
@@ -40,7 +38,6 @@ public async Task<Organization> GetOrCreateOrganizationByDomainAsync(string doma
                 State = EntityState.Enabled
             });
 
-            await EnsureAiKbSettingsAsync(createdOrganization.Id);
             await _domainEvents.PublishAsync(
                 new TenantCreatedEvent(
                     normalizedDomain,
@@ -55,7 +52,6 @@ await _domainEvents.PublishAsync(
             var raceWinner = await FindOrganizationAsync(normalizedDomain);
             if (raceWinner is not null)
             {
-                await EnsureAiKbSettingsAsync(raceWinner.Id);
                 return raceWinner;
             }
 
@@ -142,40 +138,6 @@ await _domainEvents.PublishAsync(
         return customers.FirstOrDefault(c => c.Email.Equals(normalizedEmail, StringComparison.OrdinalIgnoreCase));
     }
 
-    private async Task EnsureAiKbSettingsAsync(string organizationId)
-    {
-        var existingSettings = (await aiKbSettingsRepository.GetAllAsync())
-            .FirstOrDefault(x => x.OrganizationId == organizationId);
-        if (existingSettings is not null)
-        {
-            return;
-        }
-
-        try
-        {
-            await aiKbSettingsRepository.CreateAsync(new OrganizationAiKbSettings
-            {
-                OrganizationId = organizationId,
-                EnableAiSearch = false,
-                EnableAiAnswers = false,
-                SearchThreshold = 0.5,
-                AnswerThreshold = 0.5,
-                EmbeddingModel = "embeddinggemma",
-                EmbeddingDimensions = 768,
-                AllowedServicesCsv = string.Empty
-            });
-        }
-        catch
-        {
-            var raceWinner = (await aiKbSettingsRepository.GetAllAsync())
-                .FirstOrDefault(x => x.OrganizationId == organizationId);
-            if (raceWinner is null)
-            {
-                throw;
-            }
-        }
-    }
-
     private static string NormalizeDomain(string domain)
     {
         var normalized = (domain ?? string.Empty).Trim().ToLowerInvariant();
diff --git a/src/Helpdesk.Cli/HelpdeskCli.Lookups.cs b/src/Helpdesk.Cli/HelpdeskCli.Lookups.cs
index 84c6929e..cd5e5b46 100644
--- a/src/Helpdesk.Cli/HelpdeskCli.Lookups.cs
+++ b/src/Helpdesk.Cli/HelpdeskCli.Lookups.cs
@@ -25,15 +25,6 @@ private static Command BuildOrganizationsCommand(CliRuntime runtime, GlobalOptio
         orgs.AddCommand(GetListCommand(runtime, globals, "tenants", "/api/v1/admin/tenants"));
         orgs.AddCommand(GetListCommand(runtime, globals, "tenant-lookup", "/api/v1/admin/tenants/lookup"));
         orgs.AddCommand(GetByStringIdCommand(runtime, globals, "change-participants", "/api/v1/organizations/{id}/change-participants", "id"));
-        orgs.AddCommand(GetByStringIdCommand(runtime, globals, "ai-kb-settings", "/api/v1/organizations/{id}/ai-kb-settings", "id"));
-        orgs.AddCommand(BodyCommand(runtime, globals, "update-ai-kb-settings", HttpMethod.Put, "/api/v1/organizations/{id}/ai-kb-settings",
-            ("--provider-id", "providerId"),
-            ("--model-id", "modelId"),
-            ("--enabled", "enabled"),
-            ("--auto-suggest-enabled", "autoSuggestEnabled"),
-            ("--auto-generate-enabled", "autoGenerateEnabled")));
-        orgs.AddCommand(GetByStringIdCommand(runtime, globals, "ai-kb-readiness", "/api/v1/organizations/{id}/ai-kb-settings/readiness", "id"));
-        orgs.AddCommand(GetByStringIdCommand(runtime, globals, "ai-kb-runtime-status", "/api/v1/organizations/{id}/ai-kb-settings/runtime-status", "id"));
         orgs.AddCommand(GetByStringIdCommand(runtime, globals, "branding", "/api/v1/tenants/{id}/branding", "id"));
         orgs.AddCommand(BodyCommand(runtime, globals, "update-branding", HttpMethod.Put, "/api/v1/tenants/{id}/branding",
             ("--display-name", "displayName"),
diff --git a/src/Helpdesk.Cli/HelpdeskCli.RequestTasks.cs b/src/Helpdesk.Cli/HelpdeskCli.RequestTasks.cs
index a19a973a..da57248d 100644
--- a/src/Helpdesk.Cli/HelpdeskCli.RequestTasks.cs
+++ b/src/Helpdesk.Cli/HelpdeskCli.RequestTasks.cs
@@ -92,15 +92,6 @@ private static Command BuildTaskAssignSelfCommand(CliRuntime runtime, GlobalOpti
     private static Command BuildTicketsCommand(CliRuntime runtime, GlobalOptions globals)
     {
         var tickets = new Command("tickets", "Shared ticket helper operations.");
-        tickets.AddCommand(GetByIdCommand(runtime, globals, "ai-audit", "/api/v1/tickets/{id}/ai-audit"));
-        tickets.AddCommand(GetByIdCommand(runtime, globals, "ai-feedback", "/api/v1/tickets/{id}/ai-feedback"));
-        tickets.AddCommand(BodyCommand(runtime, globals, "add-ai-feedback", HttpMethod.Post, "/api/v1/tickets/{id}/ai-feedback", ("--rating", "rating"), ("--comment", "comment")));
-        tickets.AddCommand(GetByIdCommand(runtime, globals, "suggest-knowledge", "/api/v1/tickets/{id}/suggest-knowledge"));
-        tickets.AddCommand(BodyCommand(runtime, globals, "generate-knowledge", HttpMethod.Post, "/api/v1/tickets/{id}/generate-knowledge", ("--title", "title"), ("--content", "content")));
-        tickets.AddCommand(GetByIdCommand(runtime, globals, "requester-reply-draft", "/api/v1/tickets/{id}/requester-reply-draft"));
-        tickets.AddCommand(BodyCommand(runtime, globals, "approve-send-reply", HttpMethod.Post, "/api/v1/tickets/{id}/requester-reply-draft/approve-send", ("--body", "body"), ("--subject", "subject")));
-        tickets.AddCommand(GetByIdCommand(runtime, globals, "automation-approvals", "/api/v1/tickets/{id}/automation-approvals"));
-        tickets.AddCommand(BodyCommand(runtime, globals, "add-automation-approval", HttpMethod.Post, "/api/v1/tickets/{id}/automation-approvals", ("--article-id", "articleId"), ("--approved", "approved"), ("--comment", "comment")));
         tickets.AddCommand(BodyCommand(runtime, globals, "mark-as-seen", HttpMethod.Post, "/api/v1/tickets/{id}/mark-as-seen"));
         tickets.AddCommand(GetListCommand(runtime, globals, "timeline-count", "/api/v1/tickets/timeline/count"));
         tickets.AddCommand(GetListCommand(runtime, globals, "attachments-count", "/api/v1/tickets/attachments/count"));
diff --git a/src/Helpdesk.Cli/HelpdeskCli.Tickets.cs b/src/Helpdesk.Cli/HelpdeskCli.Tickets.cs
index 3e6bc1d4..768ee5b3 100644
--- a/src/Helpdesk.Cli/HelpdeskCli.Tickets.cs
+++ b/src/Helpdesk.Cli/HelpdeskCli.Tickets.cs
@@ -26,9 +26,6 @@ private static Command BuildChangesCommand(CliRuntime runtime, GlobalOptions glo
         var changes = BuildTicketCollectionCommand(runtime, globals, "changes", "Manage changes.", "/api/v1/changes");
         var lifecycle = BodyCommand(runtime, globals, "lifecycle", HttpMethod.Post, "/api/v1/changes/{id}/lifecycle", ("--lifecycle-state", "lifecycleState"), ("--comment", "comment"));
         changes.AddCommand(lifecycle);
-        changes.AddCommand(GetByIdCommand(runtime, globals, "ai-review", "/api/v1/changes/{id}/ai-review"));
-        changes.AddCommand(BodyCommand(runtime, globals, "run-ai-review", HttpMethod.Post, "/api/v1/changes/{id}/ai-review", ("--prompt", "prompt"), ("--force", "force")));
-        changes.AddCommand(BodyCommand(runtime, globals, "ack-ai-review", HttpMethod.Post, "/api/v1/changes/{id}/ai-review/acknowledge", ("--comment", "comment")));
         return changes;
     }
 
diff --git a/src/Helpdesk.Infrastructure.SqliteMigrations/Migrations/Helpdesk/20260915120000_RemoveLegacyNativeAi.cs b/src/Helpdesk.Infrastructure.SqliteMigrations/Migrations/Helpdesk/20260915120000_RemoveLegacyNativeAi.cs
new file mode 100644
index 00000000..cfbb0280
--- /dev/null
+++ b/src/Helpdesk.Infrastructure.SqliteMigrations/Migrations/Helpdesk/20260915120000_RemoveLegacyNativeAi.cs
@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Helpdesk.Infrastructure.Persistence;
+
+#nullable disable
+
+namespace Helpdesk.Infrastructure.SqliteMigrations.Migrations.Helpdesk;
+
+[DbContext(typeof(HelpdeskDbContext))]
+[Migration("20260915120000_RemoveLegacyNativeAi")]
+public partial class RemoveLegacyNativeAi : Migration
+{
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.Sql("""
+            DROP TABLE IF EXISTS "TicketAiFeedback";
+            DROP TABLE IF EXISTS "TicketKnowledgeSuggestions";
+            DROP TABLE IF EXISTS "TicketAiSuggestions";
+            DROP TABLE IF EXISTS "KnowledgeEmbeddings";
+            DROP TABLE IF EXISTS "KnowledgeBaseCategories";
+            DROP TABLE IF EXISTS "KnowledgeBaseArticles";
+            DROP TABLE IF EXISTS "AiModels";
+            DROP TABLE IF EXISTS "AiProviders";
+            DROP TABLE IF EXISTS "AiOperationAuditRecords";
+            DROP TABLE IF EXISTS "OrganizationAiKbSettings";
+            DROP INDEX IF EXISTS "IX_Tickets_OrganizationId_SourceKnowledgeArticleId";
+            ALTER TABLE "Tickets" DROP COLUMN "AiUnderstanding";
+            ALTER TABLE "Organizations" DROP COLUMN "EnableAiIntake";
+            ALTER TABLE "Tickets" DROP COLUMN "SourceKnowledgeArticleId";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewStatus";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewGateState";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewOutputJson";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewCorrelationId";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewFailureReason";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewRequestedAt";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewCompletedAt";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewAcknowledgedAt";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewAcknowledgedByUserId";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewAcknowledgedByName";
+            ALTER TABLE "Tickets" DROP COLUMN "AiReviewAcknowledgementNotes";
+            """);
+    }
+
+    protected override void Down(MigrationBuilder migrationBuilder) =>
+        throw new NotSupportedException("The retired native AI schema cannot be restored automatically.");
+}
diff --git a/src/Helpdesk.Infrastructure/AI/AiProviderService.cs b/src/Helpdesk.Infrastructure/AI/AiProviderService.cs
deleted file mode 100644
index 7f064fbd..00000000
--- a/src/Helpdesk.Infrastructure/AI/AiProviderService.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class AiProviderService(
-    HelpdeskDbContext db,
-    ISecretProtector protector,
-    IAiClient client,
-    ILogger<AiProviderService> logger) : IAiProviderService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly ISecretProtector _protector = protector;
-    private readonly IAiClient _client = client;
-    private readonly ILogger<AiProviderService> _logger = logger;
-
-    public async Task<IEnumerable<AiProvider>> ListAsync(CancellationToken token) =>
-        await _db.AiProviders.Include(p => p.Models).AsNoTracking().ToListAsync(token);
-
-    public async Task<AiProvider?> GetAsync(Guid id, CancellationToken token) =>
-        await _db.AiProviders.Include(p => p.Models).FirstOrDefaultAsync(p => p.Id == id, token);
-
-    public async Task<AiProvider> CreateAsync(AiProvider provider, string apiKey, CancellationToken token)
-    {
-        provider.Id = provider.Id == Guid.Empty ? Guid.NewGuid() : provider.Id;
-        provider.ApiKeyEncrypted = _protector.Protect(apiKey);
-        provider.CreatedAt = DateTime.UtcNow;
-        _db.AiProviders.Add(provider);
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("AI provider {ProviderId} created", provider.Id);
-        return provider;
-    }
-
-    public async Task<AiProvider?> UpdateAsync(AiProvider provider, string? apiKey, CancellationToken token)
-    {
-        var existing = await _db.AiProviders.FirstOrDefaultAsync(p => p.Id == provider.Id, token);
-        if (existing is null) return null;
-
-        existing.Name = provider.Name;
-        existing.ProviderType = provider.ProviderType;
-        existing.BaseUrl = provider.BaseUrl;
-        existing.IsEnabled = provider.IsEnabled;
-        existing.DefaultModel = provider.DefaultModel;
-        existing.ExtraHeadersJson = provider.ExtraHeadersJson;
-        existing.UpdatedAt = DateTime.UtcNow;
-        if (!string.IsNullOrWhiteSpace(apiKey))
-            existing.ApiKeyEncrypted = _protector.Protect(apiKey);
-
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("AI provider {ProviderId} updated", provider.Id);
-        return existing;
-    }
-
-    public async Task<bool> DeleteAsync(Guid id, CancellationToken token)
-    {
-        var provider = await _db.AiProviders.Include(p => p.Models).FirstOrDefaultAsync(p => p.Id == id, token);
-        if (provider is null) return false;
-        _db.AiProviders.Remove(provider);
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("AI provider {ProviderId} deleted", id);
-        return true;
-    }
-
-    public async Task<IEnumerable<string>> ListModelsAsync(Guid providerId, CancellationToken token)
-    {
-        var provider = await _db.AiProviders
-            .Include(p => p.Models)
-            .FirstOrDefaultAsync(p => p.Id == providerId, token);
-        if (provider is null) return Enumerable.Empty<string>();
-
-        var raw = await _client.ListModelsAsync(provider, token) ?? Enumerable.Empty<string>();
-
-        // 1) Normalize & validate
-        var now = DateTime.UtcNow;
-        var modelNames = raw
-            .Where(n => !string.IsNullOrWhiteSpace(n))
-            .Select(n => n!.Trim())
-            .Distinct(StringComparer.Ordinal)
-            .ToList();
-        if (modelNames.Count == 0)
-        {
-            // Nothing valid returned — nothing to do
-            return Array.Empty<string>();
-        }
-
-        // 2) Add only missing models (no touching existing rows -> avoids concurrency/rowcount issues)
-        var existingNames = provider.Models.Select(m => m.Name).ToHashSet(StringComparer.Ordinal);
-        var toAdd = modelNames
-            .Where(n => !existingNames.Contains(n))
-            .Select(n => new AiModel
-            {
-                Id = Guid.NewGuid(),
-                AiProviderId = provider.Id,
-                Name = n,
-                IsEnabled = true,
-                CreatedAt = now
-            })
-            .ToList();
-
-        if (toAdd.Count > 0)
-            _db.Set<AiModel>().AddRange(toAdd);
-
-        // 3) (Optional) prune stale rows (models no longer advertised by provider)
-        //    If you prefer to keep historical rows, comment this out.
-        var toRemove = provider.Models
-            .Where(m => !modelNames.Contains(m.Name, StringComparer.Ordinal))
-            .ToList();
-        if (toRemove.Count > 0)
-            _db.Set<AiModel>().RemoveRange(toRemove);
-
-        // 4) Save
-        if (toAdd.Count > 0 || toRemove.Count > 0)
-            await _db.SaveChangesAsync(token);
-
-        return modelNames;
-    }
-
-    public async Task<AiProviderConnectionTestResult> TestAsync(Guid providerId, CancellationToken token)
-    {
-        var provider = await _db.AiProviders.FirstOrDefaultAsync(p => p.Id == providerId, token);
-        if (provider is null)
-        {
-            return new AiProviderConnectionTestResult(
-                false,
-                Message: "Provider not found.");
-        }
-
-        var result = await _client.TestAsync(provider, token);
-        _logger.LogInformation(
-            "AI provider {ProviderId} test result success={Success} status={StatusCode} url={Url}",
-            providerId,
-            result.Success,
-            result.StatusCode,
-            result.AttemptedUrl);
-        return result;
-    }
-
-    public async Task<string> ChatTestAsync(Guid providerId, string prompt, string? model, CancellationToken token)
-    {
-        var provider = await _db.AiProviders.FirstOrDefaultAsync(p => p.Id == providerId, token);
-        if (provider is null) return string.Empty;
-        return await _client.ChatAsync(provider, prompt, model, token);
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/AutoReplyService.cs b/src/Helpdesk.Infrastructure/AI/AutoReplyService.cs
deleted file mode 100644
index 486afb00..00000000
--- a/src/Helpdesk.Infrastructure/AI/AutoReplyService.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class AutoReplyService(
-    IAiClient aiClient,
-    HelpdeskDbContext db,
-    ILogger<AutoReplyService> logger) : IAutoReplyService
-{
-    private readonly IAiClient _aiClient = aiClient;
-    private readonly HelpdeskDbContext _db = db;
-    private readonly ILogger<AutoReplyService> _logger = logger;
-
-    public async Task<string> PrepareReplyAsync(Ticket ticket, KnowledgeBaseArticle article, CancellationToken token)
-    {
-        var provider = await _db.AiProviders.FirstAsync(p => p.IsEnabled, token);
-        var articleText = $"{article.Summary} {article.Resolution}";
-        var prompt = $"Use the following article to draft a reply: {articleText}";
-        var reply = await _aiClient.ChatAsync(provider, prompt, provider.DefaultModel, token);
-        _logger.LogInformation("Auto reply generated for ticket {TicketId}", ticket.Id);
-        return reply;
-    }
-}
-
diff --git a/src/Helpdesk.Infrastructure/AI/DataProtectionSecretProtector.cs b/src/Helpdesk.Infrastructure/AI/DataProtectionSecretProtector.cs
index bee3e31d..ce8a7c9f 100644
--- a/src/Helpdesk.Infrastructure/AI/DataProtectionSecretProtector.cs
+++ b/src/Helpdesk.Infrastructure/AI/DataProtectionSecretProtector.cs
@@ -18,7 +18,7 @@ public DataProtectionSecretProtector(
         ILogger<DataProtectionSecretProtector> logger)
     {
         // IMPORTANT: purpose must stay stable for protect/unprotect
-        _protector = provider.CreateProtector("AIProviderKeys");
+        _protector = provider.CreateProtector("ExternalServiceCredentials");
         _toleratePlaintextInDev = env.IsDevelopment();
         _logger = logger;
     }
diff --git a/src/Helpdesk.Infrastructure/AI/EmbeddingService.cs b/src/Helpdesk.Infrastructure/AI/EmbeddingService.cs
deleted file mode 100644
index a2a6964d..00000000
--- a/src/Helpdesk.Infrastructure/AI/EmbeddingService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class EmbeddingService(
-    HelpdeskDbContext db,
-    IAiRuntime aiRuntime,
-    ILogger<EmbeddingService> logger) : IEmbeddingService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IAiRuntime _aiRuntime = aiRuntime;
-    private readonly ILogger<EmbeddingService> _logger = logger;
-
-    public async Task<float[]> CreateEmbeddingAsync(string orgId, string text, CancellationToken token)
-    {
-        var embeddings = await CreateEmbeddingsAsync(orgId, new[] { text }, token);
-        return embeddings.First();
-    }
-
-    public async Task<IReadOnlyList<float[]>> CreateEmbeddingsAsync(
-        string orgId,
-        IEnumerable<string> texts,
-        CancellationToken token)
-    {
-        var inputArray = texts as string[] ?? texts.ToArray();
-        var runtime = await _aiRuntime.CreateEmbeddingGeneratorAsync(
-            new AiEmbeddingRuntimeRequest(orgId, Scenario: "kb-embedding"),
-            token);
-        var generated = await runtime.Generator.GenerateAsync(inputArray, cancellationToken: token);
-        _logger.LogInformation(
-            "Embeddings generated via AI runtime for org {OrgId} provider={Provider} model={Model} count={Count}",
-            orgId,
-            runtime.ProviderName,
-            runtime.ModelId,
-            inputArray.Length);
-
-        return generated.Select(embedding => embedding.Vector.ToArray()).ToArray();
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/HelpdeskAiRuntime.cs b/src/Helpdesk.Infrastructure/AI/HelpdeskAiRuntime.cs
deleted file mode 100644
index 912f42c4..00000000
--- a/src/Helpdesk.Infrastructure/AI/HelpdeskAiRuntime.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.AI;
-
-public sealed class HelpdeskAiRuntime(
-    HelpdeskDbContext db,
-    IAiClient aiClient,
-    IAiOperationAuditService aiAudit,
-    ISecretProtector protector,
-    IHttpClientFactory httpClientFactory,
-    ILogger<LegacyEmbeddingGeneratorAdapter> embeddingLogger,
-    ILoggerFactory loggerFactory) : IAiRuntime
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IAiClient _aiClient = aiClient;
-    private readonly IAiOperationAuditService _aiAudit = aiAudit;
-    private readonly ISecretProtector _protector = protector;
-    private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
-    private readonly ILogger<LegacyEmbeddingGeneratorAdapter> _embeddingLogger = embeddingLogger;
-    private readonly ILoggerFactory _loggerFactory = loggerFactory;
-
-    public async Task<AiResolvedChatClient> CreateChatClientAsync(AiChatRuntimeRequest request, CancellationToken token)
-    {
-        var (providers, modelMap, maxAttempts) = await ResolveChatProvidersAsync(request, token);
-        var primaryModelId = modelMap[providers[0].Id];
-
-        return new AiResolvedChatClient(
-            new ResilientChatClient(
-                _aiClient,
-                providers,
-                modelMap,
-                maxAttempts,
-                _aiAudit,
-                request.OrganizationId,
-                request.SubjectId,
-                request.CorrelationId,
-                request.Scenario,
-                _loggerFactory.CreateLogger<ResilientChatClient>()),
-            string.Join(" -> ", providers.Select(x => x.Name)),
-            primaryModelId);
-    }
-
-    public async Task<AiResolvedEmbeddingGenerator> CreateEmbeddingGeneratorAsync(AiEmbeddingRuntimeRequest request, CancellationToken token)
-    {
-        var settings = await _db.OrganizationAiKbSettings
-            .AsNoTracking()
-            .FirstOrDefaultAsync(s => s.OrganizationId == request.OrganizationId, token)
-            ?? throw new InvalidOperationException($"No AI/KB settings found for org {request.OrganizationId}");
-
-        var providers = await ResolveEmbeddingProvidersAsync(request, settings, token);
-        var dimensions = request.Dimensions ?? settings.EmbeddingDimensions;
-        var generator = new ResilientEmbeddingGenerator(
-            providers,
-            dimensions,
-            _protector,
-            _httpClientFactory,
-            _loggerFactory);
-
-        return new AiResolvedEmbeddingGenerator(
-            generator,
-            string.Join(" -> ", providers.Select(x => x.Provider.Name)),
-            providers[0].ModelId,
-            dimensions);
-    }
-
-    private async Task<(List<AiProvider> Providers, Dictionary<Guid, string> ModelMap, int MaxAttempts)> ResolveChatProvidersAsync(
-        AiChatRuntimeRequest request,
-        CancellationToken token)
-    {
-        if (request.ProviderId.HasValue)
-        {
-            var explicitProvider = await _db.AiProviders
-                .AsNoTracking()
-                .FirstOrDefaultAsync(p => p.Id == request.ProviderId.Value && p.IsEnabled, token)
-                ?? throw new InvalidOperationException($"AI provider not found or disabled: {request.ProviderId}");
-            var explicitModel = request.ModelId ?? explicitProvider.DefaultModel
-                ?? throw new InvalidOperationException($"Provider '{explicitProvider.Name}' has no default model configured.");
-            return ([explicitProvider], new Dictionary<Guid, string> { [explicitProvider.Id] = explicitModel }, 1);
-        }
-
-        OrganizationAiKbSettings? settings = null;
-        var providers = new List<AiProvider>();
-        var modelMap = new Dictionary<Guid, string>();
-
-        if (!string.IsNullOrWhiteSpace(request.OrganizationId))
-        {
-            settings = await _db.OrganizationAiKbSettings
-                .AsNoTracking()
-                .FirstOrDefaultAsync(s => s.OrganizationId == request.OrganizationId, token);
-
-            if (settings is not null
-                && Guid.TryParse(settings.KnowledgeProviderId, out var knowledgeProviderId))
-            {
-                var knowledgeProvider = await _db.AiProviders
-                    .AsNoTracking()
-                    .FirstOrDefaultAsync(p => p.Id == knowledgeProviderId && p.IsEnabled, token);
-                if (knowledgeProvider is not null)
-                {
-                    providers.Add(knowledgeProvider);
-                    modelMap[knowledgeProvider.Id] = request.ModelId
-                        ?? settings.KnowledgeModelName
-                        ?? knowledgeProvider.DefaultModel
-                        ?? throw new InvalidOperationException($"Provider '{knowledgeProvider.Name}' has no default model configured.");
-                }
-            }
-        }
-
-        if (providers.Count == 0)
-        {
-            var fallbackPrimary = await _db.AiProviders
-                .AsNoTracking()
-                .FirstOrDefaultAsync(p => p.IsEnabled, token)
-                ?? throw new InvalidOperationException("No enabled AI provider configured.");
-            providers.Add(fallbackPrimary);
-            modelMap[fallbackPrimary.Id] = request.ModelId
-                ?? fallbackPrimary.DefaultModel
-                ?? throw new InvalidOperationException($"Provider '{fallbackPrimary.Name}' has no default model configured.");
-        }
-
-        if (settings?.EnableProviderFallback == true)
-        {
-            var providerIds = providers.Select(x => x.Id).ToList();
-            var fallbackProviders = await _db.AiProviders
-                .AsNoTracking()
-                .Where(p => p.IsEnabled && !providerIds.Contains(p.Id))
-                .OrderBy(p => p.Name)
-                .ToListAsync(token);
-
-            foreach (var provider in fallbackProviders)
-            {
-                var modelId = request.ModelId
-                    ?? provider.DefaultModel
-                    ?? settings.KnowledgeModelName
-                    ?? providers[0].DefaultModel;
-                if (string.IsNullOrWhiteSpace(modelId))
-                {
-                    continue;
-                }
-
-                providers.Add(provider);
-                modelMap[provider.Id] = modelId;
-            }
-        }
-
-        return (providers, modelMap, settings?.MaxProviderAttempts is > 0 ? settings.MaxProviderAttempts : 1);
-    }
-
-    private async Task<List<(AiProvider Provider, string ModelId)>> ResolveEmbeddingProvidersAsync(
-        AiEmbeddingRuntimeRequest request,
-        OrganizationAiKbSettings settings,
-        CancellationToken token)
-    {
-        var results = new List<(AiProvider Provider, string ModelId)>();
-        var providerIds = new List<Guid>();
-
-        if (request.ProviderId.HasValue)
-        {
-            providerIds.Add(request.ProviderId.Value);
-        }
-        else if (Guid.TryParse(settings.EmbeddingProviderId, out var configuredProviderId))
-        {
-            providerIds.Add(configuredProviderId);
-        }
-
-        foreach (var providerId in providerIds)
-        {
-            var provider = await _db.AiProviders
-                .AsNoTracking()
-                .FirstOrDefaultAsync(p => p.Id == providerId && p.IsEnabled, token);
-            var modelId = request.ModelId ?? settings.EmbeddingModel ?? provider?.DefaultModel;
-            if (provider is not null && !string.IsNullOrWhiteSpace(modelId))
-            {
-                results.Add((provider, modelId));
-            }
-        }
-
-        if (settings.EnableProviderFallback)
-        {
-            var fallbackProviders = await _db.AiProviders
-                .AsNoTracking()
-                .Where(p => p.IsEnabled && !providerIds.Contains(p.Id))
-                .OrderBy(p => p.Name)
-                .ToListAsync(token);
-
-            foreach (var provider in fallbackProviders)
-            {
-                var modelId = request.ModelId ?? settings.EmbeddingModel ?? provider.DefaultModel;
-                if (!string.IsNullOrWhiteSpace(modelId))
-                {
-                    results.Add((provider, modelId));
-                }
-            }
-        }
-
-        if (results.Count == 0)
-        {
-            throw new InvalidOperationException($"No embedding provider is configured for org {request.OrganizationId}.");
-        }
-
-        return results;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/LegacyChatClientAdapter.cs b/src/Helpdesk.Infrastructure/AI/LegacyChatClientAdapter.cs
deleted file mode 100644
index affc4482..00000000
--- a/src/Helpdesk.Infrastructure/AI/LegacyChatClientAdapter.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.AI;
-
-namespace Helpdesk.Infrastructure.AI;
-
-internal sealed class LegacyChatClientAdapter(
-    IAiClient aiClient,
-    AiProvider provider,
-    string modelId) : IChatClient
-{
-    private readonly IAiClient _aiClient = aiClient;
-    private readonly AiProvider _provider = provider;
-    private readonly string _modelId = modelId;
-
-    public void Dispose()
-    {
-    }
-
-    public async Task<ChatResponse> GetResponseAsync(
-        IEnumerable<ChatMessage> messages,
-        ChatOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        var prompt = string.Join(
-            Environment.NewLine + Environment.NewLine,
-            messages.Select(message => $"{message.Role}: {FlattenContents(message)}"));
-
-        var selectedModel = options?.ModelId ?? _modelId;
-        var content = await _aiClient.ChatAsync(_provider, prompt, selectedModel, cancellationToken);
-        return new ChatResponse(new ChatMessage(ChatRole.Assistant, content));
-    }
-
-    public IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
-        IEnumerable<ChatMessage> messages,
-        ChatOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        return GetEmptyStream();
-    }
-
-    public object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        return null;
-    }
-
-    private static string FlattenContents(ChatMessage message)
-    {
-        if (!string.IsNullOrWhiteSpace(message.Text))
-        {
-            return message.Text;
-        }
-
-        return string.Join(" ", message.Contents.Select(content => content.ToString()));
-    }
-
-    private static async IAsyncEnumerable<ChatResponseUpdate> GetEmptyStream()
-    {
-        yield break;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/LegacyEmbeddingGeneratorAdapter.cs b/src/Helpdesk.Infrastructure/AI/LegacyEmbeddingGeneratorAdapter.cs
deleted file mode 100644
index e4a2b4c6..00000000
--- a/src/Helpdesk.Infrastructure/AI/LegacyEmbeddingGeneratorAdapter.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System.Net;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.AI;
-
-public sealed class LegacyEmbeddingGeneratorAdapter(
-    AiProvider provider,
-    string modelId,
-    int? dimensions,
-    ISecretProtector protector,
-    IHttpClientFactory httpClientFactory,
-    ILogger<LegacyEmbeddingGeneratorAdapter> logger) : IEmbeddingGenerator<string, Embedding<float>>
-{
-    private readonly AiProvider _provider = provider;
-    private readonly string _modelId = modelId;
-    private readonly int? _dimensions = dimensions;
-    private readonly ISecretProtector _protector = protector;
-    private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
-    private readonly ILogger<LegacyEmbeddingGeneratorAdapter> _logger = logger;
-
-    public void Dispose()
-    {
-    }
-
-    public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(
-        IEnumerable<string> values,
-        EmbeddingGenerationOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        var inputArray = values as string[] ?? values.ToArray();
-        var vectors = await CreateEmbeddingsAsync(inputArray, cancellationToken);
-        var embeddings = vectors
-            .Select(vector => new Embedding<float>(vector))
-            .ToArray();
-
-        return new GeneratedEmbeddings<Embedding<float>>(embeddings);
-    }
-
-    public object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        return null;
-    }
-
-    private async Task<IReadOnlyList<float[]>> CreateEmbeddingsAsync(
-        string[] inputArray,
-        CancellationToken token)
-    {
-        var baseUrl = _provider.BaseUrl?.TrimEnd('/')
-            ?? throw new InvalidOperationException("Provider.BaseUrl is empty.");
-
-        var apiKey = _protector.Unprotect(_provider.ApiKeyEncrypted);
-
-        var client = _httpClientFactory.CreateClient("OpenAICompatible");
-        client.Timeout = TimeSpan.FromSeconds(2);
-
-        static string TrimSuffix(string value, string suffix) =>
-            value.EndsWith(suffix, StringComparison.OrdinalIgnoreCase) ? value[..^suffix.Length] : value;
-
-        var candidates = new List<(Uri uri, string kind)>
-        {
-            (new Uri((baseUrl.EndsWith("/v1", StringComparison.OrdinalIgnoreCase) ? baseUrl : baseUrl + "/v1") + "/embeddings"), "openai")
-        };
-
-        var normalizedRoot = TrimSuffix(TrimSuffix(baseUrl, "/v1"), "/");
-        normalizedRoot = TrimSuffix(normalizedRoot, "/ollama");
-
-        candidates.Add((new Uri(normalizedRoot + "/api/embeddings"), "generic"));
-        candidates.Add((new Uri(normalizedRoot + "/api/embed"), "embed-legacy"));
-        candidates.Add((new Uri(normalizedRoot + "/ollama/api/embeddings"), "generic"));
-        candidates.Add((new Uri(normalizedRoot + "/ollama/api/embed"), "embed-legacy"));
-
-        string lastErrBody = string.Empty;
-        HttpStatusCode? lastStatus = null;
-
-        foreach (var (uri, kind) in candidates)
-        {
-            try
-            {
-                using var request = new HttpRequestMessage(HttpMethod.Post, uri);
-                if (!string.IsNullOrWhiteSpace(apiKey))
-                {
-                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", apiKey);
-                }
-                request.Content = JsonContent.Create(new
-                {
-                    model = _modelId,
-                    input = inputArray,
-                    dimensions = _dimensions
-                });
-
-                _logger.LogInformation(
-                    "Embeddings attempt: {Kind} -> {Url} (model={Model}, count={Count})",
-                    kind,
-                    uri,
-                    _modelId,
-                    inputArray.Length);
-
-                using var response = await client.SendAsync(request, token);
-                if (!response.IsSuccessStatusCode)
-                {
-                    lastStatus = response.StatusCode;
-                    lastErrBody = await response.Content.ReadAsStringAsync(token);
-
-                    if (response.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.MethodNotAllowed)
-                    {
-                        _logger.LogWarning(
-                            "Embeddings attempt failed {Status} at {Url}. Trying next candidate.",
-                            (int)response.StatusCode,
-                            uri);
-                        continue;
-                    }
-
-                    throw new EmbeddingUnavailableException($"Embeddings {response.StatusCode}");
-                }
-
-                await using var stream = await response.Content.ReadAsStreamAsync(token);
-                using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: token);
-                return ParseEmbeddingVectors(doc.RootElement);
-            }
-            catch (HttpRequestException ex) when (lastStatus is HttpStatusCode.NotFound or HttpStatusCode.MethodNotAllowed)
-            {
-                _logger.LogWarning(ex, "Embeddings candidate failed at {Url}; falling back.", uri);
-            }
-        }
-
-        throw new InvalidOperationException(
-            $"Could not reach a working embeddings endpoint for base '{baseUrl}'. Last status={(int?)lastStatus} body='{lastErrBody}'.");
-    }
-
-    private static IReadOnlyList<float[]> ParseEmbeddingVectors(JsonElement rootEl)
-    {
-        var result = new List<float[]>();
-
-        if (rootEl.TryGetProperty("data", out var dataArray) && dataArray.ValueKind == JsonValueKind.Array)
-        {
-            foreach (var item in dataArray.EnumerateArray())
-            {
-                if (item.TryGetProperty("embedding", out var embedding))
-                {
-                    result.Add(embedding.EnumerateArray().Select(value => value.GetSingle()).ToArray());
-                }
-            }
-
-            if (result.Count > 0)
-            {
-                return result;
-            }
-        }
-
-        if (rootEl.TryGetProperty("embeddings", out var embeddingsArray) && embeddingsArray.ValueKind == JsonValueKind.Array)
-        {
-            foreach (var item in embeddingsArray.EnumerateArray())
-            {
-                var vectorEl = item;
-                if (item.ValueKind == JsonValueKind.Object && item.TryGetProperty("embedding", out var inner))
-                {
-                    vectorEl = inner;
-                }
-
-                if (vectorEl.ValueKind == JsonValueKind.Array)
-                {
-                    result.Add(vectorEl.EnumerateArray().Select(value => value.GetSingle()).ToArray());
-                }
-            }
-        }
-
-        if (result.Count == 0)
-        {
-            throw new InvalidOperationException("Embeddings response did not contain recognized vector data.");
-        }
-
-        return result;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/LoggerAiOperationAuditService.cs b/src/Helpdesk.Infrastructure/AI/LoggerAiOperationAuditService.cs
deleted file mode 100644
index 4f72cceb..00000000
--- a/src/Helpdesk.Infrastructure/AI/LoggerAiOperationAuditService.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Persistence;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.AI;
-
-public sealed class LoggerAiOperationAuditService(
-    HelpdeskDbContext db,
-    ILogger<LoggerAiOperationAuditService> logger) : IAiOperationAuditService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly ILogger<LoggerAiOperationAuditService> _logger = logger;
-
-    public async Task RecordAsync(AiOperationAuditEntry entry, CancellationToken token)
-    {
-        _db.Add(new Shared.Models.AiOperationAuditRecord
-        {
-            OperationName = entry.OperationName,
-            OrganizationId = entry.OrganizationId,
-            ProviderName = entry.ProviderName,
-            ModelId = entry.ModelId,
-            CorrelationId = entry.CorrelationId,
-            SubjectId = entry.SubjectId,
-            Notes = entry.Notes
-        });
-
-        await _db.SaveChangesAsync(token);
-
-        _logger.LogInformation(
-            "AI operation {Operation} org={OrganizationId} provider={Provider} model={Model} correlation={CorrelationId} subject={SubjectId}",
-            entry.OperationName,
-            entry.OrganizationId,
-            entry.ProviderName,
-            entry.ModelId,
-            entry.CorrelationId,
-            entry.SubjectId);
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/OpenAiCompatibleClient.cs b/src/Helpdesk.Infrastructure/AI/OpenAiCompatibleClient.cs
deleted file mode 100644
index caeb0ad8..00000000
--- a/src/Helpdesk.Infrastructure/AI/OpenAiCompatibleClient.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
-using Helpdesk.Shared.Enums;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class OpenAiCompatibleClient(IHttpClientFactory httpClientFactory, ISecretProtector protector) : IAiClient
-{
-    private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
-    private readonly ISecretProtector _protector = protector;
-
-    private static void EnsureSupported(AiProvider provider)
-    {
-        if (provider.ProviderType != AiProviderType.OpenAI &&
-            provider.ProviderType != AiProviderType.OpenAICompatible &&
-            provider.ProviderType != AiProviderType.Groq)
-        {
-            throw new NotSupportedException($"Provider type {provider.ProviderType} is not supported.");
-        }
-    }
-
-    private HttpRequestMessage CreateRequest(HttpMethod method, AiProvider provider, Uri uri)
-    {
-        var request = new HttpRequestMessage(method, uri);
-        var apiKey = _protector.Unprotect(provider.ApiKeyEncrypted);
-        if (!string.IsNullOrWhiteSpace(apiKey))
-        {
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", apiKey);
-        }
-
-        if (!string.IsNullOrWhiteSpace(provider.ExtraHeadersJson))
-        {
-            try
-            {
-                var headers = JsonSerializer.Deserialize<Dictionary<string, string>>(provider.ExtraHeadersJson);
-                if (headers is not null)
-                {
-                    foreach (var (key, value) in headers)
-                    {
-                        request.Headers.TryAddWithoutValidation(key, value);
-                    }
-                }
-            }
-            catch (JsonException)
-            {
-                // Ignore invalid headers JSON
-            }
-        }
-
-        return request;
-    }
-
-    private static IReadOnlyList<Uri> BuildEndpointCandidates(AiProvider provider, string relativePath)
-    {
-        var baseUrl = (provider.BaseUrl ?? string.Empty).Trim();
-        if (string.IsNullOrWhiteSpace(baseUrl))
-        {
-            throw new InvalidOperationException("Provider base URL is empty.");
-        }
-
-        var normalized = baseUrl.TrimEnd('/');
-        if (normalized.EndsWith("/api", StringComparison.OrdinalIgnoreCase) ||
-            normalized.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
-        {
-            return [new Uri($"{normalized}/{relativePath}")];
-        }
-
-        return
-        [
-            new Uri($"{normalized}/v1/{relativePath}"),
-            new Uri($"{normalized}/api/{relativePath}")
-        ];
-    }
-
-    private static string? TruncateBody(string? body)
-    {
-        if (string.IsNullOrWhiteSpace(body))
-        {
-            return body;
-        }
-
-        var compact = body.Trim();
-        return compact.Length <= 600 ? compact : compact[..600];
-    }
-
-    private static string BuildFailureMessage(int? statusCode, string? body)
-    {
-        return statusCode switch
-        {
-            null => "Connection failed before the provider returned a response.",
-            _ when string.IsNullOrWhiteSpace(body) => $"Provider returned HTTP {statusCode}.",
-            _ => $"Provider returned HTTP {statusCode}: {TruncateBody(body)}"
-        };
-    }
-
-    private async Task<(JsonElement? Json, AiProviderConnectionTestResult Result)> TryGetJsonAsync(
-        AiProvider provider,
-        HttpMethod method,
-        string relativePath,
-        object? payload,
-        CancellationToken token)
-    {
-        var client = _httpClientFactory.CreateClient("OpenAICompatible");
-        AiProviderConnectionTestResult? lastFailure = null;
-
-        foreach (var candidate in BuildEndpointCandidates(provider, relativePath))
-        {
-            try
-            {
-                using var request = CreateRequest(method, provider, candidate);
-                if (payload is not null)
-                {
-                    request.Content = JsonContent.Create(payload);
-                }
-
-                using var response = await client.SendAsync(request, token);
-                var body = await response.Content.ReadAsStringAsync(token);
-                if (response.IsSuccessStatusCode)
-                {
-                    var json = JsonSerializer.Deserialize<JsonElement>(body);
-                    return (json, new AiProviderConnectionTestResult(
-                        true,
-                        candidate.ToString(),
-                        (int)response.StatusCode,
-                        "Connection OK."));
-                }
-
-                lastFailure = new AiProviderConnectionTestResult(
-                    false,
-                    candidate.ToString(),
-                    (int)response.StatusCode,
-                    BuildFailureMessage((int)response.StatusCode, body),
-                    TruncateBody(body));
-            }
-            catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException or JsonException)
-            {
-                lastFailure = new AiProviderConnectionTestResult(
-                    false,
-                    candidate.ToString(),
-                    Message: ex.Message);
-            }
-        }
-
-        return (null, lastFailure ?? new AiProviderConnectionTestResult(false, Message: "Connection failed."));
-    }
-
-    public async Task<IEnumerable<string>> ListModelsAsync(AiProvider provider, CancellationToken token)
-    {
-        EnsureSupported(provider);
-        var (json, result) = await TryGetJsonAsync(provider, HttpMethod.Get, "models", payload: null, token);
-        if (json is null)
-        {
-            throw new InvalidOperationException(result.Message ?? "Model discovery failed.");
-        }
-
-        return json.Value.GetProperty("data").EnumerateArray()
-            .Select(m => m.GetProperty("id").GetString() ?? string.Empty)
-            .Where(id => !string.IsNullOrEmpty(id))
-            .ToList();
-    }
-
-    public async Task<AiProviderConnectionTestResult> TestAsync(AiProvider provider, CancellationToken token)
-    {
-        EnsureSupported(provider);
-        var (_, result) = await TryGetJsonAsync(provider, HttpMethod.Get, "models", payload: null, token);
-        return result;
-    }
-
-    public async Task<string> ChatAsync(AiProvider provider, string prompt, string? model, CancellationToken token)
-    {
-        EnsureSupported(provider);
-        var modelName = model ?? provider.DefaultModel ?? throw new ArgumentException("Model must be provided", nameof(model));
-        var payload = new
-        {
-            model = modelName,
-            messages = new[] { new { role = "user", content = prompt } },
-            stream = false
-        };
-
-        var (json, result) = await TryGetJsonAsync(provider, HttpMethod.Post, "chat/completions", payload, token);
-        if (json is null)
-        {
-            throw new InvalidOperationException(result.Message ?? "Chat test failed.");
-        }
-
-        return json.Value.GetProperty("choices")[0].GetProperty("message").GetProperty("content").GetString() ?? string.Empty;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/RequesterReplyDraftService.cs b/src/Helpdesk.Infrastructure/AI/RequesterReplyDraftService.cs
deleted file mode 100644
index 52d16439..00000000
--- a/src/Helpdesk.Infrastructure/AI/RequesterReplyDraftService.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.AI;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Application.Services.AI;
-
-public sealed class RequesterReplyDraftService(
-    IAiRuntime aiRuntime,
-    IKnowledgeRetrievalService retrievalService,
-    IAiPromptTemplateService promptTemplateService,
-    IAiOperationAuditService auditService,
-    HelpdeskDbContext db,
-    ILogger<RequesterReplyDraftService> logger) : IRequesterReplyDraftService
-{
-    private readonly IAiRuntime _aiRuntime = aiRuntime;
-    private readonly IKnowledgeRetrievalService _retrievalService = retrievalService;
-    private readonly IAiPromptTemplateService _promptTemplateService = promptTemplateService;
-    private readonly IAiOperationAuditService _auditService = auditService;
-    private readonly HelpdeskDbContext _db = db;
-    private readonly ILogger<RequesterReplyDraftService> _logger = logger;
-
-    public async Task<RequesterReplyDraftDto?> GenerateAsync(Ticket ticket, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(ticket.OrganizationId))
-        {
-            return null;
-        }
-
-        var settings = await _db.OrganizationAiKbSettings
-            .AsNoTracking()
-            .FirstOrDefaultAsync(x => x.OrganizationId == ticket.OrganizationId, token);
-        if (settings is null || (!settings.EnableAiAnswers && !settings.EnableAiSearch))
-        {
-            return null;
-        }
-
-        var retrieval = (await _retrievalService.RetrieveAsync(ticket.OrganizationId, ticket.Description, 1, token))
-            .FirstOrDefault();
-        if (retrieval is null)
-        {
-            return null;
-        }
-
-        var followUpQuestions = BuildFollowUpQuestions(retrieval);
-        var suggestedLink = $"/kb/{retrieval.Article.Id}";
-
-        if (!retrieval.IsHighConfidence)
-        {
-            return new RequesterReplyDraftDto
-            {
-                RequiresClarification = true,
-                ConfidenceLabel = retrieval.ConfidenceLabel,
-                SuggestedArticleTitle = retrieval.Article.Title,
-                SuggestedArticleLink = suggestedLink,
-                DraftReply = "Please confirm a few details so we can validate the best next step for your issue.",
-                FollowUpQuestions = followUpQuestions
-            };
-        }
-
-        var runtime = await _aiRuntime.CreateChatClientAsync(
-            new AiChatRuntimeRequest(ticket.OrganizationId, Scenario: "ticket-requester-reply", SubjectId: ticket.Id),
-            token);
-        var systemPrompt = _promptTemplateService.Render(
-            "Ticket.RequesterReplyDraft.System",
-            new Dictionary<string, string?>());
-        var evidence = string.Join(
-            Environment.NewLine,
-            retrieval.Evidence.Select(x => $"- {x.Text}"));
-        var userPrompt = $"""
-Ticket title: {ticket.Title}
-Ticket description: {ticket.Description}
-Suggested article: {retrieval.Article.Title}
-Article summary: {retrieval.Article.Summary}
-Article resolution: {retrieval.Article.Resolution}
-Grounding evidence:
-{evidence}
-Write a concise helpdesk response to the requester. Use plain language, do not mention AI, and keep it actionable.
-""";
-        var response = await runtime.Client.GetResponseAsync(
-            [
-                new ChatMessage(ChatRole.System, systemPrompt),
-                new ChatMessage(ChatRole.User, userPrompt)
-            ],
-            cancellationToken: token);
-
-        await _auditService.RecordAsync(
-            new AiOperationAuditEntry(
-                "ticket-requester-reply",
-                ticket.OrganizationId,
-                runtime.ProviderName,
-                runtime.ModelId,
-                SubjectId: ticket.Id),
-            token);
-
-        _logger.LogInformation("Requester reply draft generated for ticket {TicketId}", ticket.Id);
-
-        return new RequesterReplyDraftDto
-        {
-            RequiresClarification = false,
-            ConfidenceLabel = retrieval.ConfidenceLabel,
-            SuggestedArticleTitle = retrieval.Article.Title,
-            SuggestedArticleLink = suggestedLink,
-            DraftReply = response.Text ?? string.Empty,
-            FollowUpQuestions = followUpQuestions
-        };
-    }
-
-    private static List<string> BuildFollowUpQuestions(KnowledgeRetrievalResult retrieval)
-    {
-        return
-        [
-            "Which service or application is affected?",
-            "What exact error message or behavior are you seeing?",
-            "When did the issue start, and is it still happening now?"
-        ];
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/ResilientChatClient.cs b/src/Helpdesk.Infrastructure/AI/ResilientChatClient.cs
deleted file mode 100644
index 0365d1e7..00000000
--- a/src/Helpdesk.Infrastructure/AI/ResilientChatClient.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.AI;
-
-internal sealed class ResilientChatClient(
-    IAiClient aiClient,
-    IReadOnlyList<AiProvider> providers,
-    IReadOnlyDictionary<Guid, string> modelMap,
-    int maxAttempts,
-    IAiOperationAuditService auditService,
-    string? organizationId,
-    string? subjectId,
-    string? correlationId,
-    string? scenario,
-    ILogger<ResilientChatClient> logger) : IChatClient
-{
-    private readonly IAiClient _aiClient = aiClient;
-    private readonly IReadOnlyList<AiProvider> _providers = providers;
-    private readonly IReadOnlyDictionary<Guid, string> _modelMap = modelMap;
-    private readonly int _maxAttempts = Math.Max(1, maxAttempts);
-    private readonly IAiOperationAuditService _auditService = auditService;
-    private readonly string? _organizationId = organizationId;
-    private readonly string? _subjectId = subjectId;
-    private readonly string? _correlationId = correlationId;
-    private readonly string? _scenario = scenario;
-    private readonly ILogger<ResilientChatClient> _logger = logger;
-
-    public void Dispose()
-    {
-    }
-
-    public async Task<ChatResponse> GetResponseAsync(
-        IEnumerable<ChatMessage> messages,
-        ChatOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        var prompt = string.Join(
-            Environment.NewLine + Environment.NewLine,
-            messages.Select(message => $"{message.Role}: {FlattenContents(message)}"));
-
-        Exception? lastError = null;
-        var failures = new List<string>();
-        for (var attempt = 0; attempt < _maxAttempts; attempt++)
-        {
-            var provider = _providers[attempt % _providers.Count];
-            var selectedModel = options?.ModelId ?? _modelMap[provider.Id];
-
-            try
-            {
-                var content = await _aiClient.ChatAsync(provider, prompt, selectedModel, cancellationToken);
-                if (attempt > 0)
-                {
-                    _logger.LogWarning(
-                        "AI chat fallback succeeded on provider {ProviderName} after {AttemptCount} attempts.",
-                        provider.Name,
-                        attempt + 1);
-
-                    await _auditService.RecordAsync(
-                        new AiOperationAuditEntry(
-                            "runtime-chat-fallback",
-                            _organizationId,
-                            provider.Name,
-                            selectedModel,
-                            _correlationId,
-                            _subjectId,
-                            BuildFallbackNotes(attempt + 1, failures, _scenario)),
-                        cancellationToken);
-                }
-
-                return new ChatResponse(new ChatMessage(ChatRole.Assistant, content));
-            }
-            catch (Exception ex)
-            {
-                lastError = ex;
-                _logger.LogWarning(
-                    ex,
-                    "AI chat attempt {Attempt} failed for provider {ProviderName}.",
-                    attempt + 1,
-                    provider.Name);
-                failures.Add($"{provider.Name}/{selectedModel}: {ex.GetType().Name}");
-            }
-        }
-
-        await _auditService.RecordAsync(
-            new AiOperationAuditEntry(
-                "runtime-chat-failure",
-                _organizationId,
-                string.Join(" -> ", _providers.Select(x => x.Name)),
-                options?.ModelId ?? _modelMap[_providers[0].Id],
-                _correlationId,
-                _subjectId,
-                BuildFailureNotes(failures, _scenario)),
-            cancellationToken);
-
-        throw new InvalidOperationException("All configured AI chat providers failed.", lastError);
-    }
-
-    public IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
-        IEnumerable<ChatMessage> messages,
-        ChatOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        return GetEmptyStream();
-    }
-
-    public object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        return null;
-    }
-
-    private static string FlattenContents(ChatMessage message)
-    {
-        if (!string.IsNullOrWhiteSpace(message.Text))
-        {
-            return message.Text;
-        }
-
-        return string.Join(" ", message.Contents.Select(content => content.ToString()));
-    }
-
-    private static async IAsyncEnumerable<ChatResponseUpdate> GetEmptyStream()
-    {
-        yield break;
-    }
-
-    private static string BuildFallbackNotes(int attempts, IReadOnlyCollection<string> failures, string? scenario)
-    {
-        var parts = new List<string> { $"Fallback succeeded after {attempts} attempts." };
-        if (!string.IsNullOrWhiteSpace(scenario))
-        {
-            parts.Add($"Scenario: {scenario}.");
-        }
-
-        if (failures.Count > 0)
-        {
-            parts.Add($"Prior failures: {string.Join("; ", failures)}.");
-        }
-
-        return string.Join(" ", parts);
-    }
-
-    private static string BuildFailureNotes(IReadOnlyCollection<string> failures, string? scenario)
-    {
-        var parts = new List<string> { "All configured chat providers failed." };
-        if (!string.IsNullOrWhiteSpace(scenario))
-        {
-            parts.Add($"Scenario: {scenario}.");
-        }
-
-        if (failures.Count > 0)
-        {
-            parts.Add($"Failures: {string.Join("; ", failures)}.");
-        }
-
-        return string.Join(" ", parts);
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/ResilientEmbeddingGenerator.cs b/src/Helpdesk.Infrastructure/AI/ResilientEmbeddingGenerator.cs
deleted file mode 100644
index f99b4ac1..00000000
--- a/src/Helpdesk.Infrastructure/AI/ResilientEmbeddingGenerator.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.AI;
-
-internal sealed class ResilientEmbeddingGenerator(
-    IReadOnlyList<(AiProvider Provider, string ModelId)> providers,
-    int? dimensions,
-    ISecretProtector protector,
-    IHttpClientFactory httpClientFactory,
-    ILoggerFactory loggerFactory) : IEmbeddingGenerator<string, Embedding<float>>
-{
-    private readonly IReadOnlyList<(AiProvider Provider, string ModelId)> _providers = providers;
-    private readonly int? _dimensions = dimensions;
-    private readonly ISecretProtector _protector = protector;
-    private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
-    private readonly ILoggerFactory _loggerFactory = loggerFactory;
-
-    public void Dispose()
-    {
-    }
-
-    public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(
-        IEnumerable<string> values,
-        EmbeddingGenerationOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        Exception? lastError = null;
-        foreach (var (provider, modelId) in _providers)
-        {
-            try
-            {
-                var generator = new LegacyEmbeddingGeneratorAdapter(
-                    provider,
-                    modelId,
-                    _dimensions,
-                    _protector,
-                    _httpClientFactory,
-                    _loggerFactory.CreateLogger<LegacyEmbeddingGeneratorAdapter>());
-                return await generator.GenerateAsync(values, options, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                lastError = ex;
-                _loggerFactory.CreateLogger<ResilientEmbeddingGenerator>()
-                    .LogWarning(ex, "Embedding generation failed for provider {ProviderName}.", provider.Name);
-            }
-        }
-
-        throw new InvalidOperationException("All configured embedding providers failed.", lastError);
-    }
-
-    public object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        return null;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/StaticAiPromptTemplateService.cs b/src/Helpdesk.Infrastructure/AI/StaticAiPromptTemplateService.cs
deleted file mode 100644
index 112f5d5d..00000000
--- a/src/Helpdesk.Infrastructure/AI/StaticAiPromptTemplateService.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Helpdesk.Application.Services.AI;
-
-namespace Helpdesk.Infrastructure.AI;
-
-public sealed class StaticAiPromptTemplateService : IAiPromptTemplateService
-{
-    public string Render(string templateName, IReadOnlyDictionary<string, string?> values)
-    {
-        return templateName switch
-        {
-            "KnowledgeBase.GenerateDraftFromResolvedTicket.System" =>
-                "Generate a concise knowledge base article. Output title on the first line, then body.",
-            "Ticket.RequesterReplyDraft.System" =>
-                "Draft a concise, professional helpdesk response for an end user. Stay grounded in the supplied article and evidence. If details are missing, ask clarifying questions instead of assuming facts.",
-            "Change.PeerReview.System" =>
-                """
-                You are a senior infrastructure engineer reviewing an ITIL-aligned change request.
-                Review the supplied JSON carefully and be strict about rollback quality, implementation completeness, validation coverage, risk clarity, and missing information.
-                Return JSON only with this shape:
-                {
-                  "summary": "short summary",
-                  "issuesFound": ["..."],
-                  "risksIdentified": ["..."],
-                  "missingInformation": ["..."],
-                  "recommendations": ["..."],
-                  "rawReview": "short narrative review",
-                  "hasBlockingIssues": true
-                }
-                Mark hasBlockingIssues true when rollback, implementation, testing, or critical risk details are missing or weak.
-                """,
-            _ => string.Join(Environment.NewLine, values.Select(kvp => $"{kvp.Key}: {kvp.Value}"))
-        };
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/AI/TicketUnderstandingService.cs b/src/Helpdesk.Infrastructure/AI/TicketUnderstandingService.cs
deleted file mode 100644
index 5208a2f4..00000000
--- a/src/Helpdesk.Infrastructure/AI/TicketUnderstandingService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Application.Services.AI;
-
-public class TicketUnderstandingService(
-    HelpdeskDbContext db,
-    IKnowledgeRetrievalService retrievalService,
-    ILogger<TicketUnderstandingService> logger) : ITicketUnderstandingService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IKnowledgeRetrievalService _retrievalService = retrievalService;
-    private readonly ILogger<TicketUnderstandingService> _logger = logger;
-
-    public Task<string> UnderstandAsync(Ticket ticket, CancellationToken token) => Task.FromResult(string.Empty);
-
-    public async Task<TicketKnowledgeSuggestion?> AnalyzeTicketAsync(Ticket ticket, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(ticket.OrganizationId))
-            return null;
-
-        var result = (await _retrievalService.RetrieveAsync(ticket.OrganizationId, ticket.Description, 1, token)).FirstOrDefault();
-        if (result is null)
-            return null;
-
-        var suggestion = new TicketKnowledgeSuggestion
-        {
-            TicketId = ticket.Id,
-            KnowledgeBaseArticleId = result.Article.Id,
-            Article = result.Article,
-            Score = result.Score
-        };
-        _db.TicketKnowledgeSuggestions.Add(suggestion);
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("Knowledge suggestion {SuggestionId} created for ticket {TicketId}", suggestion.Id, ticket.Id);
-        return suggestion;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/Changes/ChangeReviewService.cs b/src/Helpdesk.Infrastructure/Changes/ChangeReviewService.cs
deleted file mode 100644
index 827e0e52..00000000
--- a/src/Helpdesk.Infrastructure/Changes/ChangeReviewService.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-using System.Text.Json;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.Changes;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Change;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-
-namespace Helpdesk.Infrastructure.Changes;
-
-public sealed class ChangeReviewService(
-    IAiRuntime aiRuntime,
-    IAiPromptTemplateService promptTemplates,
-    IAiOperationAuditService auditService,
-    HelpdeskDbContext db,
-    ILogger<ChangeReviewService> logger) : IChangeReviewService
-{
-    private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web)
-    {
-        WriteIndented = false
-    };
-
-    private readonly IAiRuntime _aiRuntime = aiRuntime;
-    private readonly IAiPromptTemplateService _promptTemplates = promptTemplates;
-    private readonly IAiOperationAuditService _auditService = auditService;
-    private readonly HelpdeskDbContext _db = db;
-    private readonly ILogger<ChangeReviewService> _logger = logger;
-
-    public string NormalizeChangeType(string? changeType)
-    {
-        return changeType?.Trim().ToLowerInvariant() switch
-        {
-            "standard" => "Standard",
-            "normal" => "Normal",
-            "emergency" => "Emergency",
-            _ => string.Empty
-        };
-    }
-
-    public ChangeTemplateDto? DeserializeTemplate(string? templateJson)
-    {
-        if (string.IsNullOrWhiteSpace(templateJson))
-        {
-            return null;
-        }
-
-        return JsonSerializer.Deserialize<ChangeTemplateDto>(templateJson, JsonOptions);
-    }
-
-    public string SerializeTemplate(ChangeTemplateDto? template)
-    {
-        return JsonSerializer.Serialize(NormalizeTemplate(template ?? new ChangeTemplateDto()), JsonOptions);
-    }
-
-    public ChangeTemplateValidationDto ValidateTemplate(string? changeType, ChangeTemplateDto? template)
-    {
-        var normalizedType = NormalizeChangeType(changeType);
-        var normalizedTemplate = NormalizeTemplate(template ?? new ChangeTemplateDto());
-        var errors = new List<string>();
-
-        if (string.IsNullOrWhiteSpace(normalizedType))
-        {
-            errors.Add("Change type must be Standard, Normal, or Emergency.");
-        }
-
-        if (string.IsNullOrWhiteSpace(normalizedTemplate.ScopeOfChange))
-        {
-            errors.Add("Scope of change is required.");
-        }
-
-        if (normalizedTemplate.AffectedSystems.Count == 0)
-        {
-            errors.Add("At least one affected system or service is required.");
-        }
-
-        if (normalizedTemplate.ImplementationSteps.Count == 0)
-        {
-            errors.Add("Implementation steps are required.");
-        }
-
-        if (normalizedTemplate.ValidationSteps.Count == 0)
-        {
-            errors.Add("Validation steps are required.");
-        }
-
-        if (string.IsNullOrWhiteSpace(normalizedTemplate.RollbackPlan)
-            && string.IsNullOrWhiteSpace(normalizedTemplate.RollbackReference))
-        {
-            errors.Add("A rollback plan or rollback reference is required.");
-        }
-
-        switch (normalizedType)
-        {
-            case "Standard":
-                if (normalizedTemplate.IsPreApproved != true)
-                {
-                    errors.Add("Standard changes must confirm pre-approved change status.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.ExistingRunbookReference))
-                {
-                    errors.Add("Standard changes require an SOP or runbook reference.");
-                }
-
-                break;
-            case "Normal":
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.BusinessJustification))
-                {
-                    errors.Add("Business justification is required for normal changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.ImpactAssessment))
-                {
-                    errors.Add("Impact assessment is required for normal changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.RiskAssessment))
-                {
-                    errors.Add("Risk assessment is required for normal changes.");
-                }
-
-                if (normalizedTemplate.PreChangeChecks.Count == 0)
-                {
-                    errors.Add("Pre-change checks are required for normal changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.TestingPlan))
-                {
-                    errors.Add("Validation or testing plan is required for normal changes.");
-                }
-
-                break;
-            case "Emergency":
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.EmergencyReason))
-                {
-                    errors.Add("Emergency reason is required for emergency changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.BusinessImpactIfNotImplemented))
-                {
-                    errors.Add("Business impact if not implemented is required for emergency changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.ImmediateRiskAssessment))
-                {
-                    errors.Add("Immediate risk assessment is required for emergency changes.");
-                }
-
-                if (string.IsNullOrWhiteSpace(normalizedTemplate.PostChangeValidation))
-                {
-                    errors.Add("Post-change validation is required for emergency changes.");
-                }
-
-                break;
-        }
-
-        return new ChangeTemplateValidationDto
-        {
-            IsComplete = errors.Count == 0,
-            Errors = errors
-        };
-    }
-
-    public ChangeAiReviewDto BuildReviewDto(Change change)
-    {
-        ChangeAiReviewDto? stored = null;
-        if (!string.IsNullOrWhiteSpace(change.AiReviewOutputJson))
-        {
-            stored = JsonSerializer.Deserialize<ChangeAiReviewDto>(change.AiReviewOutputJson, JsonOptions);
-        }
-
-        stored ??= new ChangeAiReviewDto();
-        stored.Status = change.AiReviewStatus;
-        stored.GateState = change.AiReviewGateState;
-        stored.CorrelationId ??= change.AiReviewCorrelationId;
-        stored.FailureReason ??= change.AiReviewFailureReason;
-        stored.AcknowledgementNotes ??= change.AiReviewAcknowledgementNotes;
-        stored.AcknowledgedByUserId ??= change.AiReviewAcknowledgedByUserId;
-        stored.AcknowledgedByName ??= change.AiReviewAcknowledgedByName;
-        stored.RequestedAt ??= change.AiReviewRequestedAt;
-        stored.CompletedAt ??= change.AiReviewCompletedAt;
-        stored.AcknowledgedAt ??= change.AiReviewAcknowledgedAt;
-        stored.RequiresAcknowledgement = change.AiReviewGateState == ChangeReviewGateState.Warning;
-        return stored;
-    }
-
-    public bool RequiresReviewBeforeProgress(Change change)
-    {
-        return change.AiReviewStatus is not ChangeReviewStatus.Complete
-            || change.AiReviewGateState == ChangeReviewGateState.Warning;
-    }
-
-    public void MarkReviewStale(Change change)
-    {
-        if (change.AiReviewStatus == ChangeReviewStatus.NotRequested)
-        {
-            return;
-        }
-
-        change.AiReviewStatus = ChangeReviewStatus.Stale;
-        change.AiReviewGateState = ChangeReviewGateState.Warning;
-        change.AiReviewAcknowledgedAt = null;
-        change.AiReviewAcknowledgedByName = null;
-        change.AiReviewAcknowledgedByUserId = null;
-        change.AiReviewAcknowledgementNotes = null;
-    }
-
-    public async Task<ChangeAiReviewDto> RunReviewAsync(Change change, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(change.OrganizationId))
-        {
-            if (!string.IsNullOrWhiteSpace(change.CustomerId))
-            {
-                var organizationId = await _db.Customers
-                    .AsNoTracking()
-                    .Where(x => x.Id == change.CustomerId)
-                    .Select(x => x.OrganizationId)
-                    .FirstOrDefaultAsync(token);
-
-                if (!string.IsNullOrWhiteSpace(organizationId))
-                {
-                    change.OrganizationId = organizationId;
-                    await _db.SaveChangesAsync(token);
-                }
-            }
-
-            if (string.IsNullOrWhiteSpace(change.OrganizationId))
-            {
-                throw new InvalidOperationException("Select an organization before AI review can run.");
-            }
-        }
-
-        var template = DeserializeTemplate(change.ChangeTemplateJson) ?? new ChangeTemplateDto();
-        var validation = ValidateTemplate(change.ChangeType, template);
-        if (!validation.IsComplete)
-        {
-            throw new InvalidOperationException("Change template is incomplete. Complete the required ITIL fields before AI review.");
-        }
-
-        change.AiReviewStatus = ChangeReviewStatus.Pending;
-        change.AiReviewGateState = ChangeReviewGateState.NotRequired;
-        change.AiReviewRequestedAt = DateTimeOffset.UtcNow;
-        change.AiReviewCompletedAt = null;
-        change.AiReviewFailureReason = null;
-        change.AiReviewAcknowledgedAt = null;
-        change.AiReviewAcknowledgedByName = null;
-        change.AiReviewAcknowledgedByUserId = null;
-        change.AiReviewAcknowledgementNotes = null;
-
-        var correlationId = Guid.NewGuid().ToString("N");
-        change.AiReviewCorrelationId = correlationId;
-        await _db.SaveChangesAsync(token);
-
-        await _auditService.RecordAsync(
-            new AiOperationAuditEntry(
-                "change-ai-review-requested",
-                change.OrganizationId,
-                "pending",
-                "pending",
-                correlationId,
-                change.Id,
-                $"Requested AI peer review for {NormalizeChangeType(change.ChangeType)} change {change.TrackingId}."),
-            token);
-
-        try
-        {
-            var runtime = await _aiRuntime.CreateChatClientAsync(
-                new AiChatRuntimeRequest(
-                    change.OrganizationId,
-                    CorrelationId: correlationId,
-                    SubjectId: change.Id,
-                    Scenario: "change-ai-review"),
-                token);
-
-            var systemPrompt = _promptTemplates.Render(
-                "Change.PeerReview.System",
-                new Dictionary<string, string?>());
-            var payload = JsonSerializer.Serialize(
-                new
-                {
-                    change.TrackingId,
-                    ChangeType = NormalizeChangeType(change.ChangeType),
-                    change.Title,
-                    change.Description,
-                    Template = template
-                },
-                JsonOptions);
-
-            var response = await runtime.Client.GetResponseAsync(
-                [
-                    new ChatMessage(ChatRole.System, systemPrompt),
-                    new ChatMessage(ChatRole.User, payload)
-                ],
-                cancellationToken: token);
-
-            var review = ParseReviewResponse(response.Text ?? string.Empty);
-            review.Status = ChangeReviewStatus.Complete;
-            review.CorrelationId = correlationId;
-            review.RequestedAt = change.AiReviewRequestedAt;
-            review.CompletedAt = DateTimeOffset.UtcNow;
-            review.GateState = review.HasBlockingIssues ? ChangeReviewGateState.Warning : ChangeReviewGateState.Pass;
-            review.RequiresAcknowledgement = review.HasBlockingIssues;
-
-            change.AiReviewStatus = review.Status;
-            change.AiReviewGateState = review.GateState;
-            change.AiReviewCompletedAt = review.CompletedAt;
-            change.AiReviewOutputJson = JsonSerializer.Serialize(review, JsonOptions);
-            await _db.SaveChangesAsync(token);
-
-            await _auditService.RecordAsync(
-                new AiOperationAuditEntry(
-                    "change-ai-review-completed",
-                    change.OrganizationId,
-                    runtime.ProviderName,
-                    runtime.ModelId,
-                    correlationId,
-                    change.Id,
-                    review.Summary),
-                token);
-
-            _logger.LogInformation("Completed AI peer review for change {ChangeId}", change.Id);
-            return review;
-        }
-        catch (Exception ex)
-        {
-            change.AiReviewStatus = ChangeReviewStatus.Failed;
-            change.AiReviewGateState = ChangeReviewGateState.Warning;
-            change.AiReviewFailureReason = ex.Message;
-            change.AiReviewCompletedAt = DateTimeOffset.UtcNow;
-            change.AiReviewOutputJson = JsonSerializer.Serialize(
-                new ChangeAiReviewDto
-                {
-                    Status = ChangeReviewStatus.Failed,
-                    GateState = ChangeReviewGateState.Warning,
-                    FailureReason = ex.Message,
-                    Summary = "AI peer review failed.",
-                    RequestedAt = change.AiReviewRequestedAt,
-                    CompletedAt = change.AiReviewCompletedAt,
-                    CorrelationId = correlationId
-                },
-                JsonOptions);
-            await _db.SaveChangesAsync(token);
-
-            await _auditService.RecordAsync(
-                new AiOperationAuditEntry(
-                    "change-ai-review-failed",
-                    change.OrganizationId,
-                    "failed",
-                    "failed",
-                    correlationId,
-                    change.Id,
-                    ex.Message),
-                token);
-
-            throw;
-        }
-    }
-
-    private static ChangeTemplateDto NormalizeTemplate(ChangeTemplateDto template)
-    {
-        return new ChangeTemplateDto
-        {
-            IsPreApproved = template.IsPreApproved,
-            ExistingRunbookReference = NormalizeText(template.ExistingRunbookReference),
-            ScopeOfChange = NormalizeText(template.ScopeOfChange),
-            AffectedSystems = NormalizeList(template.AffectedSystems),
-            ImplementationSteps = NormalizeList(template.ImplementationSteps),
-            ValidationSteps = NormalizeList(template.ValidationSteps),
-            RollbackReference = NormalizeText(template.RollbackReference),
-            RiskClassification = NormalizeText(template.RiskClassification),
-            ChangeDescription = NormalizeText(template.ChangeDescription),
-            BusinessJustification = NormalizeText(template.BusinessJustification),
-            ImpactAssessment = NormalizeText(template.ImpactAssessment),
-            RiskAssessment = NormalizeText(template.RiskAssessment),
-            PreChangeChecks = NormalizeList(template.PreChangeChecks),
-            TestingPlan = NormalizeText(template.TestingPlan),
-            RollbackPlan = NormalizeText(template.RollbackPlan),
-            Dependencies = NormalizeList(template.Dependencies),
-            EmergencyReason = NormalizeText(template.EmergencyReason),
-            BusinessImpactIfNotImplemented = NormalizeText(template.BusinessImpactIfNotImplemented),
-            ImmediateRiskAssessment = NormalizeText(template.ImmediateRiskAssessment),
-            IncidentReference = NormalizeText(template.IncidentReference),
-            PostChangeValidation = NormalizeText(template.PostChangeValidation)
-        };
-    }
-
-    private static List<string> NormalizeList(IEnumerable<string>? items)
-    {
-        return items?
-            .Select(NormalizeText)
-            .Where(x => !string.IsNullOrWhiteSpace(x))
-            .Cast<string>()
-            .Distinct(StringComparer.OrdinalIgnoreCase)
-            .ToList()
-            ?? new List<string>();
-    }
-
-    private static string? NormalizeText(string? value)
-    {
-        return string.IsNullOrWhiteSpace(value) ? null : value.Trim();
-    }
-
-    private static ChangeAiReviewDto ParseReviewResponse(string rawResponse)
-    {
-        var cleaned = ExtractJson(rawResponse);
-        ChangeAiReviewDto? parsed = null;
-        if (!string.IsNullOrWhiteSpace(cleaned))
-        {
-            try
-            {
-                parsed = JsonSerializer.Deserialize<ChangeAiReviewDto>(cleaned, JsonOptions);
-            }
-            catch
-            {
-                // Fall through to a raw-text fallback.
-            }
-        }
-
-        parsed ??= new ChangeAiReviewDto
-        {
-            Summary = "AI peer review completed.",
-            RawReview = rawResponse,
-            Recommendations = rawResponse
-                .Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
-                .Take(10)
-                .ToList()
-        };
-        parsed.RawReview = string.IsNullOrWhiteSpace(parsed.RawReview) ? rawResponse : parsed.RawReview;
-        parsed.IssuesFound = NormalizeList(parsed.IssuesFound);
-        parsed.RisksIdentified = NormalizeList(parsed.RisksIdentified);
-        parsed.MissingInformation = NormalizeList(parsed.MissingInformation);
-        parsed.Recommendations = NormalizeList(parsed.Recommendations);
-        parsed.HasBlockingIssues = parsed.HasBlockingIssues
-            || parsed.IssuesFound.Count > 0
-            || parsed.MissingInformation.Count > 0;
-        if (string.IsNullOrWhiteSpace(parsed.Summary))
-        {
-            parsed.Summary = parsed.HasBlockingIssues
-                ? "AI review found issues that require reviewer acknowledgement."
-                : "AI review did not find blocking issues.";
-        }
-
-        return parsed;
-    }
-
-    private static string ExtractJson(string rawResponse)
-    {
-        var trimmed = rawResponse.Trim();
-        if (trimmed.StartsWith("```", StringComparison.Ordinal))
-        {
-            var firstBreak = trimmed.IndexOf('\n');
-            var lastFence = trimmed.LastIndexOf("```", StringComparison.Ordinal);
-            if (firstBreak >= 0 && lastFence > firstBreak)
-            {
-                trimmed = trimmed.Substring(firstBreak + 1, lastFence - firstBreak - 1).Trim();
-            }
-        }
-
-        var firstBrace = trimmed.IndexOf('{');
-        var lastBrace = trimmed.LastIndexOf('}');
-        return firstBrace >= 0 && lastBrace > firstBrace
-            ? trimmed.Substring(firstBrace, lastBrace - firstBrace + 1)
-            : trimmed;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/Changes/ChangeTemplateService.cs b/src/Helpdesk.Infrastructure/Changes/ChangeTemplateService.cs
new file mode 100644
index 00000000..45ac5136
--- /dev/null
+++ b/src/Helpdesk.Infrastructure/Changes/ChangeTemplateService.cs
@@ -0,0 +1,92 @@
+using System.Text.Json;
+using Helpdesk.Application.Services.Changes;
+using Helpdesk.Shared.DTOs.Change;
+
+namespace Helpdesk.Infrastructure.Changes;
+
+public sealed class ChangeTemplateService : IChangeTemplateService
+{
+    private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web);
+
+    public string NormalizeChangeType(string? changeType) => changeType?.Trim().ToLowerInvariant() switch
+    {
+        "standard" => "Standard",
+        "normal" => "Normal",
+        "emergency" => "Emergency",
+        _ => string.Empty
+    };
+
+    public ChangeTemplateDto? DeserializeTemplate(string? templateJson) =>
+        string.IsNullOrWhiteSpace(templateJson) ? null : JsonSerializer.Deserialize<ChangeTemplateDto>(templateJson, JsonOptions);
+
+    public string SerializeTemplate(ChangeTemplateDto? template) =>
+        JsonSerializer.Serialize(NormalizeTemplate(template ?? new ChangeTemplateDto()), JsonOptions);
+
+    public ChangeTemplateValidationDto ValidateTemplate(string? changeType, ChangeTemplateDto? template)
+    {
+        var normalizedType = NormalizeChangeType(changeType);
+        var normalizedTemplate = NormalizeTemplate(template ?? new ChangeTemplateDto());
+        var errors = new List<string>();
+
+        if (string.IsNullOrWhiteSpace(normalizedType)) errors.Add("Change type must be Standard, Normal, or Emergency.");
+        if (string.IsNullOrWhiteSpace(normalizedTemplate.ScopeOfChange)) errors.Add("Scope of change is required.");
+        if (normalizedTemplate.AffectedSystems.Count == 0) errors.Add("At least one affected system or service is required.");
+        if (normalizedTemplate.ImplementationSteps.Count == 0) errors.Add("Implementation steps are required.");
+        if (normalizedTemplate.ValidationSteps.Count == 0) errors.Add("Validation steps are required.");
+        if (string.IsNullOrWhiteSpace(normalizedTemplate.RollbackPlan) && string.IsNullOrWhiteSpace(normalizedTemplate.RollbackReference)) errors.Add("A rollback plan or rollback reference is required.");
+
+        switch (normalizedType)
+        {
+            case "Standard":
+                if (normalizedTemplate.IsPreApproved != true) errors.Add("Standard changes must confirm pre-approved change status.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.ExistingRunbookReference)) errors.Add("Standard changes require an SOP or runbook reference.");
+                break;
+            case "Normal":
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.BusinessJustification)) errors.Add("Business justification is required for normal changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.ImpactAssessment)) errors.Add("Impact assessment is required for normal changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.RiskAssessment)) errors.Add("Risk assessment is required for normal changes.");
+                if (normalizedTemplate.PreChangeChecks.Count == 0) errors.Add("Pre-change checks are required for normal changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.TestingPlan)) errors.Add("Validation or testing plan is required for normal changes.");
+                break;
+            case "Emergency":
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.EmergencyReason)) errors.Add("Emergency reason is required for emergency changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.BusinessImpactIfNotImplemented)) errors.Add("Business impact if not implemented is required for emergency changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.ImmediateRiskAssessment)) errors.Add("Immediate risk assessment is required for emergency changes.");
+                if (string.IsNullOrWhiteSpace(normalizedTemplate.PostChangeValidation)) errors.Add("Post-change validation is required for emergency changes.");
+                break;
+        }
+
+        return new ChangeTemplateValidationDto { IsComplete = errors.Count == 0, Errors = errors };
+    }
+
+    private static ChangeTemplateDto NormalizeTemplate(ChangeTemplateDto template) => new()
+    {
+        IsPreApproved = template.IsPreApproved,
+        ExistingRunbookReference = NormalizeText(template.ExistingRunbookReference),
+        ScopeOfChange = NormalizeText(template.ScopeOfChange),
+        AffectedSystems = NormalizeList(template.AffectedSystems),
+        ImplementationSteps = NormalizeList(template.ImplementationSteps),
+        ValidationSteps = NormalizeList(template.ValidationSteps),
+        RollbackReference = NormalizeText(template.RollbackReference),
+        RiskClassification = NormalizeText(template.RiskClassification),
+        ChangeDescription = NormalizeText(template.ChangeDescription),
+        BusinessJustification = NormalizeText(template.BusinessJustification),
+        ImpactAssessment = NormalizeText(template.ImpactAssessment),
+        RiskAssessment = NormalizeText(template.RiskAssessment),
+        PreChangeChecks = NormalizeList(template.PreChangeChecks),
+        TestingPlan = NormalizeText(template.TestingPlan),
+        RollbackPlan = NormalizeText(template.RollbackPlan),
+        Dependencies = NormalizeList(template.Dependencies),
+        EmergencyReason = NormalizeText(template.EmergencyReason),
+        BusinessImpactIfNotImplemented = NormalizeText(template.BusinessImpactIfNotImplemented),
+        ImmediateRiskAssessment = NormalizeText(template.ImmediateRiskAssessment),
+        IncidentReference = NormalizeText(template.IncidentReference),
+        PostChangeValidation = NormalizeText(template.PostChangeValidation)
+    };
+
+    private static List<string> NormalizeList(IEnumerable<string>? items) => items?
+        .Select(NormalizeText).Where(x => !string.IsNullOrWhiteSpace(x)).Cast<string>()
+        .Distinct(StringComparer.OrdinalIgnoreCase).ToList() ?? [];
+
+    private static string? NormalizeText(string? value) => string.IsNullOrWhiteSpace(value) ? null : value.Trim();
+}
diff --git a/src/Helpdesk.Infrastructure/DependencyInjection.cs b/src/Helpdesk.Infrastructure/DependencyInjection.cs
index 29cf097f..4e63cbef 100644
--- a/src/Helpdesk.Infrastructure/DependencyInjection.cs
+++ b/src/Helpdesk.Infrastructure/DependencyInjection.cs
@@ -2,12 +2,11 @@
 using Helpdesk.Application.Services.Email;
 using Helpdesk.Application.Services.EmailTemplates;
 using Helpdesk.Application.Services.Branding;
-using Helpdesk.Application.Services.KB;
+using Helpdesk.Application.Services.Changes;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.Services.SupportNotifications;
 using Helpdesk.Application.Services.Tenants;
 using Helpdesk.Application.Services.Tickets;
-using Helpdesk.Application.Services.Changes;
 using Helpdesk.Application.Sla;
 using Helpdesk.Application.RequestTasks;
 using Helpdesk.Application.Orchestration;
@@ -20,13 +19,11 @@
 using Helpdesk.Application.Workflow;
 using Helpdesk.Application.AiAssistant;
 using Helpdesk.Infrastructure.Configuration;
-using Helpdesk.Infrastructure.AI;
-using Helpdesk.Infrastructure.Changes;
 using Helpdesk.Infrastructure.Email;
 using Helpdesk.Infrastructure.Html;
-using Helpdesk.Infrastructure.KB;
 using Helpdesk.Infrastructure.Services;
 using Helpdesk.Infrastructure.Events;
+using Helpdesk.Infrastructure.Changes;
 using Helpdesk.Infrastructure.EmailTemplates;
 using Helpdesk.Infrastructure.Identity;
 using Helpdesk.Infrastructure.Persistence;
@@ -42,7 +39,6 @@
 using Helpdesk.Shared.Models;
 using Helpdesk.Shared.Services;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql.EntityFrameworkCore.PostgreSQL;
@@ -96,17 +92,6 @@ public static IServiceCollection AddHelpdeskInfrastructure(this IServiceCollecti
 
         AddRepositoryRegistrations(services);
 
-        services.AddHttpClient("OpenAICompatible", client =>
-        {
-            client.Timeout = Timeout.InfiniteTimeSpan;
-        })
-        .SetHandlerLifetime(TimeSpan.FromMinutes(10))
-        .AddStandardResilienceHandler(options =>
-        {
-            options.AttemptTimeout.Timeout = TimeSpan.FromMinutes(2);
-            options.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(5);
-            options.CircuitBreaker.SamplingDuration = TimeSpan.FromMinutes(5);
-        });
         services.AddHttpClient("OrchestrationInternalApi")
             .SetHandlerLifetime(TimeSpan.FromMinutes(10));
         services.AddHttpClient("AiAssistantWebhook")
@@ -114,26 +99,6 @@ public static IServiceCollection AddHelpdeskInfrastructure(this IServiceCollecti
         services.AddHttpClient<IAuthentikAdminClient, AuthentikAdminClient>()
             .SetHandlerLifetime(TimeSpan.FromMinutes(10));
 
-        services.AddScoped<IAiClient, OpenAiCompatibleClient>();
-        services.AddScoped<IAiRuntime, HelpdeskAiRuntime>();
-        services.AddScoped<IAiPromptTemplateService, StaticAiPromptTemplateService>();
-        services.AddScoped<IAiOperationAuditService, LoggerAiOperationAuditService>();
-        services.AddScoped<IAiProviderService, AiProviderService>();
-        services.AddScoped<IEmbeddingService, EmbeddingService>();
-        if (databaseProvider is DatabaseProvider.PostgreSql)
-        {
-            services.AddScoped<IKnowledgeVectorStore, PgVectorKnowledgeVectorStore>();
-        }
-        else
-        {
-            services.AddScoped<IKnowledgeVectorStore, NoOpKnowledgeVectorStore>();
-        }
-        services.AddScoped<IKnowledgeRetrievalService, KnowledgeRetrievalService>();
-        services.AddScoped<IKnowledgeBuilderService, KnowledgeBuilderService>();
-        services.AddScoped<IKnowledgeSuggestionService, KnowledgeSuggestionService>();
-        services.AddScoped<ITicketUnderstandingService, TicketUnderstandingService>();
-        services.AddScoped<IRequesterReplyDraftService, RequesterReplyDraftService>();
-        services.AddScoped<IChangeReviewService, ChangeReviewService>();
         services.AddScoped<ITenantProvisioningService, TenantProvisioningService>();
         services.AddScoped<ITicketNotificationService, TicketNotificationService>();
         services.AddScoped<ISupportAccessService, SupportAccessService>();
@@ -249,12 +214,7 @@ private static void ConfigureDatabase(
     {
         if (provider is DatabaseProvider.PostgreSql)
         {
-            options.UseNpgsql(connectionString, npgsql => npgsql.UseVector());
-            // The historical PostgreSQL model contains intentional provider
-            // annotations that EF Core 10 re-detects as pending changes. The
-            // application always applies the explicit migration chain; fresh
-            // PostgreSQL setup is verified by the Compose smoke test.
-            options.ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning));
+            options.UseNpgsql(connectionString);
             return;
         }
 
@@ -292,6 +252,7 @@ private static void AddRepositoryRegistrations(IServiceCollection services)
         services.AddScoped<IRepository<Request>, EfRepository<Request>>();
         services.AddScoped<IRepository<RequestTask>, EfRepository<RequestTask>>();
         services.AddScoped<IRepository<Change>, EfRepository<Change>>();
+        services.AddScoped<IChangeTemplateService, ChangeTemplateService>();
         services.AddScoped<IRepository<WorkLog>, EfRepository<WorkLog>>();
         services.AddScoped<IRepository<TicketTimelineEvent>, EfRepository<TicketTimelineEvent>>();
         services.AddScoped<IRepository<Ticket>, EfRepository<Ticket>>();
@@ -301,8 +262,6 @@ private static void AddRepositoryRegistrations(IServiceCollection services)
         services.AddScoped<IRepository<Organization>, EfRepository<Organization>>();
         services.AddScoped<IRepository<Customer>, EfRepository<Customer>>();
         services.AddScoped<IRepository<CustomerAuthLink>, EfRepository<CustomerAuthLink>>();
-        services.AddScoped<IRepository<KnowledgeBaseCategory>, EfRepository<KnowledgeBaseCategory>>();
-        services.AddScoped<IRepository<KnowledgeBaseArticle>, EfRepository<KnowledgeBaseArticle>>();
         services.AddScoped<IRepository<Asset>, EfRepository<Asset>>();
         services.AddScoped<IRepository<SlaPolicy>, SlaPolicyRepository>();
         services.AddScoped<IRepository<WorkingCalendar>, EfRepository<WorkingCalendar>>();
@@ -333,11 +292,6 @@ private static void AddRepositoryRegistrations(IServiceCollection services)
         services.AddScoped<IRepository<TenantGraphDatasetSettings>, EfRepository<TenantGraphDatasetSettings>>();
         services.AddScoped<IRepository<PasswordResetToken>, EfRepository<PasswordResetToken>>();
         services.AddScoped<IRepository<TwoFactorCode>, EfRepository<TwoFactorCode>>();
-        services.AddScoped<IRepository<OrganizationAiKbSettings>, EfRepository<OrganizationAiKbSettings>>();
-        services.AddScoped<IRepository<TicketKnowledgeSuggestion>, EfRepository<TicketKnowledgeSuggestion>>();
-        services.AddScoped<IRepository<AiProvider>, EfRepository<AiProvider>>();
-        services.AddScoped<IRepository<AiModel>, EfRepository<AiModel>>();
-        services.AddScoped<IRepository<KnowledgeEmbedding>, EfRepository<KnowledgeEmbedding>>();
         services.AddScoped<IRepository<SupportGroup>, EfRepository<SupportGroup>>();
         services.AddScoped<IRepository<SupportGroupMember>, EfRepository<SupportGroupMember>>();
         services.AddScoped<IRepository<OrganizationSupportCoverage>, EfRepository<OrganizationSupportCoverage>>();
diff --git a/src/Helpdesk.Infrastructure/DesignTimeDbContextFactory.cs b/src/Helpdesk.Infrastructure/DesignTimeDbContextFactory.cs
index 72427b08..8df9e759 100644
--- a/src/Helpdesk.Infrastructure/DesignTimeDbContextFactory.cs
+++ b/src/Helpdesk.Infrastructure/DesignTimeDbContextFactory.cs
@@ -20,7 +20,7 @@ public HelpdeskDbContext CreateDbContext(string[] args)
             ?? throw new InvalidOperationException(
                 "A design-time Helpdesk database connection string is required. Set HELPDESK_DESIGNTIME_DB, ConnectionStrings__HelpdeskDb, or ConnectionStrings:HelpdeskDb.");
 
-        optionsBuilder.UseNpgsql(connectionString, npg => npg.UseVector());
+        optionsBuilder.UseNpgsql(connectionString);
 
         var tenant = new DummyTenantContext();
         return new HelpdeskDbContext(optionsBuilder.Options, tenant, new Microsoft.AspNetCore.Http.HttpContextAccessor());
diff --git a/src/Helpdesk.Infrastructure/EfJsonConverters.cs b/src/Helpdesk.Infrastructure/EfJsonConverters.cs
index ec347e1a..b52997d3 100644
--- a/src/Helpdesk.Infrastructure/EfJsonConverters.cs
+++ b/src/Helpdesk.Infrastructure/EfJsonConverters.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Pgvector;
 
 namespace Helpdesk.Infrastructure.Persistence;
 
@@ -36,10 +35,6 @@ public static ValueConverter<List<T>, string> EnumListToJson<T>() where T : stru
             v => v.RootElement.GetRawText(),
             v => ParseJsonDocument(v));
 
-    public static ValueConverter<Vector, string> VectorToJson { get; } =
-        new(v => JsonSerializer.Serialize(v.ToArray(), (JsonSerializerOptions?)null),
-            v => new Vector(JsonSerializer.Deserialize<float[]>(v, (JsonSerializerOptions?)null) ?? Array.Empty<float>()));
-
     private static JsonDocument ParseJsonDocument(string? value)
     {
         return JsonDocument.Parse(string.IsNullOrWhiteSpace(value) ? "{}" : value!, new JsonDocumentOptions());
diff --git a/src/Helpdesk.Infrastructure/Email/GraphEmailProcessor.cs b/src/Helpdesk.Infrastructure/Email/GraphEmailProcessor.cs
index 108c3720..21188191 100644
--- a/src/Helpdesk.Infrastructure/Email/GraphEmailProcessor.cs
+++ b/src/Helpdesk.Infrastructure/Email/GraphEmailProcessor.cs
@@ -2,7 +2,6 @@
 using Helpdesk.Application.Events;
 using Helpdesk.Application.Incidents;
 using Helpdesk.Application.Messaging;
-using Helpdesk.Application.Services.AI;
 using Helpdesk.Application.Services.Tickets;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.Services.Tenants;
@@ -25,7 +24,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Text.RegularExpressions;
-using Pgvector;
 
 namespace Helpdesk.Application.Services.Email;
 
@@ -39,15 +37,12 @@ public class GraphEmailProcessor : IGraphEmailProcessor
     private readonly ITenantProvisioningService _tenantProvisioningService;
     private readonly ITicketNotificationService _ticketNotificationService;
     private readonly IRepository<BlockedEntity> _blockedRepo;
-    private readonly IRepository<OrganizationAiKbSettings> _aiKbRepo;
     private readonly IEmailService _emailService;
     private readonly IRepository<EmailTemplate> _templateRepo;
     private readonly IRepository<Incident> _incidentRepo;
     private readonly IRepository<Ticket> _ticketRepo;
     private readonly IRepository<TicketTimelineEvent> _timelineRepo;
     private readonly ITicketAttachmentService _attachmentService;
-    private readonly IEmbeddingService _embeddingService;
-    private readonly IRepository<KnowledgeEmbedding> _embeddingRepo;
     private readonly IInboundInlineImageResolver _inlineImageResolver;
     private readonly IEmailTemplateRenderer _templateRenderer;
     private readonly IEmailLayoutResolver _layoutResolver;
@@ -62,15 +57,12 @@ public GraphEmailProcessor(
         ITenantProvisioningService tenantProvisioningService,
         ITicketNotificationService ticketNotificationService,
         IRepository<BlockedEntity> blockedRepo,
-        IRepository<OrganizationAiKbSettings> aiKbRepo,
         IEmailService emailService,
         IRepository<EmailTemplate> templateRepo,
         IRepository<Incident> incidentRepo,
         IRepository<Ticket> ticketRepo,
         IRepository<TicketTimelineEvent> timelineRepo,
         ITicketAttachmentService attachmentService,
-        IEmbeddingService embeddingService,
-        IRepository<KnowledgeEmbedding> embeddingRepo,
         IInboundInlineImageResolver inlineImageResolver,
         IEmailTemplateRenderer templateRenderer,
         IEmailLayoutResolver layoutResolver,
@@ -84,15 +76,12 @@ public GraphEmailProcessor(
         _tenantProvisioningService = tenantProvisioningService;
         _ticketNotificationService = ticketNotificationService;
         _blockedRepo = blockedRepo;
-        _aiKbRepo = aiKbRepo;
         _emailService = emailService;
         _templateRepo = templateRepo;
         _incidentRepo = incidentRepo;
         _ticketRepo = ticketRepo;
         _timelineRepo = timelineRepo;
         _attachmentService = attachmentService;
-        _embeddingService = embeddingService;
-        _embeddingRepo = embeddingRepo;
         _inlineImageResolver = inlineImageResolver;
         _templateRenderer = templateRenderer;
         _layoutResolver = layoutResolver;
@@ -351,8 +340,6 @@ await RecordInboundMessageMarkerAsync(
                 _logger.LogWarning("Failed to send new ticket confirmation for incident {TrackingId}", incident.TrackingId);
             }
 
-            await TryCreateEmailEmbeddingsAsync(customer.OrganizationId, incident.Id, graphMessage.Body?.Content ?? string.Empty, token);
-
             _logger.LogInformation("Successfully created Incident {TrackingId}", incident.TrackingId);
             ticket = incident;
         }
@@ -797,82 +784,6 @@ await _timelineRepo.CreateAsync(new TicketTimelineEvent
         });
     }
 
-    private async Task TryCreateEmailEmbeddingsAsync(string orgId, string sourceId, string text, CancellationToken token)
-    {
-        try
-        {
-            var settings = (await _aiKbRepo.GetAllAsync())
-                .FirstOrDefault(s => s.OrganizationId == orgId);
-            if (settings is null || (!settings.EnableAiSearch && !settings.EnableAiAnswers))
-            {
-                return;
-            }
-
-            var chunks = TextChunker.Split(text).ToList();
-            if (chunks.Count == 0)
-            {
-                return;
-            }
-
-            var inputs = chunks.Select(c => c.Text).ToList();
-            var vectors = await _embeddingService.CreateEmbeddingsAsync(orgId, inputs, token);
-
-            if (vectors.Count != inputs.Count)
-            {
-                _logger.LogWarning(
-                    "Embedding count mismatch for source {SourceId}: inputs={Inputs}, vectors={Vectors}. Falling back to single vector.",
-                    sourceId, inputs.Count, vectors.Count);
-
-                var combined = string.Join("\n\n", inputs);
-                var single = await _embeddingService.CreateEmbeddingAsync(orgId, combined, token);
-
-                await _embeddingRepo.CreateAsync(new KnowledgeEmbedding
-                {
-                    OrganizationId = orgId,
-                    SourceType = "Email",
-                    SourceId = sourceId,
-                    DocumentTitle = "Email Message",
-                    ChunkIndex = 0,
-                    ChunkId = "0",
-                    Text = combined,
-                    MetadataJson = "{\"source\":\"email\"}",
-                    Vector = new Vector(single),
-                    CreatedAt = DateTime.UtcNow
-                });
-
-                return;
-            }
-
-            for (var i = 0; i < Math.Min(inputs.Count, vectors.Count); i++)
-            {
-                await _embeddingRepo.CreateAsync(new KnowledgeEmbedding
-                {
-                    OrganizationId = orgId,
-                    SourceType = "Email",
-                    SourceId = sourceId,
-                    DocumentTitle = "Email Message",
-                    ChunkIndex = i,
-                    ChunkId = chunks[i].ChunkId,
-                    Text = inputs[i],
-                    MetadataJson = "{\"source\":\"email\"}",
-                    Vector = new Vector(vectors[i]),
-                    CreatedAt = DateTime.UtcNow
-                });
-            }
-        }
-        catch (OperationCanceledException) when (token.IsCancellationRequested)
-        {
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(
-                ex,
-                "Email embedding generation failed for source {SourceId}. Inbound email processing will continue.",
-                sourceId);
-        }
-    }
-
     private async Task<string?> GetOrCreateMailFolderIdAsync(GraphServiceClient graphClient, string mailbox, string folderName, CancellationToken token)
     {
         if (string.IsNullOrEmpty(folderName)) return null;
diff --git a/src/Helpdesk.Infrastructure/Events/NotificationDomainEventPublisher.cs b/src/Helpdesk.Infrastructure/Events/NotificationDomainEventPublisher.cs
index 39c6a45c..71abf2ad 100644
--- a/src/Helpdesk.Infrastructure/Events/NotificationDomainEventPublisher.cs
+++ b/src/Helpdesk.Infrastructure/Events/NotificationDomainEventPublisher.cs
@@ -65,8 +65,7 @@ private static NotificationSeverity MapSeverity(DomainEvent domainEvent)
         if (domainEvent.EventType is "DomainEvent.Workflow.RequestFailedByCriticalTask"
             or "DomainEvent.RequestTask.Failed"
             or "DomainEvent.RequestTask.AutomationFailed"
-            or "DomainEvent.Orchestration.External orchestration.TestFailed"
-            or "DomainEvent.Change.AiReviewFailed")
+            or "DomainEvent.Orchestration.External orchestration.TestFailed")
         {
             return NotificationSeverity.Error;
         }
@@ -76,8 +75,7 @@ private static NotificationSeverity MapSeverity(DomainEvent domainEvent)
             or "DomainEvent.RequestTask.RetryScheduled"
             or "DomainEvent.RequestTask.Blocked"
             or "DomainEvent.Workflow.RequestBlockedByTaskFailure"
-            or "DomainEvent.Orchestration.External orchestration.CallbackRejected"
-            or "DomainEvent.Change.AiReviewAcknowledged")
+            or "DomainEvent.Orchestration.External orchestration.CallbackRejected")
         {
             return NotificationSeverity.Warning;
         }
diff --git a/src/Helpdesk.Infrastructure/Helpdesk.Infrastructure.csproj b/src/Helpdesk.Infrastructure/Helpdesk.Infrastructure.csproj
index 3b056857..408a1687 100644
--- a/src/Helpdesk.Infrastructure/Helpdesk.Infrastructure.csproj
+++ b/src/Helpdesk.Infrastructure/Helpdesk.Infrastructure.csproj
@@ -22,14 +22,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.10.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.12" />
 	  <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.12" />
 	  <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.10.0" />
     <PackageReference Include="Microsoft.Kiota.Abstractions" Version="2.1.2" />
-    <PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.10.0" />
     <PackageReference Include="Microsoft.Graph" Version="5.105.0" />
-    <PackageReference Include="pgvector.entityframeworkcore" Version="0.3.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
diff --git a/src/Helpdesk.Infrastructure/HelpdeskDbContext.cs b/src/Helpdesk.Infrastructure/HelpdeskDbContext.cs
index 0c040f7b..e41d19a5 100644
--- a/src/Helpdesk.Infrastructure/HelpdeskDbContext.cs
+++ b/src/Helpdesk.Infrastructure/HelpdeskDbContext.cs
@@ -4,9 +4,9 @@
 using Helpdesk.Infrastructure.Persistence.Entities;
 using Helpdesk.Infrastructure.Persistence.Connectivity;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Npgsql.EntityFrameworkCore.PostgreSQL;
-using Pgvector.EntityFrameworkCore;
 
 namespace Helpdesk.Infrastructure.Persistence;
 
@@ -40,13 +40,6 @@ public class HelpdeskDbContext(
     public DbSet<TicketTimelineEvent> TicketTimelineEvents => Set<TicketTimelineEvent>();
     public DbSet<TicketRelation> TicketRelations => Set<TicketRelation>();
     public DbSet<TicketEvent> TicketEvents => Set<TicketEvent>();
-    public DbSet<KnowledgeBaseCategory> KnowledgeBaseCategories => Set<KnowledgeBaseCategory>();
-    public DbSet<KnowledgeBaseArticle> KnowledgeBaseArticles => Set<KnowledgeBaseArticle>();
-    public DbSet<KnowledgeEmbedding> KnowledgeEmbeddings => Set<KnowledgeEmbedding>();
-    public DbSet<TicketKnowledgeSuggestion> TicketKnowledgeSuggestions => Set<TicketKnowledgeSuggestion>();
-    public DbSet<TicketAiSuggestions> TicketAiSuggestions => Set<TicketAiSuggestions>();
-    public DbSet<TicketAiFeedback> TicketAiFeedback => Set<TicketAiFeedback>();
-    public DbSet<AiOperationAuditRecord> AiOperationAuditRecords => Set<AiOperationAuditRecord>();
     public DbSet<SlaPolicy> SlaPolicies => Set<SlaPolicy>();
     public DbSet<SlaEscalationRule> SlaEscalationRules => Set<SlaEscalationRule>();
     public DbSet<TicketSlaState> TicketSlaStates => Set<TicketSlaState>();
@@ -72,9 +65,6 @@ public class HelpdeskDbContext(
     public DbSet<InstanceInitialization> InstanceInitializations => Set<InstanceInitialization>();
     public DbSet<Service> Services => Set<Service>();
     public DbSet<RequestForm> RequestForms => Set<RequestForm>();
-    public DbSet<AiProvider> AiProviders => Set<AiProvider>();
-    public DbSet<AiModel> AiModels => Set<AiModel>();
-    public DbSet<OrganizationAiKbSettings> OrganizationAiKbSettings => Set<OrganizationAiKbSettings>();
     public DbSet<NotificationEntity> Notifications => Set<NotificationEntity>();
     public DbSet<NotificationReadEntity> NotificationReads => Set<NotificationReadEntity>();
     public DbSet<SupportGroup> SupportGroups => Set<SupportGroup>();
@@ -96,6 +86,17 @@ public class HelpdeskDbContext(
     public DbSet<AiInvestigationWorklogEntry> AiInvestigationWorklogEntries => Set<AiInvestigationWorklogEntry>();
     public DbSet<AiAssistantWebhookAuditRecord> AiAssistantWebhookAuditRecords => Set<AiAssistantWebhookAuditRecord>();
 
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        // The rc.7 cleanup is an explicit terminal migration, while the
+        // historical snapshots must retain their retired native-AI mappings
+        // so existing installations can be upgraded. EF Core consequently
+        // reports a pending model change for either provider before applying
+        // that migration. Always apply the migration chain instead.
+        optionsBuilder.ConfigureWarnings(warnings =>
+            warnings.Ignore(RelationalEventId.PendingModelChangesWarning));
+    }
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         var isPostgreSql = Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL";
@@ -129,11 +130,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.HasKey(x => new { x.ConversationId, x.CallId });
             entity.HasOne<Helpdesk.Shared.AiAssistant.Chat.AiAssistantChatConversation>().WithMany().HasForeignKey(x => x.ConversationId).OnDelete(DeleteBehavior.Restrict);
         });
-        if (isPostgreSql)
-        {
-            modelBuilder.HasPostgresExtension("vector");
-        }
-
         modelBuilder.Entity<Ticket>().HasQueryFilter(ticket =>
             _tenantContext.IsHelpdeskAdmin ||
             string.IsNullOrWhiteSpace(_tenantContext.TenantId) ||
@@ -285,29 +281,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<Request>(entity =>
         {
             entity.HasIndex(x => new { x.OrganizationId, x.SourceTicketId });
-            entity.HasIndex(x => new { x.OrganizationId, x.SourceKnowledgeArticleId });
             entity.Property(x => x.SourceTicketId).HasMaxLength(64);
             entity.Property(x => x.SourceAutomationBindingId).HasMaxLength(64);
         });
 
-        modelBuilder.Entity<AiOperationAuditRecord>(entity =>
-        {
-            if (isSqlite)
-            {
-                entity.Property<long>("CreatedAtSortTicks")
-                    .HasComputedColumnSql("CAST((julianday(\"CreatedAt\") - 2440587.5) * 864000000000 + 621355968000000000 AS INTEGER)");
-                entity.HasIndex("CreatedAtSortTicks");
-            }
-            entity.Property(x => x.OperationName).HasMaxLength(128);
-            entity.Property(x => x.OrganizationId).HasMaxLength(128);
-            entity.Property(x => x.ProviderName).HasMaxLength(128);
-            entity.Property(x => x.ModelId).HasMaxLength(256);
-            entity.Property(x => x.CorrelationId).HasMaxLength(128);
-            entity.Property(x => x.SubjectId).HasMaxLength(64);
-            entity.HasIndex(x => new { x.SubjectId, x.CreatedAt });
-            entity.HasIndex(x => new { x.OrganizationId, x.CreatedAt });
-        });
-
         modelBuilder.Entity<M2MConnectivitySettings>(entity =>
         {
             entity.ToTable("M2MConnectivitySettings");
@@ -345,16 +322,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             }
         });
 
-        modelBuilder.Entity<KnowledgeBaseArticle>(entity =>
-        {
-            entity.Property(x => x.AutomationBindingId).HasMaxLength(64);
-            entity.Property(x => x.AutomationRequestFormId).HasMaxLength(64);
-            entity.Property(x => x.AutomationTaskTemplateName).HasMaxLength(256);
-            entity.Property(x => x.AutomationOrchestrationRequestDefinitionId).HasMaxLength(256);
-            entity.Property(x => x.AutomationOrchestrationJobDefinitionId).HasMaxLength(256);
-            entity.HasIndex(x => new { x.OrganizationId, x.AutomationBindingId });
-        });
-
         modelBuilder.Entity<DatasetDefinition>(entity =>
         {
             entity.ToTable("DatasetDefinitions");
@@ -768,151 +735,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.Cascade);
         });
 
-        modelBuilder.Entity<AiProvider>(entity =>
-        {
-            entity.ToTable("AiProviders");
-            entity.HasKey(p => p.Id);
-            entity.Property(p => p.ProviderType).HasConversion<string>();
-            entity.Property(p => p.CreatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.Property(p => p.UpdatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.Property(p => p.ExtraHeadersJson).HasColumnType("TEXT");
-            entity.HasMany(p => p.Models)
-                .WithOne(m => m.Provider)
-                .HasForeignKey(m => m.AiProviderId);
-        });
-
-        modelBuilder.Entity<AiModel>(entity =>
-        {
-            entity.ToTable("AiModels");
-            entity.HasKey(m => m.Id);
-            entity.Property(m => m.CreatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.Property(m => m.UpdatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.Property(m => m.ExtraHeadersJson).HasColumnType("TEXT");
-        });
-
-        modelBuilder.Entity<KnowledgeBaseArticle>(entity =>
-        {
-            entity.ToTable("KnowledgeBaseArticles");
-            entity.HasKey(a => a.Id);
-            entity.HasIndex(a => a.OrganizationId);
-            entity.Property(a => a.OrganizationId).IsRequired();
-            entity.Property(a => a.Service).IsRequired();
-            entity.Property(a => a.State)
-                .HasConversion<string>()
-                .HasDefaultValue(KnowledgeBaseArticleState.Draft);
-            if (isPostgreSql)
-            {
-                entity.Property(a => a.Tags).HasColumnType("jsonb");
-            }
-            else
-            {
-                entity.Property(a => a.Tags)
-                    .HasConversion(EfJsonConverters.StringListToJson);
-            }
-            entity.Property(a => a.CreatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.Property(a => a.UpdatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.HasMany(a => a.Embeddings)
-                .WithOne(e => e.Article)
-                .HasForeignKey(e => e.KnowledgeBaseArticleId);
-        });
-
-        modelBuilder.Entity<KnowledgeEmbedding>(entity =>
-        {
-            entity.ToTable("KnowledgeEmbeddings");
-            entity.HasKey(e => e.Id);
-            entity.Property(e => e.OrganizationId).IsRequired();
-            entity.Property(e => e.SourceType).IsRequired();
-            entity.Property(e => e.SourceId).IsRequired();
-            entity.Property(e => e.DocumentTitle).IsRequired();
-            entity.Property(e => e.ChunkIndex).HasDefaultValue(0);
-            entity.Property(e => e.ChunkId).IsRequired();
-            entity.Property(e => e.Text).IsRequired();
-            entity.Property(e => e.MetadataJson).IsRequired().HasColumnType("TEXT");
-            entity.Property(e => e.LastScore).HasDefaultValue(0);
-            if (isPostgreSql)
-            {
-                entity.Property(e => e.Vector).HasVectorType(768);
-            }
-            else
-            {
-                entity.Property(e => e.Vector)
-                    .HasConversion(EfJsonConverters.VectorToJson)
-                    .HasColumnType("TEXT");
-            }
-            entity.HasIndex(e => new { e.OrganizationId, e.SourceType })
-                .HasDatabaseName("ix_embedding_org_source");
-            entity.HasIndex(e => new { e.OrganizationId, e.SourceType, e.SourceId, e.ChunkIndex })
-                .HasDatabaseName("ix_embedding_org_document_chunk");
-            entity.Property(e => e.CreatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-        });
-
-        modelBuilder.Entity<TicketKnowledgeSuggestion>(entity =>
-        {
-            entity.ToTable("TicketKnowledgeSuggestions");
-            entity.HasKey(s => s.Id);
-            entity.Property(s => s.CreatedAt).HasDefaultValueSql("CURRENT_TIMESTAMP");
-            entity.HasOne(s => s.Article)
-                .WithMany()
-                .HasForeignKey(s => s.KnowledgeBaseArticleId);
-        });
-
-        modelBuilder.Entity<TicketAiSuggestions>(b =>
-        {
-            b.HasKey(x => x.TicketId);
-            b.Property(x => x.ItemsJson).IsRequired();
-            b.HasOne<Ticket>()
-             .WithOne()
-             .HasForeignKey<TicketAiSuggestions>(x => x.TicketId)
-             .OnDelete(DeleteBehavior.Cascade);
-        });
-
-        modelBuilder.Entity<TicketAiFeedback>(entity =>
-        {
-            if (isSqlite)
-            {
-                entity.Property<long>("CreatedAtSortTicks")
-                    .HasComputedColumnSql("CAST((julianday(\"CreatedAt\") - 2440587.5) * 864000000000 + 621355968000000000 AS INTEGER)");
-                entity.HasIndex("CreatedAtSortTicks");
-            }
-            entity.ToTable("TicketAiFeedback");
-            entity.HasKey(x => x.Id);
-            entity.Property(x => x.FeedbackType).HasMaxLength(64);
-            entity.Property(x => x.FeedbackValue).HasMaxLength(64);
-            entity.Property(x => x.ArticleId).HasMaxLength(64);
-            entity.Property(x => x.RequestId).HasMaxLength(64);
-            entity.Property(x => x.CreatedByUserId).HasMaxLength(128);
-            entity.Property(x => x.CreatedByName).HasMaxLength(256);
-            entity.HasIndex(x => new { x.TicketId, x.CreatedAt });
-            entity.HasIndex(x => new { x.TicketId, x.ArticleId, x.FeedbackType, x.FeedbackValue });
-            entity.HasIndex(x => new { x.TicketId, x.RequestId, x.FeedbackType, x.FeedbackValue });
-            entity.HasOne<Ticket>()
-                .WithMany()
-                .HasForeignKey(x => x.TicketId)
-                .OnDelete(DeleteBehavior.Cascade);
-        });
-
         modelBuilder.Entity<Change>(entity =>
         {
             entity.Property(x => x.ChangeType).HasMaxLength(32);
             if (isPostgreSql)
             {
                 entity.Property(x => x.ChangeTemplateJson).HasColumnType("jsonb");
-                entity.Property(x => x.AiReviewOutputJson).HasColumnType("jsonb");
             }
             else
             {
                 entity.Property(x => x.ChangeTemplateJson).HasColumnType("TEXT");
-                entity.Property(x => x.AiReviewOutputJson).HasColumnType("TEXT");
             }
-            entity.Property(x => x.AiReviewCorrelationId).HasMaxLength(128);
-            entity.Property(x => x.AiReviewFailureReason).HasMaxLength(1024);
-            entity.Property(x => x.AiReviewAcknowledgementNotes).HasMaxLength(1024);
-            entity.Property(x => x.AiReviewAcknowledgedByUserId).HasMaxLength(128);
-            entity.Property(x => x.AiReviewAcknowledgedByName).HasMaxLength(256);
-            entity.Property(x => x.AiReviewStatus)
-                .HasConversion<int>();
-            entity.Property(x => x.AiReviewGateState)
-                .HasConversion<int>();
         });
 
         modelBuilder.Entity<TicketCategory>(entity =>
@@ -971,8 +804,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.Cascade);
         });
 
-        modelBuilder.Entity<OrganizationAiKbSettings>().ToTable("OrganizationAiKbSettings");
-
         modelBuilder.ApplyConfiguration(new ServiceConfiguration(_tenantContext, _httpContextAccessor));
         modelBuilder.ApplyConfiguration(new RequestFormConfiguration(_tenantContext, isPostgreSql));
         modelBuilder.Entity<RequestForm>().HasQueryFilter(form =>
diff --git a/src/Helpdesk.Infrastructure/KB/KnowledgeBuilderService.cs b/src/Helpdesk.Infrastructure/KB/KnowledgeBuilderService.cs
deleted file mode 100644
index 6b1cbbd6..00000000
--- a/src/Helpdesk.Infrastructure/KB/KnowledgeBuilderService.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Helpdesk.Application.Services.AI;
-using System.Linq;
-
-namespace Helpdesk.Application.Services.KB;
-
-public class KnowledgeBuilderService(
-    IAiRuntime aiRuntime,
-    HelpdeskDbContext db,
-    IEmbeddingService embeddingService,
-    IKnowledgeVectorStore vectorStore,
-    IAiPromptTemplateService promptTemplates,
-    IAiOperationAuditService aiAudit,
-    ILogger<KnowledgeBuilderService> logger) : IKnowledgeBuilderService
-{
-    private readonly IAiRuntime _aiRuntime = aiRuntime;
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IEmbeddingService _embeddingService = embeddingService;
-    private readonly IKnowledgeVectorStore _vectorStore = vectorStore;
-    private readonly IAiPromptTemplateService _promptTemplates = promptTemplates;
-    private readonly IAiOperationAuditService _aiAudit = aiAudit;
-    private readonly ILogger<KnowledgeBuilderService> _logger = logger;
-
-    public async Task<KnowledgeBaseArticle> BuildArticleAsync(string prompt, CancellationToken token)
-    {
-        var runtime = await _aiRuntime.CreateChatClientAsync(
-            new AiChatRuntimeRequest(OrganizationId: null, Scenario: "kb-build"),
-            token);
-        var response = await runtime.Client.GetResponseAsync(
-            [new Microsoft.Extensions.AI.ChatMessage(Microsoft.Extensions.AI.ChatRole.User, prompt)],
-            cancellationToken: token);
-        var content = response.Text ?? string.Empty;
-        var article = new KnowledgeBaseArticle
-        {
-            Title = content.Split('\n').FirstOrDefault() ?? "Draft Article",
-            Summary = content,
-            Resolution = content
-        };
-        _db.KnowledgeBaseArticles.Add(article);
-        await _db.SaveChangesAsync(token);
-        await _aiAudit.RecordAsync(
-            new AiOperationAuditEntry(
-                "kb-build",
-                article.OrganizationId,
-                runtime.ProviderName,
-                runtime.ModelId,
-                SubjectId: article.Id.ToString()),
-            token);
-        if (!string.IsNullOrWhiteSpace(article.OrganizationId))
-            await _embeddingService.CreateEmbeddingAsync(article.OrganizationId, content, token);
-        _logger.LogInformation("Draft knowledge base article {ArticleId} created", article.Id);
-        return article;
-    }
-
-    public async Task<KnowledgeBaseArticle?> GenerateDraftFromResolvedTicketAsync(
-        string ticketId,
-        CancellationToken token,
-        bool regenerate = false)
-    {
-        var ticket = await _db.Incidents
-            .AsNoTracking()
-            .FirstOrDefaultAsync(t => t.Id == ticketId, token);
-
-        if (ticket is null)
-        {
-            return null;
-        }
-
-        if (ticket.State != TicketState.Resolved)
-        {
-            return null;
-        }
-
-        var existing = await _db.KnowledgeBaseArticles
-            .Include(a => a.Embeddings)
-            .FirstOrDefaultAsync(a =>
-                a.LinkedTicketId == ticket.Id &&
-                a.OrganizationId == ticket.OrganizationId,
-                token);
-
-        if (existing is not null && !regenerate)
-        {
-            return existing;
-        }
-
-        var runtime = await _aiRuntime.CreateChatClientAsync(
-            new AiChatRuntimeRequest(ticket.OrganizationId, Scenario: "kb-draft-from-ticket", SubjectId: ticket.Id),
-            token);
-
-        if (runtime is null)
-        {
-            return null;
-        }
-
-        var workLogs = await _db.WorkLogs
-            .AsNoTracking()
-            .Where(w => w.TicketId == ticket.Id)
-            .ToListAsync(token);
-
-        var workLogText = workLogs.Count == 0
-            ? "No work logs."
-            : string.Join("\n", workLogs.Select(w => $"- {w.LoggedAt:u}: {w.NotesText ?? string.Empty} ({w.Hours}h)"));
-
-        var systemPrompt = _promptTemplates.Render(
-            "KnowledgeBase.GenerateDraftFromResolvedTicket.System",
-            new Dictionary<string, string?>());
-        var userPrompt = $"""
-Title: {ticket.Title}
-Description: {ticket.Description}
-Work Logs:
-{workLogText}
-""";
-        var aiResult = await runtime.Client.GetResponseAsync(
-            [
-                new Microsoft.Extensions.AI.ChatMessage(Microsoft.Extensions.AI.ChatRole.System, systemPrompt),
-                new Microsoft.Extensions.AI.ChatMessage(Microsoft.Extensions.AI.ChatRole.User, userPrompt)
-            ],
-            cancellationToken: token);
-        var generatedContent = aiResult.Text ?? string.Empty;
-        var lines = generatedContent.Replace("\r", string.Empty).Split('\n');
-        var parsedTitle = lines.FirstOrDefault()?.Trim();
-        if (string.IsNullOrWhiteSpace(parsedTitle))
-        {
-            parsedTitle = "Draft Article";
-        }
-
-        var parsedContent = string.Join('\n', lines.Skip(1)).Trim();
-        if (string.IsNullOrWhiteSpace(parsedContent))
-        {
-            parsedContent = generatedContent;
-        }
-
-        var now = DateTime.UtcNow;
-        var article = existing ?? new KnowledgeBaseArticle
-        {
-            OrganizationId = ticket.OrganizationId ?? string.Empty,
-            LinkedTicketId = ticket.Id,
-            SourceIncidentId = ticket.Id,
-            Service = "General",
-            State = KnowledgeBaseArticleState.Draft,
-            CreatedAt = now
-        };
-
-        article.Title = parsedTitle;
-        article.Summary = parsedContent;
-        article.Resolution = parsedContent;
-        article.State = KnowledgeBaseArticleState.Draft;
-        article.CreatedByModel = runtime.ModelId;
-        article.LastRegeneratedAt = now;
-        article.UpdatedAt = now;
-        if (existing is null)
-        {
-            _db.KnowledgeBaseArticles.Add(article);
-        }
-
-        if (!string.IsNullOrWhiteSpace(ticket.OrganizationId))
-        {
-            var contentChunks = TextChunker.Split(parsedContent).ToList();
-            var embeddings = await _embeddingService.CreateEmbeddingsAsync(
-                ticket.OrganizationId,
-                contentChunks.Select(chunk => chunk.Text),
-                token);
-
-            var chunks = embeddings
-                .Select((emb, index) => new KnowledgeVectorRecord(
-                    article.Id,
-                    ticket.OrganizationId,
-                    "KB",
-                    article.Id.ToString(),
-                    article.Title,
-                    index,
-                    index < contentChunks.Count ? contentChunks[index].ChunkId : index.ToString(),
-                    index < contentChunks.Count ? contentChunks[index].Text : parsedContent,
-                    new Dictionary<string, string>
-                    {
-                        ["articleId"] = article.Id.ToString(),
-                        ["ticketId"] = ticket.Id,
-                        ["state"] = article.State.ToString()
-                    },
-                    emb,
-                    now))
-                .ToList();
-
-            await _vectorStore.ReplaceArticleChunksAsync(
-                article.Id,
-                ticket.OrganizationId,
-                "KB",
-                article.Id.ToString(),
-                chunks,
-                token);
-        }
-
-        await _aiAudit.RecordAsync(
-            new AiOperationAuditEntry(
-                "kb-draft-from-ticket",
-                ticket.OrganizationId,
-                runtime.ProviderName,
-                runtime.ModelId,
-                SubjectId: ticket.Id),
-            token);
-
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("Draft knowledge base article {ArticleId} created from ticket {TicketId}", article.Id, ticket.Id);
-        return article;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/KB/KnowledgeRetrievalService.cs b/src/Helpdesk.Infrastructure/KB/KnowledgeRetrievalService.cs
deleted file mode 100644
index c2671d17..00000000
--- a/src/Helpdesk.Infrastructure/KB/KnowledgeRetrievalService.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Helpdesk.Application.Services.KB;
-
-public sealed class KnowledgeRetrievalService(
-    HelpdeskDbContext db,
-    IEmbeddingService embeddingService,
-    IKnowledgeVectorStore vectorStore) : IKnowledgeRetrievalService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IEmbeddingService _embeddingService = embeddingService;
-    private readonly IKnowledgeVectorStore _vectorStore = vectorStore;
-
-    public async Task<IReadOnlyList<KnowledgeRetrievalResult>> RetrieveAsync(
-        string organizationId,
-        string query,
-        int limit,
-        CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(organizationId) || string.IsNullOrWhiteSpace(query) || limit <= 0)
-        {
-            return Array.Empty<KnowledgeRetrievalResult>();
-        }
-
-        var vector = await _embeddingService.CreateEmbeddingAsync(organizationId, query, token);
-        var matches = await _vectorStore.SearchAsync(
-            organizationId,
-            vector,
-            Math.Max(limit * 3, limit),
-            new KnowledgeVectorFilter(SourceTypes: ["KB"]),
-            token);
-        if (matches.Count == 0)
-        {
-            return Array.Empty<KnowledgeRetrievalResult>();
-        }
-
-        var articleIds = matches
-            .Select(match => match.KnowledgeBaseArticleId)
-            .Distinct()
-            .Take(limit)
-            .ToList();
-
-        var articles = await _db.KnowledgeBaseArticles
-            .AsNoTracking()
-            .Where(article => articleIds.Contains(article.Id))
-            .ToDictionaryAsync(article => article.Id, token);
-
-        var grouped = matches
-            .Where(match => articles.ContainsKey(match.KnowledgeBaseArticleId))
-            .GroupBy(match => match.KnowledgeBaseArticleId)
-            .OrderByDescending(group => group.Max(match => match.Score))
-            .Take(limit);
-
-        return grouped
-            .Select(group =>
-            {
-                var evidence = group
-                    .OrderByDescending(match => match.Score)
-                    .Take(3)
-                    .Select(match => new KnowledgeEvidenceChunk(
-                        match.KnowledgeBaseArticleId,
-                        match.ChunkId,
-                        match.SourceId,
-                        match.DocumentTitle,
-                        match.ChunkIndex,
-                        match.Text,
-                        match.Metadata,
-                        match.Score))
-                    .ToList();
-
-                var topScore = evidence.Count == 0 ? 0 : evidence[0].Score;
-                return new KnowledgeRetrievalResult(
-                    articles[group.Key],
-                    topScore,
-                    evidence,
-                    topScore >= 0.75d,
-                    topScore >= 0.85d ? "High" : topScore >= 0.6d ? "Medium" : "Low");
-            })
-            .ToList();
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/KB/KnowledgeSuggestionService.cs b/src/Helpdesk.Infrastructure/KB/KnowledgeSuggestionService.cs
deleted file mode 100644
index fc40ee49..00000000
--- a/src/Helpdesk.Infrastructure/KB/KnowledgeSuggestionService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.Extensions.Logging;
-using Helpdesk.Application.Services.AI;
-using Microsoft.EntityFrameworkCore;
-
-namespace Helpdesk.Application.Services.KB;
-
-public class KnowledgeSuggestionService(
-    HelpdeskDbContext db,
-    IKnowledgeRetrievalService retrievalService,
-    ILogger<KnowledgeSuggestionService> logger) : IKnowledgeSuggestionService
-{
-    private readonly HelpdeskDbContext _db = db;
-    private readonly IKnowledgeRetrievalService _retrievalService = retrievalService;
-    private readonly ILogger<KnowledgeSuggestionService> _logger = logger;
-
-    public async Task<IEnumerable<TicketKnowledgeSuggestion>> SuggestAsync(Ticket ticket, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(ticket.OrganizationId))
-            return Enumerable.Empty<TicketKnowledgeSuggestion>();
-
-        var results = await _retrievalService.RetrieveAsync(ticket.OrganizationId, ticket.Description, 5, token);
-        var suggestions = results
-            .Select(result => new TicketKnowledgeSuggestion
-            {
-                TicketId = ticket.Id,
-                KnowledgeBaseArticleId = result.Article.Id,
-                Article = result.Article,
-                Score = result.Score
-            })
-            .ToList();
-        if (suggestions.Count == 0)
-            return suggestions;
-        _db.TicketKnowledgeSuggestions.AddRange(suggestions);
-        await _db.SaveChangesAsync(token);
-        _logger.LogInformation("{Count} suggestions stored for ticket {TicketId}", suggestions.Count, ticket.Id);
-        return suggestions;
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/KB/NoOpKnowledgeVectorStore.cs b/src/Helpdesk.Infrastructure/KB/NoOpKnowledgeVectorStore.cs
deleted file mode 100644
index 6164860d..00000000
--- a/src/Helpdesk.Infrastructure/KB/NoOpKnowledgeVectorStore.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Helpdesk.Application.Services.KB;
-
-namespace Helpdesk.Infrastructure.KB;
-
-public sealed class NoOpKnowledgeVectorStore : IKnowledgeVectorStore
-{
-    public Task ReplaceArticleChunksAsync(
-        Guid articleId,
-        string organizationId,
-        string sourceType,
-        string sourceId,
-        IReadOnlyList<KnowledgeVectorRecord> chunks,
-        CancellationToken token) => Task.CompletedTask;
-
-    public Task<IReadOnlyList<KnowledgeVectorMatch>> SearchAsync(
-        string organizationId,
-        IReadOnlyList<float> vector,
-        int limit,
-        KnowledgeVectorFilter? filter,
-        CancellationToken token) => Task.FromResult<IReadOnlyList<KnowledgeVectorMatch>>([]);
-}
diff --git a/src/Helpdesk.Infrastructure/KB/PgVectorKnowledgeVectorStore.cs b/src/Helpdesk.Infrastructure/KB/PgVectorKnowledgeVectorStore.cs
deleted file mode 100644
index cf79c435..00000000
--- a/src/Helpdesk.Infrastructure/KB/PgVectorKnowledgeVectorStore.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Microsoft.EntityFrameworkCore;
-using Npgsql;
-using Pgvector;
-using System.Text.Json;
-
-namespace Helpdesk.Infrastructure.KB;
-
-public sealed class PgVectorKnowledgeVectorStore(
-    HelpdeskDbContext db) : IKnowledgeVectorStore
-{
-    private readonly HelpdeskDbContext _db = db;
-
-    private sealed class SearchRow
-    {
-        public Guid KnowledgeBaseArticleId { get; set; }
-        public string OrganizationId { get; set; } = string.Empty;
-        public string SourceId { get; set; } = string.Empty;
-        public string DocumentTitle { get; set; } = string.Empty;
-        public int ChunkIndex { get; set; }
-        public string ChunkId { get; set; } = string.Empty;
-        public string Text { get; set; } = string.Empty;
-        public string MetadataJson { get; set; } = "{}";
-        public double Score { get; set; }
-    }
-
-    public async Task ReplaceArticleChunksAsync(
-        Guid articleId,
-        string organizationId,
-        string sourceType,
-        string sourceId,
-        IReadOnlyList<KnowledgeVectorRecord> chunks,
-        CancellationToken token)
-    {
-        var existing = await _db.KnowledgeEmbeddings
-            .Where(x => x.KnowledgeBaseArticleId == articleId)
-            .ToListAsync(token);
-
-        if (existing.Count > 0)
-        {
-            _db.KnowledgeEmbeddings.RemoveRange(existing);
-        }
-
-        foreach (var chunk in chunks)
-        {
-            _db.KnowledgeEmbeddings.Add(new KnowledgeEmbedding
-            {
-                Id = Guid.NewGuid(),
-                KnowledgeBaseArticleId = articleId,
-                OrganizationId = organizationId,
-                SourceType = sourceType,
-                SourceId = sourceId,
-                DocumentTitle = chunk.DocumentTitle,
-                ChunkIndex = chunk.ChunkIndex,
-                ChunkId = chunk.ChunkId,
-                Text = chunk.Text,
-                MetadataJson = SerializeMetadata(chunk.Metadata),
-                Vector = new Vector(chunk.Vector.ToArray()),
-                CreatedAt = chunk.CreatedAt
-            });
-        }
-    }
-
-    public async Task<IReadOnlyList<KnowledgeVectorMatch>> SearchAsync(
-        string organizationId,
-        IReadOnlyList<float> vector,
-        int limit,
-        KnowledgeVectorFilter? filter,
-        CancellationToken token)
-    {
-        if (!_db.Database.IsRelational())
-        {
-            var query = _db.KnowledgeEmbeddings
-                .Where(x => x.OrganizationId == organizationId && x.KnowledgeBaseArticleId.HasValue);
-
-            query = ApplyFilter(query, filter);
-
-            return query
-                .AsEnumerable()
-                .Select(x => new KnowledgeVectorMatch(
-                    x.KnowledgeBaseArticleId!.Value,
-                    x.OrganizationId,
-                    x.SourceId,
-                    x.DocumentTitle,
-                    x.ChunkIndex,
-                    x.ChunkId,
-                    x.Text,
-                    DeserializeMetadata(x.MetadataJson),
-                    1 - Distance(vector, x.Vector.ToArray())))
-                .OrderByDescending(x => x.Score)
-                .Take(limit)
-                .ToList();
-        }
-
-        var sql = @"
-        SELECT ""KnowledgeBaseArticleId"",
-               ""OrganizationId"",
-               ""SourceId"",
-               ""DocumentTitle"",
-               ""ChunkIndex"",
-               ""ChunkId"",
-               ""Text"",
-               ""MetadataJson"",
-               COALESCE(1 - (""Vector"" <#> @vec), 0) AS ""Score""
-        FROM ""KnowledgeEmbeddings""
-        WHERE ""OrganizationId"" = @org";
-
-        var parameters = new List<object>
-        {
-            new NpgsqlParameter<Vector>("vec", new Vector(vector.ToArray())),
-            new NpgsqlParameter<string>("org", organizationId),
-        };
-
-        if (filter?.SourceTypes?.Count > 0)
-        {
-            sql += " AND \"SourceType\" = ANY (@sourceTypes)";
-            parameters.Add(new NpgsqlParameter<string[]>("sourceTypes", filter.SourceTypes.ToArray()));
-        }
-
-        if (filter?.SourceIds?.Count > 0)
-        {
-            sql += " AND \"SourceId\" = ANY (@sourceIds)";
-            parameters.Add(new NpgsqlParameter<string[]>("sourceIds", filter.SourceIds.ToArray()));
-        }
-
-        if (filter?.ArticleIds?.Count > 0)
-        {
-            sql += " AND \"KnowledgeBaseArticleId\" = ANY (@articleIds)";
-            parameters.Add(new NpgsqlParameter<Guid[]>("articleIds", filter.ArticleIds.ToArray()));
-        }
-
-        sql += @"
-        ORDER BY ""Vector"" <#> @vec
-        LIMIT @lim";
-
-        parameters.Add(new NpgsqlParameter<int>("lim", limit));
-
-        var rows = await _db.Database
-            .SqlQueryRaw<SearchRow>(sql, parameters.ToArray())
-            .ToListAsync(token);
-
-        return rows
-            .Select(row => new KnowledgeVectorMatch(
-                row.KnowledgeBaseArticleId,
-                row.OrganizationId,
-                row.SourceId,
-                row.DocumentTitle,
-                row.ChunkIndex,
-                row.ChunkId,
-                row.Text,
-                DeserializeMetadata(row.MetadataJson),
-                row.Score))
-            .ToList();
-    }
-
-    private static IQueryable<KnowledgeEmbedding> ApplyFilter(
-        IQueryable<KnowledgeEmbedding> query,
-        KnowledgeVectorFilter? filter)
-    {
-        if (filter?.SourceTypes?.Count > 0)
-        {
-            query = query.Where(x => filter.SourceTypes.Contains(x.SourceType));
-        }
-
-        if (filter?.SourceIds?.Count > 0)
-        {
-            query = query.Where(x => filter.SourceIds.Contains(x.SourceId));
-        }
-
-        if (filter?.ArticleIds?.Count > 0)
-        {
-            query = query.Where(x => x.KnowledgeBaseArticleId.HasValue && filter.ArticleIds.Contains(x.KnowledgeBaseArticleId.Value));
-        }
-
-        return query;
-    }
-
-    private static string SerializeMetadata(IReadOnlyDictionary<string, string> metadata) =>
-        JsonSerializer.Serialize(metadata);
-
-    private static IReadOnlyDictionary<string, string> DeserializeMetadata(string? metadataJson) =>
-        string.IsNullOrWhiteSpace(metadataJson)
-            ? new Dictionary<string, string>()
-            : JsonSerializer.Deserialize<Dictionary<string, string>>(metadataJson) ?? new Dictionary<string, string>();
-
-    private static double Distance(IReadOnlyList<float> left, float[] right)
-    {
-        double sum = 0;
-        var length = Math.Min(left.Count, right.Length);
-        for (var i = 0; i < length; i++)
-        {
-            var diff = left[i] - right[i];
-            sum += diff * diff;
-        }
-
-        return Math.Sqrt(sum);
-    }
-}
diff --git a/src/Helpdesk.Infrastructure/Migrations/20250811184655_InitPostgres.cs b/src/Helpdesk.Infrastructure/Migrations/20250811184655_InitPostgres.cs
index f18d413a..b3cb8683 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20250811184655_InitPostgres.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20250811184655_InitPostgres.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Pgvector;
 
 #nullable disable
 
@@ -15,10 +14,6 @@ public partial class InitPostgres : Migration
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.Sql(@"CREATE EXTENSION IF NOT EXISTS ""uuid-ossp"";");
-            migrationBuilder.Sql(@"CREATE EXTENSION IF NOT EXISTS vector;");
-
-            migrationBuilder.AlterDatabase()
-                .Annotation("Npgsql:PostgresExtension:vector", ",,");
 
             migrationBuilder.CreateTable(
                 name: "ActivityLogs",
@@ -422,7 +417,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     Id = table.Column<Guid>(type: "uuid", nullable: false),
                     KnowledgeBaseArticleId = table.Column<Guid>(type: "uuid", nullable: false),
-                    Vector = table.Column<Vector>(type: "vector(1536)", nullable: false),
+                    Vector = table.Column<float[]>(type: "real[]", nullable: false),
                     CreatedAt = table.Column<DateTime>(type: "timestamp without time zone", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP")
                 },
                 constraints: table =>
diff --git a/src/Helpdesk.Infrastructure/Migrations/20250812160000_AddOrgToKbAndEmbeddings.cs b/src/Helpdesk.Infrastructure/Migrations/20250812160000_AddOrgToKbAndEmbeddings.cs
index 2221d30c..a7c4f943 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20250812160000_AddOrgToKbAndEmbeddings.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20250812160000_AddOrgToKbAndEmbeddings.cs
@@ -71,16 +71,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table: "KnowledgeBaseArticles",
                 column: "OrganizationId");
 
-            // Ensure pgvector is available (safe if already installed)
-            migrationBuilder.Sql(@"CREATE EXTENSION IF NOT EXISTS vector;");
-
-            // ✅ Create HNSW index with the correct operator class.
-            // Use vector_l2_ops unless you explicitly use cosine or inner-product.
-            migrationBuilder.Sql(@"
-CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-ON ""KnowledgeEmbeddings""
-USING hnsw (""Vector"" vector_l2_ops);
-");
 
             // btree helper for filters
             migrationBuilder.Sql(@"
@@ -91,7 +81,6 @@ CREATE INDEX IF NOT EXISTS ix_embedding_org_source
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
             migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_source;");
 
             migrationBuilder.DropIndex(
@@ -110,4 +99,3 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
-
diff --git a/src/Helpdesk.Infrastructure/Migrations/20250813071319_pgvector_updates.cs b/src/Helpdesk.Infrastructure/Migrations/20250813071319_pgvector_updates.cs
index 9f7a167b..2ad869e4 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20250813071319_pgvector_updates.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20250813071319_pgvector_updates.cs
@@ -19,11 +19,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 oldClrType: typeof(double),
                 oldType: "double precision");
 
-            migrationBuilder.Sql(@"
-                CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-                ON ""KnowledgeEmbeddings""
-                USING hnsw (""Vector"" vector_l2_ops);  -- or vector_cosine_ops / vector_ip_ops
-            ");
         }
 
         /// <inheritdoc />
@@ -37,8 +32,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 oldClrType: typeof(double),
                 oldType: "double precision",
                 oldDefaultValue: 0.0);
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
         }
     }
 }
diff --git a/src/Helpdesk.Infrastructure/Migrations/20250813104715_update_vector_756_nomad.cs b/src/Helpdesk.Infrastructure/Migrations/20250813104715_update_vector_756_nomad.cs
index 9183bf4d..8dede0b5 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20250813104715_update_vector_756_nomad.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20250813104715_update_vector_756_nomad.cs
@@ -9,41 +9,10 @@ public partial class update_vector_756_nomad : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            // Drop ANN index before changing the vector dimension
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
-
-            // If safe to wipe old embeddings (most teams do when changing dims):
-            // migrationBuilder.Sql(@"TRUNCATE TABLE ""KnowledgeEmbeddings"";");
-
-            // Change column to 768 dims
-            migrationBuilder.Sql(@"
-ALTER TABLE ""KnowledgeEmbeddings""
-ALTER COLUMN ""Vector"" TYPE vector(768);
-");
-
-            // Recreate HNSW index with correct opclass (L2 here; use cosine/ip if that's your metric)
-            migrationBuilder.Sql(@"
-CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-ON ""KnowledgeEmbeddings""
-USING hnsw (""Vector"" vector_l2_ops);
-");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
-
-            // Revert to 1536 dims
-            migrationBuilder.Sql(@"
-ALTER TABLE ""KnowledgeEmbeddings""
-ALTER COLUMN ""Vector"" TYPE vector(1536);
-");
-
-            migrationBuilder.Sql(@"
-CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-ON ""KnowledgeEmbeddings""
-USING hnsw (""Vector"" vector_l2_ops);
-");
         }
 
     }
diff --git a/src/Helpdesk.Infrastructure/Migrations/20260509170447_UseEmbeddingGemma768Vectors.cs b/src/Helpdesk.Infrastructure/Migrations/20260509170447_UseEmbeddingGemma768Vectors.cs
index 9c8e1668..30358009 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20260509170447_UseEmbeddingGemma768Vectors.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20260509170447_UseEmbeddingGemma768Vectors.cs
@@ -9,73 +9,11 @@ public partial class UseEmbeddingGemma768Vectors : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
-            migrationBuilder.Sql(@"TRUNCATE TABLE ""KnowledgeEmbeddings"";");
-            migrationBuilder.Sql(@"
-ALTER TABLE ""KnowledgeEmbeddings""
-ALTER COLUMN ""Vector"" TYPE vector(768);
-");
-            migrationBuilder.Sql(@"
-CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-ON ""KnowledgeEmbeddings""
-USING hnsw (""Vector"" vector_l2_ops);
-");
-            migrationBuilder.Sql(@"
-INSERT INTO ""AiProviders""
-    (""Id"", ""Name"", ""ProviderType"", ""BaseUrl"", ""ApiKeyEncrypted"", ""IsEnabled"", ""DefaultModel"", ""ExtraHeadersJson"", ""CreatedAt"", ""UpdatedAt"")
-VALUES
-    ('83f1b5f6-6314-4f5d-817e-36bd447d3f97', 'Local embeddings', 'OpenAICompatible', 'http://localhost:11434', '', FALSE, 'embeddinggemma', NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
-ON CONFLICT (""Id"") DO UPDATE SET
-    ""Name"" = EXCLUDED.""Name"",
-    ""ProviderType"" = EXCLUDED.""ProviderType"",
-    ""BaseUrl"" = EXCLUDED.""BaseUrl"",
-    ""IsEnabled"" = EXCLUDED.""IsEnabled"",
-    ""DefaultModel"" = EXCLUDED.""DefaultModel"",
-    ""UpdatedAt"" = CURRENT_TIMESTAMP;
-");
-            migrationBuilder.Sql(@"
-INSERT INTO ""AiModels""
-    (""Id"", ""AiProviderId"", ""Name"", ""IsEnabled"", ""ExtraHeadersJson"", ""CreatedAt"", ""UpdatedAt"")
-SELECT '2d0f042e-75d7-496b-a1c1-922a7a1b246b',
-       '83f1b5f6-6314-4f5d-817e-36bd447d3f97',
-       'embeddinggemma',
-       TRUE,
-       NULL,
-       CURRENT_TIMESTAMP,
-       CURRENT_TIMESTAMP
-WHERE NOT EXISTS (
-    SELECT 1 FROM ""AiModels"" WHERE ""Id"" = '2d0f042e-75d7-496b-a1c1-922a7a1b246b'
-);
-");
-            migrationBuilder.Sql(@"
-UPDATE ""OrganizationAiKbSettings""
-SET ""EmbeddingProviderId"" = '83f1b5f6-6314-4f5d-817e-36bd447d3f97',
-    ""EmbeddingModel"" = 'embeddinggemma',
-    ""EmbeddingDimensions"" = 768;
-");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_embedding_org_hnsw;");
-            migrationBuilder.Sql(@"TRUNCATE TABLE ""KnowledgeEmbeddings"";");
-            migrationBuilder.Sql(@"
-ALTER TABLE ""KnowledgeEmbeddings""
-ALTER COLUMN ""Vector"" TYPE vector(1536);
-");
-            migrationBuilder.Sql(@"
-CREATE INDEX IF NOT EXISTS ix_embedding_org_hnsw
-ON ""KnowledgeEmbeddings""
-USING hnsw (""Vector"" vector_l2_ops);
-");
-            migrationBuilder.Sql(@"
-UPDATE ""OrganizationAiKbSettings""
-SET ""EmbeddingProviderId"" = NULL
-WHERE ""EmbeddingProviderId"" = '83f1b5f6-6314-4f5d-817e-36bd447d3f97';
-");
-            migrationBuilder.Sql(@"DELETE FROM ""AiModels"" WHERE ""Id"" = '2d0f042e-75d7-496b-a1c1-922a7a1b246b';");
-            migrationBuilder.Sql(@"DELETE FROM ""AiProviders"" WHERE ""Id"" = '83f1b5f6-6314-4f5d-817e-36bd447d3f97';");
         }
     }
 }
diff --git a/src/Helpdesk.Infrastructure/Migrations/20260514195500_AddGlobalSearchTrigramIndexes.cs b/src/Helpdesk.Infrastructure/Migrations/20260514195500_AddGlobalSearchTrigramIndexes.cs
index 7057efb6..fc661d98 100644
--- a/src/Helpdesk.Infrastructure/Migrations/20260514195500_AddGlobalSearchTrigramIndexes.cs
+++ b/src/Helpdesk.Infrastructure/Migrations/20260514195500_AddGlobalSearchTrigramIndexes.cs
@@ -10,53 +10,11 @@ public partial class AddGlobalSearchTrigramIndexes : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"CREATE EXTENSION IF NOT EXISTS pg_trgm;");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_tickets_title_trgm ON ""Tickets"" USING gin (""Title"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_tickets_description_trgm ON ""Tickets"" USING gin (""Description"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_tickets_trackingid_trgm ON ""Tickets"" USING gin (""TrackingId"" gin_trgm_ops);");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_services_name_trgm ON ""Services"" USING gin (""Name"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_services_description_trgm ON ""Services"" USING gin (""Description"" gin_trgm_ops);");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_requestforms_title_trgm ON ""RequestForms"" USING gin (""Title"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_requestforms_description_trgm ON ""RequestForms"" USING gin (""Description"" gin_trgm_ops);");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_users_name_trgm ON ""Users"" USING gin (""Name"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_users_email_trgm ON ""Users"" USING gin (""Email"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_users_role_trgm ON ""Users"" USING gin (""Role"" gin_trgm_ops);");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_customers_name_trgm ON ""Customers"" USING gin (""Name"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_customers_email_trgm ON ""Customers"" USING gin (""Email"" gin_trgm_ops);");
-
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_organizations_name_trgm ON ""Organizations"" USING gin (""Name"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_organizations_dnsname_trgm ON ""Organizations"" USING gin (""DnsName"" gin_trgm_ops);");
-            migrationBuilder.Sql(@"CREATE INDEX IF NOT EXISTS ix_organizations_contactinfo_trgm ON ""Organizations"" USING gin (""ContactInfo"" gin_trgm_ops);");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_organizations_contactinfo_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_organizations_dnsname_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_organizations_name_trgm;");
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_customers_email_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_customers_name_trgm;");
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_users_role_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_users_email_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_users_name_trgm;");
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_requestforms_description_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_requestforms_title_trgm;");
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_services_description_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_services_name_trgm;");
-
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_tickets_trackingid_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_tickets_description_trgm;");
-            migrationBuilder.Sql(@"DROP INDEX IF EXISTS ix_tickets_title_trgm;");
         }
     }
 }
diff --git a/src/Helpdesk.Infrastructure/Migrations/20260915120000_RemoveLegacyNativeAi.cs b/src/Helpdesk.Infrastructure/Migrations/20260915120000_RemoveLegacyNativeAi.cs
new file mode 100644
index 00000000..15826ae7
--- /dev/null
+++ b/src/Helpdesk.Infrastructure/Migrations/20260915120000_RemoveLegacyNativeAi.cs
@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Helpdesk.Infrastructure.Persistence;
+
+#nullable disable
+
+namespace Helpdesk.Infrastructure.Persistence.Migrations;
+
+/// <summary>Removes the retired in-process provider, knowledge, vector, and review schema.</summary>
+[DbContext(typeof(HelpdeskDbContext))]
+[Migration("20260915120000_RemoveLegacyNativeAi")]
+public partial class RemoveLegacyNativeAi : Migration
+{
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.Sql("""
+            DROP TABLE IF EXISTS "TicketAiFeedback" CASCADE;
+            DROP TABLE IF EXISTS "TicketKnowledgeSuggestions" CASCADE;
+            DROP TABLE IF EXISTS "TicketAiSuggestions" CASCADE;
+            DROP TABLE IF EXISTS "KnowledgeEmbeddings" CASCADE;
+            DROP TABLE IF EXISTS "KnowledgeBaseCategories" CASCADE;
+            DROP TABLE IF EXISTS "KnowledgeBaseArticles" CASCADE;
+            DROP TABLE IF EXISTS "AiModels" CASCADE;
+            DROP TABLE IF EXISTS "AiProviders" CASCADE;
+            DROP TABLE IF EXISTS "AiOperationAuditRecords" CASCADE;
+            DROP TABLE IF EXISTS "OrganizationAiKbSettings" CASCADE;
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiUnderstanding";
+            ALTER TABLE "Organizations" DROP COLUMN IF EXISTS "EnableAiIntake";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "SourceKnowledgeArticleId";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewStatus";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewGateState";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewOutputJson";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewCorrelationId";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewFailureReason";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewRequestedAt";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewCompletedAt";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewAcknowledgedAt";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewAcknowledgedByUserId";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewAcknowledgedByName";
+            ALTER TABLE "Tickets" DROP COLUMN IF EXISTS "AiReviewAcknowledgementNotes";
+            """);
+    }
+
+    protected override void Down(MigrationBuilder migrationBuilder) =>
+        throw new NotSupportedException("The retired native AI schema cannot be restored automatically.");
+}
diff --git a/src/Helpdesk.Infrastructure/VectorExtensions.cs b/src/Helpdesk.Infrastructure/VectorExtensions.cs
deleted file mode 100644
index 7560687d..00000000
--- a/src/Helpdesk.Infrastructure/VectorExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Pgvector;
-
-namespace Helpdesk.Infrastructure.Persistence;
-
-public static class VectorExtensions
-{
-    public static PropertyBuilder<Vector> HasVectorType(this PropertyBuilder<Vector> builder, int dimensions)
-    {
-        return builder.HasColumnType($"vector({dimensions})");
-    }
-}
diff --git a/src/Helpdesk.Mcp.Core/Helpdesk.Mcp.Core.csproj b/src/Helpdesk.Mcp.Core/Helpdesk.Mcp.Core.csproj
index df46bdf5..70ffebd9 100644
--- a/src/Helpdesk.Mcp.Core/Helpdesk.Mcp.Core.csproj
+++ b/src/Helpdesk.Mcp.Core/Helpdesk.Mcp.Core.csproj
@@ -5,7 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.10.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.12" />
     <PackageReference Include="ModelContextProtocol" Version="2.2.0" />
   </ItemGroup>
diff --git a/src/Helpdesk.Mcp.Core/Tools/HelpdeskTools.cs b/src/Helpdesk.Mcp.Core/Tools/HelpdeskTools.cs
index 5cad6bb1..55b51c86 100644
--- a/src/Helpdesk.Mcp.Core/Tools/HelpdeskTools.cs
+++ b/src/Helpdesk.Mcp.Core/Tools/HelpdeskTools.cs
@@ -100,9 +100,9 @@ public async Task<HelpdeskToolResponse> helpdesk_logs(string operation = "search
 
     [McpServerTool(UseStructuredContent = true), Description("Manage incidents. Read operations: list, get, peek, timeline, timeline_count, attachments_count, listeners_count. Confirmed mutations: create, bulk_create, update, delete, state, bulk_state, assign, assign_self, add_worklog, close. assign_self resolves the configured agent user only after confirmation. close requires request.incidentId and request.closureNote, writes an internal closure note by default, then sets the incident state to Resolved. Every mutation requires confirm:true.")]
     public Task<HelpdeskToolResponse> helpdesk_incidents(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default) => TicketOperation("helpdesk_incidents", "/api/v1/incidents", "incidentId", operation, request, confirm, cancellationToken);
-    [McpServerTool(UseStructuredContent = true), Description("Manage service requests. Reads: list, get, tasks, ai_audit, timeline, timeline_count, attachments_count, listeners_count. Confirmed mutations: create, bulk_create, update, delete, state, bulk_state, assign, assign_self, add_worklog. state requires request.requestId and request.newState; bulk_state requires request.ids and request.newState; assign requires request.ids and request.assignedToId. Every mutation requires confirm:true.")]
+    [McpServerTool(UseStructuredContent = true), Description("Manage service requests. Reads: list, get, tasks, timeline, timeline_count, attachments_count, listeners_count. Confirmed mutations: create, bulk_create, update, delete, state, bulk_state, assign, assign_self, add_worklog. state requires request.requestId and request.newState; bulk_state requires request.ids and request.newState; assign requires request.ids and request.assignedToId. Every mutation requires confirm:true.")]
     public Task<HelpdeskToolResponse> helpdesk_requests(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default) => TicketOperation("helpdesk_requests", "/api/v1/requests", "requestId", operation, request, confirm, cancellationToken);
-    [McpServerTool(UseStructuredContent = true), Description("Manage changes. Reads: list, get, timeline, worklogs, ai_review, timeline_count, attachments_count, listeners_count. Confirmed mutations: create, bulk_create, update, delete, state, bulk_state, assign, assign_self, add_worklog, lifecycle, run_ai_review, ack_ai_review. Every mutation requires confirm:true.")]
+    [McpServerTool(UseStructuredContent = true), Description("Manage changes. Reads: list, get, timeline, worklogs, timeline_count, attachments_count, listeners_count. Confirmed mutations: create, bulk_create, update, delete, state, bulk_state, assign, assign_self, add_worklog, lifecycle. Every mutation requires confirm:true.")]
     public Task<HelpdeskToolResponse> helpdesk_changes(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default) => TicketOperation("helpdesk_changes", "/api/v1/changes", "changeId", operation, request, confirm, cancellationToken);
 
     [McpServerTool(UseStructuredContent = true), Description("Report AiAssistant AI investigation progress to its existing Helpdesk AI worklog. Operations: report. This narrowly scoped autonomous update does not create a normal worklog or change ticket state; it requires invocationId, eventId, ticketId, ticketType, correlationId, status, and message. The existing authenticated MCP/API identity is required. Tenant scope is derived from the matched Helpdesk invocation; the tool cannot select, override, or bypass it.")]
@@ -119,7 +119,7 @@ public async Task<HelpdeskToolResponse> helpdesk_ai_assistant(string operation,
 
     [McpServerTool(UseStructuredContent = true), Description("Manage request tasks. Reads: list, get. Confirmed mutations: create, update, delete, start, complete, fail, retry, bulk_start, bulk_complete, bulk_retry. Single-task actions require request.taskId; bulk actions require request.ids. Every mutation requires confirm:true.")]
     public Task<HelpdeskToolResponse> helpdesk_request_tasks(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default) => TaskOperation(operation, request, confirm, cancellationToken);
-    [McpServerTool(UseStructuredContent = true), Description("Inspect organizations. Operations: list, get, tenants, tenant_lookup, change_participants, ai_kb_settings, ai_kb_readiness, ai_kb_runtime_status. tenants and tenant_lookup are global administrative reads; remaining detail operations require organizationId.")]
+    [McpServerTool(UseStructuredContent = true), Description("Inspect organizations. Operations: list, get, tenants, tenant_lookup, change_participants. tenants and tenant_lookup are global administrative reads; remaining detail operations require organizationId.")]
     public async Task<HelpdeskToolResponse> helpdesk_organizations(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default)
     {
         if (operation == "tenants") return await Execute(() => client.GetAsync("/api/v1/admin/tenants", true, cancellationToken), "Organization tenants completed.").ConfigureAwait(false);
@@ -151,7 +151,7 @@ public async Task<HelpdeskToolResponse> helpdesk_search(string operation, JsonEl
         return await Execute(() => client.GetAsync(Query($"/api/v1/global-search/{operation}", payload), true, cancellationToken), "Bounded search completed.").ConfigureAwait(false);
     }
 
-    [McpServerTool(UseStructuredContent = true), Description("Inspect shared ticket helper data. Operations: ai_audit, ai_feedback, suggest_knowledge, requester_reply_draft, automation_approvals, timeline_count, attachments_count, listeners_count. Count operations require request.ticketType (incidents, requests, or changes) and request.ticketId. Prefer the matching domain tool when the ticket type is already known.")]
+    [McpServerTool(UseStructuredContent = true), Description("Inspect shared ticket counts. Operations: timeline_count, attachments_count, listeners_count. Count operations require request.ticketType (incidents, requests, or changes) and request.ticketId. Prefer the matching domain tool when the ticket type is already known.")]
     public async Task<HelpdeskToolResponse> helpdesk_tickets(string operation, JsonElement? request = null, bool confirm = false, CancellationToken cancellationToken = default)
     {
         if (operation is "timeline_count" or "attachments_count" or "listeners_count")
@@ -162,15 +162,14 @@ public async Task<HelpdeskToolResponse> helpdesk_tickets(string operation, JsonE
             var countPath = operation.Replace('_', '/');
             return await Execute(() => client.GetAsync($"/api/v1/{count.TicketType}/{Uri.EscapeDataString(count.TicketId)}/{countPath}", true, cancellationToken), $"Ticket {operation} completed.").ConfigureAwait(false);
         }
-        var id = String(request, "ticketId");
-        if (string.IsNullOrWhiteSpace(id)) return Validation("request.ticketId is required.");
-        if (operation is "add_ai_feedback" or "generate_knowledge" or "approve_send_reply" or "add_automation_approval" or "mark_as_seen")
+        if (operation == "mark_as_seen")
         {
-            var suffix = operation switch { "add_ai_feedback" => "/ai-feedback", "generate_knowledge" => "/generate-knowledge", "approve_send_reply" => "/requester-reply-draft/approve-send", "add_automation_approval" => "/automation-approvals", _ => "/mark-as-seen" };
-            return await Mutation(operation, [id], confirm, HttpMethod.Post, $"/api/v1/tickets/{Uri.EscapeDataString(id)}{suffix}", BodyWithout(Object(request), "ticketId"), cancellationToken).ConfigureAwait(false);
+            var id = String(request, "ticketId");
+            return string.IsNullOrWhiteSpace(id)
+                ? Validation("request.ticketId is required.")
+                : await Mutation(operation, [id], confirm, HttpMethod.Post, $"/api/v1/tickets/{Uri.EscapeDataString(id)}/mark-as-seen", BodyWithout(Object(request), "ticketId"), cancellationToken).ConfigureAwait(false);
         }
-        if (operation is not ("ai_audit" or "ai_feedback" or "suggest_knowledge" or "requester_reply_draft" or "automation_approvals")) return Invalid("helpdesk_tickets", operation, ["ai_audit", "ai_feedback", "suggest_knowledge", "requester_reply_draft", "automation_approvals", "add_ai_feedback", "generate_knowledge", "approve_send_reply", "add_automation_approval", "mark_as_seen", "timeline_count", "attachments_count", "listeners_count"]);
-        return await Execute(() => client.GetAsync($"/api/v1/tickets/{Uri.EscapeDataString(id)}/{operation.Replace('_', '-')}", true, cancellationToken), $"Ticket {operation} completed.").ConfigureAwait(false);
+        return Invalid("helpdesk_tickets", operation, ["timeline_count", "attachments_count", "listeners_count", "mark_as_seen"]);
     }
 
     [McpServerTool(UseStructuredContent = true), Description("Inspect permission-aware role definitions. Operations: list, get; get requires request.roleId.")]
@@ -296,7 +295,6 @@ public async Task<HelpdeskToolResponse> helpdesk_admin_mutations(string operatio
             "delete_service" => (HttpMethod.Delete, "/api/v1/services", "serviceId"),
             "create_request_form" => (HttpMethod.Post, "/api/v1/request-forms", "requestFormId"),
             "create_service_request_form" => (HttpMethod.Post, "/api/v1/services", "serviceId"),
-            "update_organization_ai_kb_settings" => (HttpMethod.Put, "/api/v1/organizations", "organizationId"),
             "update_organization_branding" => (HttpMethod.Put, "/api/v1/tenants", "organizationId"),
             "update_request_form" => (HttpMethod.Put, "/api/v1/request-forms", "requestFormId"),
             "delete_request_form" => (HttpMethod.Delete, "/api/v1/request-forms", "requestFormId"),
@@ -312,7 +310,7 @@ public async Task<HelpdeskToolResponse> helpdesk_admin_mutations(string operatio
         var isCreate = (operation.StartsWith("create_", StringComparison.Ordinal) || operation == "provision_user") && operation is not ("create_self_service_request" or "create_service_request_form");
         if (!isCreate && string.IsNullOrWhiteSpace(id)) return Validation($"request.{map.Item3} is required.");
         var suffix = operation switch { "customer_invite" => "/invite", "customer_resend_invite" => "/resend-invite", "customer_disable_login" => "/disable-login", "customer_sync_authentik" => "/sync-authentik", _ => "" };
-        var path = operation == "create_service_request_form" ? $"/api/v1/services/{Uri.EscapeDataString(id!)}/forms/" : operation == "update_organization_ai_kb_settings" ? $"/api/v1/organizations/{Uri.EscapeDataString(id!)}/ai-kb-settings" : operation == "update_organization_branding" ? $"/api/v1/tenants/{Uri.EscapeDataString(id!)}/branding" : isCreate || operation == "create_self_service_request" ? map.Item2 : $"{map.Item2}/{Uri.EscapeDataString(id!)}{suffix}";
+        var path = operation == "create_service_request_form" ? $"/api/v1/services/{Uri.EscapeDataString(id!)}/forms/" : operation == "update_organization_branding" ? $"/api/v1/tenants/{Uri.EscapeDataString(id!)}/branding" : isCreate || operation == "create_self_service_request" ? map.Item2 : $"{map.Item2}/{Uri.EscapeDataString(id!)}{suffix}";
         return await Mutation(operation, string.IsNullOrWhiteSpace(id) ? [] : [id], confirm, map.Item1, path, isCreate ? payload : BodyWithout(payload, map.Item3), cancellationToken).ConfigureAwait(false);
     }
 
@@ -347,16 +345,15 @@ private async Task<HelpdeskToolResponse> TicketOperation(string tool, string bas
             if (operation == "update") mutationBody = NormalizeTicketPriority(mutationBody as JsonObject);
             return await Mutation(operation, [id], confirm, method, $"{basePath}/{Uri.EscapeDataString(id)}{mutationSuffix}", mutationBody, ct).ConfigureAwait(false);
         }
-        if (tool == "helpdesk_changes" && operation is "lifecycle" or "run_ai_review" or "ack_ai_review")
+        if (tool == "helpdesk_changes" && operation == "lifecycle")
         {
             if (string.IsNullOrWhiteSpace(id)) return Validation($"request.{idName} is required.");
-            var changeMutationSuffix = operation == "lifecycle" ? "/lifecycle" : operation == "run_ai_review" ? "/ai-review" : "/ai-review/acknowledge";
-            return await Mutation(operation, [id], confirm, HttpMethod.Post, $"{basePath}/{Uri.EscapeDataString(id)}{changeMutationSuffix}", BodyWithout(Object(request), idName), ct).ConfigureAwait(false);
+            return await Mutation(operation, [id], confirm, HttpMethod.Post, $"{basePath}/{Uri.EscapeDataString(id)}/lifecycle", BodyWithout(Object(request), idName), ct).ConfigureAwait(false);
         }
         if (string.IsNullOrWhiteSpace(id)) return Validation($"request.{idName} is required.");
-        var allowed = tool == "helpdesk_incidents" ? new[] { "get", "peek", "timeline" } : tool == "helpdesk_requests" ? new[] { "get", "tasks", "ai_audit", "timeline" } : new[] { "get", "timeline", "worklogs", "ai_review" };
+        var allowed = tool == "helpdesk_incidents" ? new[] { "get", "peek", "timeline" } : tool == "helpdesk_requests" ? new[] { "get", "tasks", "timeline" } : new[] { "get", "timeline", "worklogs" };
         if (!allowed.Contains(operation)) return Invalid(tool, operation, ["list", .. allowed]);
-        var suffix = operation switch { "peek" => "/peek", "timeline" => "/timeline", "tasks" => "/tasks", "ai_audit" => "/ai-audit", "worklogs" => "/worklogs", "ai_review" => "/ai-review", _ => "" };
+        var suffix = operation switch { "peek" => "/peek", "timeline" => "/timeline", "tasks" => "/tasks", "worklogs" => "/worklogs", _ => "" };
         return await Execute(() => client.GetAsync($"{basePath}/{Uri.EscapeDataString(id)}{suffix}", true, ct), $"{tool} {operation} completed.").ConfigureAwait(false);
     }
 
@@ -507,9 +504,9 @@ private async Task<HelpdeskToolResponse> LookupRead(string tool, string basePath
     {
         if (operation == "list") return await Execute(() => client.GetAsync(Query(basePath + "/", Object(request)), true, ct), $"{tool} list completed.").ConfigureAwait(false);
         var id = String(request, idName); if (string.IsNullOrWhiteSpace(id)) return Validation($"request.{idName} is required.");
-        var allowed = tool switch { "helpdesk_organizations" => new[] { "get", "tenants", "tenant_lookup", "ai_kb_settings", "ai_kb_readiness", "ai_kb_runtime_status" }, "helpdesk_customers" => new[] { "get", "auth_status" }, _ => new[] { "get" } };
+        var allowed = tool switch { "helpdesk_organizations" => new[] { "get", "tenants", "tenant_lookup" }, "helpdesk_customers" => new[] { "get", "auth_status" }, _ => new[] { "get" } };
         if (!allowed.Contains(operation)) return Invalid(tool, operation, ["list", .. allowed]);
-        var suffix = operation switch { "tenants" => "/tenants", "tenant_lookup" => "/tenant-lookup", "ai_kb_settings" => "/ai-kb-settings", "ai_kb_readiness" => "/ai-kb-readiness", "ai_kb_runtime_status" => "/ai-kb-runtime-status", "auth_status" => "/auth-status", _ => "" };
+        var suffix = operation switch { "tenants" => "/tenants", "tenant_lookup" => "/tenant-lookup", "auth_status" => "/auth-status", _ => "" };
         return await Execute(() => client.GetAsync($"{basePath}/{Uri.EscapeDataString(id)}{suffix}", true, ct), $"{tool} {operation} completed.").ConfigureAwait(false);
     }
     private Task<HelpdeskToolResponse> Read(string tool, string operation, IReadOnlyList<string> allowed, string path, JsonElement? request, CancellationToken ct) => !allowed.Contains(operation) ? Task.FromResult(Invalid(tool, operation, allowed)) : Execute(() => client.GetAsync(path, true, ct), $"{tool} {operation} completed.");
diff --git a/src/Helpdesk.Mcp.Core/Tools/McpOperationCatalog.cs b/src/Helpdesk.Mcp.Core/Tools/McpOperationCatalog.cs
index 5d579570..789e9c15 100644
--- a/src/Helpdesk.Mcp.Core/Tools/McpOperationCatalog.cs
+++ b/src/Helpdesk.Mcp.Core/Tools/McpOperationCatalog.cs
@@ -52,7 +52,6 @@ public static class McpOperationCatalog
 
         Ticket("helpdesk_requests", "requests", "requestId", "RequestRequest", "get", "GET", false),
         Ticket("helpdesk_requests", "requests", "requestId", "RequestRequest", "tasks", "GET", false),
-        Ticket("helpdesk_requests", "requests", "requestId", "RequestRequest", "ai_audit", "GET", false),
         Ticket("helpdesk_requests", "requests", "requestId", "RequestRequest", "timeline", "GET", false),
         TicketCount("helpdesk_requests", "requests", "requestId", "timeline_count"),
         TicketCount("helpdesk_requests", "requests", "requestId", "attachments_count"),
@@ -66,7 +65,6 @@ public static class McpOperationCatalog
         Ticket("helpdesk_changes", "changes", "changeId", "ChangeRequest", "get", "GET", false),
         Ticket("helpdesk_changes", "changes", "changeId", "ChangeRequest", "timeline", "GET", false),
         Ticket("helpdesk_changes", "changes", "changeId", "ChangeRequest", "worklogs", "GET", false),
-        Ticket("helpdesk_changes", "changes", "changeId", "ChangeRequest", "ai_review", "GET", false),
         TicketCount("helpdesk_changes", "changes", "changeId", "timeline_count"),
         TicketCount("helpdesk_changes", "changes", "changeId", "attachments_count"),
         TicketCount("helpdesk_changes", "changes", "changeId", "listeners_count"),
@@ -76,8 +74,6 @@ public static class McpOperationCatalog
         Ticket("helpdesk_changes", "changes", "changeId", "TicketStateRequest", "state", "POST", true),
         Ticket("helpdesk_changes", "changes", "changeId", "TicketWorklogRequest", "add_worklog", "POST", true),
         Ticket("helpdesk_changes", "changes", "changeId", "ChangeLifecycleRequest", "lifecycle", "POST", true),
-        Ticket("helpdesk_changes", "changes", "changeId", "ChangeAiReviewRequest", "run_ai_review", "POST", true),
-        Ticket("helpdesk_changes", "changes", "changeId", "ChangeRequest", "ack_ai_review", "POST", true),
         Operation("helpdesk_ai_assistant", "report", "AiAssistantWorklogRequest", "POST", "/api/v1/ai-assistant/investigations/{invocationId}/worklog", false),
 
         Read("helpdesk_request_forms", "get", "RequestFormRequest", "/api/v1/request-forms/{requestFormId}", "Get one request form."),
@@ -120,12 +116,8 @@ public static IReadOnlyList<string> OperationsFor(string tool) => All
         "peek" => $"/api/v1/{ticketType}/{{{idName}}}/peek",
         "timeline" => $"/api/v1/{ticketType}/{{{idName}}}/timeline",
         "tasks" => $"/api/v1/{ticketType}/{{{idName}}}/tasks",
-        "ai_audit" => $"/api/v1/{ticketType}/{{{idName}}}/ai-audit",
         "worklogs" => $"/api/v1/{ticketType}/{{{idName}}}/worklogs",
-        "ai_review" => $"/api/v1/{ticketType}/{{{idName}}}/ai-review",
         "lifecycle" => $"/api/v1/{ticketType}/{{{idName}}}/lifecycle",
-        "run_ai_review" => $"/api/v1/{ticketType}/{{{idName}}}/ai-review",
-        "ack_ai_review" => $"/api/v1/{ticketType}/{{{idName}}}/ai-review/acknowledge",
         _ => $"/api/v1/{ticketType}/{{{idName}}}"
     };
 
@@ -143,8 +135,6 @@ private static IEnumerable<McpOperationDefinition> AdditionalOperations()
         yield return Operation("helpdesk_organizations", "tenants", "None", "GET", "/api/v1/admin/tenants", false);
         yield return Operation("helpdesk_organizations", "tenant_lookup", "None", "GET", "/api/v1/admin/tenants/lookup", false);
         yield return Operation("helpdesk_organizations", "change_participants", "OrganizationRequest", "GET", "/api/v1/organizations/{organizationId}/change-participants", false);
-        foreach (var operation in new[] { "ai_kb_settings", "ai_kb_readiness", "ai_kb_runtime_status" })
-            yield return Operation("helpdesk_organizations", operation, "OrganizationRequest", "GET", $"/api/v1/organizations/{{organizationId}}/{operation.Replace('_', '-')}", false);
 
         foreach (var resource in new[] { ("helpdesk_customers", "/api/v1/customers", "customer"), ("helpdesk_users", "/api/v1/users", "user"), ("helpdesk_roles", "/api/v1/admin/role-definitions", "role") })
         {
@@ -156,15 +146,7 @@ private static IEnumerable<McpOperationDefinition> AdditionalOperations()
         yield return Operation("helpdesk_users", "by_email", "UserEmailRequest", "GET", "/api/v1/users/by-email/{email}", false);
         foreach (var operation in new[] { "users", "customers", "organizations" }) yield return Operation("helpdesk_search", operation, "SearchRequest", "GET", $"/api/v1/global-search/{operation}", false);
 
-        foreach (var operation in new[] { "ai_audit", "ai_feedback", "suggest_knowledge", "requester_reply_draft", "automation_approvals" }) yield return Operation("helpdesk_tickets", operation, "TicketRequest", "GET", $"/api/v1/tickets/{{ticketId}}/{operation.Replace('_', '-')}", false);
-        foreach (var (operation, path) in new[]
-                 {
-                     ("add_ai_feedback", "/api/v1/tickets/{ticketId}/ai-feedback"),
-                     ("generate_knowledge", "/api/v1/tickets/{ticketId}/generate-knowledge"),
-                     ("approve_send_reply", "/api/v1/tickets/{ticketId}/requester-reply-draft/approve-send"),
-                     ("add_automation_approval", "/api/v1/tickets/{ticketId}/automation-approvals"),
-                     ("mark_as_seen", "/api/v1/tickets/{ticketId}/mark-as-seen")
-                 }) yield return Operation("helpdesk_tickets", operation, "TicketMutationRequest", "POST", path, true);
+        yield return Operation("helpdesk_tickets", "mark_as_seen", "TicketMutationRequest", "POST", "/api/v1/tickets/{ticketId}/mark-as-seen", true);
 
         yield return Operation("helpdesk_services", "list", "ListRequest", "GET", "/api/v1/services/", false);
         yield return Operation("helpdesk_services", "get", "ServiceRequest", "GET", "/api/v1/services/{serviceId}", false);
@@ -235,7 +217,6 @@ private static IEnumerable<McpOperationDefinition> TicketRemainder(string tool,
         yield return ("create_request_form", "POST", "/api/v1/request-forms");
         yield return ("create_service_request_form", "POST", "/api/v1/services/{serviceId}/forms/");
         yield return ("provision_user", "POST", "/api/v1/users/provision");
-        yield return ("update_organization_ai_kb_settings", "PUT", "/api/v1/organizations/{organizationId}/ai-kb-settings");
         yield return ("update_organization_branding", "PUT", "/api/v1/tenants/{organizationId}/branding");
         yield return ("update_request_form", "PUT", "/api/v1/request-forms/{requestFormId}");
         yield return ("delete_request_form", "DELETE", "/api/v1/request-forms/{requestFormId}");
diff --git a/src/Helpdesk.Shared/DTOs/AI/AiProviderCreateDto.cs b/src/Helpdesk.Shared/DTOs/AI/AiProviderCreateDto.cs
deleted file mode 100644
index 27b1491d..00000000
--- a/src/Helpdesk.Shared/DTOs/AI/AiProviderCreateDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.AI;
-
-using Helpdesk.Shared.Enums;
-
-public class AiProviderCreateDto
-{
-    public string Name { get; set; } = string.Empty;
-    public AiProviderType ProviderType { get; set; }
-    public string BaseUrl { get; set; } = string.Empty;
-    public string ApiKey { get; set; } = string.Empty;
-    public bool IsEnabled { get; set; }
-    public string? DefaultModel { get; set; }
-    public string? ExtraHeadersJson { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/AI/AiProviderSummaryDto.cs b/src/Helpdesk.Shared/DTOs/AI/AiProviderSummaryDto.cs
deleted file mode 100644
index 8258ce82..00000000
--- a/src/Helpdesk.Shared/DTOs/AI/AiProviderSummaryDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.AI;
-
-using Helpdesk.Shared.Enums;
-
-public class AiProviderSummaryDto
-{
-    public string Id { get; set; } = string.Empty;
-    public string Name { get; set; } = string.Empty;
-    public AiProviderType ProviderType { get; set; }
-    public string BaseUrl { get; set; } = string.Empty;
-    public bool IsEnabled { get; set; }
-    public string? DefaultModel { get; set; }
-    public IEnumerable<AiModelDto> Models { get; set; } = new List<AiModelDto>();
-}
diff --git a/src/Helpdesk.Shared/DTOs/AI/AiProviderTestResultDto.cs b/src/Helpdesk.Shared/DTOs/AI/AiProviderTestResultDto.cs
deleted file mode 100644
index fa3fdf94..00000000
--- a/src/Helpdesk.Shared/DTOs/AI/AiProviderTestResultDto.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Helpdesk.Shared.DTOs.AI;
-
-public class AiProviderTestResultDto
-{
-    public bool Success { get; set; }
-    public string? AttemptedUrl { get; set; }
-    public int? StatusCode { get; set; }
-    public string? Message { get; set; }
-    public string? ErrorBody { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/AI/AiProviderUpdateDto.cs b/src/Helpdesk.Shared/DTOs/AI/AiProviderUpdateDto.cs
deleted file mode 100644
index 8b879fe0..00000000
--- a/src/Helpdesk.Shared/DTOs/AI/AiProviderUpdateDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.AI;
-
-using Helpdesk.Shared.Enums;
-
-public class AiProviderUpdateDto
-{
-    public string Name { get; set; } = string.Empty;
-    public AiProviderType ProviderType { get; set; }
-    public string BaseUrl { get; set; } = string.Empty;
-    public bool IsEnabled { get; set; }
-    public string? DefaultModel { get; set; }
-    public string? ExtraHeadersJson { get; set; }
-    public string? ApiKey { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/ApproveRequesterReplyDraftDto.cs b/src/Helpdesk.Shared/DTOs/Article/ApproveRequesterReplyDraftDto.cs
deleted file mode 100644
index 7c0be2e9..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/ApproveRequesterReplyDraftDto.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class ApproveRequesterReplyDraftDto
-{
-    public string? EditedReply { get; set; }
-    public bool IncludeFollowUpQuestions { get; set; } = true;
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/ArticleDto.cs b/src/Helpdesk.Shared/DTOs/Article/ArticleDto.cs
deleted file mode 100644
index b082d22c..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/ArticleDto.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class ArticleDto
-{
-    public string Id { get; set; } = string.Empty;
-    public string Title { get; set; } = string.Empty;
-    public string? Content { get; set; }
-    public string CategoryId { get; set; } = string.Empty;
-    public bool IsPublic { get; set; }
-
-    public KnowledgeBaseArticleState State { get; set; }
-    public string? LinkedTicketId { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public KnowledgeArticleAutomationTargetDto? AutomationTarget { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAiAuditEntryDto.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAiAuditEntryDto.cs
deleted file mode 100644
index b1451bc6..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAiAuditEntryDto.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class KnowledgeArticleAiAuditEntryDto
-{
-    public Guid Id { get; set; }
-    public string OperationName { get; set; } = string.Empty;
-    public string ProviderName { get; set; } = string.Empty;
-    public string ModelId { get; set; } = string.Empty;
-    public string? CorrelationId { get; set; }
-    public string? Notes { get; set; }
-    public string? SourceSubjectId { get; set; }
-    public DateTimeOffset CreatedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAutomationTargetDto.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAutomationTargetDto.cs
deleted file mode 100644
index 2673e12c..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeArticleAutomationTargetDto.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class KnowledgeArticleAutomationTargetDto
-{
-    public string? BindingId { get; set; }
-    public string? RequestFormId { get; set; }
-    public Guid? TaskTemplateId { get; set; }
-    public string? TaskTemplateName { get; set; }
-    public string? OrchestrationRequestDefinitionId { get; set; }
-    public string? OrchestrationJobDefinitionId { get; set; }
-    public bool Enabled { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseArticleStatsDto.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseArticleStatsDto.cs
deleted file mode 100644
index fad528cf..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseArticleStatsDto.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class KnowledgeBaseArticleStatsDto
-{
-    public int ChunkCount { get; set; }
-    public string SourceType { get; set; } = "KB";
-    public string SourceId { get; set; } = string.Empty;
-    public string DocumentTitle { get; set; } = string.Empty;
-    public DateTime? LastIndexedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseHealthDto.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseHealthDto.cs
deleted file mode 100644
index 8f83f97c..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseHealthDto.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class KnowledgeBaseHealthDto
-{
-    public int TotalArticles { get; set; }
-    public int DraftArticles { get; set; }
-    public int PublishedArticles { get; set; }
-    public int UnresolvedTicketsWithoutKb { get; set; }
-    public int IndexedArticles { get; set; }
-    public int IndexedChunkCount { get; set; }
-    public int OrphanedChunkCount { get; set; }
-    public int EmailChunkCount { get; set; }
-    public double IndexedArticleCoverage { get; set; }
-    public int SuggestionFeedbackCount { get; set; }
-    public int HelpfulSuggestionCount { get; set; }
-    public int NotHelpfulSuggestionCount { get; set; }
-    public double SuggestionHelpfulRate { get; set; }
-    public int AutomationFeedbackCount { get; set; }
-    public int AutomationResolvedCount { get; set; }
-    public int AutomationNotResolvedCount { get; set; }
-    public double AutomationResolvedRate { get; set; }
-    public int AiAuditCount { get; set; }
-    public DateTimeOffset? LastAiAuditAt { get; set; }
-    public int KnowledgeBuildAuditCount { get; set; }
-    public int KnowledgeDraftFromTicketAuditCount { get; set; }
-    public int RequesterReplyAuditCount { get; set; }
-    public int RequesterReplyApprovedAuditCount { get; set; }
-    public int AutomationApprovedAuditCount { get; set; }
-    public int RuntimeFallbackAuditCount { get; set; }
-    public int RuntimeFailureAuditCount { get; set; }
-    public DateTimeOffset? LastRuntimeAuditAt { get; set; }
-    public string? TopRuntimeFallbackProvider { get; set; }
-    public int TopRuntimeFallbackCount { get; set; }
-    public string? TopRuntimeFailureProvider { get; set; }
-    public int TopRuntimeFailureCount { get; set; }
-    public List<string> RecentRuntimeEvidence { get; set; } = new();
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseReindexResultDto.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseReindexResultDto.cs
deleted file mode 100644
index 24a1269f..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeBaseReindexResultDto.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class KnowledgeBaseReindexResultDto
-{
-    public int RequestedArticles { get; set; }
-    public int ReindexedArticles { get; set; }
-    public int SkippedArticles { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/KnowledgeSuggestion.cs b/src/Helpdesk.Shared/DTOs/Article/KnowledgeSuggestion.cs
deleted file mode 100644
index dd7fee01..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/KnowledgeSuggestion.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public record KnowledgeSuggestionEvidence(string ChunkId, string SourceId, string Excerpt, double Score);
-
-public record KnowledgeSuggestion(
-    string ArticleId,
-    string Title,
-    string Excerpt,
-    string Link,
-    double Score,
-    string ConfidenceLabel = "Low",
-    bool IsHighConfidence = false,
-    bool RequiresClarification = false,
-    string? ClarificationPrompt = null,
-    IReadOnlyList<KnowledgeSuggestionEvidence>? Evidence = null,
-    KnowledgeArticleAutomationTargetDto? AutomationTarget = null);
diff --git a/src/Helpdesk.Shared/DTOs/Article/RequesterReplyDraftDto.cs b/src/Helpdesk.Shared/DTOs/Article/RequesterReplyDraftDto.cs
deleted file mode 100644
index 3a8fa1ad..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/RequesterReplyDraftDto.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class RequesterReplyDraftDto
-{
-    public bool RequiresClarification { get; set; }
-    public string ConfidenceLabel { get; set; } = "Low";
-    public string DraftReply { get; set; } = string.Empty;
-    public string SuggestedArticleTitle { get; set; } = string.Empty;
-    public string SuggestedArticleLink { get; set; } = string.Empty;
-    public List<string> FollowUpQuestions { get; set; } = new();
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/SubmitTicketAiFeedbackDto.cs b/src/Helpdesk.Shared/DTOs/Article/SubmitTicketAiFeedbackDto.cs
deleted file mode 100644
index d9ef6d39..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/SubmitTicketAiFeedbackDto.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class SubmitTicketAiFeedbackDto
-{
-    public string FeedbackType { get; set; } = string.Empty;
-    public string FeedbackValue { get; set; } = string.Empty;
-    public string? ArticleId { get; set; }
-    public string? RequestId { get; set; }
-    public string? Notes { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/TicketAiAuditEntryDto.cs b/src/Helpdesk.Shared/DTOs/Article/TicketAiAuditEntryDto.cs
deleted file mode 100644
index 7c71859a..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/TicketAiAuditEntryDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class TicketAiAuditEntryDto
-{
-    public Guid Id { get; set; }
-    public string OperationName { get; set; } = string.Empty;
-    public string? OrganizationId { get; set; }
-    public string ProviderName { get; set; } = string.Empty;
-    public string ModelId { get; set; } = string.Empty;
-    public string? CorrelationId { get; set; }
-    public string? SubjectId { get; set; }
-    public string? Notes { get; set; }
-    public DateTimeOffset CreatedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/TicketAiFeedbackDto.cs b/src/Helpdesk.Shared/DTOs/Article/TicketAiFeedbackDto.cs
deleted file mode 100644
index 3450bb75..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/TicketAiFeedbackDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class TicketAiFeedbackDto
-{
-    public Guid Id { get; set; }
-    public string FeedbackType { get; set; } = string.Empty;
-    public string FeedbackValue { get; set; } = string.Empty;
-    public string? ArticleId { get; set; }
-    public string? RequestId { get; set; }
-    public string? Notes { get; set; }
-    public string? CreatedByUserId { get; set; }
-    public string? CreatedByName { get; set; }
-    public DateTimeOffset CreatedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/TicketAutomationApprovalResultDto.cs b/src/Helpdesk.Shared/DTOs/Article/TicketAutomationApprovalResultDto.cs
deleted file mode 100644
index cb1d079d..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/TicketAutomationApprovalResultDto.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class TicketAutomationApprovalResultDto
-{
-    public string RequestId { get; set; } = string.Empty;
-    public string RequestTrackingId { get; set; } = string.Empty;
-    public string? RequestTaskId { get; set; }
-    public string? RequestTaskStatus { get; set; }
-    public string AutomationBindingId { get; set; } = string.Empty;
-    public string ArticleId { get; set; } = string.Empty;
-}
diff --git a/src/Helpdesk.Shared/DTOs/Article/UpdateKbStateDto.cs b/src/Helpdesk.Shared/DTOs/Article/UpdateKbStateDto.cs
deleted file mode 100644
index c4f73cab..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/UpdateKbStateDto.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Shared.DTOs.Article;
-
-public class UpdateKbStateDto
-{
-    public KnowledgeBaseArticleState State { get; set; }
-}
-
diff --git a/src/Helpdesk.Shared/DTOs/Article/UpdateKnowledgeArticleAutomationTargetDto.cs b/src/Helpdesk.Shared/DTOs/Article/UpdateKnowledgeArticleAutomationTargetDto.cs
deleted file mode 100644
index d1c09315..00000000
--- a/src/Helpdesk.Shared/DTOs/Article/UpdateKnowledgeArticleAutomationTargetDto.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Article;
-
-public sealed class UpdateKnowledgeArticleAutomationTargetDto
-{
-    public string? BindingId { get; set; }
-    public bool ClearTarget { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Change/AcknowledgeChangeAiReviewDto.cs b/src/Helpdesk.Shared/DTOs/Change/AcknowledgeChangeAiReviewDto.cs
deleted file mode 100644
index 9bfcdc61..00000000
--- a/src/Helpdesk.Shared/DTOs/Change/AcknowledgeChangeAiReviewDto.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Change;
-
-public class AcknowledgeChangeAiReviewDto
-{
-    public string? Notes { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Change/ChangeAiReviewDto.cs b/src/Helpdesk.Shared/DTOs/Change/ChangeAiReviewDto.cs
deleted file mode 100644
index 127712ae..00000000
--- a/src/Helpdesk.Shared/DTOs/Change/ChangeAiReviewDto.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Helpdesk.Shared.Models;
-
-namespace Helpdesk.Shared.DTOs.Change;
-
-public class ChangeAiReviewDto
-{
-    public ChangeReviewStatus Status { get; set; } = ChangeReviewStatus.NotRequested;
-    public ChangeReviewGateState GateState { get; set; } = ChangeReviewGateState.NotRequired;
-    public string Summary { get; set; } = string.Empty;
-    public List<string> IssuesFound { get; set; } = new();
-    public List<string> RisksIdentified { get; set; } = new();
-    public List<string> MissingInformation { get; set; } = new();
-    public List<string> Recommendations { get; set; } = new();
-    public string RawReview { get; set; } = string.Empty;
-    public bool HasBlockingIssues { get; set; }
-    public bool RequiresAcknowledgement { get; set; }
-    public string? CorrelationId { get; set; }
-    public string? FailureReason { get; set; }
-    public string? AcknowledgedByUserId { get; set; }
-    public string? AcknowledgedByName { get; set; }
-    public string? AcknowledgementNotes { get; set; }
-    public DateTimeOffset? RequestedAt { get; set; }
-    public DateTimeOffset? CompletedAt { get; set; }
-    public DateTimeOffset? AcknowledgedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Change/ChangeDto.cs b/src/Helpdesk.Shared/DTOs/Change/ChangeDto.cs
index 2b37b72b..80a85dc7 100644
--- a/src/Helpdesk.Shared/DTOs/Change/ChangeDto.cs
+++ b/src/Helpdesk.Shared/DTOs/Change/ChangeDto.cs
@@ -39,13 +39,5 @@ public class ChangeDto
     public bool IsTemplateComplete { get; set; }
     public List<string> TemplateValidationErrors { get; set; } = new();
     public List<Guid> CategoryIds { get; set; } = new();
-    public int AiSuggestionCount { get; set; }
-    public int AiAuditCount { get; set; }
-    public DateTimeOffset? LastAiActivityAt { get; set; }
-    public ChangeReviewStatus AiReviewStatus { get; set; }
-    public ChangeReviewGateState AiReviewGateState { get; set; }
-    public string? LatestAiReviewSummary { get; set; }
-    public DateTimeOffset? LastAiReviewAt { get; set; }
-    public bool RequiresAiReviewAcknowledgement { get; set; }
     public TicketSlaDto? Sla { get; set; }
 }
diff --git a/src/Helpdesk.Shared/DTOs/Change/RunChangeAiReviewRequestDto.cs b/src/Helpdesk.Shared/DTOs/Change/RunChangeAiReviewRequestDto.cs
deleted file mode 100644
index 89b2acdb..00000000
--- a/src/Helpdesk.Shared/DTOs/Change/RunChangeAiReviewRequestDto.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Change;
-
-public class RunChangeAiReviewRequestDto
-{
-    public bool Force { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Change/UpdateChangeDto.cs b/src/Helpdesk.Shared/DTOs/Change/UpdateChangeDto.cs
index 7e2b387a..707fea2a 100644
--- a/src/Helpdesk.Shared/DTOs/Change/UpdateChangeDto.cs
+++ b/src/Helpdesk.Shared/DTOs/Change/UpdateChangeDto.cs
@@ -16,5 +16,4 @@ public class UpdateChangeDto
     public List<Guid>? CategoryIds { get; set; }
     public string? ChangeType { get; set; }
     public ChangeTemplateDto? ChangeTemplate { get; set; }
-    public bool AcknowledgeAiReviewWarnings { get; set; }
 }
diff --git a/src/Helpdesk.Shared/DTOs/Dashboard/AdminDashboardDto.cs b/src/Helpdesk.Shared/DTOs/Dashboard/AdminDashboardDto.cs
index 23bfcdfe..d6482743 100644
--- a/src/Helpdesk.Shared/DTOs/Dashboard/AdminDashboardDto.cs
+++ b/src/Helpdesk.Shared/DTOs/Dashboard/AdminDashboardDto.cs
@@ -7,7 +7,6 @@ public class AdminDashboardDto
     public int IncidentsToday { get; set; }
     public int UnassignedIncidents { get; set; }
     public int PendingChanges { get; set; }
-    public int KnowledgeDraftCount { get; set; }
     public Dictionary<TicketState, int> IncidentCountsByState { get; set; } = new();
     public Dictionary<string, int> RequestCountsByState { get; set; } = new();
     public Dictionary<string, int> ChangeCountsByState { get; set; } = new();
diff --git a/src/Helpdesk.Shared/DTOs/Incident/IncidentDto.cs b/src/Helpdesk.Shared/DTOs/Incident/IncidentDto.cs
index cae5a3fe..fcca55c4 100644
--- a/src/Helpdesk.Shared/DTOs/Incident/IncidentDto.cs
+++ b/src/Helpdesk.Shared/DTOs/Incident/IncidentDto.cs
@@ -38,9 +38,6 @@ public class IncidentDto
     public TicketState State { get; set; } = TicketState.New;
     public TicketPriority Priority { get; set; } = TicketPriority.Low;
     public List<Guid> CategoryIds { get; set; } = new();
-    public int AiSuggestionCount { get; set; }
-    public int AiAutomationRunCount { get; set; }
-    public DateTimeOffset? LastAiActivityAt { get; set; }
 
     // Assigned technician/team member
     public string? AssignedToId { get; set; }
diff --git a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiKbSettingsDto.cs b/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiKbSettingsDto.cs
deleted file mode 100644
index bae00746..00000000
--- a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiKbSettingsDto.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Organization;
-
-public class OrganizationAiKbSettingsDto
-{
-    public bool EnableAiSearch { get; set; }
-    public bool EnableAiAnswers { get; set; }
-    public double SearchThreshold { get; set; }
-    public double AnswerThreshold { get; set; }
-
-    public string? EmbeddingProviderId { get; set; }
-    public string EmbeddingModel { get; set; } = string.Empty;
-    public int EmbeddingDimensions { get; set; }
-
-    public string? KnowledgeProviderId { get; set; }
-    public string? KnowledgeModelName { get; set; }
-
-    public int SuggestionLimit { get; set; }
-    public string? AllowedServicesCsv { get; set; }
-    public bool EnableProviderFallback { get; set; }
-    public int MaxProviderAttempts { get; set; }
-    public int MinimumSuggestionFeedbackCount { get; set; }
-    public double MinimumSuggestionHelpfulRate { get; set; }
-    public int MinimumAutomationFeedbackCount { get; set; }
-    public double MinimumAutomationResolvedRate { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiReadinessDto.cs b/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiReadinessDto.cs
deleted file mode 100644
index 6ac25e79..00000000
--- a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiReadinessDto.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Organization;
-
-public sealed class OrganizationAiReadinessDto
-{
-    public int SuggestionFeedbackCount { get; set; }
-    public int HelpfulSuggestionCount { get; set; }
-    public double SuggestionHelpfulRate { get; set; }
-    public int AutomationFeedbackCount { get; set; }
-    public int AutomationResolvedCount { get; set; }
-    public double AutomationResolvedRate { get; set; }
-    public bool SuggestionGateMet { get; set; }
-    public bool AutomationGateMet { get; set; }
-    public bool ProductionReady { get; set; }
-    public List<string> BlockingReasons { get; set; } = new();
-    public int AiAuditCount { get; set; }
-    public DateTimeOffset? LastAiAuditAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiRuntimeStatusDto.cs b/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiRuntimeStatusDto.cs
deleted file mode 100644
index 73954163..00000000
--- a/src/Helpdesk.Shared/DTOs/Organization/OrganizationAiRuntimeStatusDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.DTOs.Organization;
-
-public sealed class OrganizationAiRuntimeStatusDto
-{
-    public string Status { get; set; } = string.Empty;
-    public bool RuntimeReady { get; set; }
-    public bool FallbackEnabled { get; set; }
-    public int MaxProviderAttempts { get; set; }
-    public int EnabledProviderCount { get; set; }
-    public int FallbackProviderCount { get; set; }
-    public List<string> Reasons { get; set; } = new();
-    public List<string> RecentEvidence { get; set; } = new();
-    public List<OrganizationAiRuntimeProviderStatusDto> Providers { get; set; } = new();
-}
diff --git a/src/Helpdesk.Shared/DTOs/Request/RequestDto.cs b/src/Helpdesk.Shared/DTOs/Request/RequestDto.cs
index 421cb241..caf5b3ef 100644
--- a/src/Helpdesk.Shared/DTOs/Request/RequestDto.cs
+++ b/src/Helpdesk.Shared/DTOs/Request/RequestDto.cs
@@ -26,8 +26,6 @@ public class RequestDto
     public string? PayloadJson { get; set; }
     public string? SourceTicketId { get; set; }
     public string? SourceTicketTrackingId { get; set; }
-    public string? SourceKnowledgeArticleId { get; set; }
-    public string? SourceKnowledgeArticleTitle { get; set; }
     public string? SourceAutomationBindingId { get; set; }
     public string? WorkflowStatus { get; set; }
     public string? WorkflowBlockReason { get; set; }
diff --git a/src/Helpdesk.Shared/Enum/AiProviderType.cs b/src/Helpdesk.Shared/Enum/AiProviderType.cs
deleted file mode 100644
index a02bd1f8..00000000
--- a/src/Helpdesk.Shared/Enum/AiProviderType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Helpdesk.Shared.Enums;
-
-public enum AiProviderType
-{
-    OpenAI,
-    OpenAICompatible,
-    Anthropic,
-    Gemini,
-    Groq,
-    Grok,
-    Custom
-}
-
diff --git a/src/Helpdesk.Shared/Helpdesk.Shared.csproj b/src/Helpdesk.Shared/Helpdesk.Shared.csproj
index 8f386cc0..a45e59bc 100644
--- a/src/Helpdesk.Shared/Helpdesk.Shared.csproj
+++ b/src/Helpdesk.Shared/Helpdesk.Shared.csproj
@@ -11,7 +11,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
     <PackageReference Include="Npgsql" Version="10.0.3" />
-    <PackageReference Include="Pgvector" Version="0.3.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Helpdesk.Shared/LegacyPgvectorMigrationCompatibility.cs b/src/Helpdesk.Shared/LegacyPgvectorMigrationCompatibility.cs
new file mode 100644
index 00000000..533c1882
--- /dev/null
+++ b/src/Helpdesk.Shared/LegacyPgvectorMigrationCompatibility.cs
@@ -0,0 +1,11 @@
+// Historical EF migration snapshots reference Pgvector.Vector. This isolated compatibility
+// type lets those immutable snapshots compile after rc.7 removes the pgvector package.
+namespace Pgvector;
+
+[Obsolete("Only used by historical EF migration snapshots; not mapped by the runtime model.")]
+public readonly struct Vector(float[] values)
+{
+    private readonly float[] values = values;
+
+    public float[] ToArray() => values ?? [];
+}
diff --git a/src/Helpdesk.Shared/Models/AiModel.cs b/src/Helpdesk.Shared/Models/AiModel.cs
deleted file mode 100644
index 2ff559f3..00000000
--- a/src/Helpdesk.Shared/Models/AiModel.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public class AiModel
-{
-    public Guid Id { get; set; }
-    public Guid AiProviderId { get; set; }
-    public AiProvider Provider { get; set; } = null!;
-    public string Name { get; set; } = string.Empty;
-    public bool IsEnabled { get; set; }
-    public string? ExtraHeadersJson { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime? UpdatedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/Models/AiOperationAuditRecord.cs b/src/Helpdesk.Shared/Models/AiOperationAuditRecord.cs
deleted file mode 100644
index fe89fdd1..00000000
--- a/src/Helpdesk.Shared/Models/AiOperationAuditRecord.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public class AiOperationAuditRecord
-{
-    public Guid Id { get; set; }
-    public string OperationName { get; set; } = string.Empty;
-    public string? OrganizationId { get; set; }
-    public string ProviderName { get; set; } = string.Empty;
-    public string ModelId { get; set; } = string.Empty;
-    public string? CorrelationId { get; set; }
-    public string? SubjectId { get; set; }
-    public string? Notes { get; set; }
-    public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
-}
diff --git a/src/Helpdesk.Shared/Models/AiProvider.cs b/src/Helpdesk.Shared/Models/AiProvider.cs
deleted file mode 100644
index 97d0cdee..00000000
--- a/src/Helpdesk.Shared/Models/AiProvider.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Helpdesk.Shared.Enums;
-
-namespace Helpdesk.Shared.Models;
-
-public class AiProvider
-{
-    public Guid Id { get; set; }
-    public string Name { get; set; } = string.Empty;
-    public AiProviderType ProviderType { get; set; }
-    public string BaseUrl { get; set; } = string.Empty;
-    public string ApiKeyEncrypted { get; set; } = string.Empty;
-    public bool IsEnabled { get; set; }
-    public string? DefaultModel { get; set; }
-    public string? ExtraHeadersJson { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime? UpdatedAt { get; set; }
-
-    public ICollection<AiModel> Models { get; set; } = new List<AiModel>();
-}
diff --git a/src/Helpdesk.Shared/Models/Change.cs b/src/Helpdesk.Shared/Models/Change.cs
index 4f421680..9c197f99 100644
--- a/src/Helpdesk.Shared/Models/Change.cs
+++ b/src/Helpdesk.Shared/Models/Change.cs
@@ -13,15 +13,4 @@ public class Change : Ticket
     public DateTime? ImplementationStartAt { get; set; }
     public DateTime? ImplementationEndAt { get; set; }
     public string? ChangeTemplateJson { get; set; }
-    public ChangeReviewStatus AiReviewStatus { get; set; } = ChangeReviewStatus.NotRequested;
-    public ChangeReviewGateState AiReviewGateState { get; set; } = ChangeReviewGateState.NotRequired;
-    public string? AiReviewOutputJson { get; set; }
-    public string? AiReviewCorrelationId { get; set; }
-    public string? AiReviewFailureReason { get; set; }
-    public string? AiReviewAcknowledgementNotes { get; set; }
-    public DateTimeOffset? AiReviewRequestedAt { get; set; }
-    public DateTimeOffset? AiReviewCompletedAt { get; set; }
-    public DateTimeOffset? AiReviewAcknowledgedAt { get; set; }
-    public string? AiReviewAcknowledgedByUserId { get; set; }
-    public string? AiReviewAcknowledgedByName { get; set; }
 }
diff --git a/src/Helpdesk.Shared/Models/ChangeReviewGateState.cs b/src/Helpdesk.Shared/Models/ChangeReviewGateState.cs
deleted file mode 100644
index a6dc9d03..00000000
--- a/src/Helpdesk.Shared/Models/ChangeReviewGateState.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public enum ChangeReviewGateState
-{
-    NotRequired = 0,
-    Pass = 1,
-    Warning = 2,
-    Acknowledged = 3
-}
diff --git a/src/Helpdesk.Shared/Models/ChangeReviewStatus.cs b/src/Helpdesk.Shared/Models/ChangeReviewStatus.cs
deleted file mode 100644
index ecd1e26b..00000000
--- a/src/Helpdesk.Shared/Models/ChangeReviewStatus.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public enum ChangeReviewStatus
-{
-    NotRequested = 0,
-    Pending = 1,
-    Complete = 2,
-    Failed = 3,
-    Stale = 4
-}
diff --git a/src/Helpdesk.Shared/Models/KnowledgeBaseArticle.cs b/src/Helpdesk.Shared/Models/KnowledgeBaseArticle.cs
deleted file mode 100644
index fa4e7a1a..00000000
--- a/src/Helpdesk.Shared/Models/KnowledgeBaseArticle.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Dodo.Primitives;
-
-namespace Helpdesk.Shared.Models;
-
-public class KnowledgeBaseArticle
-{
-    public Guid Id { get; set; } = Guid.Parse(Uuid.CreateVersion7().ToString());
-    public string OrganizationId { get; set; } = string.Empty;
-    public string Service { get; set; } = string.Empty;
-    public string Title { get; set; } = string.Empty;
-    public string? Summary { get; set; }
-    public string? Problem { get; set; }
-    public string? Resolution { get; set; }
-    public string? RootCause { get; set; }
-    public string? Application { get; set; }
-    public List<string> Tags { get; set; } = new();
-    public string? SourceIncidentId { get; set; }
-    public string? AutomationBindingId { get; set; }
-    public string? AutomationRequestFormId { get; set; }
-    public Guid? AutomationTaskTemplateId { get; set; }
-    public string? AutomationTaskTemplateName { get; set; }
-    public string? AutomationOrchestrationRequestDefinitionId { get; set; }
-    public string? AutomationOrchestrationJobDefinitionId { get; set; }
-    public KnowledgeBaseArticleState State { get; set; } = KnowledgeBaseArticleState.Draft;
-    public string? LinkedTicketId { get; set; }
-    public string? CreatedByModel { get; set; }
-    public DateTime? LastRegeneratedAt { get; set; }
-    public bool IsPublished { get; set; }
-    public DateTime? PublishedAt { get; set; }
-    public string? PublishedById { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime? UpdatedAt { get; set; }
-
-    public ICollection<KnowledgeEmbedding> Embeddings { get; set; } = new List<KnowledgeEmbedding>();
-}
diff --git a/src/Helpdesk.Shared/Models/KnowledgeBaseArticleState.cs b/src/Helpdesk.Shared/Models/KnowledgeBaseArticleState.cs
deleted file mode 100644
index 26429329..00000000
--- a/src/Helpdesk.Shared/Models/KnowledgeBaseArticleState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public enum KnowledgeBaseArticleState
-{
-    Draft,
-    Published
-}
diff --git a/src/Helpdesk.Shared/Models/KnowledgeBaseCategory.cs b/src/Helpdesk.Shared/Models/KnowledgeBaseCategory.cs
deleted file mode 100644
index 05d4f2c1..00000000
--- a/src/Helpdesk.Shared/Models/KnowledgeBaseCategory.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Dodo.Primitives;
-
-namespace Helpdesk.Shared.Models;
-
-public class KnowledgeBaseCategory
-{
-    public string Id { get; set; } = Uuid.CreateVersion7().ToString();
-    public string Name { get; set; } = string.Empty;
-}
diff --git a/src/Helpdesk.Shared/Models/KnowledgeEmbedding.cs b/src/Helpdesk.Shared/Models/KnowledgeEmbedding.cs
deleted file mode 100644
index 9c2e2784..00000000
--- a/src/Helpdesk.Shared/Models/KnowledgeEmbedding.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Dodo.Primitives;
-using Pgvector;
-
-namespace Helpdesk.Shared.Models;
-
-public class KnowledgeEmbedding
-{
-    public Guid Id { get; set; } = Guid.Parse(Uuid.CreateVersion7().ToString());
-    public string OrganizationId { get; set; } = string.Empty;
-    public string SourceType { get; set; } = "KB";
-    public string SourceId { get; set; } = string.Empty;
-    public string DocumentTitle { get; set; } = string.Empty;
-    public int ChunkIndex { get; set; }
-    public string ChunkId { get; set; } = string.Empty;
-    public string Text { get; set; } = string.Empty;
-    public string MetadataJson { get; set; } = "{}";
-    public double LastScore { get; set; }
-    public Guid? KnowledgeBaseArticleId { get; set; }
-    public KnowledgeBaseArticle Article { get; set; } = null!;
-    public Vector Vector { get; set; } = null!;
-    public DateTime CreatedAt { get; set; }
-}
diff --git a/src/Helpdesk.Shared/Models/Organization.cs b/src/Helpdesk.Shared/Models/Organization.cs
index 2a9fb39f..8a4ba43a 100644
--- a/src/Helpdesk.Shared/Models/Organization.cs
+++ b/src/Helpdesk.Shared/Models/Organization.cs
@@ -7,7 +7,6 @@ public class Organization
     public string Id { get; set; } = Uuid.CreateVersion7().ToString();
     public string Name { get; set; } = string.Empty;
     public string? DnsName { get; set; }
-    public bool EnableAiIntake { get; set; }
     public string? ContactInfo { get; set; }
     public string? AssignedSlaId { get; set; }
     public string? ItSupportOrganizationId { get; set; }
diff --git a/src/Helpdesk.Shared/Models/OrganizationAiKbSettings.cs b/src/Helpdesk.Shared/Models/OrganizationAiKbSettings.cs
deleted file mode 100644
index 519907d7..00000000
--- a/src/Helpdesk.Shared/Models/OrganizationAiKbSettings.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Dodo.Primitives;
-
-namespace Helpdesk.Shared.Models;
-
-public class OrganizationAiKbSettings
-{
-    public string Id { get; set; } = Uuid.CreateVersion7().ToString();
-    public string OrganizationId { get; set; } = string.Empty;
-
-    // Feature flags
-    public bool EnableAiSearch { get; set; }
-    public bool EnableAiAnswers { get; set; }
-
-    // Ranking/thresholds
-    public double SearchThreshold { get; set; }
-    public double AnswerThreshold { get; set; }
-
-    // Embeddings
-    public string? EmbeddingProviderId { get; set; }
-    public string EmbeddingModel { get; set; } = string.Empty;
-    public int EmbeddingDimensions { get; set; }
-
-    // Knowledge model
-    public string? KnowledgeProviderId { get; set; }
-    public string? KnowledgeModelName { get; set; }
-
-    // Other
-    public int SuggestionLimit { get; set; } = 3;
-    public string? AllowedServicesCsv { get; set; }
-    public bool EnableProviderFallback { get; set; } = true;
-    public int MaxProviderAttempts { get; set; } = 2;
-    public int MinimumSuggestionFeedbackCount { get; set; } = 5;
-    public double MinimumSuggestionHelpfulRate { get; set; } = 0.6;
-    public int MinimumAutomationFeedbackCount { get; set; } = 3;
-    public double MinimumAutomationResolvedRate { get; set; } = 0.5;
-}
diff --git a/src/Helpdesk.Shared/Models/Request.cs b/src/Helpdesk.Shared/Models/Request.cs
index 882f592a..e162352e 100644
--- a/src/Helpdesk.Shared/Models/Request.cs
+++ b/src/Helpdesk.Shared/Models/Request.cs
@@ -10,7 +10,6 @@ public class Request : Ticket
     [Column("Category")]
     public string? LegacyCategory { get; set; }
     public string? SourceTicketId { get; set; }
-    public Guid? SourceKnowledgeArticleId { get; set; }
     public string? SourceAutomationBindingId { get; set; }
     public string? RequestFormId { get; set; }
     public string? PayloadJson { get; set; }
diff --git a/src/Helpdesk.Shared/Models/Ticket.cs b/src/Helpdesk.Shared/Models/Ticket.cs
index e538fa64..f892db66 100644
--- a/src/Helpdesk.Shared/Models/Ticket.cs
+++ b/src/Helpdesk.Shared/Models/Ticket.cs
@@ -34,7 +34,6 @@ public abstract class Ticket
     // This is the new user-facing ID like 'INC-ABC-123'
     public string TrackingId { get; set; } = string.Empty;
 
-    public string? AiUnderstanding { get; set; }
 
     // Counter for user/technician replies
     public int Replies { get; set; } = 0;
diff --git a/src/Helpdesk.Shared/Models/TicketAiFeedback.cs b/src/Helpdesk.Shared/Models/TicketAiFeedback.cs
deleted file mode 100644
index 912e407f..00000000
--- a/src/Helpdesk.Shared/Models/TicketAiFeedback.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public class TicketAiFeedback
-{
-    public Guid Id { get; set; }
-    public string TicketId { get; set; } = string.Empty;
-    public string FeedbackType { get; set; } = string.Empty;
-    public string FeedbackValue { get; set; } = string.Empty;
-    public string? ArticleId { get; set; }
-    public string? RequestId { get; set; }
-    public string? Notes { get; set; }
-    public string? CreatedByUserId { get; set; }
-    public string? CreatedByName { get; set; }
-    public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
-}
diff --git a/src/Helpdesk.Shared/Models/TicketAiSuggestions.cs b/src/Helpdesk.Shared/Models/TicketAiSuggestions.cs
deleted file mode 100644
index 212966ba..00000000
--- a/src/Helpdesk.Shared/Models/TicketAiSuggestions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public class TicketAiSuggestions
-{
-    public string TicketId { get; set; } = string.Empty;
-    public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
-    public string ItemsJson { get; set; } = "[]";
-}
-
diff --git a/src/Helpdesk.Shared/Models/TicketKnowledgeSuggestion.cs b/src/Helpdesk.Shared/Models/TicketKnowledgeSuggestion.cs
deleted file mode 100644
index a1504082..00000000
--- a/src/Helpdesk.Shared/Models/TicketKnowledgeSuggestion.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Helpdesk.Shared.Models;
-
-public class TicketKnowledgeSuggestion
-{
-    public Guid Id { get; set; }
-    public string TicketId { get; set; } = string.Empty;
-    public Guid KnowledgeBaseArticleId { get; set; }
-    public KnowledgeBaseArticle Article { get; set; } = null!;
-    public double Score { get; set; }
-    public DateTime CreatedAt { get; set; }
-}
diff --git a/tests/Helpdesk.Tests/Api/AiProviderEndpointsTests.cs b/tests/Helpdesk.Tests/Api/AiProviderEndpointsTests.cs
deleted file mode 100644
index 7550ef31..00000000
--- a/tests/Helpdesk.Tests/Api/AiProviderEndpointsTests.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System.Net;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using Helpdesk.API;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.DTOs.AI;
-using Helpdesk.Shared.Enums;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Dodo.Primitives;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Logging;
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Xunit;
-
-namespace Helpdesk.Tests.Api;
-
-public class AiProviderEndpointsTests : IClassFixture<WebApplicationFactory<Program>>
-{
-    private readonly WebApplicationFactory<Program> _factory;
-
-    public AiProviderEndpointsTests(WebApplicationFactory<Program> factory)
-    {
-        Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
-
-        _factory = factory.WithWebHostBuilder(builder =>
-        {
-            builder.UseIsolatedTestStorage();
-            builder.UseSetting(WebHostDefaults.EnvironmentKey, "Development");
-            builder.UseEnvironment("Development");
-
-            builder.ConfigureAppConfiguration((context, cfg) =>
-            {
-                cfg.AddInMemoryCollection(new Dictionary<string, string?>
-                {
-                    ["Jwt:Issuer"] = "test",
-                    ["Jwt:Audience"] = "test",
-                    ["Jwt:Key"] = "test-key-123456789012345678901234"
-                });
-            });
-
-            builder.ConfigureServices(services =>
-            {
-                var userRepo = new InMemoryRepository<User>();
-                var roleRepo = new InMemoryRepository<Role>();
-                var orgRepo = new InMemoryRepository<Organization>();
-
-                var orgId = Uuid.CreateVersion7().ToString();
-                orgRepo.CreateAsync(new Organization { Id = orgId, Name = "DevOrg" }).Wait();
-                roleRepo.CreateAsync(new Role { Name = "HelpdeskAdmin" }).Wait();
-                userRepo.CreateAsync(new User
-                {
-                    Name = "Test User",
-                    Email = "test@example.com",
-                    Role = "HelpdeskAdmin",
-                    OrganizationId = orgId,
-                    HashedPassword = BCrypt.Net.BCrypt.HashPassword("password")
-                }).Wait();
-
-                services.AddSingleton<IRepository<User>>(userRepo);
-                services.AddSingleton<IRepository<Role>>(roleRepo);
-                services.AddSingleton<IRepository<Organization>>(orgRepo);
-                services.AddSingleton<IAiProviderService, InMemoryAiProviderService>();
-
-                services.AddAuthentication(options =>
-                {
-                    options.DefaultAuthenticateScheme = "Test";
-                    options.DefaultChallengeScheme = "Test";
-                }).AddScheme<AuthenticationSchemeOptions, TestAuthHandler>("Test", _ => { });
-            });
-        });
-    }
-
-    [Fact]
-    public async Task Get_Providers_ReturnsUnauthorized_ForAnonymous()
-    {
-        var client = _factory.CreateClient();
-        var resp = await client.GetAsync("/api/v1/ai/providers");
-        Assert.Equal(HttpStatusCode.Unauthorized, resp.StatusCode);
-    }
-
-    [Fact]
-    public async Task Get_Provider_ReturnsNotFound_WhenMissing()
-    {
-        var client = await GetAuthenticatedClientAsync();
-        var resp = await client.GetAsync($"/api/v1/ai/providers/{Guid.NewGuid()}");
-        Assert.Equal(HttpStatusCode.NotFound, resp.StatusCode);
-    }
-
-    [Fact]
-    public async Task Get_Providers_ReturnsForbidden_ForNonAdmin()
-    {
-        var client = await GetAuthenticatedClientAsync("User");
-        var resp = await client.GetAsync("/api/v1/ai/providers");
-        Assert.Equal(HttpStatusCode.Forbidden, resp.StatusCode);
-    }
-
-    [Fact]
-    public async Task Crud_Endpoints_ReturnSuccess()
-    {
-        var client = await GetAuthenticatedClientAsync();
-        var createDto = new AiProviderCreateDto
-        {
-            Name = "OpenAI",
-            ProviderType = AiProviderType.OpenAICompatible,
-            BaseUrl = "https://example.com",
-            ApiKey = "key",
-            IsEnabled = true
-        };
-        var createResp = await client.PostAsJsonAsync("/api/v1/ai/providers", createDto);
-        var created = await createResp.Content.ReadFromJsonAsync<AiProviderSummaryDto>();
-        var id = Guid.Parse(created!.Id);
-
-        var getResp = await client.GetAsync($"/api/v1/ai/providers/{id}");
-        Assert.Equal(HttpStatusCode.OK, getResp.StatusCode);
-
-        var updateDto = new AiProviderUpdateDto
-        {
-            Name = "New",
-            ProviderType = AiProviderType.OpenAICompatible,
-            BaseUrl = "https://example.com",
-            IsEnabled = false
-        };
-        var putResp = await client.PutAsJsonAsync($"/api/v1/ai/providers/{id}", updateDto);
-        Assert.Equal(HttpStatusCode.OK, putResp.StatusCode);
-        var updated = await putResp.Content.ReadFromJsonAsync<AiProviderSummaryDto>();
-        Assert.False(updated!.IsEnabled);
-
-        var deleteResp = await client.DeleteAsync($"/api/v1/ai/providers/{id}");
-        Assert.Equal(HttpStatusCode.NoContent, deleteResp.StatusCode);
-    }
-
-    [Fact]
-    public async Task TestEndpoints_ReturnSuccess()
-    {
-        var client = await GetAuthenticatedClientAsync();
-        var dto = new AiProviderCreateDto
-        {
-            Name = "OpenAI",
-            ProviderType = AiProviderType.OpenAICompatible,
-            BaseUrl = "https://example.com",
-            ApiKey = "key",
-            IsEnabled = true
-        };
-        var createResp = await client.PostAsJsonAsync("/api/v1/ai/providers", dto);
-        var created = await createResp.Content.ReadFromJsonAsync<AiProviderSummaryDto>();
-        var id = Guid.Parse(created!.Id);
-
-        var testResp = await client.PostAsync($"/api/v1/ai/providers/{id}/test", null);
-        Assert.Equal(HttpStatusCode.OK, testResp.StatusCode);
-        var testResult = await testResp.Content.ReadFromJsonAsync<AiProviderTestResultDto>();
-        Assert.NotNull(testResult);
-        Assert.True(testResult!.Success);
-
-        var chatResp = await client.PostAsJsonAsync($"/api/v1/ai/providers/{id}/chat-test", new AiChatRequestDto { Prompt = "hi" });
-        Assert.Equal(HttpStatusCode.OK, chatResp.StatusCode);
-    }
-
-    [Fact]
-    public async Task Test_Endpoint_ReturnsNotFound_WhenMissing()
-    {
-        var client = await GetAuthenticatedClientAsync();
-        var resp = await client.PostAsync($"/api/v1/ai/providers/{Guid.NewGuid()}/test", null);
-        Assert.Equal(HttpStatusCode.NotFound, resp.StatusCode);
-    }
-
-    private Task<HttpClient> GetAuthenticatedClientAsync(string role = "HelpdeskAdmin")
-    {
-        var client = _factory.CreateClient();
-        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Test", role);
-        return Task.FromResult(client);
-    }
-
-    private class InMemoryAiProviderService : IAiProviderService
-    {
-        private readonly List<AiProvider> _providers = new();
-
-        public Task<string> ChatTestAsync(Guid providerId, string prompt, string? model, CancellationToken token) => Task.FromResult("ok");
-
-        public Task<AiProvider> CreateAsync(AiProvider provider, string apiKey, CancellationToken token)
-        {
-            provider.Id = provider.Id == Guid.Empty ? Guid.NewGuid() : provider.Id;
-            _providers.Add(provider);
-            return Task.FromResult(provider);
-        }
-
-        public Task<bool> DeleteAsync(Guid id, CancellationToken token)
-        {
-            var removed = _providers.RemoveAll(p => p.Id == id) > 0;
-            return Task.FromResult(removed);
-        }
-
-        public Task<AiProvider?> GetAsync(Guid id, CancellationToken token) => Task.FromResult(_providers.FirstOrDefault(p => p.Id == id));
-
-        public Task<IEnumerable<AiProvider>> ListAsync(CancellationToken token) => Task.FromResult<IEnumerable<AiProvider>>(_providers);
-
-        public Task<IEnumerable<string>> ListModelsAsync(Guid providerId, CancellationToken token) => Task.FromResult<IEnumerable<string>>(new[] { "model" });
-
-        public Task<AiProviderConnectionTestResult> TestAsync(Guid providerId, CancellationToken token)
-            => Task.FromResult(new AiProviderConnectionTestResult(true, "https://example.com/api/models", 200, "Connection OK."));
-
-        public Task<AiProvider?> UpdateAsync(AiProvider provider, string? apiKey, CancellationToken token)
-        {
-            var existing = _providers.FirstOrDefault(p => p.Id == provider.Id);
-            if (existing is null) return Task.FromResult<AiProvider?>(null);
-            existing.Name = provider.Name;
-            existing.ProviderType = provider.ProviderType;
-            existing.BaseUrl = provider.BaseUrl;
-            existing.IsEnabled = provider.IsEnabled;
-            existing.DefaultModel = provider.DefaultModel;
-            existing.ExtraHeadersJson = provider.ExtraHeadersJson;
-            return Task.FromResult<AiProvider?>(existing);
-        }
-    }
-
-    private class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
-    {
-        public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder)
-            : base(options, logger, encoder) { }
-
-        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            if (!Request.Headers.TryGetValue("Authorization", out var header))
-                return Task.FromResult(AuthenticateResult.Fail("No authorization header"));
-
-            var parts = header.ToString().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-            var role = parts.Length > 1 ? parts[1] : string.Empty;
-
-            var claims = new[]
-            {
-                new Claim(ClaimTypes.Name, "Test"),
-                new Claim(ClaimTypes.Role, role)
-            };
-            var identity = new ClaimsIdentity(claims, Scheme.Name);
-            var principal = new ClaimsPrincipal(identity);
-            var ticket = new AuthenticationTicket(principal, Scheme.Name);
-            return Task.FromResult(AuthenticateResult.Success(ticket));
-        }
-    }
-}
diff --git a/tests/Helpdesk.Tests/Api/BootstrapStartupTests.cs b/tests/Helpdesk.Tests/Api/BootstrapStartupTests.cs
index 9c30b6d0..50fec4b9 100644
--- a/tests/Helpdesk.Tests/Api/BootstrapStartupTests.cs
+++ b/tests/Helpdesk.Tests/Api/BootstrapStartupTests.cs
@@ -150,15 +150,8 @@ public async Task Empty_schema_is_not_readiness_evidence_for_completed_descripto
     [Fact]
     public async Task Fresh_environment_postgresql_requires_setup_and_restarts_with_exact_committed_identity()
     {
-        await using var postgres = new PostgreSqlBuilder().WithImage("pgvector/pgvector:pg16").Build();
+        await using var postgres = new PostgreSqlBuilder().WithImage("postgres:16").Build();
         await postgres.StartAsync();
-        await using (var connection = new NpgsqlConnection(postgres.GetConnectionString()))
-        {
-            await connection.OpenAsync();
-            await using var command = connection.CreateCommand();
-            command.CommandText = "CREATE EXTENSION vector; CREATE EXTENSION pg_trgm;";
-            await command.ExecuteNonQueryAsync();
-        }
         var (service, store, options) = Create();
         var config = Config(("ConnectionStrings:HelpdeskDb", postgres.GetConnectionString()));
         var configured = await service.ResolveAsync(config);
diff --git a/tests/Helpdesk.Tests/Api/BootstrapStateStoreTests.cs b/tests/Helpdesk.Tests/Api/BootstrapStateStoreTests.cs
index 1c4c7325..e713dfa6 100644
--- a/tests/Helpdesk.Tests/Api/BootstrapStateStoreTests.cs
+++ b/tests/Helpdesk.Tests/Api/BootstrapStateStoreTests.cs
@@ -10,7 +10,6 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.DependencyInjection;
-using Pgvector.EntityFrameworkCore;
 using System.Text;
 using Testcontainers.PostgreSql;
 using Helpdesk.Shared.Models;
@@ -63,12 +62,10 @@ public async Task PostgreSql_preflight_rejects_a_missing_connection_without_atte
     }
 
     [Theory]
-    [InlineData(true, true, 0, false, false, false, false, PostgreSqlTargetKind.Empty, true)]
-    [InlineData(true, true, 4, true, true, true, true, PostgreSqlTargetKind.EstablishedRatelDesk, false)]
-    [InlineData(true, true, 1, false, false, false, false, PostgreSqlTargetKind.UnrelatedOrUnrecognized, false)]
+    [InlineData(0, false, false, false, false, PostgreSqlTargetKind.Empty, true)]
+    [InlineData(4, true, true, true, true, PostgreSqlTargetKind.EstablishedRatelDesk, false)]
+    [InlineData(1, false, false, false, false, PostgreSqlTargetKind.UnrelatedOrUnrecognized, false)]
     public void PostgreSql_preflight_classifies_empty_established_and_unrelated_targets(
-        bool hasVector,
-        bool hasTrigram,
         long publicTableCount,
         bool hasMigrationHistory,
         bool hasOrganizationsTable,
@@ -78,8 +75,6 @@ public void PostgreSql_preflight_classifies_empty_established_and_unrelated_targ
         bool expectedSuccess)
     {
         var result = PostgreSqlSetupPreflightService.Classify(
-            hasVector,
-            hasTrigram,
             publicTableCount,
             hasMigrationHistory,
             hasOrganizationsTable,
@@ -206,7 +201,7 @@ public async Task Local_admin_recovery_returns_no_token_when_a_postgresql_identi
     public async Task Local_admin_recovery_reenables_an_instance_administrator_in_postgresql()
     {
         await using var postgres = new PostgreSqlBuilder()
-            .WithImage("pgvector/pgvector:pg16")
+            .WithImage("postgres:16")
             .Build();
         await postgres.StartAsync();
 
@@ -558,21 +553,13 @@ public async Task Unattended_initialization_uses_the_same_sqlite_bootstrap_pipel
     public async Task Unattended_initialization_uses_the_same_postgresql_bootstrap_pipeline()
     {
         await using var postgres = new PostgreSqlBuilder()
-            .WithImage("pgvector/pgvector:pg16")
+            .WithImage("postgres:16")
             .Build();
         await postgres.StartAsync();
 
         var directory = Path.Combine(Path.GetTempPath(), $"rateldesk-unattended-{Guid.NewGuid():N}");
         try
         {
-            await using (var connection = new Npgsql.NpgsqlConnection(postgres.GetConnectionString()))
-            {
-                await connection.OpenAsync();
-                await using var extensions = connection.CreateCommand();
-                extensions.CommandText = "CREATE EXTENSION IF NOT EXISTS vector; CREATE EXTENSION IF NOT EXISTS pg_trgm;";
-                await extensions.ExecuteNonQueryAsync();
-            }
-
             var options = new BootstrapOptions
             {
                 StateDirectory = directory,
@@ -613,7 +600,7 @@ public async Task Unattended_initialization_uses_the_same_postgresql_bootstrap_p
             Assert.True(await identity.Users.AnyAsync(user => user.Email == "admin@example.test" && user.IsInstanceAdministrator));
 
             var applicationOptions = new DbContextOptionsBuilder<Helpdesk.Infrastructure.Persistence.HelpdeskDbContext>()
-                .UseNpgsql(postgres.GetConnectionString(), npgsql => npgsql.UseVector())
+                .UseNpgsql(postgres.GetConnectionString())
                 .Options;
             await using var application = new Helpdesk.Infrastructure.Persistence.HelpdeskDbContext(
                 applicationOptions,
@@ -637,21 +624,13 @@ public async Task Unattended_initialization_uses_the_same_postgresql_bootstrap_p
     public async Task Concurrent_postgresql_initialization_creates_one_instance_and_one_administrator()
     {
         await using var postgres = new PostgreSqlBuilder()
-            .WithImage("pgvector/pgvector:pg16")
+            .WithImage("postgres:16")
             .Build();
         await postgres.StartAsync();
 
         var directory = Path.Combine(Path.GetTempPath(), $"rateldesk-concurrent-bootstrap-{Guid.NewGuid():N}");
         try
         {
-            await using (var connection = new Npgsql.NpgsqlConnection(postgres.GetConnectionString()))
-            {
-                await connection.OpenAsync();
-                await using var extensions = connection.CreateCommand();
-                extensions.CommandText = "CREATE EXTENSION IF NOT EXISTS vector; CREATE EXTENSION IF NOT EXISTS pg_trgm;";
-                await extensions.ExecuteNonQueryAsync();
-            }
-
             var options = new BootstrapOptions
             {
                 StateDirectory = directory,
@@ -713,7 +692,7 @@ public async Task Concurrent_postgresql_initialization_creates_one_instance_and_
             Assert.Single(await identity.Users.Where(user => user.IsInstanceAdministrator).ToListAsync());
 
             var applicationOptions = new DbContextOptionsBuilder<Helpdesk.Infrastructure.Persistence.HelpdeskDbContext>()
-                .UseNpgsql(postgres.GetConnectionString(), npgsql => npgsql.UseVector())
+                .UseNpgsql(postgres.GetConnectionString())
                 .Options;
             await using var application = new Helpdesk.Infrastructure.Persistence.HelpdeskDbContext(
                 applicationOptions,
@@ -780,12 +759,12 @@ public async Task Legacy_adoption_marks_only_a_database_with_organization_and_us
     public async Task PostgreSql_migrations_adopt_established_legacy_data_but_leave_a_fresh_database_uninitialized()
     {
         await using var postgres = new PostgreSqlBuilder()
-            .WithImage("pgvector/pgvector:pg16")
+            .WithImage("postgres:16")
             .Build();
         await postgres.StartAsync();
 
         var options = new DbContextOptionsBuilder<Helpdesk.Infrastructure.Persistence.HelpdeskDbContext>()
-            .UseNpgsql(postgres.GetConnectionString(), npgsql => npgsql.UseVector())
+            .UseNpgsql(postgres.GetConnectionString())
             .Options;
         var adoption = new LegacyInstallationAdoptionService();
 
@@ -811,7 +790,13 @@ public async Task PostgreSql_migrations_adopt_established_legacy_data_but_leave_
         var establishedMigrator = established.GetService<IMigrator>();
         await establishedMigrator.MigrateAsync("20260912082029_AddRoleDefinitions");
         var organization = new Organization { Name = "Established organization" };
-        established.Organizations.Add(organization);
+        // The historical target still requires EnableAiIntake, removed from
+        // the rc.7 entity model. Seed that legacy shape before exercising the
+        // upgrade path with current entities.
+        await established.Database.ExecuteSqlInterpolatedAsync($"""
+            INSERT INTO "Organizations" ("Id", "Name", "EnableAiIntake", "State")
+            VALUES ({organization.Id}, {organization.Name}, {false}, {(int)organization.State});
+            """);
         var customer = new Customer
         {
             Name = "Established OIDC customer",
diff --git a/tests/Helpdesk.Tests/Api/IncidentCcRecipientsEndpointsTests.cs b/tests/Helpdesk.Tests/Api/IncidentCcRecipientsEndpointsTests.cs
index 0323d119..d5bc7c9e 100644
--- a/tests/Helpdesk.Tests/Api/IncidentCcRecipientsEndpointsTests.cs
+++ b/tests/Helpdesk.Tests/Api/IncidentCcRecipientsEndpointsTests.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Collections.Generic;
 using Helpdesk.API;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Incidents;
 using Helpdesk.Application.Messaging;
 using Helpdesk.Application.Services.Notifications;
@@ -29,7 +28,6 @@ public partial class IncidentCcRecipientsEndpointsTests : IClassFixture<WebAppli
     private readonly WebApplicationFactory<Program> _factory;
     private readonly InMemoryRepository<Incident> _incidentRepo = new();
     private readonly InMemoryRepository<Customer> _customerRepo = new();
-    private readonly InMemoryRepository<KnowledgeBaseArticle> _kbRepo = new();
     private readonly InMemoryRepository<User> _userRepo = new();
     private readonly IRequestSender _sender = Substitute.For<IRequestSender>();
     private readonly ITicketNotificationService _ticketNotificationService = Substitute.For<ITicketNotificationService>();
@@ -59,9 +57,7 @@ public IncidentCcRecipientsEndpointsTests(WebApplicationFactory<Program> factory
             {
                 services.AddSingleton<IRepository<Incident>>(_incidentRepo);
                 services.AddSingleton<IRepository<Customer>>(_customerRepo);
-                services.AddSingleton<IRepository<KnowledgeBaseArticle>>(_kbRepo);
                 services.AddSingleton<IRepository<User>>(_userRepo);
-                services.AddSingleton<IKnowledgeBuilderService, NoopKnowledgeBuilderService>();
                 services.AddSingleton(_sender);
                 services.AddSingleton(_ticketNotificationService);
                 services.AddSingleton(_supportAccessService);
@@ -568,12 +564,6 @@ await _customerRepo.CreateAsync(new Customer
         });
     }
 
-    private class NoopKnowledgeBuilderService : IKnowledgeBuilderService
-    {
-        public Task<KnowledgeBaseArticle> BuildArticleAsync(string prompt, CancellationToken token) => Task.FromResult(new KnowledgeBaseArticle());
-        public Task<KnowledgeBaseArticle?> GenerateDraftFromResolvedTicketAsync(string ticketId, CancellationToken token, bool regenerate = false) => Task.FromResult<KnowledgeBaseArticle?>(null);
-    }
-
     private class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
     {
         public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder)
diff --git a/tests/Helpdesk.Tests/Api/KbEndpointsTests.cs b/tests/Helpdesk.Tests/Api/KbEndpointsTests.cs
deleted file mode 100644
index 70530f1d..00000000
--- a/tests/Helpdesk.Tests/Api/KbEndpointsTests.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using System.Text.Json;
-using Helpdesk.API;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using System.Net.Http.Headers;
-using Xunit;
-
-namespace Helpdesk.Tests.Api;
-
-public class KbEndpointsTests : IClassFixture<WebApplicationFactory<Program>>
-{
-    private readonly WebApplicationFactory<Program> _factory;
-    private readonly Guid _articleId;
-    private readonly string _ticketId;
-
-    public KbEndpointsTests(WebApplicationFactory<Program> factory)
-    {
-        Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Production");
-        Environment.SetEnvironmentVariable("RUN_MIGRATIONS", "false");
-        _articleId = Guid.NewGuid();
-        _ticketId = Guid.NewGuid().ToString();
-
-        _factory = factory.WithWebHostBuilder(builder =>
-        {
-            builder.UseIsolatedTestStorage();
-            builder.UseSetting(WebHostDefaults.EnvironmentKey, "Production");
-            builder.UseEnvironment("Production");
-
-            builder.ConfigureServices(services =>
-            {
-                var descriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbContextOptions<HelpdeskDbContext>));
-                if (descriptor != null) services.Remove(descriptor);
-                var provider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider();
-                services.AddDbContext<HelpdeskDbContext>(o =>
-                {
-                    o.UseInMemoryDatabase("KbTests");
-                    o.UseInternalServiceProvider(provider);
-                });
-
-                var userRepo = new InMemoryRepository<User>();
-                var roleRepo = new InMemoryRepository<Role>();
-                var orgRepo = new InMemoryRepository<Organization>();
-
-                var orgId = Guid.NewGuid().ToString();
-                orgRepo.CreateAsync(new Organization { Id = orgId, Name = "DevOrg" }).Wait();
-                roleRepo.CreateAsync(new Role { Name = "HelpdeskAdmin" }).Wait();
-                userRepo.CreateAsync(new User { Name = "Test User", Email = "test@example.com", Role = "HelpdeskAdmin", OrganizationId = orgId, HashedPassword = "pwd" }).Wait();
-
-                services.AddSingleton<IRepository<User>>(userRepo);
-                services.AddSingleton<IRepository<Role>>(roleRepo);
-                services.AddSingleton<IRepository<Organization>>(orgRepo);
-
-                services.AddScoped<IKnowledgeBuilderService, FakeKnowledgeBuilderService>();
-
-                services.AddAuthentication(o =>
-                {
-                    o.DefaultAuthenticateScheme = "Test";
-                    o.DefaultChallengeScheme = "Test";
-                }).AddScheme<AuthenticationSchemeOptions, TestAuthHandler>("Test", _ => { });
-
-                var sp = services.BuildServiceProvider();
-                using var scope = sp.CreateScope();
-                var db = scope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-                db.Database.EnsureCreated();
-                db.KnowledgeBaseArticles.Add(new KnowledgeBaseArticle { Id = _articleId, Title = "Old", OrganizationId = orgId, Service = "General", State = KnowledgeBaseArticleState.Draft, LinkedTicketId = _ticketId, CreatedAt = DateTime.UtcNow });
-                db.Tickets.Add(new Incident { Id = _ticketId, Title = "Issue", Description = "d", OrganizationId = orgId, State = TicketState.Resolved });
-                db.SaveChanges();
-            });
-        });
-    }
-
-    [Fact(Skip = "Requires authenticated KB setup")]
-    public async Task Regeneration_StateTransition_And_Health_Work()
-    {
-        var client = GetAuthenticatedClient();
-
-        var regen = await client.PostAsync($"/api/v1/kb/{_articleId}/regenerate", null);
-        Assert.Equal(HttpStatusCode.OK, regen.StatusCode);
-
-        var dto = new UpdateKbStateDto { State = KnowledgeBaseArticleState.Published };
-        var stateResp = await client.PutAsJsonAsync($"/api/v1/kb/{_articleId}/state", dto);
-        Assert.Equal(HttpStatusCode.OK, stateResp.StatusCode);
-
-        var healthResp = await client.GetAsync("/api/v1/kb/health");
-        Assert.Equal(HttpStatusCode.OK, healthResp.StatusCode);
-        var json = await healthResp.Content.ReadFromJsonAsync<JsonElement>();
-        Assert.Equal(1, json.GetProperty("TotalArticles").GetInt32());
-        Assert.Equal(1, json.GetProperty("PublishedArticles").GetInt32());
-    }
-
-    private HttpClient GetAuthenticatedClient()
-    {
-        var client = _factory.CreateClient();
-        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Test", "HelpdeskAdmin");
-        return client;
-    }
-
-    private class FakeKnowledgeBuilderService : IKnowledgeBuilderService
-    {
-        private readonly HelpdeskDbContext _db;
-        public FakeKnowledgeBuilderService(HelpdeskDbContext db) { _db = db; }
-        public Task<KnowledgeBaseArticle> BuildArticleAsync(string prompt, CancellationToken token) => Task.FromResult(new KnowledgeBaseArticle());
-        public async Task<KnowledgeBaseArticle?> GenerateDraftFromResolvedTicketAsync(string ticketId, CancellationToken token, bool regenerate = false)
-        {
-            var article = await _db.KnowledgeBaseArticles.FirstOrDefaultAsync(a => a.LinkedTicketId == ticketId, token);
-            if (article == null) return null;
-            article.LastRegeneratedAt = DateTime.UtcNow;
-            await _db.SaveChangesAsync(token);
-            return article;
-        }
-    }
-
-    private class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
-    {
-        public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder)
-            : base(options, logger, encoder) { }
-
-        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            var claims = new[] { new Claim(ClaimTypes.Name, "test"), new Claim(ClaimTypes.Role, "HelpdeskAdmin") };
-            var identity = new ClaimsIdentity(claims, "Test");
-            var principal = new ClaimsPrincipal(identity);
-            var ticket = new AuthenticationTicket(principal, "Test");
-            return Task.FromResult(AuthenticateResult.Success(ticket));
-        }
-    }
-}
diff --git a/tests/Helpdesk.Tests/Api/LiveHistoryFilteringEndpointsTests.cs b/tests/Helpdesk.Tests/Api/LiveHistoryFilteringEndpointsTests.cs
index 9569754a..0b854251 100644
--- a/tests/Helpdesk.Tests/Api/LiveHistoryFilteringEndpointsTests.cs
+++ b/tests/Helpdesk.Tests/Api/LiveHistoryFilteringEndpointsTests.cs
@@ -13,7 +13,6 @@
 using Helpdesk.Application.Events;
 using Helpdesk.Application.Messaging;
 using Helpdesk.Application.Services.Changes;
-using Helpdesk.Application.Services.KB;
 using Helpdesk.Application.Services.Notifications;
 using Helpdesk.Application.Services.SupportNotifications;
 using Helpdesk.Application.Sla;
@@ -1451,14 +1450,10 @@ await harness.SeedAsync(db =>
         var requestUpdate = await harness.Client.PutAsJsonAsync("/api/v1/requests/req-self-service-update", new UpdateRequestDto { State = TicketState.Resolved });
         var changeUpdate = await harness.Client.PutAsJsonAsync("/api/v1/changes/chg-self-service-update", new UpdateChangeDto { State = TicketState.Resolved, Priority = TicketPriority.Low });
         var changeDelete = await harness.Client.DeleteAsync("/api/v1/changes/chg-self-service-update");
-        var runReview = await harness.Client.PostAsJsonAsync("/api/v1/changes/chg-self-service-update/ai-review", new { });
-        var acknowledgeReview = await harness.Client.PostAsJsonAsync("/api/v1/changes/chg-self-service-update/ai-review/acknowledge", new { });
 
         Assert.Equal(System.Net.HttpStatusCode.Forbidden, requestUpdate.StatusCode);
         Assert.Equal(System.Net.HttpStatusCode.Forbidden, changeUpdate.StatusCode);
         Assert.Equal(System.Net.HttpStatusCode.Forbidden, changeDelete.StatusCode);
-        Assert.True(runReview.StatusCode == System.Net.HttpStatusCode.Forbidden, await runReview.Content.ReadAsStringAsync());
-        Assert.True(acknowledgeReview.StatusCode == System.Net.HttpStatusCode.Forbidden, await acknowledgeReview.Content.ReadAsStringAsync());
         await harness.WithDbAsync(async db =>
         {
             Assert.Equal(TicketState.New, (await db.Requests.FindAsync("req-self-service-update"))!.State);
@@ -1467,7 +1462,7 @@ await harness.WithDbAsync(async db =>
     }
 
     [Fact]
-    public async Task RequestTaskAndAiAuditEndpoints_RespectRequestScope()
+    public async Task RequestTaskEndpoints_RespectRequestScope()
     {
         await using var harness = await LiveHistoryFilteringHarness.CreateAsync();
         await harness.SeedAsync(db =>
@@ -1486,13 +1481,11 @@ await harness.SeedAsync(db =>
 
         var ownTasks = await harness.Client.GetAsync("/api/v1/requests/req-self-service-tasks/tasks");
         var foreignTasks = await harness.Client.GetAsync("/api/v1/requests/req-foreign-tasks/tasks");
-        var ownAiAudit = await harness.Client.GetAsync("/api/v1/requests/req-self-service-tasks/ai-audit");
         var ownRequest = await harness.Client.GetAsync("/api/v1/requests/req-self-service-tasks");
         var foreignRequest = await harness.Client.GetAsync("/api/v1/requests/req-foreign-tasks");
 
         Assert.Equal(System.Net.HttpStatusCode.OK, ownTasks.StatusCode);
         Assert.Equal(System.Net.HttpStatusCode.Forbidden, foreignTasks.StatusCode);
-        Assert.Equal(System.Net.HttpStatusCode.Forbidden, ownAiAudit.StatusCode);
         Assert.Equal(System.Net.HttpStatusCode.OK, ownRequest.StatusCode);
         Assert.Equal(System.Net.HttpStatusCode.Forbidden, foreignRequest.StatusCode);
     }
@@ -1677,7 +1670,6 @@ public static async Task<LiveHistoryFilteringHarness> CreateAsync(CurrentUserAcc
             builder.Services.AddScoped<IRepository<RequestTask>, EfRepository<RequestTask>>();
             builder.Services.AddScoped<IRepository<User>, EfRepository<User>>();
             builder.Services.AddScoped<IRepository<Change>, EfRepository<Change>>();
-            builder.Services.AddScoped<IRepository<KnowledgeBaseArticle>, EfRepository<KnowledgeBaseArticle>>();
             builder.Services.AddScoped<ICurrentUserAccessService, CurrentUserAccessService>();
             if (accessProfile is not null)
             {
@@ -1697,7 +1689,6 @@ public static async Task<LiveHistoryFilteringHarness> CreateAsync(CurrentUserAcc
                 builder.Services.AddSingleton(NSubstitute.Substitute.For<Helpdesk.Application.Workflow.IWorkflowEngine>());
             }
             builder.Services.AddSingleton<Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService, Helpdesk.Application.Services.Tickets.TicketRefGeneratorService>();
-            builder.Services.AddSingleton<IChangeReviewService, TestChangeReviewService>();
             builder.Services.AddSingleton<ITicketNotificationService, NoopTicketNotificationService>();
             builder.Services.AddSingleton<ITicketSlaInitializer, NoopTicketSlaInitializer>();
             builder.Services.AddSingleton<ITicketSlaCompletionService, NoopTicketSlaCompletionService>();
@@ -1705,7 +1696,7 @@ public static async Task<LiveHistoryFilteringHarness> CreateAsync(CurrentUserAcc
             builder.Services.AddSingleton<ITicketSlaRepository, NoopTicketSlaRepository>();
             builder.Services.AddSingleton<ISlaClockService, NoopSlaClockService>();
             builder.Services.AddSingleton<ISlaEscalationEvaluator, NoopSlaEscalationEvaluator>();
-            builder.Services.AddSingleton<IKnowledgeBuilderService, NoopKnowledgeBuilderService>();
+            builder.Services.AddSingleton<IChangeTemplateService, TestChangeTemplateService>();
             builder.Services.AddSingleton<IBackgroundJobQueue, NoopBackgroundJobQueue>();
             builder.Services.AddSingleton<ISupportNotificationService, NoopSupportNotificationService>();
             builder.Services.AddSingleton<ISupportAccessService, AllowAllSupportAccessService>();
@@ -1891,15 +1882,6 @@ public Task EvaluateAndNotifyAsync(Ticket ticket, TicketSlaState slaState, DateT
             Task.CompletedTask;
     }
 
-    private sealed class NoopKnowledgeBuilderService : IKnowledgeBuilderService
-    {
-        public Task<KnowledgeBaseArticle> BuildArticleAsync(string prompt, CancellationToken token) =>
-            Task.FromResult(new KnowledgeBaseArticle { Id = Guid.NewGuid(), Title = "Test article" });
-
-        public Task<KnowledgeBaseArticle?> GenerateDraftFromResolvedTicketAsync(string ticketId, CancellationToken token, bool regenerate = false) =>
-            Task.FromResult<KnowledgeBaseArticle?>(null);
-    }
-
     private sealed class NoopBackgroundJobQueue : IBackgroundJobQueue
     {
         public void Queue(Func<IServiceProvider, CancellationToken, Task> work)
@@ -1925,7 +1907,7 @@ public Task<bool> CanUserSupportOrganizationAsync(string userId, string customer
             Task.FromResult(true);
     }
 
-    private sealed class TestChangeReviewService : IChangeReviewService
+    private sealed class TestChangeTemplateService : IChangeTemplateService
     {
         public string NormalizeChangeType(string? changeType) =>
             changeType?.Trim().ToLowerInvariant() switch
@@ -1946,16 +1928,6 @@ public string NormalizeChangeType(string? changeType) =>
             Errors = []
         };
 
-        public ChangeAiReviewDto BuildReviewDto(Change change) => new();
-
-        public bool RequiresReviewBeforeProgress(Change change) => false;
-
-        public void MarkReviewStale(Change change)
-        {
-        }
-
-        public Task<ChangeAiReviewDto> RunReviewAsync(Change change, CancellationToken token) =>
-            Task.FromResult(new ChangeAiReviewDto());
     }
 
     private sealed class NoopTicketNotificationService : ITicketNotificationService
diff --git a/tests/Helpdesk.Tests/Api/LocalAuthenticationEndpointsTests.cs b/tests/Helpdesk.Tests/Api/LocalAuthenticationEndpointsTests.cs
index e195a334..7b593546 100644
--- a/tests/Helpdesk.Tests/Api/LocalAuthenticationEndpointsTests.cs
+++ b/tests/Helpdesk.Tests/Api/LocalAuthenticationEndpointsTests.cs
@@ -919,51 +919,6 @@ public async Task Local_user_cannot_queue_a_knowledge_suggestion_for_a_foreign_t
         }
     }
 
-    [Fact]
-    public async Task Read_only_incident_user_cannot_queue_a_knowledge_suggestion()
-    {
-        const string organizationId = "knowledge-suggestion-reader-organization";
-        const string ticketId = "22222222-2222-2222-2222-222222222222";
-        const string email = "knowledge.suggestion.reader@example.test";
-        await using (var setupScope = _factory.Services.CreateAsyncScope())
-        {
-            var identityUsers = setupScope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();
-            var createUser = await identityUsers.CreateAsync(
-                new ApplicationUser { UserName = email, Email = email, DisplayName = "Knowledge Suggestion Reader" },
-                "correct horse battery staple");
-            Assert.True(createUser.Succeeded);
-            var userId = (await identityUsers.FindByEmailAsync(email))!.Id;
-
-            var db = setupScope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-            db.Organizations.Add(new Organization { Id = organizationId, Name = "Knowledge suggestion reader organization" });
-            db.Users.Add(new User
-            {
-                Id = userId,
-                Name = "Knowledge Suggestion Reader",
-                Email = email,
-                OrganizationId = organizationId,
-                Role = "User"
-            });
-            db.Incidents.Add(new Incident
-            {
-                Id = ticketId,
-                OrganizationId = organizationId,
-                RequesterEmail = email,
-                Title = "Reader-owned incident",
-                Description = "A reader must not queue AI processing."
-            });
-            await db.SaveChangesAsync();
-        }
-
-        using var reader = CreateClient(new WebApplicationFactoryClientOptions { HandleCookies = true });
-        Assert.Equal(HttpStatusCode.NoContent, (await reader.PostAsJsonAsync("/api/v1/local-auth/login", new LocalAuthenticationEndpoints.LocalLoginRequest(
-            email, "correct horse battery staple"))).StatusCode);
-
-        var enqueue = await reader.PostAsJsonAsync($"/api/v1/tickets/{ticketId}/suggest-knowledge", new { });
-
-        Assert.Equal(HttpStatusCode.Forbidden, enqueue.StatusCode);
-    }
-
     [Fact]
     public async Task Scoped_technician_management_access_is_limited_to_the_assigned_tenant()
     {
diff --git a/tests/Helpdesk.Tests/Api/OrganizationCustomerEndpointsTests.cs b/tests/Helpdesk.Tests/Api/OrganizationCustomerEndpointsTests.cs
index 3d89d1b0..a9580871 100644
--- a/tests/Helpdesk.Tests/Api/OrganizationCustomerEndpointsTests.cs
+++ b/tests/Helpdesk.Tests/Api/OrganizationCustomerEndpointsTests.cs
@@ -1,7 +1,6 @@
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using Helpdesk.API;
-using Helpdesk.Shared.DTOs.Organization;
 using Helpdesk.Shared.Models;
 using Helpdesk.Shared.Services;
 using Dodo.Primitives;
@@ -46,7 +45,6 @@ public OrganizationCustomerEndpointsTests(WebApplicationFactory<Program> factory
                 var userRepo = new InMemoryRepository<User>();
                 var roleRepo = new InMemoryRepository<Role>();
                 var orgRepo = new InMemoryRepository<Organization>();
-                var orgSettingsRepo = new InMemoryRepository<OrganizationAiKbSettings>();
                 var customerRepo = new InMemoryRepository<Customer>();
                 var emailTemplateRepo = new InMemoryRepository<EmailTemplate>();
 
@@ -65,7 +63,6 @@ public OrganizationCustomerEndpointsTests(WebApplicationFactory<Program> factory
                 services.AddSingleton<IRepository<User>>(userRepo);
                 services.AddSingleton<IRepository<Role>>(roleRepo);
                 services.AddSingleton<IRepository<Organization>>(orgRepo);
-                services.AddSingleton<IRepository<OrganizationAiKbSettings>>(orgSettingsRepo);
                 services.AddSingleton<IRepository<Customer>>(customerRepo);
                 services.AddSingleton<IRepository<EmailTemplate>>(emailTemplateRepo);
 
@@ -134,53 +131,6 @@ public async Task Customer_CreateEdit_PersistsIsEnabled()
         Assert.Equal(EntityState.Enabled, get!.State);
     }
 
-    [Fact]
-    public async Task Organization_AiKbSettings_PersistsSwitchesAndModelFields()
-    {
-        var client = await GetAuthenticatedClientAsync();
-
-        var orgResp = await client.PostAsJsonAsync("/api/v1/organizations", new Organization { Name = "AI Org", IsEnabled = true });
-        orgResp.EnsureSuccessStatusCode();
-        var org = await orgResp.Content.ReadFromJsonAsync<Organization>();
-
-        var update = new OrganizationAiKbSettingsDto
-        {
-            EnableAiSearch = true,
-            EnableAiAnswers = false,
-            SearchThreshold = 0.42,
-            AnswerThreshold = 0.73,
-            EmbeddingProviderId = Guid.NewGuid().ToString(),
-            EmbeddingModel = "text-embedding-3-small",
-            EmbeddingDimensions = 1536,
-            KnowledgeProviderId = Guid.NewGuid().ToString(),
-            KnowledgeModelName = "qwen3.5:9b",
-            SuggestionLimit = 4,
-            AllowedServicesCsv = "incident,request",
-            EnableProviderFallback = false,
-            MaxProviderAttempts = 1,
-            MinimumSuggestionFeedbackCount = 2,
-            MinimumSuggestionHelpfulRate = 0.5,
-            MinimumAutomationFeedbackCount = 1,
-            MinimumAutomationResolvedRate = 0.25
-        };
-
-        var updateResp = await client.PutAsJsonAsync($"/api/v1/organizations/{org!.Id}/ai-kb-settings", update);
-        updateResp.EnsureSuccessStatusCode();
-
-        var get = await client.GetFromJsonAsync<OrganizationAiKbSettingsDto>($"/api/v1/organizations/{org.Id}/ai-kb-settings");
-
-        Assert.NotNull(get);
-        Assert.True(get!.EnableAiSearch);
-        Assert.False(get.EnableAiAnswers);
-        Assert.Equal(update.EmbeddingProviderId, get.EmbeddingProviderId);
-        Assert.Equal(update.EmbeddingModel, get.EmbeddingModel);
-        Assert.Equal(update.EmbeddingDimensions, get.EmbeddingDimensions);
-        Assert.Equal(update.KnowledgeProviderId, get.KnowledgeProviderId);
-        Assert.Equal(update.KnowledgeModelName, get.KnowledgeModelName);
-        Assert.False(get.EnableProviderFallback);
-        Assert.Equal(update.MaxProviderAttempts, get.MaxProviderAttempts);
-    }
-
     private Task<HttpClient> GetAuthenticatedClientAsync()
     {
         var client = _factory.CreateClient();
diff --git a/tests/Helpdesk.Tests/Api/TicketAiFeedbackEndpointsTests.cs b/tests/Helpdesk.Tests/Api/TicketAiFeedbackEndpointsTests.cs
deleted file mode 100644
index 1fc8c863..00000000
--- a/tests/Helpdesk.Tests/Api/TicketAiFeedbackEndpointsTests.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System.Net;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Helpdesk.API.Endpoints.Tickets;
-using Helpdesk.Application.Messaging;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Auth;
-using Helpdesk.Shared.DTOs.Article;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace Helpdesk.Tests.Api;
-
-public sealed class TicketAiFeedbackEndpointsTests
-{
-    [Fact]
-    public async Task AutomationFeedback_RejectsRequestFromAnotherOrganization()
-    {
-        await using var harness = await TicketAiFeedbackHarness.CreateAsync();
-        var ticketId = Guid.NewGuid().ToString();
-        await harness.SeedAsync(db =>
-        {
-            db.Incidents.Add(new Incident
-            {
-                Id = ticketId,
-                TrackingId = "INC-ALPHA",
-                Title = "Tenant alpha incident",
-                OrganizationId = "org-alpha"
-            });
-            db.Requests.Add(new Request
-            {
-                Id = "request-beta",
-                TrackingId = "REQ-BETA",
-                Title = "Tenant beta request",
-                OrganizationId = "org-beta"
-            });
-        });
-
-        var response = await harness.Client.PostAsJsonAsync(
-            $"/api/v1/tickets/{ticketId}/ai-feedback",
-            new SubmitTicketAiFeedbackDto
-            {
-                FeedbackType = "automation",
-                FeedbackValue = "accepted",
-                RequestId = "request-beta"
-            });
-
-        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        await harness.AssertNoFeedbackAsync();
-    }
-
-    private sealed class TicketAiFeedbackHarness : IAsyncDisposable
-    {
-        private readonly SqliteConnection connection;
-        private readonly WebApplication app;
-
-        private TicketAiFeedbackHarness(SqliteConnection connection, WebApplication app, HttpClient client)
-        {
-            this.connection = connection;
-            this.app = app;
-            Client = client;
-        }
-
-        public HttpClient Client { get; }
-
-        public static async Task<TicketAiFeedbackHarness> CreateAsync()
-        {
-            var connection = new SqliteConnection("Data Source=:memory:");
-            await connection.OpenAsync();
-
-            var builder = WebApplication.CreateBuilder(new WebApplicationOptions
-            {
-                EnvironmentName = "Development"
-            });
-            builder.WebHost.UseTestServer();
-            builder.Services.AddHttpContextAccessor();
-            builder.Services.AddDbContext<HelpdeskDbContext>(options => options.UseSqlite(connection));
-            builder.Services.AddSingleton<ITenantContext>(new TestTenantContext());
-            builder.Services.AddSingleton<ICurrentUserAccessService, TenantAlphaIncidentManagerAccessService>();
-            builder.Services.AddSingleton<IRequestSender, FailingRequestSender>();
-            builder.Services.AddAuthentication(options =>
-            {
-                options.DefaultAuthenticateScheme = "Test";
-                options.DefaultChallengeScheme = "Test";
-            }).AddScheme<AuthenticationSchemeOptions, TestAuthHandler>("Test", _ => { });
-            builder.Services.AddAuthorization();
-
-            var app = builder.Build();
-            app.UseAuthentication();
-            app.UseAuthorization();
-            var ticketGroup = app.MapGroup("/api/v1/tickets/{id:guid}")
-                .RequireAuthorization();
-            TicketEndpoints.MapTicketAiFeedbackEndpoint(ticketGroup);
-
-            using (var scope = app.Services.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-                await db.Database.EnsureCreatedAsync();
-            }
-
-            await app.StartAsync();
-            var client = app.GetTestClient();
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Test", "incident-manager");
-            return new TicketAiFeedbackHarness(connection, app, client);
-        }
-
-        public async Task SeedAsync(Action<HelpdeskDbContext> seed)
-        {
-            using var scope = app.Services.CreateScope();
-            var db = scope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-            seed(db);
-            await db.SaveChangesAsync();
-        }
-
-        public async Task AssertNoFeedbackAsync()
-        {
-            using var scope = app.Services.CreateScope();
-            var db = scope.ServiceProvider.GetRequiredService<HelpdeskDbContext>();
-            Assert.Empty(await db.TicketAiFeedback.ToListAsync());
-        }
-
-        public async ValueTask DisposeAsync()
-        {
-            Client.Dispose();
-            await app.DisposeAsync();
-            await connection.DisposeAsync();
-        }
-    }
-
-    private sealed class TenantAlphaIncidentManagerAccessService : ICurrentUserAccessService
-    {
-        private static readonly CurrentUserAccessProfile Profile = new(
-            IsAuthenticated: true,
-            Name: "Tenant alpha manager",
-            Email: "manager@example.test",
-            PrimaryOrganizationId: "org-alpha",
-            PrimaryOrganizationName: "Tenant alpha",
-            CustomerId: null,
-            IsHelpdeskAdmin: false,
-            RoleBundles: new HashSet<string>(StringComparer.OrdinalIgnoreCase),
-            Permissions: new HashSet<string>(StringComparer.OrdinalIgnoreCase) { HelpdeskPermissions.IncidentManager },
-            AllowedOrganizationIds: new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "org-alpha" },
-            ManagedOrganizationIds: new HashSet<string>(StringComparer.OrdinalIgnoreCase));
-
-        public Task<CurrentUserAccessProfile> ResolveAsync(ClaimsPrincipal user, CancellationToken ct = default) =>
-            Task.FromResult(Profile);
-    }
-
-    private sealed class TestTenantContext : ITenantContext
-    {
-        public string? TenantId => "org-alpha";
-        public string? UserId => "manager-alpha";
-        public bool IsHelpdeskAdmin => false;
-    }
-
-    private sealed class FailingRequestSender : IRequestSender
-    {
-        public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default) =>
-            throw new InvalidOperationException($"Unexpected request dispatch: {request.GetType().Name}");
-    }
-
-    private sealed class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
-    {
-        public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder)
-            : base(options, logger, encoder)
-        {
-        }
-
-        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            var identity = new ClaimsIdentity(
-                [new Claim(ClaimTypes.NameIdentifier, "manager-alpha")],
-                Scheme.Name);
-            return Task.FromResult(AuthenticateResult.Success(
-                new AuthenticationTicket(new ClaimsPrincipal(identity), Scheme.Name)));
-        }
-    }
-}
diff --git a/tests/Helpdesk.Tests/Api/WorkflowOpsEndpointsTests.cs b/tests/Helpdesk.Tests/Api/WorkflowOpsEndpointsTests.cs
index 9147af7a..9848a65d 100644
--- a/tests/Helpdesk.Tests/Api/WorkflowOpsEndpointsTests.cs
+++ b/tests/Helpdesk.Tests/Api/WorkflowOpsEndpointsTests.cs
@@ -147,7 +147,7 @@ public static async Task<WorkflowOpsHarness> CreateAsync(string actor, bool useS
                 if (connection is not null)
                 {
                     await db.Database.MigrateAsync();
-                    Assert.False(db.Database.HasPendingModelChanges());
+                    Assert.Empty(await db.Database.GetPendingMigrationsAsync());
                 }
                 else
                     await db.Database.EnsureCreatedAsync();
diff --git a/tests/Helpdesk.Tests/Application/Incidents/CreateIncidentCommandHandlerTests.cs b/tests/Helpdesk.Tests/Application/Incidents/CreateIncidentCommandHandlerTests.cs
deleted file mode 100644
index d7410034..00000000
--- a/tests/Helpdesk.Tests/Application/Incidents/CreateIncidentCommandHandlerTests.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using Helpdesk.Application.Incidents;
-using Helpdesk.Application.Sla;
-using Helpdesk.Application.Services.SupportNotifications;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using NSubstitute;
-using Xunit;
-
-namespace Helpdesk.Tests.Application.Incidents;
-
-public class CreateIncidentCommandHandlerTests
-{
-    [Fact]
-    public async Task Handle_CallsRepositoryAddOnce()
-    {
-        var repo = Substitute.For<IRepository<Incident>>();
-        repo.CreateAsync(Arg.Any<Incident>()).Returns(ci => ci.Arg<Incident>());
-        var refGen = Substitute.For<Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService>();
-        refGen.NextReferenceAsync(Arg.Any<string>()).Returns("INC-XYZ-123-456");
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        var understanding = Substitute.For<Helpdesk.Application.Services.AI.ITicketUnderstandingService>();
-        var suggestions = Substitute.For<Helpdesk.Application.Services.KB.IKnowledgeSuggestionService>();
-        var suggRepo = Substitute.For<IRepository<TicketKnowledgeSuggestion>>();
-        var supportNotifications = Substitute.For<ISupportNotificationService>();
-        var handler = new CreateIncidentCommandHandler(repo, refGen, orgRepo, understanding, suggestions, suggRepo, supportNotifications);
-        var command = new CreateIncidentCommand(
-            "Test",
-            "Desc",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null);
-
-        await handler.Handle(command, CancellationToken.None);
-
-        await repo.Received(1).CreateAsync(Arg.Any<Incident>());
-    }
-
-    [Fact]
-    public async Task Handle_InitializesTicketSlaState_WhenInitializerProvided()
-    {
-        var repo = Substitute.For<IRepository<Incident>>();
-        repo.CreateAsync(Arg.Any<Incident>()).Returns(ci => ci.Arg<Incident>());
-        var refGen = Substitute.For<Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService>();
-        refGen.NextReferenceAsync(Arg.Any<string>()).Returns("INC-XYZ-123-456");
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        var understanding = Substitute.For<Helpdesk.Application.Services.AI.ITicketUnderstandingService>();
-        var suggestions = Substitute.For<Helpdesk.Application.Services.KB.IKnowledgeSuggestionService>();
-        var suggRepo = Substitute.For<IRepository<TicketKnowledgeSuggestion>>();
-        var supportNotifications = Substitute.For<ISupportNotificationService>();
-        var slaInitializer = Substitute.For<ITicketSlaInitializer>();
-
-        var handler = new CreateIncidentCommandHandler(
-            repo,
-            refGen,
-            orgRepo,
-            understanding,
-            suggestions,
-            suggRepo,
-            supportNotifications,
-            slaInitializer);
-
-        var command = new CreateIncidentCommand(
-            "Test",
-            "Desc",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null);
-
-        await handler.Handle(command, CancellationToken.None);
-
-        await slaInitializer.Received(1).InitializeAsync(Arg.Any<Incident>());
-    }
-
-    [Fact]
-    public async Task Handle_Persists_AssignedToId_WhenProvided()
-    {
-        var repo = Substitute.For<IRepository<Incident>>();
-        Incident? captured = null;
-        repo.CreateAsync(Arg.Do<Incident>(x => captured = x)).Returns(ci => ci.Arg<Incident>());
-        var refGen = Substitute.For<Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService>();
-        refGen.NextReferenceAsync(Arg.Any<string>()).Returns("INC-XYZ-123-456");
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        var understanding = Substitute.For<Helpdesk.Application.Services.AI.ITicketUnderstandingService>();
-        var suggestions = Substitute.For<Helpdesk.Application.Services.KB.IKnowledgeSuggestionService>();
-        var suggRepo = Substitute.For<IRepository<TicketKnowledgeSuggestion>>();
-        var supportNotifications = Substitute.For<ISupportNotificationService>();
-        var handler = new CreateIncidentCommandHandler(repo, refGen, orgRepo, understanding, suggestions, suggRepo, supportNotifications);
-        var command = new CreateIncidentCommand(
-            "Test",
-            "Desc",
-            null,
-            null,
-            "org-1",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            "user-1");
-
-        await handler.Handle(command, CancellationToken.None);
-
-        Assert.Equal("user-1", captured!.AssignedToId);
-    }
-
-    [Fact]
-    public async Task Handle_UnassignedTicket_NotifiesSupport()
-    {
-        var repo = Substitute.For<IRepository<Incident>>();
-        repo.CreateAsync(Arg.Any<Incident>()).Returns(ci => ci.Arg<Incident>());
-        var refGen = Substitute.For<Helpdesk.Application.Services.Tickets.ITicketRefGeneratorService>();
-        refGen.NextReferenceAsync(Arg.Any<string>()).Returns("INC-XYZ-123-456");
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        var understanding = Substitute.For<Helpdesk.Application.Services.AI.ITicketUnderstandingService>();
-        var suggestions = Substitute.For<Helpdesk.Application.Services.KB.IKnowledgeSuggestionService>();
-        var suggRepo = Substitute.For<IRepository<TicketKnowledgeSuggestion>>();
-        var supportNotifications = Substitute.For<ISupportNotificationService>();
-        var handler = new CreateIncidentCommandHandler(repo, refGen, orgRepo, understanding, suggestions, suggRepo, supportNotifications);
-
-        await handler.Handle(new CreateIncidentCommand(
-            "Test",
-            "Desc",
-            null,
-            null,
-            "org-1",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null), CancellationToken.None);
-
-        await supportNotifications.Received(1).NotifyTicketCreatedUnassignedAsync(
-            Arg.Is<Incident>(x => x.TrackingId == "INC-XYZ-123-456"),
-            Arg.Any<CancellationToken>());
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/AiProviderServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/AiProviderServiceTests.cs
deleted file mode 100644
index 5291b9bf..00000000
--- a/tests/Helpdesk.Tests/Application/Services/AiProviderServiceTests.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Enums;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class AiProviderServiceTests
-{
-    private static (HelpdeskDbContext ctx, IAiClient client, ISecretProtector protector, AiProviderService svc) CreateService()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        var client = Substitute.For<IAiClient>();
-        var protector = Substitute.For<ISecretProtector>();
-        protector.Protect(Arg.Any<string>()).Returns(ci => $"enc-{ci.Arg<string>()}");
-        var logger = Substitute.For<ILogger<AiProviderService>>();
-        var svc = new AiProviderService(ctx, protector, client, logger);
-        return (ctx, client, protector, svc);
-    }
-
-    [Fact]
-    public async Task Crud_Operations_Encrypt_ApiKey()
-    {
-        var (ctx, client, protector, svc) = CreateService();
-        var provider = new AiProvider { Name = "Test", ProviderType = AiProviderType.OpenAI, BaseUrl = "https://api" };
-
-        await svc.CreateAsync(provider, "key", CancellationToken.None);
-        var created = await svc.GetAsync(provider.Id, CancellationToken.None);
-        Assert.NotNull(created);
-        Assert.Equal("enc-key", created!.ApiKeyEncrypted);
-        protector.Received(1).Protect("key");
-
-        provider.Name = "Updated";
-        await svc.UpdateAsync(provider, "new", CancellationToken.None);
-        var updated = await svc.GetAsync(provider.Id, CancellationToken.None);
-        Assert.Equal("Updated", updated!.Name);
-        Assert.Equal("enc-new", updated.ApiKeyEncrypted);
-        protector.Received().Protect("new");
-
-        var deleted = await svc.DeleteAsync(provider.Id, CancellationToken.None);
-        Assert.True(deleted);
-        Assert.Empty(ctx.AiProviders);
-    }
-
-
-    [Fact]
-    public async Task TestAsync_ReturnsFalse_WhenClientFails()
-    {
-        var (ctx, client, _, svc) = CreateService();
-        var provider = new AiProvider { Name = "Test", ProviderType = AiProviderType.OpenAI, BaseUrl = "https://api" };
-        await svc.CreateAsync(provider, "key", CancellationToken.None);
-
-        client.TestAsync(Arg.Any<AiProvider>(), Arg.Any<CancellationToken>())
-            .Returns(new AiProviderConnectionTestResult(false, Message: "failed"));
-
-        var result = await svc.TestAsync(provider.Id, CancellationToken.None);
-        Assert.False(result.Success);
-        Assert.Equal("failed", result.Message);
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/ChangeReviewServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/ChangeReviewServiceTests.cs
deleted file mode 100644
index ec4bf47c..00000000
--- a/tests/Helpdesk.Tests/Application/Services/ChangeReviewServiceTests.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.Changes;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.DTOs.Change;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class ChangeReviewServiceTests
-{
-    [Fact]
-    public void ValidateTemplate_ReturnsErrors_WhenRollbackAndStepsAreMissing()
-    {
-        using var ctx = CreateDbContext();
-        var service = CreateService(ctx);
-
-        var result = service.ValidateTemplate("Normal", new ChangeTemplateDto
-        {
-            ScopeOfChange = "Patch application nodes",
-            AffectedSystems = ["portal-app"],
-            BusinessJustification = "Security update",
-            ImpactAssessment = "Brief restart",
-            RiskAssessment = "Low"
-        });
-
-        Assert.False(result.IsComplete);
-        Assert.Contains(result.Errors, x => x.Contains("Implementation steps", StringComparison.OrdinalIgnoreCase));
-        Assert.Contains(result.Errors, x => x.Contains("rollback", StringComparison.OrdinalIgnoreCase));
-    }
-
-    [Fact]
-    public void ValidateTemplate_ReturnsComplete_ForEmergencyTemplate_WithRequiredFields()
-    {
-        using var ctx = CreateDbContext();
-        var service = CreateService(ctx);
-
-        var result = service.ValidateTemplate("Emergency", new ChangeTemplateDto
-        {
-            ScopeOfChange = "Restore API availability",
-            AffectedSystems = ["customer-api"],
-            ImplementationSteps = ["Drain traffic", "Deploy hotfix", "Warm instances"],
-            ValidationSteps = ["Run smoke tests", "Confirm error rate normal"],
-            RollbackPlan = "Redeploy previous image and restore prior config.",
-            EmergencyReason = "Current release is causing outages.",
-            BusinessImpactIfNotImplemented = "Customers cannot place orders.",
-            ImmediateRiskAssessment = "Temporary service instability during failover.",
-            PostChangeValidation = "Observe health checks and error-rate dashboards for 15 minutes."
-        });
-
-        Assert.True(result.IsComplete);
-        Assert.Empty(result.Errors);
-    }
-
-    private static ChangeReviewService CreateService(HelpdeskDbContext ctx)
-    {
-        return new ChangeReviewService(
-            Substitute.For<IAiRuntime>(),
-            Substitute.For<IAiPromptTemplateService>(),
-            Substitute.For<IAiOperationAuditService>(),
-            ctx,
-            Substitute.For<ILogger<ChangeReviewService>>());
-    }
-
-    private static HelpdeskDbContext CreateDbContext()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        return new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/EmbeddingServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/EmbeddingServiceTests.cs
deleted file mode 100644
index 140fdcbb..00000000
--- a/tests/Helpdesk.Tests/Application/Services/EmbeddingServiceTests.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.AI;
-using Helpdesk.Infrastructure.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.AI;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-using System.Net;
-using System.Net.Http;
-using System.Text.Json;
-using Pgvector;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class EmbeddingServiceTests
-{
-    private static EmbeddingService CreateService(Func<HttpRequestMessage, HttpResponseMessage> handler, out HelpdeskDbContext ctx)
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        var provider = new AiProvider
-        {
-            Id = Guid.NewGuid(),
-            BaseUrl = "https://api.example.com/",
-            ApiKeyEncrypted = "enc-key",
-            DefaultModel = "text-embedding",
-            IsEnabled = true
-        };
-        ctx.AiProviders.Add(provider);
-        ctx.AiModels.Add(new AiModel { AiProviderId = provider.Id, Name = "text-embedding", IsEnabled = true });
-        ctx.OrganizationAiKbSettings.Add(new OrganizationAiKbSettings
-        {
-            OrganizationId = "org1",
-            EmbeddingProviderId = provider.Id.ToString(),
-            EmbeddingModel = "text-embedding",
-            EmbeddingDimensions = 512
-        });
-        ctx.SaveChanges();
-
-        var factory = Substitute.For<IHttpClientFactory>();
-        factory.CreateClient("OpenAICompatible")
-               .Returns(new HttpClient(new TestHandler(handler)));
-
-        var protector = Substitute.For<ISecretProtector>();
-        protector.Unprotect("enc-key").Returns("plain");
-
-        var runtime = Substitute.For<IAiRuntime>();
-        var generatorLogger = Substitute.For<ILogger<LegacyEmbeddingGeneratorAdapter>>();
-        runtime.CreateEmbeddingGeneratorAsync(Arg.Any<AiEmbeddingRuntimeRequest>(), Arg.Any<CancellationToken>())
-            .Returns(ci =>
-            {
-                var request = ci.Arg<AiEmbeddingRuntimeRequest>();
-                var generator = new LegacyEmbeddingGeneratorAdapter(
-                    provider,
-                    request.ModelId ?? "text-embedding",
-                    request.Dimensions ?? 512,
-                    protector,
-                    factory,
-                    generatorLogger);
-                return new AiResolvedEmbeddingGenerator(generator, "provider", request.ModelId ?? "text-embedding", request.Dimensions ?? 512);
-            });
-
-        var logger = Substitute.For<ILogger<EmbeddingService>>();
-        return new EmbeddingService(ctx, runtime, logger);
-    }
-
-    [Fact]
-    public async Task CreateEmbeddingAsync_ReturnsVector()
-    {
-        static HttpResponseMessage Response(HttpRequestMessage _)
-        {
-            var json = JsonSerializer.Serialize(new { embeddings = new[] { new { embedding = new[] { 0.1f, 0.2f } } } });
-            return new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(json)
-            };
-        }
-
-        var service = CreateService(Response, out _);
-
-        var embedding = await service.CreateEmbeddingAsync("org1", "hello", CancellationToken.None);
-
-        Assert.Equal(new[] { 0.1f, 0.2f }, embedding);
-    }
-
-    [Fact]
-    public async Task VectorStore_SearchAsync_FiltersByOrganization_AndHonorsLimit()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-
-        var a1 = new KnowledgeBaseArticle { OrganizationId = "org1", Service = "svc", Title = "a1" };
-        var a2 = new KnowledgeBaseArticle { OrganizationId = "org1", Service = "svc", Title = "a2" };
-        var b1 = new KnowledgeBaseArticle { OrganizationId = "org2", Service = "svc", Title = "b1" };
-        ctx.KnowledgeBaseArticles.AddRange(a1, a2, b1);
-        ctx.KnowledgeEmbeddings.AddRange(
-            new KnowledgeEmbedding { OrganizationId = "org1", SourceType = "KB", SourceId = a1.Id.ToString(), DocumentTitle = a1.Title, ChunkIndex = 0, ChunkId = "0", MetadataJson = "{\"articleId\":\"" + a1.Id + "\"}", KnowledgeBaseArticleId = a1.Id, Text = "a1", Vector = new Vector(new[] { 1f, 0f }) },
-            new KnowledgeEmbedding { OrganizationId = "org1", SourceType = "KB", SourceId = a2.Id.ToString(), DocumentTitle = a2.Title, ChunkIndex = 0, ChunkId = "0", MetadataJson = "{\"articleId\":\"" + a2.Id + "\"}", KnowledgeBaseArticleId = a2.Id, Text = "a2", Vector = new Vector(new[] { 0.9f, 0.1f }) },
-            new KnowledgeEmbedding { OrganizationId = "org2", SourceType = "KB", SourceId = b1.Id.ToString(), DocumentTitle = b1.Title, ChunkIndex = 0, ChunkId = "0", MetadataJson = "{\"articleId\":\"" + b1.Id + "\"}", KnowledgeBaseArticleId = b1.Id, Text = "b1", Vector = new Vector(new[] { 1f, 0f }) }
-        );
-        ctx.SaveChanges();
-
-        var store = new PgVectorKnowledgeVectorStore(ctx);
-
-        var results = (await store.SearchAsync("org1", new[] { 1f, 0f }, 1, new KnowledgeVectorFilter(SourceTypes: ["KB"]), CancellationToken.None)).ToList();
-
-        Assert.Single(results);
-        Assert.Equal("org1", results[0].OrganizationId);
-        Assert.Equal(a1.Id, results[0].KnowledgeBaseArticleId);
-        Assert.Equal(a1.Title, results[0].DocumentTitle);
-    }
-
-    private class TestHandler : HttpMessageHandler
-    {
-        private readonly Func<HttpRequestMessage, HttpResponseMessage> _handler;
-        public TestHandler(Func<HttpRequestMessage, HttpResponseMessage> handler) => _handler = handler;
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-            => Task.FromResult(_handler(request));
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/GraphEmailProcessorTests.cs b/tests/Helpdesk.Tests/Application/Services/GraphEmailProcessorTests.cs
index 799c674f..879fa13d 100644
--- a/tests/Helpdesk.Tests/Application/Services/GraphEmailProcessorTests.cs
+++ b/tests/Helpdesk.Tests/Application/Services/GraphEmailProcessorTests.cs
@@ -41,9 +41,6 @@ private static GraphEmailProcessor CreateProcessor(
         IRepository<TicketTimelineEvent>? timelineRepo = null,
         ITenantProvisioningService? tenantProvisioningService = null,
         ITicketNotificationService? ticketNotificationService = null,
-        IRepository<OrganizationAiKbSettings>? aiKbRepo = null,
-        IEmbeddingService? embeddingService = null,
-        IRepository<KnowledgeEmbedding>? embeddingRepo = null,
         IInlineImageStorageService? inlineImageStorage = null)
     {
         if (timelineRepo is null)
@@ -67,15 +64,12 @@ private static GraphEmailProcessor CreateProcessor(
             tenantProvisioningService ?? Substitute.For<ITenantProvisioningService>(),
             ticketNotificationService ?? Substitute.For<ITicketNotificationService>(),
             Substitute.For<IRepository<BlockedEntity>>(),
-            aiKbRepo ?? Substitute.For<IRepository<OrganizationAiKbSettings>>(),
             emailService,
             templateRepo,
             incidentRepo,
             ticketRepo,
             timelineRepo,
             attachmentService,
-            embeddingService ?? Substitute.For<IEmbeddingService>(),
-            embeddingRepo ?? Substitute.For<IRepository<KnowledgeEmbedding>>(),
             new InboundInlineImageResolver(inlineImageStorage ?? Substitute.For<IInlineImageStorageService>(), NullLogger<InboundInlineImageResolver>.Instance),
             Substitute.For<IEmailTemplateRenderer>(),
             Substitute.For<IEmailLayoutResolver>(),
@@ -393,63 +387,6 @@ await timelineRepo.Received(1).CreateAsync(Arg.Is<TicketTimelineEvent>(e =>
             e.CreatedByUserId == "<spam-reply@example.test>"));
     }
 
-    [Fact]
-    public async Task ProcessIncidentAsync_CreatesEmbeddings_WhenAiEnabled()
-    {
-        var mediator = Substitute.For<IRequestSender>();
-        var incidentRepo = Substitute.For<IRepository<Incident>>();
-        incidentRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Incident>>(Array.Empty<Incident>()));
-        var created = new Incident { Id = "1", TrackingId = "INC-NEW-1" };
-        mediator.Send(Arg.Any<CreateIncidentCommand>(), Arg.Any<CancellationToken>()).Returns(created);
-        var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        var env = Substitute.For<IHostEnvironment>();
-        env.ContentRootPath.Returns(tempRoot);
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        var db = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        var attachmentService = new TicketAttachmentService(db, new Helpdesk.Infrastructure.Storage.TicketAttachmentFileStore(env, Microsoft.Extensions.Options.Options.Create(new Helpdesk.Infrastructure.Storage.StorageOptions { RootPath = Path.Combine(tempRoot, "storage") })));
-        var emailService = Substitute.For<IEmailService>();
-        emailService.SendEmailAsync(Arg.Any<IEnumerable<string>>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<IEnumerable<string>?>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(true));
-        var templateRepo = Substitute.For<IRepository<EmailTemplate>>();
-        templateRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<EmailTemplate>>(new[]
-        {
-            new EmailTemplate { Name = "NewTicketConfirmation", Subject = "s", HtmlContent = "b" }
-        }));
-        var embeddingService = Substitute.For<IEmbeddingService>();
-        embeddingService.CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>())
-            .Returns(Task.FromResult<IReadOnlyList<float[]>>(new[] { new float[] { 0.1f } }));
-        var embeddingRepo = Substitute.For<IRepository<KnowledgeEmbedding>>();
-        var aiRepo = Substitute.For<IRepository<OrganizationAiKbSettings>>();
-        aiRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<OrganizationAiKbSettings>>(new[]
-        {
-            new OrganizationAiKbSettings { OrganizationId = "org1", EnableAiSearch = true }
-        }));
-
-        var processor = CreateProcessor(
-            mediator,
-            incidentRepo,
-            attachmentService,
-            emailService,
-            templateRepo,
-            timelineRepo: null,
-            tenantProvisioningService: null,
-            ticketNotificationService: null,
-            aiKbRepo: aiRepo,
-            embeddingService: embeddingService,
-            embeddingRepo: embeddingRepo);
-
-        var message = new Message { Subject = "Help", Body = new ItemBody { Content = "body" } };
-        var customer = new Customer { Id = "cust1", OrganizationId = "org1", Email = "a@b.com", Name = "Cust" };
-        var attachments = new List<GraphAttachment>();
-
-        await processor.ProcessIncidentAsync(message, attachments, customer, CancellationToken.None);
-
-        await embeddingService.Received(1).CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>());
-        await embeddingRepo.Received(1).CreateAsync(Arg.Is<KnowledgeEmbedding>(e => e.SourceType == "Email" && e.SourceId == created.Id));
-    }
-
     [Fact]
     public async Task ProcessIncidentAsync_ReturnsExistingIncident_WhenInboundMessageAlreadyRecorded()
     {
@@ -495,57 +432,6 @@ public async Task ProcessIncidentAsync_ReturnsExistingIncident_WhenInboundMessag
         await timelineRepo.DidNotReceive().CreateAsync(Arg.Any<TicketTimelineEvent>());
     }
 
-    [Fact]
-    public async Task ProcessIncidentAsync_DoesNotThrow_WhenEmailEmbeddingGenerationFails()
-    {
-        var mediator = Substitute.For<IRequestSender>();
-        var incidentRepo = Substitute.For<IRepository<Incident>>();
-        incidentRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Incident>>(Array.Empty<Incident>()));
-        var created = new Incident { Id = "1", TrackingId = "INC-NEW-1" };
-        mediator.Send(Arg.Any<CreateIncidentCommand>(), Arg.Any<CancellationToken>()).Returns(created);
-        var attachmentService = Substitute.For<ITicketAttachmentService>();
-        var emailService = Substitute.For<IEmailService>();
-        var templateRepo = Substitute.For<IRepository<EmailTemplate>>();
-        templateRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<EmailTemplate>>(new[]
-        {
-            new EmailTemplate { Name = "NewTicketConfirmation", Subject = "s", HtmlContent = "b" }
-        }));
-
-        var embeddingService = Substitute.For<IEmbeddingService>();
-        embeddingService.CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>())
-            .Returns<Task<IReadOnlyList<float[]>>>(_ => throw new InvalidOperationException("embedding unavailable"));
-        var aiRepo = Substitute.For<IRepository<OrganizationAiKbSettings>>();
-        aiRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<OrganizationAiKbSettings>>(new[]
-        {
-            new OrganizationAiKbSettings { OrganizationId = "org1", EnableAiSearch = true }
-        }));
-        var timelineRepo = Substitute.For<IRepository<TicketTimelineEvent>>();
-        timelineRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<TicketTimelineEvent>>(Array.Empty<TicketTimelineEvent>()));
-        timelineRepo.CreateAsync(Arg.Any<TicketTimelineEvent>()).Returns(call => call.Arg<TicketTimelineEvent>());
-
-        var processor = CreateProcessor(
-            mediator,
-            incidentRepo,
-            attachmentService,
-            emailService,
-            templateRepo,
-            timelineRepo: timelineRepo,
-            aiKbRepo: aiRepo,
-            embeddingService: embeddingService);
-
-        var result = await processor.ProcessIncidentAsync(
-            new Message { Subject = "Help", Body = new ItemBody { Content = "body" } },
-            Enumerable.Empty<GraphAttachment>(),
-            new Customer { Id = "cust1", OrganizationId = "org1", Email = "a@b.com", Name = "Cust" },
-            CancellationToken.None,
-            "<msg-embedding-failure@example.test>");
-
-        Assert.Equal(created, result);
-        await timelineRepo.Received(1).CreateAsync(Arg.Is<TicketTimelineEvent>(e =>
-            e.TicketId == created.Id &&
-            e.CreatedByUserId == "<msg-embedding-failure@example.test>"));
-    }
-
     [Fact]
     public async Task ProcessIncidentAsync_DoesNotAddDuplicateWorkLog_WhenMessageIdAlreadyProcessed()
     {
diff --git a/tests/Helpdesk.Tests/Application/Services/KnowledgeBuilderServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/KnowledgeBuilderServiceTests.cs
deleted file mode 100644
index 322f1496..00000000
--- a/tests/Helpdesk.Tests/Application/Services/KnowledgeBuilderServiceTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Infrastructure.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.Extensions.AI;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Xunit;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class KnowledgeBuilderServiceTests
-{
-    [Fact]
-    public async Task GenerateDraftFromResolvedTicketAsync_StoresLifecycleMetadataAndEmbeddings()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        ctx.AiProviders.Add(new AiProvider { Id = Guid.NewGuid(), BaseUrl = "https://api.example.com/", ApiKeyEncrypted = "key", DefaultModel = "model", IsEnabled = true });
-        ctx.Incidents.Add(new Incident { Id = "t1", Title = "Issue", Description = "desc", State = TicketState.Resolved, OrganizationId = "org1" });
-        ctx.WorkLogs.Add(new WorkLog { TicketId = "t1", Notes = "Worked", Hours = 1 });
-        ctx.SaveChanges();
-
-        var chatClient = Substitute.For<IChatClient>();
-        chatClient.GetResponseAsync(Arg.Any<IEnumerable<ChatMessage>>(), Arg.Any<ChatOptions?>(), Arg.Any<CancellationToken>())
-            .Returns(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Title\nContent")));
-
-        var aiRuntime = Substitute.For<IAiRuntime>();
-        aiRuntime.CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>())
-            .Returns(new AiResolvedChatClient(chatClient, "provider", "model"));
-
-        var embeddingService = Substitute.For<IEmbeddingService>();
-        embeddingService.CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>())
-            .Returns(Task.FromResult<IReadOnlyList<float[]>>(new[] { new float[] { 0.1f } }));
-
-        var vectorStore = new PgVectorKnowledgeVectorStore(ctx);
-        var templates = Substitute.For<IAiPromptTemplateService>();
-        templates.Render(Arg.Any<string>(), Arg.Any<IReadOnlyDictionary<string, string?>>())
-            .Returns("Generate a concise knowledge base article. Output title on the first line, then body.");
-        var audit = Substitute.For<IAiOperationAuditService>();
-        var logger = Substitute.For<ILogger<KnowledgeBuilderService>>();
-        var service = new KnowledgeBuilderService(aiRuntime, ctx, embeddingService, vectorStore, templates, audit, logger);
-
-        var article = await service.GenerateDraftFromResolvedTicketAsync("t1", CancellationToken.None);
-
-        Assert.NotNull(article);
-        Assert.Equal("org1", article!.OrganizationId);
-        Assert.Equal(KnowledgeBaseArticleState.Draft, article.State);
-        Assert.Equal("t1", article.LinkedTicketId);
-        Assert.Equal("model", article.CreatedByModel);
-        Assert.NotNull(article.LastRegeneratedAt);
-        Assert.True(article.CreatedAt <= DateTime.UtcNow);
-        Assert.Single(ctx.KnowledgeBaseArticles);
-        Assert.Single(ctx.KnowledgeEmbeddings);
-        await embeddingService.Received(1)
-            .CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>());
-    }
-
-    [Fact]
-    public async Task GenerateDraftFromResolvedTicketAsync_ReturnsExistingArticle()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        ctx.AiProviders.Add(new AiProvider { Id = Guid.NewGuid(), BaseUrl = "https://api.example.com/", ApiKeyEncrypted = "key", DefaultModel = "model", IsEnabled = true });
-        ctx.Incidents.Add(new Incident { Id = "t1", Title = "Issue", Description = "desc", State = TicketState.Resolved, OrganizationId = "org1" });
-        ctx.KnowledgeBaseArticles.Add(new KnowledgeBaseArticle { LinkedTicketId = "t1", OrganizationId = "org1" });
-        ctx.SaveChanges();
-
-        var aiRuntime = Substitute.For<IAiRuntime>();
-        var embeddingService = Substitute.For<IEmbeddingService>();
-        var vectorStore = new PgVectorKnowledgeVectorStore(ctx);
-        var templates = Substitute.For<IAiPromptTemplateService>();
-        var audit = Substitute.For<IAiOperationAuditService>();
-        var logger = Substitute.For<ILogger<KnowledgeBuilderService>>();
-        var service = new KnowledgeBuilderService(aiRuntime, ctx, embeddingService, vectorStore, templates, audit, logger);
-
-        var article = await service.GenerateDraftFromResolvedTicketAsync("t1", CancellationToken.None);
-
-        Assert.NotNull(article);
-        Assert.Equal("t1", article!.LinkedTicketId);
-        await aiRuntime.DidNotReceive()
-            .CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>());
-    }
-
-    [Fact]
-    public async Task GenerateDraftFromResolvedTicketAsync_OnlyRunsForResolvedTickets()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        ctx.AiProviders.Add(new AiProvider { Id = Guid.NewGuid(), BaseUrl = "https://api.example.com/", ApiKeyEncrypted = "key", DefaultModel = "model", IsEnabled = true });
-        ctx.Incidents.Add(new Incident { Id = "t1", Title = "Issue", Description = "desc", State = TicketState.New, OrganizationId = "org1" });
-        ctx.SaveChanges();
-
-        var chatClient = Substitute.For<IChatClient>();
-        chatClient.GetResponseAsync(Arg.Any<IEnumerable<ChatMessage>>(), Arg.Any<ChatOptions?>(), Arg.Any<CancellationToken>())
-            .Returns(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Title\nContent")));
-        var aiRuntime = Substitute.For<IAiRuntime>();
-        aiRuntime.CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>())
-            .Returns(new AiResolvedChatClient(chatClient, "provider", "model"));
-        var embeddingService = Substitute.For<IEmbeddingService>();
-        embeddingService.CreateEmbeddingsAsync("org1", Arg.Any<IEnumerable<string>>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult<IReadOnlyList<float[]>>(new[] { new[] { 0.1f } }));
-        var vectorStore = new PgVectorKnowledgeVectorStore(ctx);
-        var templates = Substitute.For<IAiPromptTemplateService>();
-        templates.Render(Arg.Any<string>(), Arg.Any<IReadOnlyDictionary<string, string?>>())
-            .Returns("Generate a concise knowledge base article. Output title on the first line, then body.");
-        var audit = Substitute.For<IAiOperationAuditService>();
-        var logger = Substitute.For<ILogger<KnowledgeBuilderService>>();
-        var service = new KnowledgeBuilderService(aiRuntime, ctx, embeddingService, vectorStore, templates, audit, logger);
-
-        var before = await service.GenerateDraftFromResolvedTicketAsync("t1", CancellationToken.None);
-        Assert.Null(before);
-        await aiRuntime.DidNotReceive().CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>());
-
-        var ticket = ctx.Incidents.First();
-        ticket.State = TicketState.Resolved;
-        ctx.SaveChanges();
-
-        var after = await service.GenerateDraftFromResolvedTicketAsync("t1", CancellationToken.None);
-        Assert.NotNull(after);
-    }
-
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/KnowledgeRetrievalServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/KnowledgeRetrievalServiceTests.cs
deleted file mode 100644
index 164c020d..00000000
--- a/tests/Helpdesk.Tests/Application/Services/KnowledgeRetrievalServiceTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class KnowledgeRetrievalServiceTests
-{
-    [Fact]
-    public async Task RetrieveAsync_GroupsEvidenceByArticle_AndSetsConfidence()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-
-        var article1 = new KnowledgeBaseArticle { Id = Guid.NewGuid(), OrganizationId = "org1", Service = "svc", Title = "Article 1" };
-        var article2 = new KnowledgeBaseArticle { Id = Guid.NewGuid(), OrganizationId = "org1", Service = "svc", Title = "Article 2" };
-        ctx.KnowledgeBaseArticles.AddRange(article1, article2);
-        ctx.KnowledgeEmbeddings.AddRange(
-            new KnowledgeEmbedding { OrganizationId = "org1", SourceType = "KB", KnowledgeBaseArticleId = article1.Id, SourceId = article1.Id.ToString(), DocumentTitle = article1.Title, ChunkIndex = 0, ChunkId = "0", Text = "Primary evidence", MetadataJson = "{\"articleId\":\"" + article1.Id + "\"}", Vector = new Pgvector.Vector(new[] { 1f, 0f }) },
-            new KnowledgeEmbedding { OrganizationId = "org1", SourceType = "KB", KnowledgeBaseArticleId = article1.Id, SourceId = article1.Id.ToString(), DocumentTitle = article1.Title, ChunkIndex = 1, ChunkId = "1", Text = "Secondary evidence", MetadataJson = "{\"articleId\":\"" + article1.Id + "\"}", Vector = new Pgvector.Vector(new[] { 0.9f, 0.1f }) },
-            new KnowledgeEmbedding { OrganizationId = "org1", SourceType = "KB", KnowledgeBaseArticleId = article2.Id, SourceId = article2.Id.ToString(), DocumentTitle = article2.Title, ChunkIndex = 0, ChunkId = "0", Text = "Other evidence", MetadataJson = "{\"articleId\":\"" + article2.Id + "\"}", Vector = new Pgvector.Vector(new[] { 0.6f, 0.4f }) });
-        await ctx.SaveChangesAsync();
-
-        var embeddings = Substitute.For<IEmbeddingService>();
-        embeddings.CreateEmbeddingAsync("org1", "query", Arg.Any<CancellationToken>())
-            .Returns(new[] { 1f, 0f });
-
-        var store = new PgVectorKnowledgeVectorStore(ctx);
-        var service = new KnowledgeRetrievalService(ctx, embeddings, store);
-
-        var results = await service.RetrieveAsync("org1", "query", 2, CancellationToken.None);
-
-        Assert.Equal(2, results.Count);
-        Assert.Equal(article1.Id, results[0].Article.Id);
-        Assert.True(results[0].IsHighConfidence);
-        Assert.Equal("High", results[0].ConfidenceLabel);
-        Assert.Equal(2, results[0].Evidence.Count);
-        Assert.Equal("Primary evidence", results[0].Evidence[0].Text);
-        Assert.Equal(article1.Title, results[0].Evidence[0].DocumentTitle);
-        Assert.Equal(article1.Id.ToString(), results[0].Evidence[0].Metadata["articleId"]);
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/KnowledgeSuggestionServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/KnowledgeSuggestionServiceTests.cs
deleted file mode 100644
index 581a6e7e..00000000
--- a/tests/Helpdesk.Tests/Application/Services/KnowledgeSuggestionServiceTests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class KnowledgeSuggestionServiceTests
-{
-    [Fact]
-    public async Task SuggestAsync_PersistsHighConfidenceResults()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-
-        var retrieval = Substitute.For<IKnowledgeRetrievalService>();
-        var article1 = new KnowledgeBaseArticle { Id = Guid.NewGuid(), Title = "A", OrganizationId = "org1" };
-        var article2 = new KnowledgeBaseArticle { Id = Guid.NewGuid(), Title = "B", OrganizationId = "org1" };
-        var article3 = new KnowledgeBaseArticle { Id = Guid.NewGuid(), Title = "C", OrganizationId = "org1" };
-        ctx.KnowledgeBaseArticles.AddRange(article1, article2, article3);
-        ctx.SaveChanges();
-
-        var logger = Substitute.For<ILogger<KnowledgeSuggestionService>>();
-        var service = new KnowledgeSuggestionService(ctx, retrieval, logger);
-
-        var ticket = new Incident { Description = "test", OrganizationId = "org1" };
-
-        retrieval.RetrieveAsync(ticket.OrganizationId, ticket.Description, 5, Arg.Any<CancellationToken>())
-            .Returns(new[]
-            {
-                new KnowledgeRetrievalResult(
-                    article1,
-                    0.9d,
-                    [new KnowledgeEvidenceChunk(article1.Id, "0", article1.Id.ToString(), article1.Title, 0, "A", new Dictionary<string, string>(), 0.9d)],
-                    true,
-                    "High"),
-                new KnowledgeRetrievalResult(
-                    article2,
-                    0.8d,
-                    [new KnowledgeEvidenceChunk(article2.Id, "0", article2.Id.ToString(), article2.Title, 0, "B", new Dictionary<string, string>(), 0.8d)],
-                    true,
-                    "High")
-            });
-
-        var suggestions = (await service.SuggestAsync(ticket, CancellationToken.None)).ToList();
-
-        await retrieval.Received(1).RetrieveAsync(ticket.OrganizationId, ticket.Description, 5, Arg.Any<CancellationToken>());
-        Assert.Equal(2, suggestions.Count);
-        Assert.Equal(2, ctx.TicketKnowledgeSuggestions.Count());
-        Assert.All(suggestions, s => Assert.True(s.Score >= 0.5));
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/OpenAiCompatibleClientTests.cs b/tests/Helpdesk.Tests/Application/Services/OpenAiCompatibleClientTests.cs
deleted file mode 100644
index b021be8d..00000000
--- a/tests/Helpdesk.Tests/Application/Services/OpenAiCompatibleClientTests.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System.Net;
-using System.Text.Json;
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Shared.Enums;
-using Helpdesk.Shared.Models;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class OpenAiCompatibleClientTests
-{
-    [Fact]
-    public async Task ListModelsAsync_UsesApiRoot_WhenBaseUrlEndsWithApi()
-    {
-        Uri? seenUri = null;
-        var client = CreateClient(request =>
-        {
-            seenUri = request.RequestUri;
-            var json = JsonSerializer.Serialize(new { data = new[] { new { id = "qwen2.5-coder:7b" } } });
-            return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent(json) };
-        });
-
-        var models = await client.ListModelsAsync(CreateProvider("https://ai.example.com/api"), CancellationToken.None);
-
-        Assert.Contains("qwen2.5-coder:7b", models);
-        Assert.Equal("https://ai.example.com/api/models", seenUri?.ToString());
-    }
-
-    [Fact]
-    public async Task ListModelsAsync_UsesV1Root_WhenBaseUrlEndsWithV1()
-    {
-        Uri? seenUri = null;
-        var client = CreateClient(request =>
-        {
-            seenUri = request.RequestUri;
-            var json = JsonSerializer.Serialize(new { data = new[] { new { id = "gpt-4o-mini" } } });
-            return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent(json) };
-        });
-
-        var models = await client.ListModelsAsync(CreateProvider("https://api.openai.com/v1"), CancellationToken.None);
-
-        Assert.Contains("gpt-4o-mini", models);
-        Assert.Equal("https://api.openai.com/v1/models", seenUri?.ToString());
-    }
-
-    [Fact]
-    public async Task ListModelsAsync_FallsBack_FromV1_ToApi_ForBareRoot()
-    {
-        var seenUris = new List<string>();
-        var client = CreateClient(request =>
-        {
-            seenUris.Add(request.RequestUri!.ToString());
-            if (request.RequestUri!.ToString().EndsWith("/v1/models", StringComparison.Ordinal))
-            {
-                return new HttpResponseMessage(HttpStatusCode.NotFound)
-                {
-                    Content = new StringContent("{\"detail\":\"missing\"}")
-                };
-            }
-
-            var json = JsonSerializer.Serialize(new { data = new[] { new { id = "qwen2.5-coder:7b" } } });
-            return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent(json) };
-        });
-
-        var models = await client.ListModelsAsync(CreateProvider("https://ai.example.com"), CancellationToken.None);
-
-        Assert.Contains("qwen2.5-coder:7b", models);
-        Assert.Equal(
-            ["https://ai.example.com/v1/models", "https://ai.example.com/api/models"],
-            seenUris);
-    }
-
-    [Fact]
-    public async Task TestAsync_ReturnsDiagnostics_OnFailure()
-    {
-        var client = CreateClient(_ => new HttpResponseMessage(HttpStatusCode.Forbidden)
-        {
-            Content = new StringContent("{\"detail\":\"API key not allowed to access this endpoint.\"}")
-        });
-
-        var result = await client.TestAsync(CreateProvider("https://ai.example.com/api"), CancellationToken.None);
-
-        Assert.False(result.Success);
-        Assert.Equal("https://ai.example.com/api/models", result.AttemptedUrl);
-        Assert.Equal(403, result.StatusCode);
-        Assert.Contains("API key not allowed", result.Message);
-    }
-
-    private static OpenAiCompatibleClient CreateClient(Func<HttpRequestMessage, HttpResponseMessage> handler)
-    {
-        var factory = Substitute.For<IHttpClientFactory>();
-        factory.CreateClient("OpenAICompatible")
-            .Returns(new HttpClient(new TestHandler(handler)));
-
-        var protector = Substitute.For<ISecretProtector>();
-        protector.Unprotect("enc-key").Returns("plain-token");
-
-        return new OpenAiCompatibleClient(factory, protector);
-    }
-
-    private static AiProvider CreateProvider(string baseUrl) => new()
-    {
-        Id = Guid.NewGuid(),
-        Name = "OpenWebUI",
-        ProviderType = AiProviderType.OpenAICompatible,
-        BaseUrl = baseUrl,
-        ApiKeyEncrypted = "enc-key",
-        DefaultModel = "qwen2.5-coder:7b",
-        IsEnabled = true
-    };
-
-    private sealed class TestHandler(Func<HttpRequestMessage, HttpResponseMessage> handler) : HttpMessageHandler
-    {
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-            => Task.FromResult(handler(request));
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/RequesterReplyDraftServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/RequesterReplyDraftServiceTests.cs
deleted file mode 100644
index 437665dd..00000000
--- a/tests/Helpdesk.Tests/Application/Services/RequesterReplyDraftServiceTests.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using Helpdesk.Application.Services.AI;
-using Helpdesk.Application.Services.KB;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class RequesterReplyDraftServiceTests
-{
-    [Fact]
-    public async Task GenerateAsync_ReturnsClarificationDraft_ForLowConfidenceMatch()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        ctx.OrganizationAiKbSettings.Add(new OrganizationAiKbSettings
-        {
-            OrganizationId = "org1",
-            EnableAiSearch = true,
-            EnableAiAnswers = true
-        });
-        await ctx.SaveChangesAsync();
-
-        var retrieval = Substitute.For<IKnowledgeRetrievalService>();
-        var article = new KnowledgeBaseArticle { Id = Guid.NewGuid(), Title = "VPN Reset", OrganizationId = "org1" };
-        retrieval.RetrieveAsync("org1", "vpn broken", 1, Arg.Any<CancellationToken>())
-            .Returns(
-            [
-                new KnowledgeRetrievalResult(
-                    article,
-                    0.55d,
-                    [new KnowledgeEvidenceChunk(article.Id, "0", article.Id.ToString(), article.Title, 0, "VPN evidence", new Dictionary<string, string>(), 0.55d)],
-                    false,
-                    "Low")
-            ]);
-
-        var aiRuntime = Substitute.For<IAiRuntime>();
-        var prompts = Substitute.For<IAiPromptTemplateService>();
-        var audit = Substitute.For<IAiOperationAuditService>();
-        var logger = Substitute.For<ILogger<RequesterReplyDraftService>>();
-        var service = new RequesterReplyDraftService(aiRuntime, retrieval, prompts, audit, ctx, logger);
-
-        var draft = await service.GenerateAsync(
-            new Incident { Id = "t1", OrganizationId = "org1", Title = "VPN", Description = "vpn broken" },
-            CancellationToken.None);
-
-        Assert.NotNull(draft);
-        Assert.True(draft!.RequiresClarification);
-        Assert.Equal("Low", draft.ConfidenceLabel);
-        Assert.Equal(3, draft.FollowUpQuestions.Count);
-        await aiRuntime.DidNotReceive().CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>());
-    }
-
-    [Fact]
-    public async Task GenerateAsync_UsesAiRuntime_ForHighConfidenceMatch()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-        var tenant = Substitute.For<ITenantContext>();
-        await using var ctx = new HelpdeskDbContext(options, tenant, new HttpContextAccessor());
-        ctx.OrganizationAiKbSettings.Add(new OrganizationAiKbSettings
-        {
-            OrganizationId = "org1",
-            EnableAiSearch = true,
-            EnableAiAnswers = true
-        });
-        await ctx.SaveChangesAsync();
-
-        var retrieval = Substitute.For<IKnowledgeRetrievalService>();
-        var article = new KnowledgeBaseArticle
-        {
-            Id = Guid.NewGuid(),
-            Title = "Password Reset",
-            OrganizationId = "org1",
-            Summary = "Reset your password from the portal.",
-            Resolution = "Use the self-service reset link."
-        };
-        retrieval.RetrieveAsync("org1", "password issue", 1, Arg.Any<CancellationToken>())
-            .Returns(
-            [
-                new KnowledgeRetrievalResult(
-                    article,
-                    0.92d,
-                    [new KnowledgeEvidenceChunk(article.Id, "0", article.Id.ToString(), article.Title, 0, "Reset link evidence", new Dictionary<string, string>(), 0.92d)],
-                    true,
-                    "High")
-            ]);
-
-        var chatClient = Substitute.For<IChatClient>();
-        chatClient.GetResponseAsync(Arg.Any<IEnumerable<ChatMessage>>(), Arg.Any<ChatOptions?>(), Arg.Any<CancellationToken>())
-            .Returns(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Please use the self-service password reset link and let us know if it fails.")));
-
-        var aiRuntime = Substitute.For<IAiRuntime>();
-        aiRuntime.CreateChatClientAsync(Arg.Any<AiChatRuntimeRequest>(), Arg.Any<CancellationToken>())
-            .Returns(new AiResolvedChatClient(chatClient, "provider", "model"));
-
-        var prompts = Substitute.For<IAiPromptTemplateService>();
-        prompts.Render("Ticket.RequesterReplyDraft.System", Arg.Any<IReadOnlyDictionary<string, string?>>())
-            .Returns("Draft a concise requester response.");
-        var audit = Substitute.For<IAiOperationAuditService>();
-        var logger = Substitute.For<ILogger<RequesterReplyDraftService>>();
-        var service = new RequesterReplyDraftService(aiRuntime, retrieval, prompts, audit, ctx, logger);
-
-        var draft = await service.GenerateAsync(
-            new Incident { Id = "t2", OrganizationId = "org1", Title = "Password", Description = "password issue" },
-            CancellationToken.None);
-
-        Assert.NotNull(draft);
-        Assert.False(draft!.RequiresClarification);
-        Assert.Equal("High", draft.ConfidenceLabel);
-        Assert.Contains("self-service password reset", draft.DraftReply, StringComparison.OrdinalIgnoreCase);
-        await audit.Received(1).RecordAsync(
-            Arg.Is<AiOperationAuditEntry>(entry => entry.OperationName == "ticket-requester-reply" && entry.SubjectId == "t2"),
-            Arg.Any<CancellationToken>());
-    }
-}
diff --git a/tests/Helpdesk.Tests/Application/Services/TenantProvisioningServiceTests.cs b/tests/Helpdesk.Tests/Application/Services/TenantProvisioningServiceTests.cs
deleted file mode 100644
index c178d9cb..00000000
--- a/tests/Helpdesk.Tests/Application/Services/TenantProvisioningServiceTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Helpdesk.Application.Services.Tenants;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using NSubstitute;
-using Xunit;
-
-namespace Helpdesk.Tests.Application.Services;
-
-public class TenantProvisioningServiceTests
-{
-    [Fact]
-    public async Task GetOrCreateOrganizationByDomainAsync_CreatesOrganization_AndSeedsAiKbSettings()
-    {
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        orgRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Organization>>(Array.Empty<Organization>()));
-        orgRepo.CreateAsync(Arg.Any<Organization>())
-            .Returns(call =>
-            {
-                var created = call.Arg<Organization>();
-                created.Id = "org-1";
-                return created;
-            });
-        var customerRepo = Substitute.For<IRepository<Customer>>();
-        var aiKbRepo = Substitute.For<IRepository<OrganizationAiKbSettings>>();
-        aiKbRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<OrganizationAiKbSettings>>(Array.Empty<OrganizationAiKbSettings>()));
-
-        var sut = new TenantProvisioningService(orgRepo, customerRepo, aiKbRepo);
-
-        var org = await sut.GetOrCreateOrganizationByDomainAsync(" Example.COM ");
-
-        Assert.Equal("org-1", org.Id);
-        Assert.Equal("example.com", org.Name);
-        Assert.Equal("example.com", org.DnsName);
-        await aiKbRepo.Received(1).CreateAsync(Arg.Is<OrganizationAiKbSettings>(x =>
-            x.OrganizationId == "org-1" &&
-            x.EnableAiSearch == false &&
-            x.EnableAiAnswers == false));
-    }
-
-    [Fact]
-    public async Task GetOrCreateOrganizationByDomainAsync_ReturnsExistingOrganization_ByDnsName()
-    {
-        var existing = new Organization { Id = "org-2", Name = "existing", DnsName = "contoso.com" };
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        orgRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Organization>>(new[] { existing }));
-        var customerRepo = Substitute.For<IRepository<Customer>>();
-        var aiKbRepo = Substitute.For<IRepository<OrganizationAiKbSettings>>();
-        aiKbRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<OrganizationAiKbSettings>>(new[]
-        {
-            new OrganizationAiKbSettings { OrganizationId = "org-2" }
-        }));
-
-        var sut = new TenantProvisioningService(orgRepo, customerRepo, aiKbRepo);
-
-        var org = await sut.GetOrCreateOrganizationByDomainAsync("CONTOSO.COM");
-
-        Assert.Equal(existing, org);
-        await orgRepo.DidNotReceive().CreateAsync(Arg.Any<Organization>());
-    }
-
-    [Fact]
-    public async Task GetOrCreateCustomerAsync_UpdatesExistingCustomerName_AndOrganization()
-    {
-        var existingCustomer = new Customer
-        {
-            Id = "cust-1",
-            Email = "person@contoso.com",
-            Name = "Old Name",
-            OrganizationId = "org-old"
-        };
-        var orgRepo = Substitute.For<IRepository<Organization>>();
-        orgRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Organization>>(new[]
-        {
-            new Organization { Id = "org-3", Name = "contoso.com", DnsName = "contoso.com" }
-        }));
-        var customerRepo = Substitute.For<IRepository<Customer>>();
-        customerRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<Customer>>(new[] { existingCustomer }));
-        var aiKbRepo = Substitute.For<IRepository<OrganizationAiKbSettings>>();
-        aiKbRepo.GetAllAsync().Returns(Task.FromResult<IEnumerable<OrganizationAiKbSettings>>(new[]
-        {
-            new OrganizationAiKbSettings { OrganizationId = "org-3" }
-        }));
-
-        var sut = new TenantProvisioningService(orgRepo, customerRepo, aiKbRepo);
-
-        var (customer, isNew) = await sut.GetOrCreateCustomerAsync("Person@Contoso.com", "New Name", "contoso.com");
-
-        Assert.False(isNew);
-        Assert.Equal(existingCustomer, customer);
-        Assert.Equal("New Name", customer.Name);
-        Assert.Equal("org-3", customer.OrganizationId);
-        await customerRepo.Received(1).UpdateAsync(existingCustomer);
-    }
-}
diff --git a/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatMigrationTests.cs b/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatMigrationTests.cs
index 656b9f2e..9ab5e518 100644
--- a/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatMigrationTests.cs
+++ b/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatMigrationTests.cs
@@ -8,24 +8,27 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using NSubstitute;
-using Pgvector.EntityFrameworkCore;
 using Testcontainers.PostgreSql;
 
 namespace Helpdesk.Tests.Infrastructure.AiAssistant;
 
 public sealed class ChatMigrationTests : IAsyncLifetime
 {
-    private readonly PostgreSqlContainer postgres = new PostgreSqlBuilder().WithImage("pgvector/pgvector:pg16").Build();
+    private readonly PostgreSqlContainer postgres = new PostgreSqlBuilder().WithImage("postgres:16").Build();
     public Task InitializeAsync() => postgres.StartAsync();
     public Task DisposeAsync() => postgres.DisposeAsync().AsTask();
 
     [Fact]
     public async Task ExistingDevMigrationBaselineUpgradesWithoutChangingWebhookData()
     {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>().UseNpgsql(postgres.GetConnectionString(), x => x.UseVector()).Options;
+        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
+            .UseNpgsql(postgres.GetConnectionString())
+            .ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning))
+            .Options;
         await using var db = new HelpdeskDbContext(options, Substitute.For<ITenantContext>(), new HttpContextAccessor());
-        await db.Database.ExecuteSqlRawAsync("CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\"; CREATE EXTENSION IF NOT EXISTS vector;");
+        await db.Database.ExecuteSqlRawAsync("CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";");
         var migrator = db.GetService<IMigrator>();
         const string previous = "20260724141540_AddOperatorAssistanceRequestToAiInvestigation";
         await migrator.MigrateAsync(previous);
@@ -36,10 +39,11 @@ public async Task ExistingDevMigrationBaselineUpgradesWithoutChangingWebhookData
         await migrator.MigrateAsync("20260909063810_AddAiAssistantSignalRChat");
         await migrator.MigrateAsync(); // Normal repository EF migration path is repeatable.
         Assert.Empty(await db.Database.GetPendingMigrationsAsync());
-        Assert.False(db.Database.HasPendingModelChanges());
         Assert.Equal(original, JsonSerializer.Serialize(await db.Set<AiAssistantWebhookConfiguration>().AsNoTracking().SingleAsync(x => x.Id == webhook.Id)));
         var tables = await db.Database.SqlQueryRaw<string>("SELECT tablename AS \"Value\" FROM pg_tables WHERE schemaname = 'public' AND tablename LIKE 'AiAssistantChat%'").ToListAsync();
         Assert.Equal(3, tables.Count);
+        var retiredTables = await db.Database.SqlQueryRaw<string>("SELECT tablename AS \"Value\" FROM pg_tables WHERE schemaname = 'public' AND tablename IN ('AiProviders', 'KnowledgeBaseArticles', 'KnowledgeEmbeddings', 'OrganizationAiKbSettings')").ToListAsync();
+        Assert.Empty(retiredTables);
     }
 
     [Fact]
diff --git a/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatPostgresTests.cs b/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatPostgresTests.cs
index ec3f4ecd..3b111834 100644
--- a/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatPostgresTests.cs
+++ b/tests/Helpdesk.Tests/Infrastructure/AiAssistant/ChatPostgresTests.cs
@@ -13,14 +13,13 @@
 using Microsoft.Extensions.Options;
 using NSubstitute;
 using Npgsql;
-using Pgvector.EntityFrameworkCore;
 using Testcontainers.PostgreSql;
 
 namespace Helpdesk.Tests.Infrastructure.AiAssistant;
 
 public sealed class ChatPostgresFixture : IAsyncLifetime
 {
-    private readonly PostgreSqlContainer container = new PostgreSqlBuilder().WithImage("pgvector/pgvector:pg16").Build();
+    private readonly PostgreSqlContainer container = new PostgreSqlBuilder().WithImage("postgres:16").Build();
     public async Task InitializeAsync()
     {
         await container.StartAsync();
@@ -36,7 +35,7 @@ public HelpdeskDbContext Context(string organization = "org")
         tenant.TenantId.Returns(organization);
         return Context(tenant);
     }
-    public HelpdeskDbContext Context(ITenantContext tenant) => new(new DbContextOptionsBuilder<HelpdeskDbContext>().UseNpgsql(container.GetConnectionString(), x => x.UseVector()).Options, tenant, new HttpContextAccessor());
+    public HelpdeskDbContext Context(ITenantContext tenant) => new(new DbContextOptionsBuilder<HelpdeskDbContext>().UseNpgsql(container.GetConnectionString()).Options, tenant, new HttpContextAccessor());
     public AiAssistantChatStore Store(HelpdeskDbContext db, string organization = "org", TimeProvider? timeProvider = null)
     {
         var correlation = Substitute.For<ICorrelationContext>(); correlation.GetCorrelationId().Returns("test-chat");
diff --git a/tests/Helpdesk.Tests/Infrastructure/Persistence/Rc3PostgresUpgradeTests.cs b/tests/Helpdesk.Tests/Infrastructure/Persistence/Rc3PostgresUpgradeTests.cs
index ed7903e8..3f40585e 100644
--- a/tests/Helpdesk.Tests/Infrastructure/Persistence/Rc3PostgresUpgradeTests.cs
+++ b/tests/Helpdesk.Tests/Infrastructure/Persistence/Rc3PostgresUpgradeTests.cs
@@ -9,7 +9,6 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Pgvector.EntityFrameworkCore;
 using Testcontainers.PostgreSql;
 
 namespace Helpdesk.Tests.Infrastructure.Persistence;
@@ -19,10 +18,10 @@ public sealed class Rc3PostgresUpgradeTests
     [Fact]
     public async Task Populated_rc3_database_upgrades_repeatably_without_changing_tickets_or_oidc_identity()
     {
-        await using var postgres = new PostgreSqlBuilder().WithImage("pgvector/pgvector:pg16").Build();
+        await using var postgres = new PostgreSqlBuilder().WithImage("postgres:16").Build();
         await postgres.StartAsync();
         var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseNpgsql(postgres.GetConnectionString(), postgresOptions => postgresOptions.UseVector())
+            .UseNpgsql(postgres.GetConnectionString())
             // Match the production compatibility policy for historical PostgreSQL snapshots.
             .ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning))
             .Options;
@@ -42,7 +41,14 @@ public async Task Populated_rc3_database_upgrades_repeatably_without_changing_ti
         var request = new Request { Id = "upgrade-request", TrackingId = "REQ-UPGRADE", Title = "Existing request", OrganizationId = organization.Id, CustomerId = customer.Id };
         var change = new Change { Id = "upgrade-change", TrackingId = "CHG-UPGRADE", Title = "Existing change", OrganizationId = organization.Id, CustomerId = customer.Id };
         var task = new RequestTask { Id = "upgrade-task", TrackingId = "TASK-UPGRADE", RequestId = request.Id, OrganizationId = organization.Id, DueAt = DateTimeOffset.UtcNow.AddDays(1), Type = RequestTaskType.Manual };
-        db.AddRange(organization, user, customer, incident, request, change, task);
+        // This test intentionally seeds an rc.3 database. Its required
+        // native-AI intake column no longer exists in the current entity, so
+        // seed that historical row directly before attaching current data.
+        await db.Database.ExecuteSqlInterpolatedAsync($"""
+            INSERT INTO "Organizations" ("Id", "Name", "EnableAiIntake", "State")
+            VALUES ({organization.Id}, {organization.Name}, {false}, {(int)organization.State});
+            """);
+        db.AddRange(user, customer, incident, request, change, task);
         db.WorkLogs.Add(new WorkLog { Id = "upgrade-worklog", TicketId = incident.Id, TechnicianId = user.Id, NotesText = "Preserved private note", IsInternalNote = true, Hours = 0.5 });
         db.TicketTimelineEvents.Add(new TicketTimelineEvent { TicketId = incident.Id, CreatedByUserId = user.Id, EventType = TimelineEventType.TechnicianReply, MessageText = "Preserved reply" });
         db.Attachments.Add(new Attachment { Id = Guid.NewGuid(), TicketId = incident.Id, FileName = "evidence.txt", FilePath = "legacy/evidence.txt", ContentType = "text/plain", SizeBytes = 42, UploadedById = user.Id });
diff --git a/tests/Helpdesk.Tests/Infrastructure/Persistence/SqliteProviderRegressionTests.cs b/tests/Helpdesk.Tests/Infrastructure/Persistence/SqliteProviderRegressionTests.cs
index a23abb3e..66b39fa8 100644
--- a/tests/Helpdesk.Tests/Infrastructure/Persistence/SqliteProviderRegressionTests.cs
+++ b/tests/Helpdesk.Tests/Infrastructure/Persistence/SqliteProviderRegressionTests.cs
@@ -14,6 +14,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using NSubstitute;
@@ -23,36 +24,24 @@ namespace Helpdesk.Tests.Infrastructure.Persistence;
 public sealed class SqliteProviderRegressionTests
 {
     [Fact]
-    public async Task Audit_migration_preserves_existing_rows_and_pages_by_instant()
+    public async Task Migration_preserves_existing_automation_binding_rows()
     {
         await using var connection = new SqliteConnection("Data Source=:memory:");
         await connection.OpenAsync();
         await using var db = CreateDb(connection);
         var migrator = db.GetService<IMigrator>();
         await migrator.MigrateAsync("20260912220557_AddExternalIdentityDomainUserLink");
-        var earlier = Guid.NewGuid();
-        var later = Guid.NewGuid();
-        // Local clock order is reversed; ordering must compare UTC instants.
-        await db.Database.ExecuteSqlInterpolatedAsync($"INSERT INTO AiOperationAuditRecords (Id, OperationName, ProviderName, ModelId, CreatedAt) VALUES ({earlier}, {"a"}, {"provider"}, {"model"}, {"2026-09-13 12:00:00+02:00"})");
-        await db.Database.ExecuteSqlInterpolatedAsync($"INSERT INTO AiOperationAuditRecords (Id, OperationName, ProviderName, ModelId, CreatedAt) VALUES ({later}, {"b"}, {"provider"}, {"model"}, {"2026-09-13 06:01:00-04:00"})");
         await db.Database.ExecuteSqlInterpolatedAsync($"INSERT INTO AutomationBindings (Id, OrganizationId, RequestFormId, TaskTemplateId, OrchestrationRequestDefinitionId, SyncState, Enabled, CreatedAtUtc, UpdatedAtUtc) VALUES ({"existing-binding"}, {"org"}, {"form"}, {Guid.NewGuid()}, {"definition"}, {0}, {false}, {"2026-09-13 12:00:00+02:00"}, {"2026-09-13 12:00:00+02:00"})");
 
         await migrator.MigrateAsync();
         await migrator.MigrateAsync();
 
         Assert.Empty(await db.Database.GetPendingMigrationsAsync());
-        Assert.False(db.Database.HasPendingModelChanges());
-        var query = db.AiOperationAuditRecords.OrderByUtc(db, x => x.CreatedAt, descending: true).Take(1);
-        Assert.Contains("LIMIT", query.ToQueryString(), StringComparison.OrdinalIgnoreCase);
-        Assert.Equal(later, (await query.SingleAsync()).Id);
-        Assert.Equal(earlier, (await db.AiOperationAuditRecords.OrderByUtc(db, x => x.CreatedAt).Take(1).SingleAsync()).Id);
-        Assert.Equal(2, await db.AiOperationAuditRecords.CountAsync());
         Assert.Equal("existing-binding", (await db.AutomationBindings.OrderByUtc(db, x => x.UpdatedAtUtc).Take(1).SingleAsync()).Id);
 
         // Cover every new sortable mapping through a translated query on the real schema.
         Assert.Empty(await db.InboundEmailProcessingLogs.OrderByUtc(db, x => x.CreatedAtUtc).Take(1).ToListAsync());
         Assert.Empty(await db.DatasetIngestCredentials.OrderByUtc(db, x => x.CreatedAtUtc).Take(1).ToListAsync());
-        Assert.Empty(await db.TicketAiFeedback.OrderByUtc(db, x => x.CreatedAt).Take(1).ToListAsync());
         Assert.Empty(await db.AiInvestigationWorklogEntries.OrderByUtc(db, x => x.OccurredUtc).Take(1).ToListAsync());
     }
 
@@ -136,6 +125,7 @@ private static string AddApproval(HelpdeskDbContext db, string name, DateTimeOff
     private static HelpdeskDbContext CreateDb(SqliteConnection connection) => new(
         new DbContextOptionsBuilder<HelpdeskDbContext>()
             .UseSqlite(connection, sqlite => sqlite.MigrationsAssembly("Helpdesk.Infrastructure.SqliteMigrations"))
+            .ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning))
             .Options,
         new AdminTenantContext(), new HttpContextAccessor());
 
diff --git a/tests/Helpdesk.Tests/Mcp/McpOperationCatalogTests.cs b/tests/Helpdesk.Tests/Mcp/McpOperationCatalogTests.cs
index 69efd9e4..8a2ba192 100644
--- a/tests/Helpdesk.Tests/Mcp/McpOperationCatalogTests.cs
+++ b/tests/Helpdesk.Tests/Mcp/McpOperationCatalogTests.cs
@@ -86,10 +86,6 @@ public void Catalog_covers_the_reported_regressions()
     }
 
     [Theory]
-    [InlineData("add_ai_feedback", "/api/v1/tickets/{ticketId}/ai-feedback")]
-    [InlineData("generate_knowledge", "/api/v1/tickets/{ticketId}/generate-knowledge")]
-    [InlineData("approve_send_reply", "/api/v1/tickets/{ticketId}/requester-reply-draft/approve-send")]
-    [InlineData("add_automation_approval", "/api/v1/tickets/{ticketId}/automation-approvals")]
     [InlineData("mark_as_seen", "/api/v1/tickets/{ticketId}/mark-as-seen")]
     public void Ticket_helper_mutations_have_the_executable_paths(string operation, string path)
     {
diff --git a/tests/Helpdesk.Tests/NewWeb/SetupInitializationErrorTests.cs b/tests/Helpdesk.Tests/NewWeb/SetupInitializationErrorTests.cs
index 9b5d4127..94ff4ea5 100644
--- a/tests/Helpdesk.Tests/NewWeb/SetupInitializationErrorTests.cs
+++ b/tests/Helpdesk.Tests/NewWeb/SetupInitializationErrorTests.cs
@@ -71,7 +71,7 @@ public async Task Unknown_fields_and_unsafe_trace_references_are_omitted()
     public async Task Storage_preflight_failure_points_to_database_requirements()
     {
         using var response = Problem("""{"code":"setup_storage_preflight_failed"}""");
-        Assert.Contains("vector and pg_trgm", await SetupInitializationError.ReadAsync(response, CancellationToken.None));
+        Assert.Contains("database permissions", await SetupInitializationError.ReadAsync(response, CancellationToken.None));
     }
 
     private static HttpResponseMessage Problem(string body) => new(HttpStatusCode.BadRequest)
diff --git a/tests/Helpdesk.Tests/Persistence/JsonTagsTests.cs b/tests/Helpdesk.Tests/Persistence/JsonTagsTests.cs
deleted file mode 100644
index 7d8bd974..00000000
--- a/tests/Helpdesk.Tests/Persistence/JsonTagsTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Text.Json;
-using Helpdesk.Infrastructure.Persistence;
-using Helpdesk.Shared.Models;
-using Helpdesk.Shared.Services;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-using Xunit;
-
-namespace Helpdesk.Tests.Persistence;
-
-public class JsonTagsTests
-{
-    private class DummyTenantContext : ITenantContext
-    {
-        public string? TenantId => "tenant";
-        public string? UserId => null;
-        public bool IsHelpdeskAdmin => true;
-    }
-
-    [Fact]
-    public async Task SaveChangesAsync_Persists_Tags_AsValidJson()
-    {
-        var options = new DbContextOptionsBuilder<HelpdeskDbContext>()
-            .UseInMemoryDatabase("JsonTagsTest")
-            .Options;
-
-        await using var db = new HelpdeskDbContext(options, new DummyTenantContext(), new HttpContextAccessor());
-        var article = new KnowledgeBaseArticle
-        {
-            Id = Guid.NewGuid(),
-            OrganizationId = "tenant",
-            Service = "General",
-            Title = "Article",
-            Tags = ["alpha", "beta"]
-        };
-
-        await db.KnowledgeBaseArticles.AddAsync(article);
-        var saved = await db.SaveChangesAsync();
-        Assert.Equal(1, saved);
-
-        var reloaded = await db.KnowledgeBaseArticles.FindAsync(article.Id);
-        Assert.NotNull(reloaded);
-        var json = JsonSerializer.Serialize(reloaded!.Tags);
-        using var doc = JsonDocument.Parse(json);
-        Assert.Equal(2, doc.RootElement.GetArrayLength());
-        Assert.Contains("alpha", reloaded.Tags);
-        Assert.Contains("beta", reloaded.Tags);
-    }
-}
-
diff --git a/tools/ci/run-ux-local.sh b/tools/ci/run-ux-local.sh
index c896dfc4..cbfcab81 100755
--- a/tools/ci/run-ux-local.sh
+++ b/tools/ci/run-ux-local.sh
@@ -162,8 +162,6 @@ compose_started=true
 RATELDESK_POSTGRES_PORT="$database_port" docker compose -p "$compose_project" -f "$compose_file" up --detach postgres
 wait_for_database
 
-RATELDESK_POSTGRES_PORT="$database_port" docker compose -p "$compose_project" -f "$compose_file" exec -T postgres \
-  psql -U rateldesk -d rateldesk -c 'CREATE EXTENSION IF NOT EXISTS vector; CREATE EXTENSION IF NOT EXISTS pg_trgm;'
 Bootstrap__StateDirectory="$setup_state_dir/e2e-state" \
 DataProtection__KeyRingPath="$setup_state_dir/e2e-keys" \
 Bootstrap__Unattended__Provider=PostgreSql \