v0.1.29 — Geraete-Offboarding (v1)

Neu:
- Geraete-Offboarding: Geraete ueber Intune, Autopilot und Entra ID
  entfernen. Suche + ID-Aufloesung (via $batch), Recovery-Keys
  (BitLocker/FileVault/LAPS) vor dem Loeschen, Bestaetigungs-Dialog mit
  Dienst-Auswahl + 403/Multi-Admin-Approval-Handling, im Read-Only gesperrt.
  Neues Modul src/Offboard.ps1, Endpoints /api/offboard/{search,keys,execute}.
  Portiert aus Device Offboarding Manager (Ugur Koc, MIT).
- Offboarding-Berechtigungen dokumentiert; Setup-Skript -IncludeOffboarding.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

CHANGELOG.md

@@ -5,6 +5,38 @@ Versionierung folgt [Semantic Versioning](https://semver.org/lang/de/) — solan
 
 ---
 
+## [0.1.29] - 2026-08-24
+
+Geräte-Offboarding (v1).
+
+### Neu
+
+- **Geräte-Offboarding** als neue Ansicht: Geräte über **Intune, Autopilot und Entra ID** hinweg entfernen (Decommissioning). Portiert aus dem [Device Offboarding Manager](https://github.com/ugurkocde/DeviceOffboardingManager) von Ugur Koc (MIT-Lizenz).
+  - Suche per Gerätename/Seriennummer, Auflösung der IDs über alle drei Dienste (`$batch`)
+  - **Recovery-Keys vor dem Löschen**: BitLocker/FileVault und LAPS-Passwörter werden angezeigt
+  - Bestätigungs-Dialog mit Dienst-Auswahl (Entra löschen/deaktivieren, Intune, Autopilot), Pflicht-Bestätigung und Ergebnis-Liste; **403/Multi-Admin-Approval** wird abgefangen
+  - Im **Read-Only-Modus gesperrt**
+  - Neue Endpoints: `GET /api/offboard/search`, `POST /api/offboard/keys`, `POST /api/offboard/execute` (neues Modul `src/Offboard.ps1`)
+  - Zusätzliche Berechtigungen dokumentiert; Setup-Skript-Schalter `-IncludeOffboarding`. (MDE-Offboarding bewusst nicht in v1.)
+
+---
+
+## [0.1.28] - 2026-08-24
+
+Umbenennen beim Import, UI-Fixes, Geräte-Export repariert.
+
+### Neu
+
+- **Umbenennen beim Import**: Vor dem Anlegen kann jeder importierten Policy im neuen Dialog „Policies importieren" ein anderer Name gegeben werden (das richtige Namensfeld je Typ — `name`/`displayName` — wird gesetzt).
+
+### Behoben
+
+- **Geräte-Export im App Report**: Der von Graph entfernte synchrone Endpoint `getDeviceInstallStatusReport` (400 „Resource not found for the segment") ist durch den asynchronen Export-Job **`DeviceInstallStatusByApp`** ersetzt (ZIP/CSV-Auswertung, tolerantes Spalten-Mapping). ZIP/CSV-Logik in `Get-IntuneReportRows` ausgelagert.
+- **Darkmode-Kontrast** im Zuweisungs-Dialog: Gruppen-Chips nutzen jetzt die Theme-Variablen (`--surface-strong`/`--ink` statt fester heller Farben) — heller Text auf hellem Chip behoben.
+- **Dialog-Breite**: Lange Policy-Namen im Zuweisungs-/Import-Dialog brechen jetzt um (`overflow-wrap`/`flex-wrap`) statt horizontal zu scrollen; das Fenster passt sich der Breite an.
+
+---
+
 ## [0.1.27] - 2026-08-23
 
 Policy-Import härter, Administrative Vorlagen, Zuweisung nach Import, Git-Snapshot, App-Registrierungs-Doku.

Start.ps1

@@ -137,6 +137,7 @@ if (-not $SkipModuleCheck) {
 . (Join-Path $root "src/Graph.ps1")
 . (Join-Path $root "src/Api.ps1")
 . (Join-Path $root "src/PolicyIO.ps1")
+. (Join-Path $root "src/Offboard.ps1")
 . (Join-Path $root "src/Router.ps1")
 . (Join-Path $root "src/Server.ps1")
 
@@ -188,7 +189,7 @@ $script:State = [pscustomobject]@{
     Session        = @()      # geplante Zuweisungen
 }
 
-$script:ToolVersion = "0.1.27"
+$script:ToolVersion = "0.1.29"
 $script:BuildStamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
 
 Write-Host ""

docs/App-Registration.md

@@ -42,6 +42,26 @@ Nur nötig, wenn der **Geräte-Tab** (Sync/Reboot/Lock/Diagnose/Wipe/Retire) gen
 | `DeviceManagementManagedDevices.ReadWrite.All` | Sync, Neustart, Remote-Lock, Diagnose, BitLocker-Key-Rotation |
 | `DeviceManagementManagedDevices.PrivilegedOperations.All` | Wipe, Retire, Autopilot-Reset |
 
+### Geräte-Offboarding (optional)
+
+Nur nötig, wenn die **Offboarding**-Ansicht (Geräte aus Intune + Autopilot + Entra
+entfernen, Recovery-Keys lesen) genutzt wird:
+
+| Berechtigung | Wofür |
+|---|---|
+| `Device.ReadWrite.All` | Gerät aus Entra ID löschen/deaktivieren |
+| `DeviceManagementManagedDevices.ReadWrite.All` | Gerät aus Intune löschen |
+| `DeviceManagementServiceConfig.ReadWrite.All` | Gerät aus Autopilot löschen |
+| `BitlockerKey.Read.All` | BitLocker-Recovery-Keys lesen |
+| `DeviceLocalCredential.Read.All` | LAPS-Passwörter lesen |
+
+> **Wichtig:** Löschen aus Entra/Intune/Autopilot benötigt bei delegierter
+> Anmeldung zusätzlich **Verzeichnis-/Intune-Rollen** (Cloud Device Administrator
+> bzw. Intune Administrator) — die Scopes allein reichen nicht, sonst `403`.
+> Diese Scopes müssen außerdem in den **Read/Write-Scopes** des Tools eingetragen
+> sein (Einstellungen → Verbindung), damit sie im Token landen.
+> Skript: `.\docs\Setup-AppRegistration.ps1 -IncludeOffboarding -GrantAdminConsent`
+
 ### Read-Only-Variante
 
 Für eine reine Anzeige-App (im Tool als `clientIdRo` hinterlegbar) genügen die

docs/Setup-AppRegistration.ps1

@@ -61,6 +61,7 @@ param(
     [switch]$MultiTenant,
     [switch]$ReadOnly,
     [switch]$IncludeDeviceActions,
+    [switch]$IncludeOffboarding,
     [switch]$GrantAdminConsent,
     [switch]$EmitManifest
 )
@@ -85,6 +86,18 @@ if ($IncludeDeviceActions) {
           'DeviceManagementManagedDevices.PrivilegedOperations.All')
     }
 }
+if ($IncludeOffboarding) {
+    # Geraete ueber Intune/Autopilot/Entra entfernen + Recovery-Keys lesen.
+    # ACHTUNG: Loeschen braucht zusaetzlich Verzeichnis-/Intune-ROLLEN (Cloud
+    # Device Administrator / Intune Administrator) — nicht nur diese Scopes.
+    $perms += @(
+        'Device.ReadWrite.All',
+        'DeviceManagementManagedDevices.ReadWrite.All',
+        'DeviceManagementServiceConfig.ReadWrite.All',
+        'BitlockerKey.Read.All',
+        'DeviceLocalCredential.Read.All'
+    )
+}
 $perms = $perms | Select-Object -Unique
 
 # --- Verbinden ----------------------------------------------------------------

installer/build-local.ps1

@@ -12,7 +12,7 @@ if (Test-Path "$x64Dotnet\dotnet.exe") {
     $env:DOTNET_ROOT = "C:\Program Files\dotnet"
 }
 
-$version      = "0.1.27"
+$version      = "0.1.29"
 $src          = "\\Mac\Home\ClaudePRJ\Intune Manager"
 $stage        = "$env:TEMP\IntuneManagerStage"
 $installerDir = "$src\installer"

src/Api.ps1

@@ -60,6 +60,10 @@ function Invoke-ApiHandler {
         "POST /api/policies/assign"       { return Invoke-PolicyAssignEndpoint -Body $Body }
         "POST /api/policies/git-snapshot" { return Invoke-PolicyGitSnapshotEndpoint }
         "POST /api/pickfolder"            { return Invoke-FolderPickerEndpoint -Body $Body }
+
+        "GET /api/offboard/search"        { return Search-OffboardDevicesEndpoint -Query $Query }
+        "POST /api/offboard/keys"         { return Get-OffboardKeysEndpoint -Body $Body }
+        "POST /api/offboard/execute"      { return Invoke-OffboardExecuteEndpoint -Body $Body }
     }
 
     # 2-segment fallbacks (z.B. /api/groups/<id>/members)
@@ -1995,8 +1999,49 @@ function Get-AppInstallReportEndpoint {
     return @{ items = $items; count = $items.Count }
 }
 
+# Intune-Report via asynchronem Export-Job (exportJobs) -> CSV-Zeilen.
+# Kein 'select' (unbekannte Spalten wuerden 400 ausloesen) — der Aufrufer
+# greift tolerant auf die tatsaechlich gelieferten Spalten zu.
+function Get-IntuneReportRows {
+    param(
+        [Parameter(Mandatory=$true)][string]$ReportName,
+        [string]$Filter = '',
+        [int]$TimeoutSec = 120
+    )
+    $jobBody = @{ reportName = $ReportName; filter = $Filter } | ConvertTo-Json -Compress
+    $job = Invoke-MgGraphRequestRetry `
+        -Uri 'https://graph.microsoft.com/beta/deviceManagement/reports/exportJobs' `
+        -Method POST -Body $jobBody -ContentType 'application/json'
+    $jobId  = $job.id
+    $status = $job.status
+    $waited = 0
+    while ($status -ne 'completed' -and $status -ne 'failed' -and $waited -lt $TimeoutSec) {
+        Start-Sleep -Seconds 3
+        $waited += 3
+        $job    = Invoke-MgGraphRequestRetry -Uri "https://graph.microsoft.com/beta/deviceManagement/reports/exportJobs/$jobId"
+        $status = $job.status
+    }
+    if ($status -ne 'completed') { throw "Export-Job '$ReportName' nicht abgeschlossen (Status: $status nach $waited s)" }
+
+    $tmpZip = [System.IO.Path]::GetTempFileName() + '.zip'
+    $tmpDir = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), "IntuneReport_$jobId")
+    try {
+        Invoke-WebRequest -Uri $job.url -OutFile $tmpZip -UseBasicParsing
+        Add-Type -AssemblyName System.IO.Compression.FileSystem
+        [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpZip, $tmpDir)
+        $csv = Get-ChildItem -Path $tmpDir -Filter '*.csv' | Select-Object -First 1
+        if (-not $csv) { throw "Keine CSV im Export-ZIP gefunden" }
+        return @(Import-Csv -Path $csv.FullName -Encoding UTF8)
+    } finally {
+        Remove-Item -Path $tmpZip -Force -ErrorAction SilentlyContinue
+        Remove-Item -Path $tmpDir -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
+
 function Get-AppDeviceStatusEndpoint {
-    # Verwendet getDeviceInstallStatusReport (synchron, paginiert) statt deviceStatuses.
+    # Per-Device-Installationsstatus einer App via Export-Job 'DeviceInstallStatusByApp'.
+    # (Der frueher genutzte synchrone Endpoint getDeviceInstallStatusReport existiert
+    #  nicht mehr -> 400 "Resource not found for the segment".)
     param([hashtable]$Query)
     $err = Test-Connected
     if ($err) { return $err }
@@ -2006,58 +2051,38 @@ function Get-AppDeviceStatusEndpoint {
         return @{ __status = 400; error = "appId fehlt" }
     }
 
-    Write-Host "[DEVSTATUS] Lade Install-Status fuer App $appId via Reports-API..." -ForegroundColor DarkCyan
+    Write-Host "[DEVSTATUS] Export-Job (DeviceInstallStatusByApp) fuer App $appId..." -ForegroundColor DarkCyan
-    $pageSize = 50
+    try {
-    $skip     = 0
+        $rows = @(Get-IntuneReportRows -ReportName 'DeviceInstallStatusByApp' -Filter "(ApplicationId eq '$appId')")
-    $allRows  = @()
+    } catch {
-    $cols     = $null
+        $msg = $_.Exception.Message
-
+        try { if ($_.ErrorDetails.Message) { $msg = $_.ErrorDetails.Message } } catch {}
-    do {
+        return @{ __status = 500; error = "Graph-Fehler: $msg" }
-        $bodyJson = "{""filter"":""(ApplicationId eq '$appId')"",""select"":[],""skip"":$skip,""top"":$pageSize,""orderBy"":[]}"
-        try {
-            $resp = Invoke-MgGraphRequestRetry `
-                -Uri    'https://graph.microsoft.com/beta/deviceManagement/reports/getDeviceInstallStatusReport' `
-                -Method POST -Body $bodyJson -ContentType 'application/json'
-        } catch {
-            return @{ __status = 500; error = "Graph-Fehler: $($_.Exception.Message)" }
-        }
-
-        if (-not $cols) {
-            $cols = @($resp.Schema | ForEach-Object { $_.Column })
-            Write-Host "  [DEVSTATUS] Spalten: $($cols -join ',')" -ForegroundColor DarkGray
-        }
-        $rows = @($resp.Values)
-        $allRows += $rows
-        $skip += $pageSize
-    } while ($rows.Count -eq $pageSize)
-
-    Write-Host "  -> $($allRows.Count) Eintraege" -ForegroundColor DarkGray
-
-    if (-not $cols -or $allRows.Count -eq 0) {
-        return @{ items = @(); count = 0 }
     }
+    Write-Host "  -> $($rows.Count) Eintraege" -ForegroundColor DarkGray
+    if ($rows.Count -eq 0) { return @{ items = @(); count = 0 } }
 
-    function ColIdx($name) { [Array]::IndexOf($cols, $name) }
+    Write-Host "  [DEVSTATUS] Spalten: $(($rows[0].PSObject.Properties.Name) -join ',')" -ForegroundColor DarkGray
-    $iDevice    = ColIdx 'DeviceName'
-    $iUser      = ColIdx 'UserName'
-    $iState     = ColIdx 'InstallState'
-    $iDetail    = ColIdx 'InstallStateDetail'
-    $iErr       = ColIdx 'ErrorCode'
-    $iOs        = ColIdx 'OSVersion'
-    $iSync      = ColIdx 'LastModifiedDateTime'
-    if ($iOs    -lt 0) { $iOs   = ColIdx 'OsVersion' }
-    if ($iSync  -lt 0) { $iSync = ColIdx 'LastSyncDateTime' }
 
-    $result = @($allRows | ForEach-Object {
+    # Spaltennamen des Reports koennen variieren -> tolerant mit Fallbacks lesen.
+    $col = {
+        param($row, [string[]]$names)
+        foreach ($n in $names) {
+            $p = $row.PSObject.Properties[$n]
+            if ($p -and $null -ne $p.Value -and [string]$p.Value -ne '') { return [string]$p.Value }
+        }
+        return ''
+    }
+    $result = @($rows | ForEach-Object {
         $r = $_
         [pscustomobject]@{
-            DeviceName         = if ($iDevice -ge 0) { [string]$r[$iDevice] } else { '' }
+            DeviceName         = & $col $r @('DeviceName')
-            UserName           = if ($iUser   -ge 0) { [string]$r[$iUser]   } else { '' }
+            UserName           = & $col $r @('UserName','UserPrincipalName')
-            InstallState       = if ($iState  -ge 0) { [string]$r[$iState]  } else { '' }
+            InstallState       = & $col $r @('InstallState_loc','InstallState','AppInstallState_loc','AppInstallState')
-            InstallStateDetail = if ($iDetail -ge 0) { [string]$r[$iDetail] } else { '' }
+            InstallStateDetail = & $col $r @('InstallStateDetail_loc','InstallStateDetail','AppInstallStateDetail_loc','AppInstallStateDetail')
-            ErrorCode          = if ($iErr    -ge 0) { [string]$r[$iErr]    } else { '' }
+            ErrorCode          = & $col $r @('ErrorCode','HexErrorCode')
-            OsVersion          = if ($iOs     -ge 0) { [string]$r[$iOs]     } else { '' }
+            OsVersion          = & $col $r @('OSVersion','OsVersion','Platform')
-            LastSyncDateTime   = if ($iSync   -ge 0) { [string]$r[$iSync]   } else { '' }
+            LastSyncDateTime   = & $col $r @('LastModifiedDateTime','LastSyncDateTime')
         }
     })
 

src/Offboard.ps1

@@ -0,0 +1,238 @@
+# Geraete-Offboarding: ein Geraet ueber Intune, Autopilot und Entra ID hinweg
+# entfernen (Decommissioning). Vor dem Loeschen koennen BitLocker-/FileVault-Keys
+# und LAPS-Passwoerter ausgelesen werden, damit sie nicht verloren gehen.
+#
+# Portiert aus dem "Device Offboarding Manager" (Ugur Koc, MIT-Lizenz) — dort
+# WPF, hier als Web-Endpoints in den Intune Manager integriert.
+#
+# Loeschen ist destruktiv -> im Read-Only-Modus gesperrt, harte Bestaetigung im UI.
+
+# Generischer Microsoft-Graph-$batch-Helper. Nimmt Sub-Requests
+# ( @{ id; method; url; body?; headers? } ) und liefert eine Map id -> Response.
+function Invoke-GraphBatch {
+    param([Parameter(Mandatory=$true)][object[]]$Requests)
+    $map = @{}
+    for ($i = 0; $i -lt $Requests.Count; $i += 20) {
+        $chunk = $Requests[$i .. [Math]::Min($i + 19, $Requests.Count - 1)]
+        $body  = @{ requests = @($chunk) } | ConvertTo-Json -Depth 10 -Compress
+        $resp  = Invoke-MgGraphRequestRetry -Uri 'https://graph.microsoft.com/beta/$batch' -Method POST -Body $body -ContentType 'application/json'
+        foreach ($r in @($resp.responses)) { $map[[string]$r.id] = $r }
+    }
+    return $map
+}
+
+# Graph-Fehlermeldung aus einer Exception ziehen (Body statt generischer Text).
+function Get-OffboardGraphErr {
+    param($ErrorRecord)
+    $m = $ErrorRecord.Exception.Message
+    try { if ($ErrorRecord.ErrorDetails.Message) { $m = $ErrorRecord.ErrorDetails.Message } } catch {}
+    return $m
+}
+
+# Geraete suchen und ueber die drei Dienste hinweg aufloesen.
+# Query: query=<text>, type=name|serial
+function Search-OffboardDevicesEndpoint {
+    param([hashtable]$Query)
+    $err = Test-Connected
+    if ($err) { return $err }
+
+    $q    = [string]$Query['query']
+    $type = [string]$Query['type']
+    if ([string]::IsNullOrWhiteSpace($q)) { return @{ __status = 400; error = 'Suchbegriff fehlt' } }
+    $qEsc = $q -replace "'", "''"
+
+    # managedDevices unterstuetzt startswith(deviceName) bzw. serialNumber eq.
+    $filter = if ($type -eq 'serial') { "serialNumber eq '$qEsc'" } else { "startswith(deviceName,'$qEsc')" }
+    $sel    = 'id,deviceName,serialNumber,operatingSystem,osVersion,userPrincipalName,lastSyncDateTime,azureADDeviceId,managedDeviceOwnerType,managementAgent'
+    $uri    = "https://graph.microsoft.com/beta/deviceManagement/managedDevices?`$filter=$([Uri]::EscapeDataString($filter))&`$select=$sel&`$top=50&`$orderby=deviceName"
+    try {
+        $intune = @(Get-GraphPaged -Uri $uri)
+    } catch {
+        $m = Get-OffboardGraphErr $_
+        if ($m -match '403|Forbidden') {
+            return @{ __status = 403; error = 'Keine Berechtigung fuer die Geraete-Suche. Scope "DeviceManagementManagedDevices.Read.All" muss in den Read/Write-Scopes stehen UND per Admin-Consent zugestimmt sein (siehe docs/App-Registration.md). Nach dem Ergaenzen: ab- und neu anmelden.' }
+        }
+        return @{ __status = 500; error = "Graph-Fehler bei der Suche: $m" }
+    }
+    if ($intune.Count -eq 0) { return @{ items = @(); count = 0 } }
+
+    # Entra-Objekt (fuer Delete) + Autopilot-Identity (fuer Delete) per Batch nachladen.
+    $reqs = @()
+    $idx  = 0
+    foreach ($d in $intune) {
+        $aad = [string]$d.azureADDeviceId
+        $ser = [string]$d.serialNumber
+        if ($aad -and $aad -ne '00000000-0000-0000-0000-000000000000') {
+            $f = [Uri]::EscapeDataString("deviceId eq '$aad'")
+            $reqs += @{ id = "e$idx"; method = 'GET'; url = "/devices?`$filter=$f&`$select=id,deviceId,displayName,accountEnabled&`$top=1" }
+        }
+        if ($ser) {
+            $sf = [Uri]::EscapeDataString("contains(serialNumber,'$($ser -replace "'","''")')")
+            $reqs += @{ id = "a$idx"; method = 'GET'; url = "/deviceManagement/windowsAutopilotDeviceIdentities?`$filter=$sf&`$top=1" }
+        }
+        $idx++
+    }
+    $batch = if ($reqs.Count -gt 0) { Invoke-GraphBatch -Requests $reqs } else { @{} }
+
+    $items = @()
+    $idx   = 0
+    foreach ($d in $intune) {
+        $entra = $null; $autop = $null
+        $er = $batch["e$idx"]; if ($er -and [int]$er.status -eq 200) { $entra = @($er.body.value)[0] }
+        $ar = $batch["a$idx"]; if ($ar -and [int]$ar.status -eq 200) { $autop = @($ar.body.value)[0] }
+        $items += [pscustomobject]@{
+            deviceName      = [string]$d.deviceName
+            serialNumber    = [string]$d.serialNumber
+            operatingSystem = [string]$d.operatingSystem
+            osVersion       = [string]$d.osVersion
+            primaryUser     = [string]$d.userPrincipalName
+            lastSync        = $d.lastSyncDateTime
+            ownership       = [string]$d.managedDeviceOwnerType
+            coManaged       = ([string]$d.managementAgent -match 'configurationManager')
+            intuneDeviceId  = [string]$d.id
+            azureADDeviceId = [string]$d.azureADDeviceId
+            entraObjectId   = if ($entra) { [string]$entra.id } else { '' }
+            entraEnabled    = if ($entra) { [bool]$entra.accountEnabled } else { $null }
+            autopilotId     = if ($autop) { [string]$autop.id } else { '' }
+            inIntune        = $true
+            inEntra         = [bool]$entra
+            inAutopilot     = [bool]$autop
+        }
+        $idx++
+    }
+    return @{ items = @($items); count = $items.Count }
+}
+
+# Recovery-Keys eines Geraets holen (vor dem Loeschen). Body:
+#   { intuneDeviceId, azureADDeviceId, operatingSystem }
+function Get-OffboardKeysEndpoint {
+    param($Body)
+    $err = Test-Connected
+    if ($err) { return $err }
+
+    $intuneId = [string](Get-PolicyProp $Body 'intuneDeviceId')
+    $aad      = [string](Get-PolicyProp $Body 'azureADDeviceId')
+    $os       = [string](Get-PolicyProp $Body 'operatingSystem')
+
+    $bitlocker = @()
+    $fileVault = $null
+    $laps      = $null
+    $notes     = @()
+
+    if ($os -eq 'Windows' -and $aad) {
+        try {
+            $keyIds = @(Get-GraphPaged -Uri "https://graph.microsoft.com/beta/informationProtection/bitlocker/recoveryKeys?`$filter=deviceId eq '$aad'")
+            foreach ($k in $keyIds) {
+                try {
+                    $kd = Invoke-MgGraphRequestRetry -Uri "https://graph.microsoft.com/beta/informationProtection/bitlocker/recoveryKeys/$($k.id)?`$select=key,volumeType" -Method GET
+                    if ($kd.key) { $bitlocker += @{ volumeType = [string]$kd.volumeType; key = [string]$kd.key } }
+                } catch {}
+            }
+            if ($bitlocker.Count -eq 0) { $notes += 'Kein BitLocker-Key gefunden.' }
+        } catch {
+            $m = Get-OffboardGraphErr $_
+            $notes += if ($m -match '403') { 'BitLocker: Zugriff verweigert (BitlockerKey.Read.All noetig).' } else { "BitLocker: $m" }
+        }
+    }
+    elseif ($os -eq 'macOS' -and $intuneId) {
+        try {
+            $fv = Invoke-MgGraphRequestRetry -Uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices('$intuneId')/getFileVaultKey" -Method GET
+            if ($fv.value) { $fileVault = [string]$fv.value } else { $notes += 'Kein FileVault-Key gefunden.' }
+        } catch { $notes += "FileVault: $(Get-OffboardGraphErr $_)" }
+    }
+
+    # LAPS (jede Plattform, ueber die Entra-Device-Id).
+    if ($aad) {
+        try {
+            $resp  = Invoke-MgGraphRequestRetry -Uri "https://graph.microsoft.com/beta/directory/deviceLocalCredentials/$aad`?`$select=credentials" -Method GET
+            $creds = @($resp.credentials)
+            if ($creds.Count -gt 0) {
+                $latest = $creds | Sort-Object -Property backupDateTime -Descending | Select-Object -First 1
+                $pw     = [System.Text.Encoding]::UTF8.GetString([Convert]::FromBase64String([string]$latest.passwordBase64))
+                $laps   = @{ account = [string]$latest.accountName; password = $pw }
+            }
+        } catch {
+            $m = Get-OffboardGraphErr $_
+            if ($m -notmatch '404') { $notes += "LAPS: $m" }
+        }
+    }
+
+    return @{ ok = $true; keys = @{ bitlocker = @($bitlocker); fileVault = $fileVault; laps = $laps; notes = @($notes) } }
+}
+
+# Offboarding ausfuehren. Body:
+#   devices  = [ { deviceName, intuneDeviceId, entraObjectId, autopilotId } ]
+#   services = { entra: 'delete'|'disable'|'none', intune: bool, autopilot: bool }
+function Invoke-OffboardExecuteEndpoint {
+    param($Body)
+    $err = Test-Connected
+    if ($err) { return $err }
+    if ($script:State.ReadOnly) { return @{ __status = 403; error = 'Read-Only-Modus: Offboarding ist deaktiviert.' } }
+
+    $devices = @(Get-PolicyProp $Body 'devices') | Where-Object { $_ }
+    $svc     = Get-PolicyProp $Body 'services'
+    if (@($devices).Count -eq 0) { return @{ __status = 400; error = 'Keine Geraete uebergeben' } }
+
+    $entraAction = [string](Get-PolicyProp $svc 'entra')
+    $doIntune    = [bool](Get-PolicyProp $svc 'intune')
+    $doAutopilot = [bool](Get-PolicyProp $svc 'autopilot')
+
+    $reqs = @()
+    $meta = @{}
+    $n    = 0
+    foreach ($d in $devices) {
+        $name = [string](Get-PolicyProp $d 'deviceName')
+        $iid  = [string](Get-PolicyProp $d 'intuneDeviceId')
+        $eid  = [string](Get-PolicyProp $d 'entraObjectId')
+        $aid  = [string](Get-PolicyProp $d 'autopilotId')
+
+        if ($entraAction -eq 'delete' -and $eid) {
+            $rid = "r$n"; $reqs += @{ id = $rid; method = 'DELETE'; url = "/devices/$eid" }
+            $meta[$rid] = @{ name = $name; svc = 'Entra ID'; action = 'geloescht' }; $n++
+        } elseif ($entraAction -eq 'disable' -and $eid) {
+            $rid = "r$n"; $reqs += @{ id = $rid; method = 'PATCH'; url = "/devices/$eid"; body = @{ accountEnabled = $false }; headers = @{ 'Content-Type' = 'application/json' } }
+            $meta[$rid] = @{ name = $name; svc = 'Entra ID'; action = 'deaktiviert' }; $n++
+        }
+        if ($doIntune -and $iid) {
+            $rid = "r$n"; $reqs += @{ id = $rid; method = 'DELETE'; url = "/deviceManagement/managedDevices/$iid" }
+            $meta[$rid] = @{ name = $name; svc = 'Intune'; action = 'geloescht' }; $n++
+        }
+        if ($doAutopilot -and $aid) {
+            $rid = "r$n"; $reqs += @{ id = $rid; method = 'DELETE'; url = "/deviceManagement/windowsAutopilotDeviceIdentities/$aid" }
+            $meta[$rid] = @{ name = $name; svc = 'Autopilot'; action = 'geloescht' }; $n++
+        }
+    }
+    if ($reqs.Count -eq 0) { return @{ __status = 400; error = 'Keine ausfuehrbaren Aktionen (fehlende IDs oder nichts ausgewaehlt).' } }
+
+    Write-Host "[OFFBOARD] Fuehre $($reqs.Count) Aktion(en) fuer $(@($devices).Count) Geraet(e) aus..." -ForegroundColor Yellow
+    $batch = Invoke-GraphBatch -Requests $reqs
+
+    $results = @()
+    foreach ($rid in ($meta.Keys | Sort-Object { [int]($_ -replace '\D','') })) {
+        $m      = $meta[$rid]
+        $r      = $batch[$rid]
+        $status = if ($r) { [int]$r.status } else { 0 }
+        $ok     = $status -in @(200, 204)
+        $errMsg = ''
+        if (-not $ok) {
+            $code = ''
+            try { $code = [string]$r.body.error.code } catch {}
+            if ($status -eq 403 -and $code -match 'multipleAdminApproval|protectedOperation') {
+                $errMsg = 'Erfordert Multi-Admin-Approval'
+            } elseif ($status -eq 403) {
+                $errMsg = "403 - fehlende Rolle/Berechtigung fuer $($m.svc)"
+            } elseif ($status -eq 0) {
+                $errMsg = 'Keine Antwort'
+            } else {
+                $errMsg = "HTTP $status" + $(if ($code) { " ($code)" } else { '' })
+            }
+        }
+        $results += [pscustomobject]@{
+            deviceName = $m.name; service = $m.svc; action = $m.action
+            success = $ok; error = $errMsg
+        }
+    }
+    $okCount = @($results | Where-Object { $_.success }).Count
+    Write-Host "  -> $okCount/$($results.Count) erfolgreich" -ForegroundColor DarkGray
+    return @{ ok = $true; successCount = $okCount; total = $results.Count; results = @($results) }
+}

src/PolicyIO.ps1

@@ -119,6 +119,15 @@ function Get-PolicyProp {
     return $null
 }
 
+# Property setzen — Hashtable ODER PSCustomObject (fuer Import-Umbenennung).
+function Set-PolicyProp {
+    param($Obj, [string]$Name, $Value)
+    if ($null -eq $Obj) { return }
+    if ($Obj -is [System.Collections.IDictionary]) { $Obj[$Name] = $Value; return }
+    if ($Obj.PSObject.Properties[$Name]) { $Obj.$Name = $Value }
+    else { $Obj | Add-Member -NotePropertyName $Name -NotePropertyValue $Value -Force }
+}
+
 # Grobe Plattform-Bezeichnung fuer die Listenanzeige.
 function Get-PolicyPlatformLabel {
     param($Raw, [string]$Type)
@@ -563,6 +572,14 @@ function Import-PoliciesEndpoint {
             $results += @{ policyName = [string]$policyName; success = $false; error = 'Envelope ohne "policy"-Feld' }
             continue
         }
+        # Optionale Umbenennung: das richtige Namensfeld je Typ setzen.
+        $newName = [string](Get-PolicyProp $env 'newName')
+        if ($newName -and $newName.Trim()) {
+            $cfg = Get-PolicyTypeConfigByExportType $exportType
+            $nameField = if ($cfg) { $cfg.NameField } else { 'displayName' }
+            Set-PolicyProp $policy $nameField $newName.Trim()
+            $policyName = $newName.Trim()
+        }
         try {
             $imported = Import-GraphPolicyByExportType -ExportType $exportType -Policy $policy
             $results += @{ policyName = [string]$policyName; exportType = $exportType; success = $true; newId = [string](Get-PolicyProp $imported 'id') }

www/app.js

@@ -4621,6 +4621,7 @@ function switchMainView(view) {
   const reportView = document.getElementById('appReportView');
   const devView    = document.getElementById('devView');
   const polView    = document.getElementById('policiesView');
+  const offView    = document.getElementById('offView');
   document.querySelectorAll('#topbarNav .nav-tab').forEach(t => {
     t.classList.toggle('active', t.dataset.view === view);
     t.setAttribute('aria-selected', t.dataset.view === view ? 'true' : 'false');
@@ -4630,12 +4631,13 @@ function switchMainView(view) {
   reportView.classList.toggle('hidden', view !== 'report');
   devView   .classList.toggle('hidden', view !== 'devices');
   polView   .classList.toggle('hidden', view !== 'policies');
+  if (offView) offView.classList.toggle('hidden', view !== 'offboard');
 }
 
 document.querySelectorAll('#topbarNav .nav-tab').forEach(btn => {
   btn.addEventListener('click', () => {
     const view = btn.dataset.view;
-    if ((view === 'groups' || view === 'report' || view === 'devices' || view === 'policies') && !State.connected) {
+    if ((view === 'groups' || view === 'report' || view === 'devices' || view === 'policies' || view === 'offboard') && !State.connected) {
       toast('Bitte zuerst verbinden.', 'warn');
       return;
     }
@@ -4644,6 +4646,7 @@ document.querySelectorAll('#topbarNav .nav-tab').forEach(btn => {
     if (view === 'report' && ReportState.items.length === 0) loadAppReport();
     if (view === 'devices') { devLoadAll(); setTimeout(() => document.getElementById('devSearch').focus(), 80); }
     if (view === 'policies' && PolState.items.length === 0) loadPolicies();
+    if (view === 'offboard') setTimeout(() => document.getElementById('offSearch').focus(), 80);
   });
 });
 
@@ -5920,6 +5923,13 @@ function polExtractEnvelopes(parsed, fileName) {
   return [];
 }
 
+let _polImportEnvelopes = [];
+
+function polEnvName(env) {
+  return env.policyName || (env.policy && (env.policy.name || env.policy.displayName)) || '(ohne Name)';
+}
+
+// Dateien einlesen -> Rename-Dialog oeffnen (der eigentliche Import folgt dort).
 async function polHandleImportFiles(fileList) {
   const files = [...fileList];
   if (!files.length) return;
@@ -5931,10 +5941,36 @@ async function polHandleImportFiles(fileList) {
     envelopes = envelopes.concat(polExtractEnvelopes(parsed, f.name));
   }
   if (!envelopes.length) return;
-  if (!window.confirm(`${envelopes.length} Policy(s) als NEUE Policies im verbundenen Tenant anlegen?\n\nBestehende Policies werden dabei nicht verändert.`)) return;
+  _polImportEnvelopes = envelopes;
+  renderPolImportList();
+  openModal('modalPolImport');
+}
+
+function renderPolImportList() {
+  const list = document.getElementById('polImportList');
+  if (!list) return;
+  list.innerHTML = _polImportEnvelopes.map((env, i) => {
+    const type = env.exportType || env.policyType || '';
+    return `<div class="pol-import-row">
+      <input class="input pol-import-name" data-idx="${i}" value="${escapeHtml(polEnvName(env))}" placeholder="Policy-Name">
+      <span class="pol-type-badge">${escapeHtml(POL_TYPE_LABELS[type] || type || 'Policy')}</span>
+    </div>`;
+  }).join('');
+  const info = document.getElementById('polImportInfo');
+  if (info) info.textContent = `${_polImportEnvelopes.length} Policy(s)`;
+}
+
+async function polDoImport() {
+  // Geänderte Namen übernehmen (nur wenn nicht leer und wirklich anders).
+  _polImportEnvelopes.forEach((env, i) => {
+    const input = document.querySelector(`.pol-import-name[data-idx="${i}"]`);
+    const nn = input ? input.value.trim() : '';
+    if (nn && nn !== polEnvName(env)) env.newName = nn; else delete env.newName;
+  });
+  closeModal('modalPolImport');
   setLoading('Importiere Policies…');
   try {
-    const res = await api('/api/policies/import', { method: 'POST', body: { policies: envelopes }, timeoutMs: 180000 });
+    const res = await api('/api/policies/import', { method: 'POST', body: { policies: _polImportEnvelopes }, timeoutMs: 180000 });
     const results = res.results || [];
     const ok = results.filter(r => r.success);
     const fail = results.filter(r => !r.success);
@@ -5954,6 +5990,7 @@ async function polHandleImportFiles(fileList) {
     clearLoading();
   }
 }
+document.getElementById('polImportConfirm')?.addEventListener('click', polDoImport);
 
 // =============================================================
 // Post-Import: Policies pro Stück Include-/Exclude-Gruppen zuweisen
@@ -6181,3 +6218,172 @@ document.querySelectorAll('#polTable th.sortable').forEach(th => {
     renderPolicies();
   });
 });
+
+// =============================================================
+// OFFBOARDING: Geräte aus Intune / Autopilot / Entra entfernen
+// =============================================================
+const OffState = { items: [], selected: new Set() };
+function offKey(d) { return d.intuneDeviceId; }
+function offSelectedDevices() { return OffState.items.filter(d => OffState.selected.has(offKey(d))); }
+
+async function offSearch() {
+  const q = document.getElementById('offSearch').value.trim();
+  const type = document.getElementById('offSearchType').value;
+  if (q.length < 2) { toast('Mindestens 2 Zeichen.', 'warn'); return; }
+  const body = document.getElementById('offBody');
+  body.innerHTML = `<tr><td colspan="7" class="pol-hint"><span class="spinner" style="width:14px;height:14px;border-width:2px;"></span> Suche…</td></tr>`;
+  try {
+    const res = await api(`/api/offboard/search?query=${encodeURIComponent(q)}&type=${type}`, { timeoutMs: 60000 });
+    OffState.items = res.items || [];
+    OffState.selected = new Set();
+    renderOff();
+  } catch (e) {
+    toast('Suche fehlgeschlagen: ' + e.message, 'err');
+    body.innerHTML = `<tr><td colspan="7" class="pol-empty">Fehler bei der Suche.</td></tr>`;
+  }
+}
+
+function offSvcBadges(d) {
+  const b = [];
+  if (d.inIntune)    b.push('<span class="off-badge">Intune</span>');
+  if (d.inEntra)     b.push('<span class="off-badge">Entra</span>');
+  if (d.inAutopilot) b.push('<span class="off-badge">Autopilot</span>');
+  if (d.coManaged)   b.push('<span class="off-badge warn">Co-Mgmt</span>');
+  return b.join(' ') || '—';
+}
+
+function renderOff() {
+  const body = document.getElementById('offBody');
+  if (!OffState.items.length) {
+    body.innerHTML = `<tr><td colspan="7" class="pol-empty">Keine Geräte gefunden.</td></tr>`;
+    offUpdateSel();
+    return;
+  }
+  body.innerHTML = OffState.items.map(d => {
+    const k = offKey(d);
+    const checked = OffState.selected.has(k) ? 'checked' : '';
+    return `<tr data-key="${escapeHtml(k)}">
+      <td><input type="checkbox" class="off-row-check" data-key="${escapeHtml(k)}" ${checked}></td>
+      <td>${escapeHtml(d.deviceName || '—')}</td>
+      <td>${escapeHtml(d.serialNumber || '—')}</td>
+      <td>${escapeHtml(((d.operatingSystem || '') + ' ' + (d.osVersion || '')).trim() || '—')}</td>
+      <td>${escapeHtml(d.primaryUser || '—')}</td>
+      <td>${polFmtDate(d.lastSync)}</td>
+      <td>${offSvcBadges(d)}</td>
+    </tr>`;
+  }).join('');
+  body.querySelectorAll('.off-row-check').forEach(cb => {
+    cb.addEventListener('change', () => {
+      if (cb.checked) OffState.selected.add(cb.dataset.key); else OffState.selected.delete(cb.dataset.key);
+      offUpdateSel();
+    });
+  });
+  body.querySelectorAll('tr[data-key]').forEach(tr => {
+    tr.addEventListener('click', e => {
+      if (e.target.classList.contains('off-row-check')) return;
+      const cb = tr.querySelector('.off-row-check');
+      cb.checked = !cb.checked;
+      cb.dispatchEvent(new Event('change'));
+    });
+  });
+  offUpdateSel();
+}
+
+function offUpdateSel() {
+  const n = OffState.selected.size;
+  document.getElementById('offSelCount').textContent = `${n} ausgewählt`;
+  document.getElementById('offBtn').disabled = n === 0;
+}
+
+function openOffboardModal() {
+  const devs = offSelectedDevices();
+  if (!devs.length) return;
+  document.getElementById('offConfirmList').innerHTML = devs.map(d => `
+    <div class="off-confirm-row"><b>${escapeHtml(d.deviceName || '—')}</b>
+      — Intune: ${d.intuneDeviceId ? '✓' : '–'}, Entra: ${d.entraObjectId ? '✓' : '–'}, Autopilot: ${d.autopilotId ? '✓' : '–'}</div>
+  `).join('');
+  document.getElementById('offModalInfo').textContent = `${devs.length} Gerät(e)`;
+  document.getElementById('offConfirmChk').checked = false;
+  document.getElementById('offExecuteBtn').disabled = true;
+  document.getElementById('offResults').innerHTML = '';
+  document.getElementById('offKeys').innerHTML = '<div class="lbl">Recovery-Keys</div><div class="muted">Wird geladen…</div>';
+  openModal('modalOffboard');
+  offLoadKeys(devs);
+}
+
+async function offLoadKeys(devs) {
+  const box = document.getElementById('offKeys');
+  const parts = [];
+  for (const d of devs) {
+    try {
+      const res = await api('/api/offboard/keys', {
+        method: 'POST',
+        body: { intuneDeviceId: d.intuneDeviceId, azureADDeviceId: d.azureADDeviceId, operatingSystem: d.operatingSystem },
+        timeoutMs: 60000,
+      });
+      const k = res.keys || {};
+      let html = `<div class="off-key-dev"><b>${escapeHtml(d.deviceName || '—')}</b>`;
+      (k.bitlocker || []).forEach(b => { html += `<div class="off-key">BitLocker${b.volumeType ? ' (' + escapeHtml(b.volumeType) + ')' : ''}: <code>${escapeHtml(b.key)}</code></div>`; });
+      if (k.fileVault) html += `<div class="off-key">FileVault: <code>${escapeHtml(k.fileVault)}</code></div>`;
+      if (k.laps) html += `<div class="off-key">LAPS${k.laps.account ? ' (' + escapeHtml(k.laps.account) + ')' : ''}: <code>${escapeHtml(k.laps.password)}</code></div>`;
+      if (k.notes && k.notes.length) html += `<div class="muted">${k.notes.map(escapeHtml).join(' · ')}</div>`;
+      html += '</div>';
+      parts.push(html);
+    } catch (e) {
+      parts.push(`<div class="off-key-dev"><b>${escapeHtml(d.deviceName || '—')}</b> <span class="muted">Keys-Fehler: ${escapeHtml(e.message)}</span></div>`);
+    }
+  }
+  box.innerHTML = `<div class="lbl">🔑 Recovery-Keys — vor dem Löschen sichern!</div>${parts.join('')}`;
+}
+
+async function offExecute() {
+  const devs = offSelectedDevices();
+  if (!devs.length) return;
+  const services = {
+    entra:     document.querySelector('input[name="offEntra"]:checked').value,
+    intune:    document.getElementById('offSvcIntune').checked,
+    autopilot: document.getElementById('offSvcAutopilot').checked,
+  };
+  if (services.entra === 'none' && !services.intune && !services.autopilot) {
+    toast('Keinen Dienst ausgewählt.', 'warn');
+    return;
+  }
+  const payload = devs.map(d => ({
+    deviceName: d.deviceName, intuneDeviceId: d.intuneDeviceId,
+    entraObjectId: d.entraObjectId, autopilotId: d.autopilotId,
+  }));
+  document.getElementById('offExecuteBtn').disabled = true;
+  setLoading('Offboarding läuft…');
+  try {
+    const res = await api('/api/offboard/execute', { method: 'POST', body: { devices: payload, services }, timeoutMs: 180000 });
+    const results = res.results || [];
+    document.getElementById('offResults').innerHTML =
+      `<div class="lbl">Ergebnis (${res.successCount}/${res.total})</div>` +
+      results.map(r => `<div class="off-result ${r.success ? 'ok' : 'fail'}">${r.success ? '✓' : '✗'} ${escapeHtml(r.deviceName)} — ${escapeHtml(r.service)} ${escapeHtml(r.action)}${r.error ? ': ' + escapeHtml(r.error) : ''}</div>`).join('');
+    toast(`${res.successCount}/${res.total} Aktionen erfolgreich.`, res.successCount === res.total ? 'ok' : 'warn', 'Offboarding');
+    // Erfolgreich vollständig offgeboardete Geräte aus der Liste nehmen.
+    const doneNames = new Set(results.filter(r => r.success).map(r => r.deviceName));
+    if (doneNames.size) {
+      OffState.items = OffState.items.filter(d => !doneNames.has(d.deviceName) || results.some(r => r.deviceName === d.deviceName && !r.success));
+      OffState.selected = new Set();
+      renderOff();
+    }
+  } catch (e) {
+    toast('Offboarding fehlgeschlagen: ' + e.message, 'err');
+    document.getElementById('offExecuteBtn').disabled = false;
+  } finally {
+    clearLoading();
+  }
+}
+
+document.getElementById('offSearchBtn')?.addEventListener('click', offSearch);
+document.getElementById('offSearch')?.addEventListener('keydown', e => { if (e.key === 'Enter') offSearch(); });
+document.getElementById('offCheckAll')?.addEventListener('change', e => {
+  OffState.items.forEach(d => { const k = offKey(d); if (e.target.checked) OffState.selected.add(k); else OffState.selected.delete(k); });
+  renderOff();
+});
+document.getElementById('offBtn')?.addEventListener('click', openOffboardModal);
+document.getElementById('offConfirmChk')?.addEventListener('change', e => {
+  document.getElementById('offExecuteBtn').disabled = !e.target.checked;
+});
+document.getElementById('offExecuteBtn')?.addEventListener('click', offExecute);

www/index.html

@@ -37,6 +37,7 @@
     <button class="nav-tab" data-view="report" aria-selected="false">App Report</button>
     <button class="nav-tab" data-view="devices" aria-selected="false">Geräte</button>
     <button class="nav-tab" data-view="policies" aria-selected="false">Policies</button>
+    <button class="nav-tab" data-view="offboard" aria-selected="false">Offboarding</button>
   </nav>
 
   <div class="header-actions">
@@ -611,6 +612,44 @@
   </div>
 </section>
 
+<!-- ======================= OFFBOARDING ======================= -->
+<section class="off-view hidden" id="offView">
+  <div class="off-bar">
+    <select id="offSearchType" class="input" style="height:34px;max-width:170px;">
+      <option value="name">Gerätename</option>
+      <option value="serial">Seriennummer</option>
+    </select>
+    <input id="offSearch" class="input" placeholder="Suchen… (Enter)" style="max-width:320px;height:34px;">
+    <button class="btn btn-secondary btn-sm" id="offSearchBtn">Suchen</button>
+    <span class="off-bar-spacer" style="flex:1;"></span>
+    <span id="offSelCount" class="muted">0 ausgewählt</span>
+    <button class="btn btn-danger btn-sm" id="offBtn" disabled>Offboarding…</button>
+  </div>
+  <div class="off-note muted">
+    Entfernt Geräte aus <b>Intune</b>, <b>Autopilot</b> und <b>Entra ID</b>. BitLocker-/FileVault-Keys und
+    LAPS-Passwörter werden vor dem Löschen angezeigt. Benötigt zusätzliche Berechtigungen &amp; Admin-Rollen
+    (siehe <code>docs/App-Registration.md</code>) — im Read-Only-Modus gesperrt.
+  </div>
+  <div class="off-table-wrap">
+    <table class="pol-table off-table" id="offTable">
+      <thead>
+        <tr>
+          <th style="width:34px;"><input type="checkbox" id="offCheckAll"></th>
+          <th>Gerät</th>
+          <th>Seriennr.</th>
+          <th>OS</th>
+          <th>Benutzer</th>
+          <th>Letzter Sync</th>
+          <th>Dienste</th>
+        </tr>
+      </thead>
+      <tbody id="offBody">
+        <tr><td colspan="7" class="pol-hint">Nach Geräten suchen…</td></tr>
+      </tbody>
+    </table>
+  </div>
+</section>
+
 <!-- MODAL: Wipe -->
 <div class="modal-backdrop hidden" id="wipeModalBackdrop">
   <div class="modal" style="max-width:420px;">
@@ -813,6 +852,29 @@
   </div>
 </div>
 
+<!-- MODAL: Policy-Import (optional umbenennen) -->
+<div id="modalPolImport" class="modal hidden">
+  <div class="modal-backdrop" data-close></div>
+  <div class="modal-box modal-lg">
+    <div class="modal-head">
+      <h3>Policies importieren</h3>
+      <button class="modal-close" data-close aria-label="Schließen">×</button>
+    </div>
+    <div class="modal-body">
+      <div class="form-hint" style="margin-bottom:12px;">
+        Namen können vor dem Import angepasst werden. Die Policies werden als
+        <b>Neuanlage</b> im verbundenen Tenant erstellt — bestehende bleiben unverändert.
+      </div>
+      <div id="polImportList"></div>
+    </div>
+    <div class="modal-foot">
+      <span id="polImportInfo" class="muted" style="margin-right:auto;"></span>
+      <button class="btn btn-secondary" data-close>Abbrechen</button>
+      <button class="btn btn-primary" id="polImportConfirm">Importieren</button>
+    </div>
+  </div>
+</div>
+
 <!-- MODAL: Policy-Zuweisung nach Import -->
 <div id="modalPolAssign" class="modal hidden">
   <div class="modal-backdrop" data-close></div>
@@ -835,28 +897,99 @@
     </div>
   </div>
 </div>
+
+<!-- MODAL: Geräte-Offboarding -->
+<div id="modalOffboard" class="modal hidden">
+  <div class="modal-backdrop" data-close></div>
+  <div class="modal-box modal-lg">
+    <div class="modal-head">
+      <h3>Geräte offboarden</h3>
+      <button class="modal-close" data-close aria-label="Schließen">×</button>
+    </div>
+    <div class="modal-body">
+      <div class="off-warn">⚠ Entfernt die Geräte aus den gewählten Diensten. Löschen ist <b>nicht umkehrbar</b>. Recovery-Keys unbedingt vorher sichern.</div>
+      <div id="offConfirmList" class="off-confirm-list"></div>
+
+      <div class="off-services">
+        <div class="lbl">Dienste</div>
+        <div class="off-svc-row">
+          <span class="off-svc-label">Entra ID:</span>
+          <label class="off-radio"><input type="radio" name="offEntra" value="none" checked> nichts tun</label>
+          <label class="off-radio"><input type="radio" name="offEntra" value="disable"> deaktivieren</label>
+          <label class="off-radio"><input type="radio" name="offEntra" value="delete"> löschen</label>
+        </div>
+        <label class="check-chip"><input type="checkbox" id="offSvcIntune" checked><span>Aus Intune löschen</span></label>
+        <label class="check-chip"><input type="checkbox" id="offSvcAutopilot"><span>Aus Autopilot löschen</span></label>
+      </div>
+
+      <div id="offKeys" class="off-keys"></div>
+
+      <label class="check-chip off-confirm-chip"><input type="checkbox" id="offConfirmChk"><span>Ich verstehe, dass die Geräte gelöscht/entfernt werden.</span></label>
+      <div id="offResults"></div>
+    </div>
+    <div class="modal-foot">
+      <span id="offModalInfo" class="muted" style="margin-right:auto;"></span>
+      <button class="btn btn-secondary" data-close>Abbrechen</button>
+      <button class="btn btn-danger" id="offExecuteBtn" disabled>Offboarding ausführen</button>
+    </div>
+  </div>
+</div>
 <style>
-  .pol-assign-row { border:1px solid var(--border, #d9dce3); border-radius:8px; padding:12px 14px; margin-bottom:12px; }
+  /* Nutzt die Theme-Variablen der App -> passt sich Light/Dark automatisch an. */
-  .pol-assign-head { display:flex; align-items:center; gap:8px; margin-bottom:10px; }
+  .pol-assign-row { border:1px solid var(--hairline); border-radius:8px; padding:12px 14px; margin-bottom:12px; overflow-wrap:anywhere; }
-  .pol-assign-head .pol-name { font-weight:600; }
+  .pol-assign-head { display:flex; align-items:baseline; gap:8px; margin-bottom:10px; flex-wrap:wrap; }
+  .pol-assign-head .pol-name { font-weight:600; color:var(--ink); min-width:0; word-break:break-word; overflow-wrap:anywhere; }
+  .pol-assign-head .pol-type-badge { flex:0 0 auto; }
   .pol-assign-pickers { display:flex; gap:16px; flex-wrap:wrap; }
   .pol-assign-picker { flex:1; min-width:220px; }
-  .pol-assign-picker > .lbl { display:block; font-size:12px; margin-bottom:4px; opacity:.85; }
+  .pol-assign-picker > .lbl { display:block; font-size:12px; margin-bottom:4px; color:var(--body); }
-  .pol-assign-picker[data-kind="exclude"] > .lbl { color:#cb2a7a; }
+  .pol-assign-picker[data-kind="exclude"] > .lbl { color:var(--pink); }
   .pol-assign-chips { display:flex; flex-wrap:wrap; gap:6px; margin-bottom:6px; }
   .pol-assign-chip { display:inline-flex; align-items:center; gap:6px; padding:2px 8px; border-radius:12px;
-    background:var(--chip-bg, #eef0f5); font-size:12px; }
+    background:var(--surface-strong); color:var(--ink); font-size:12px; }
-  .pol-assign-chip.exclude { background:#fbe3ef; }
+  .pol-assign-chip.exclude { background:rgba(236,72,153,0.18); color:var(--ink); }
-  .pol-assign-chip button { border:none; background:none; cursor:pointer; font-size:14px; line-height:1; padding:0; opacity:.6; }
+  .pol-assign-chip button { border:none; background:none; cursor:pointer; font-size:14px; line-height:1; padding:0; color:var(--muted); }
-  .pol-assign-chip button:hover { opacity:1; }
+  .pol-assign-chip button:hover { color:var(--ink); }
   .pol-assign-search-wrap { position:relative; }
   .pol-assign-dropdown { position:absolute; z-index:20; left:0; right:0; top:100%; margin-top:2px;
-    background:var(--panel, #fff); border:1px solid var(--border, #d9dce3); border-radius:6px;
+    background:var(--canvas); border:1px solid var(--hairline); border-radius:6px;
-    max-height:200px; overflow-y:auto; box-shadow:0 6px 18px rgba(0,0,0,.12); }
+    max-height:200px; overflow-y:auto; box-shadow:0 6px 18px rgba(0,0,0,.25); }
-  .pol-assign-dropdown .opt { padding:6px 10px; cursor:pointer; font-size:13px; }
+  .pol-assign-dropdown .opt { padding:6px 10px; cursor:pointer; font-size:13px; color:var(--body); }
-  .pol-assign-dropdown .opt:hover { background:var(--chip-bg, #eef0f5); }
+  .pol-assign-dropdown .opt:hover { background:var(--surface-soft); }
-  .pol-assign-dropdown .opt .desc { font-size:11px; opacity:.6; }
+  .pol-assign-dropdown .opt .desc { font-size:11px; color:var(--muted); }
-  .pol-assign-dropdown .msg { padding:6px 10px; font-size:12px; opacity:.6; }
+  .pol-assign-dropdown .msg { padding:6px 10px; font-size:12px; color:var(--muted); }
+  .pol-import-row { display:flex; align-items:center; gap:10px; padding:8px 0; border-bottom:1px solid var(--hairline); }
+  .pol-import-row:last-child { border-bottom:none; }
+  .pol-import-name { flex:1; min-width:0; }
+  .pol-import-row .pol-type-badge { flex:0 0 auto; }
+  /* Offboarding */
+  .off-view { padding:16px 20px; }
+  .off-bar { display:flex; align-items:center; gap:10px; margin-bottom:10px; flex-wrap:wrap; }
+  .off-note { font-size:12.5px; margin-bottom:12px; line-height:1.5; }
+  .off-table-wrap { overflow-x:auto; }
+  .off-table td, .off-table th { white-space:nowrap; }
+  .off-badge { display:inline-block; padding:1px 7px; border-radius:10px; font-size:11px; background:var(--surface-strong); color:var(--ink); margin-right:3px; }
+  .off-badge.warn { background:rgba(245,158,11,0.22); }
+  .off-warn { background:rgba(239,68,68,0.14); border:1px solid rgba(239,68,68,0.35); color:var(--ink);
+    border-radius:8px; padding:10px 12px; font-size:13px; margin-bottom:12px; }
+  .off-confirm-list { margin-bottom:12px; }
+  .off-confirm-row { font-size:13px; padding:4px 0; border-bottom:1px solid var(--hairline); overflow-wrap:anywhere; }
+  .off-confirm-row:last-child { border-bottom:none; }
+  .off-services { margin:12px 0; padding:12px; border:1px solid var(--hairline); border-radius:8px; }
+  .off-services .lbl { display:block; font-size:12px; color:var(--body); margin-bottom:8px; }
+  .off-svc-row { display:flex; align-items:center; gap:14px; flex-wrap:wrap; margin-bottom:10px; }
+  .off-svc-label { font-size:13px; color:var(--ink); font-weight:600; }
+  .off-radio { display:inline-flex; align-items:center; gap:5px; font-size:13px; cursor:pointer; }
+  .off-keys { margin:12px 0; }
+  .off-keys .lbl { display:block; font-size:12px; color:var(--pink); margin-bottom:6px; }
+  .off-key-dev { border:1px solid var(--hairline); border-radius:6px; padding:8px 10px; margin-bottom:6px; font-size:12.5px; overflow-wrap:anywhere; }
+  .off-key { margin-top:3px; }
+  .off-key code { background:var(--surface-strong); color:var(--ink); padding:1px 5px; border-radius:4px; user-select:all; }
+  .off-confirm-chip { margin-top:8px; }
+  .off-result { font-size:13px; padding:3px 0; overflow-wrap:anywhere; }
+  .off-result.ok { color:var(--success); }
+  .off-result.fail { color:var(--error); }
+  #offResults .lbl { display:block; font-size:12px; color:var(--body); margin:10px 0 4px; }
 </style>
 
 <!-- MODAL: Hilfe -->