Merge branch 'feature/v1.4.7'

- csproj <Version> -> 1.4.7
- repo.json AssemblyVersion + TestingAssemblyVersion -> 1.4.7.0
- repo.json DownloadLink{Install,Update,Testing} URLs -> /v1.4.7/
- repo.json + HellionChat.yaml changelog: prepend v1.4.7 block, retire
  v1.4.3 (slim rule keeps the last 3-4 versions)
- docs/CHANGELOG.md + docs/ROADMAP.md: v1.4.7 section, next-cycle
  pointer flipped to v1.4.8 Hook-Layer-Cycle
- README.md release badge + version stamps + Project Status block
  rewritten for v1.4.7
- .github/forge-posts/v1.4.7.md (new): DE body with subtitle
  "Backlog Cleanup and Mid-Features" / versionsnatur "Mid-Feature-Patch"
- Pin diagnostic logs (RehydratePinnedTabs / TryPin / Unpin /
  PromoteToPermanent) downgraded from Info to Debug so non-debug
  console stays quiet on release builds

.editorconfig

@@ -7,12 +7,21 @@ insert_final_newline=false
 
 # JetBrains Rider custom properties for code formatting styles
 resharper_csharp_brace_style=next_line
+# Allman für standard Tooling (VS Code)
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+
+# Switch-Einrückung
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
 
 resharper_csharp_braces_for_foreach=not_required
 resharper_csharp_braces_for_for=not_required
 resharper_csharp_braces_for_while=not_required
 charset=utf-8
-end_of_line=crlf
+end_of_line=lf
 
 # Microsoft .NET properties
 csharp_new_line_before_members_in_object_initializers=false
@@ -142,7 +151,7 @@ resharper_web_config_module_not_resolved_highlighting=warning
 resharper_web_config_type_not_resolved_highlighting=warning
 resharper_web_config_wrong_module_highlighting=warning
 
-[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}]
+[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.prettierrc.json,.markdownlint.json,.yamllint.json,.stylelintrc,bowerrc,jest.config}]
 indent_style=space
 indent_size=2
 
@@ -154,3 +163,5 @@ indent_size=2
 indent_style=space
 indent_size=4
 tab_width=4
+[*.md]
+trim_trailing_whitespace=false

.gitattributes

@@ -1,2 +1,8 @@
 # Generated files
-HellionChat/Resources/Language.*.resx linguist-generated=true
+HellionChat/Resources/Language.*.resx linguist-generated=true
+* text=auto eol=lf
+*.cs text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.md text eol=lf
+*.json text eol=lf

.gitea/workflows/build.yml

@@ -0,0 +1,53 @@
+name: Build
+
+# Verifies that every push to main and every PR still builds against the
+# current Dalamud staging branch. Does not produce release artefacts; the
+# release workflow handles that on tag.
+#
+# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
+# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
+# Linux as long as the Dalamud staging assemblies are present at the
+# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
+# Dalamud SDK 15 uses on Linux).
+
+on:
+    push:
+        branches: [main]
+    pull_request:
+        branches: [main]
+    workflow_dispatch:
+
+# Minimum permissions for a build-only workflow: read the repo, nothing
+# else. Closes the CodeQL "Workflow does not contain permissions" alert
+# and matches the principle-of-least-privilege the security guide
+# recommends for workflows that don't push or create releases.
+permissions:
+    contents: read
+
+jobs:
+    build:
+        name: Build (Release)
+        runs-on: ubuntu-latest
+        timeout-minutes: 15
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+            - name: Setup .NET 10
+              uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
+              with:
+                  dotnet-version: 10.0.x
+
+            - name: Download Dalamud staging
+              run: |
+                  hooks="$HOME/.xlcore/dalamud/Hooks/dev"
+                  mkdir -p "$hooks"
+                  curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
+                  unzip -oq dalamud.zip -d "$hooks"
+
+            - name: Restore
+              run: dotnet restore HellionChat/HellionChat.csproj
+
+            - name: Build (Release)
+              run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore

.gitea/workflows/forge-announce.yml

@@ -0,0 +1,250 @@
+name: Forge Announce
+
+# Triggered when a vX.Y.Z tag is pushed. Reads .github/forge-posts/<tag>.md
+# (Frontmatter + DE bullet body) and the matching English block from
+# HellionChat/HellionChat.yaml, builds a Discord-Webhook embed and posts
+# it to the Hellion Forge #changelog channel.
+#
+# Decoupled from release.yml: a fail here does not block the GitHub
+# release, and a fail there does not block the announce. Spec lives in
+# the Vault under "Hellion Chat Forge-Auto-Announce Spec".
+#
+# Security: the only user-controlled inputs that enter run-steps are the
+# tag name and the frontmatter values from a repo-internal markdown file.
+# Tag name is read via env: (TAG_NAME, $env:TAG_NAME) and validated against
+# ^v\d+\.\d+\.\d+$ before any string interpolation. Frontmatter values are
+# parsed by regex with explicit length caps. No webhook event payload data
+# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
+
+on:
+    push:
+        tags:
+            - "v*"
+    workflow_dispatch:
+        inputs:
+            tag:
+                description: "Existing tag to (re)post, e.g. v1.1.0"
+                required: true
+                type: string
+
+permissions:
+    contents: read
+
+jobs:
+    announce:
+        name: Post changelog to Hellion Forge
+        runs-on: ubuntu-latest
+        # The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
+        # on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
+        # scope for every job by default, no environment: declaration needed.
+        timeout-minutes: 5
+
+        steps:
+            # On push:tags github.ref points at the tag commit; on workflow_dispatch
+            # the user supplies the tag explicitly. Always check out that tag so
+            # the yaml + forge-posts file are read from the tagged tree, not main.
+            - name: Checkout
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+              with:
+                  ref: ${{ github.event.inputs.tag || github.ref }}
+
+            # Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
+            # ships pre-installed on ubuntu-latest so we get the same scripting
+            # patterns release.yml uses on windows-latest. Tag is read via env: to
+            # treat it as a string variable rather than inline shell text, and
+            # validated against the semver regex before any interpolation.
+            - name: Build embed payload
+              id: build
+              shell: pwsh
+              env:
+                  TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
+              run: |
+                  $tag = $env:TAG_NAME
+                  if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
+                      throw "V1: Refusing to announce non-semver tag: $tag"
+                  }
+                  $version = $tag.Substring(1)
+
+                  # ---------- Forge-Post-Datei lesen ----------
+                  $forgePath = ".github/forge-posts/$tag.md"
+                  if (-not (Test-Path $forgePath)) {
+                      throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
+                  }
+                  $forgeRaw = Get-Content -Path $forgePath -Raw
+
+                  # Frontmatter (--- … ---) am Datei-Anfang
+                  if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
+                      throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
+                  }
+                  $fmText = $matches[1]
+                  $deBody = $matches[2].Trim()
+
+                  $subtitle = $null
+                  $versionsnatur = $null
+                  foreach ($line in ($fmText -split "`r?`n")) {
+                      if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$')      { $subtitle = $matches[1] }
+                      if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
+                  }
+                  if ([string]::IsNullOrWhiteSpace($subtitle))      { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
+                  if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
+                  if ($subtitle.Length      -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
+                  if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
+                  if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
+
+                  # ---------- EN-Block aus HellionChat.yaml ziehen ----------
+                  # 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
+                  # Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
+                  $yamlPath = "HellionChat/HellionChat.yaml"
+                  $raw = Get-Content -Path $yamlPath -Raw
+                  $marker = "changelog: |-"
+                  $idx = $raw.IndexOf($marker)
+                  if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
+                  $afterMarker = $raw.Substring($idx + $marker.Length)
+                  $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
+                  }) -join "`n"
+
+                  $header = "**v$version "
+                  $start = $changelogBody.IndexOf($header)
+                  if ($start -lt 0) {
+                      throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
+                  }
+                  $rest = $changelogBody.Substring($start)
+                  $nextHdr = $rest.IndexOf("`n`n**v", 1)
+                  $trailer = $rest.IndexOf("`n`n---")
+                  if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
+                      $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
+                  } elseif ($trailer -ge 0) {
+                      $enBlock = $rest.Substring(0, $trailer).TrimEnd()
+                  } else {
+                      $enBlock = $rest.TrimEnd()
+                  }
+
+                  # ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
+                  # Discord enforces per-embed-field limits separately from the
+                  # combined-total limit. We split the DE and EN blocks into two
+                  # embeds that share the same release URL so Discord stitches
+                  # them into one visual card. Hard caps per Discord docs:
+                  #   description: 4096 per embed
+                  #   title:        256 per embed
+                  #   footer.text: 2048 per embed
+                  #   combined sum across all embeds: 6000
+                  $title = "Hellion Chat $version — $subtitle"
+                  $deDesc = "**Deutsch**`n`n$deBody"
+                  $enDesc = "**English**`n`n$enBlock"
+                  $footerText = "Hellion Forge · $versionsnatur"
+                  $releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
+
+                  if ($deDesc.Length -gt 4096) {
+                      throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
+                  }
+                  if ($enDesc.Length -gt 4096) {
+                      throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
+                  }
+                  $totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
+                  if ($totalChars -gt 6000) {
+                      throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
+                  }
+                  Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
+
+                  # ---------- Embed-Payload bauen (zwei Embeds, gleiche url) ----------
+                  # Sharing the same `url` tells Discord to render both embeds as a
+                  # single contiguous card block. The title sits on the first embed,
+                  # the footer + timestamp on the last so it reads as one post.
+                  $payload = [ordered]@{
+                      username = "Forge Herald"
+                      avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
+                      content = "<@&1500489631555260446>"
+                      allowed_mentions = [ordered]@{
+                          parse = @()
+                          roles = @("1500489631555260446")
+                      }
+                      embeds = @(
+                          [ordered]@{
+                              title = $title
+                              url = $releaseUrl
+                              color = 12730636
+                              description = $deDesc
+                          },
+                          [ordered]@{
+                              url = $releaseUrl
+                              color = 12730636
+                              description = $enDesc
+                              footer = [ordered]@{ text = $footerText }
+                              timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
+                          }
+                      )
+                  }
+
+                  $payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
+                  # Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
+                  [System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
+
+                  Write-Host "Payload size: $($payloadJson.Length) chars"
+                  Write-Host "Embed title:  $title"
+                  Write-Host "Embed footer: $footerText"
+
+            # POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
+            # so we can pipe the payload via stdin (--data-binary @-) and keep
+            # secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
+            - name: POST to Hellion Forge webhook
+              shell: pwsh
+              env:
+                  DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
+              run: |
+                  if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
+                      throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
+                  }
+
+                  $payloadFile = "$PWD/embed-payload.json"
+                  if (-not (Test-Path $payloadFile)) {
+                      throw "Embed payload file missing — previous step did not produce embed-payload.json"
+                  }
+
+                  $maxAttempts = 2
+                  $attempt = 0
+                  while ($attempt -lt $maxAttempts) {
+                      $attempt++
+                      Write-Host "POST attempt $attempt of $maxAttempts"
+                      $tmpResp = "$PWD/.webhook-response"
+                      $tmpHeaders = "$PWD/.webhook-headers"
+                      # --silent suppresses progress; --show-error prints errors so
+                      # the workflow log shows what happened. -w prints HTTP status
+                      # to stdout for inspection. -o captures body for diagnosis,
+                      # -D captures headers.
+                      $rawStatus = Get-Content $payloadFile -Raw |
+                          curl --silent --show-error `
+                               --header 'Content-Type: application/json' `
+                               --data-binary '@-' `
+                               -D $tmpHeaders `
+                               -o $tmpResp `
+                               -w '%{http_code}' `
+                               "$env:DISCORD_FORGE_WEBHOOK"
+                      $status = [int]$rawStatus
+                      Write-Host "HTTP status: $status"
+
+                      if ($status -ge 200 -and $status -lt 300) {
+                          Write-Host "Forge announce POST succeeded."
+                          exit 0
+                      }
+
+                      $bodySnippet = ""
+                      if (Test-Path $tmpResp) {
+                          $bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
+                          if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
+                      }
+
+                      if ($status -ge 400 -and $status -lt 500) {
+                          # E2: 4xx is permanent — webhook revoked, channel deleted,
+                          # payload malformed. No retry.
+                          throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
+                      }
+
+                      # E1: 5xx (or transport-level fail with status 0) — wait + retry once
+                      if ($attempt -lt $maxAttempts) {
+                          Write-Host "Transient $status — sleeping 30s before retry."
+                          Start-Sleep -Seconds 30
+                      } else {
+                          throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
+                      }
+                  }

.gitea/workflows/release.yml

@@ -0,0 +1,183 @@
+name: Release
+
+# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
+# current Dalamud staging branch, locates the latest.zip produced by
+# DalamudPackager and attaches it to the matching Gitea Release.
+#
+# User-controlled inputs touched by this workflow:
+#   - the tag name (filtered by on.tags = v*, validated again at runtime
+#     against ^v\d+\.\d+\.\d+$ before being used in any string)
+# All other values are either repo-controlled (paths under
+# HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
+# URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
+# titles, commit messages, etc.) flows into a run-step.
+#
+# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
+# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
+# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
+
+on:
+    push:
+        tags:
+            - "v*"
+    # Manual recovery trigger. Use Gitea's "Run workflow" UI and select the
+    # tag (e.g. v1.4.4) from the Ref dropdown - not main. The Validate tag
+    # ref step below hard-fails if a non-tag ref is selected, because the
+    # release-action reads GITHUB_REF directly and rejects anything that
+    # does not start with refs/tags/.
+    workflow_dispatch:
+
+permissions:
+    contents: write
+
+jobs:
+    release:
+        name: Build and attach release ZIP
+        runs-on: ubuntu-latest
+        timeout-minutes: 20
+
+        steps:
+            # release-action@main reads GITHUB_REF directly (its action.yml
+            # does not declare a tag_name input). Validate up-front so manual
+            # dispatches from a branch ref fail loud here instead of burning
+            # a full build before the final step errors out with "ref X is
+            # not a tag".
+            - name: Validate tag ref
+              run: |
+                  if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
+                      echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
+                      echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
+                      exit 1
+                  fi
+
+            - name: Checkout
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+            - name: Setup .NET 10
+              uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
+              with:
+                  dotnet-version: 10.0.x
+
+            - name: Download Dalamud staging
+              run: |
+                  hooks="$HOME/.xlcore/dalamud/Hooks/dev"
+                  mkdir -p "$hooks"
+                  curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
+                  unzip -oq dalamud.zip -d "$hooks"
+
+            - name: Build (Release)
+              run: dotnet build HellionChat/HellionChat.csproj --configuration Release
+
+            - name: Locate latest.zip
+              id: locate
+              run: |
+                  zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
+                  if [ -z "$zip" ]; then
+                      echo "latest.zip not found under HellionChat/bin/Release" >&2
+                      exit 1
+                  fi
+                  echo "Found: $zip"
+                  echo "path=$zip" >> "$GITHUB_OUTPUT"
+
+            # Build a release body from the matching changelog block in
+            # HellionChat.yaml plus a static install / docs footer. Fails the
+            # workflow if no block exists for the tagged version, which is the
+            # automated counterpart to the "yaml + repo.json + release body
+            # kept in sync" rule.
+            #
+            # GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
+            # tag value is treated as a PowerShell variable, not as inline shell
+            # text. The strict regex below rejects anything that is not a clean
+            # semver tag before it is used to build a string.
+            - name: Generate release body
+              shell: pwsh
+              env:
+                  # github.ref_name is the tag because Validate tag ref above
+                  # already enforced refs/tags/v*. Read via env: so the value
+                  # is a PowerShell variable, not inline shell text, and gets
+                  # re-validated against the semver regex below.
+                  TAG_NAME: ${{ github.ref_name }}
+              run: |
+                  $tag = $env:TAG_NAME
+                  if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
+                      throw "Refusing to generate release body for non-semver tag: $tag"
+                  }
+                  $version = $tag.Substring(1)
+
+                  $yamlPath = "HellionChat/HellionChat.yaml"
+                  $raw = Get-Content -Path $yamlPath -Raw
+
+                  $marker = "changelog: |-"
+                  $idx = $raw.IndexOf($marker)
+                  if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
+
+                  # changelog: is the last top-level key in the manifest, so
+                  # everything after the marker is the literal block. Strip the
+                  # 4-space yaml indent (prettier convention) from each line.
+                  $afterMarker = $raw.Substring($idx + $marker.Length)
+                  $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
+                  }) -join "`n"
+
+                  # Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
+                  # matches verify-changelog-sync.sh and slim-rule grep.
+                  $header = "**v$version "
+                  $start = $changelogBody.IndexOf($header)
+                  if ($start -lt 0) {
+                      throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
+                  }
+
+                  $rest = $changelogBody.Substring($start)
+                  $nextHdr = $rest.IndexOf("`n`n**v", 1)
+                  $trailer = $rest.IndexOf("`n`n---")
+
+                  if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
+                      $currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
+                  } elseif ($trailer -ge 0) {
+                      $currentBlock = $rest.Substring(0, $trailer).TrimEnd()
+                  } else {
+                      $currentBlock = $rest.TrimEnd()
+                  }
+
+                  # Static install / docs / licence footer is maintained as a
+                  # separate file so the workflow YAML stays clean (no embedded
+                  # heredoc that would have to be indented under the run-block).
+                  $footerPath = ".github/release-footer.md"
+                  if (-not (Test-Path $footerPath)) {
+                      throw "Release footer template not found: $footerPath"
+                  }
+                  $footer = Get-Content -Path $footerPath -Raw
+
+                  $body = $currentBlock + "`n" + $footer
+                  $body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
+
+                  Write-Host "Generated release body for $tag :"
+                  Write-Host "----------------------------------------"
+                  Write-Host $body
+                  Write-Host "----------------------------------------"
+
+            # release-action@main only declares files/title/body/pre_release/
+            # draft/api_key/insecure as inputs (see its action.yml). It silently
+            # ignores anything else, including body_path and tag_name. The tag
+            # itself comes from GITHUB_REF, the body must be passed inline via
+            # body:, so we re-emit release-body.md as a step output first.
+            - name: Expose release body for release-action
+              id: body
+              shell: bash
+              run: |
+                  {
+                      echo 'content<<RELEASE_BODY_EOF'
+                      cat release-body.md
+                      echo 'RELEASE_BODY_EOF'
+                  } >> "$GITHUB_OUTPUT"
+
+            # Gitea-native release action. Creates the release if the tag has no
+            # release yet, or updates the existing one with latest.zip attached
+            # and the generated body. The auto-injected GITHUB_TOKEN on Gitea
+            # Actions has Gitea-API scope and is sufficient for release write.
+            - name: Attach to Gitea release
+              uses: https://gitea.com/actions/release-action@main
+              with:
+                  files: ${{ steps.locate.outputs.path }}
+                  body: ${{ steps.body.outputs.content }}
+                  api_key: ${{ secrets.GITHUB_TOKEN }}

.gitea/workflows/security.yml

@@ -0,0 +1,20 @@
+name: Security
+on:
+    push:
+        branches: [main, master]
+    pull_request:
+    schedule:
+        - cron: "0 6 * * 1"
+    workflow_dispatch:
+
+jobs:
+    scan:
+        uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
+        with:
+            # MessageStore.cs uses string-interpolation in CommandText for table
+            # names and clause-joins that come from internal code constants, not
+            # user input. Values are bound via SqlParameter, the SQL surface is
+            # local-only inside a Dalamud plugin. Semgrep matches the pattern
+            # without dataflow, so it flags those eight call sites; CodeQL
+            # would not. Suppressed for this repo only.
+            semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"

.githooks/pre-push

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# .githooks/pre-push — invokes preflight.sh (A/B/C/D=build).
+exec scripts/preflight.sh

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,73 +1,73 @@
 name: Bug report
 description: Something in HellionChat is broken or behaves wrong
 labels:
-  - bug
+    - bug
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting. Please fill in the fields below so I can
-        reproduce the issue. If this is a security issue, stop here and
-        use the [private vulnerability advisory](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
-        instead.
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting. Please fill in the fields below so I can
+              reproduce the issue. If this is a security issue, stop here and
+              report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
+              instead.
 
-  - type: input
-    id: version
-    attributes:
-      label: HellionChat version
-      description: From Settings → Information → Version
-      placeholder: "0.5.4"
-    validations:
-      required: true
-
-  - type: dropdown
-    id: platform
-    attributes:
-      label: Platform
-      options:
-        - Windows (XIVLauncher)
-        - Linux (XIVLauncher Core)
-        - macOS (XIVLauncher Core / wine)
-        - Other
-    validations:
-      required: true
-
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened
-      description: Plain description, no log dumps yet
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: What you expected
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: How to reproduce
-      description: Step-by-step from "open settings" or "log in" through to the broken behaviour
-    validations:
-      required: true
-
-  - type: textarea
-    id: log
-    attributes:
-      label: Relevant /xllog excerpt
-      description: Filter for "HellionChat" if the log is huge
-      render: text
-
-  - type: checkboxes
-    id: confirm
-    attributes:
-      label: Pre-flight
-      options:
-        - label: I am running the latest version of HellionChat
+    - type: input
+      id: version
+      attributes:
+          label: HellionChat version
+          description: From Settings → Information → Version
+          placeholder: "0.5.4"
+      validations:
           required: true
-        - label: I have searched existing issues for duplicates
+
+    - type: dropdown
+      id: platform
+      attributes:
+          label: Platform
+          options:
+              - Windows (XIVLauncher)
+              - Linux (XIVLauncher Core)
+              - macOS (XIVLauncher Core / wine)
+              - Other
+      validations:
           required: true
+
+    - type: textarea
+      id: what-happened
+      attributes:
+          label: What happened
+          description: Plain description, no log dumps yet
+      validations:
+          required: true
+
+    - type: textarea
+      id: expected
+      attributes:
+          label: What you expected
+      validations:
+          required: true
+
+    - type: textarea
+      id: steps
+      attributes:
+          label: How to reproduce
+          description: Step-by-step from "open settings" or "log in" through to the broken behaviour
+      validations:
+          required: true
+
+    - type: textarea
+      id: log
+      attributes:
+          label: Relevant /xllog excerpt
+          description: Filter for "HellionChat" if the log is huge
+          render: text
+
+    - type: checkboxes
+      id: confirm
+      attributes:
+          label: Pre-flight
+          options:
+              - label: I am running the latest version of HellionChat
+                required: true
+              - label: I have searched existing issues for duplicates
+                required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,15 @@
 blank_issues_enabled: false
 
 contact_links:
-  - name: Security vulnerability
-    url: https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
-    about: Do not open a public issue for security problems. Use the private advisory instead.
+    - name: Security vulnerability
+      url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
+      about: Do not open a public issue for security problems. Report by e-mail instead.
 
-  - name: Upstream Chat 2 issue
-    url: https://github.com/Infiziert90/ChatTwo/issues
-    about: If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
+    - name: Upstream Chat 2 issue
+      url: https://github.com/Infiziert90/ChatTwo/issues
+      about:
+          If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
 
-  - name: Discord
-    url: https://discord.com/users/j.j_kazama
-    about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking.
+    - name: Discord
+      url: https://discord.com/users/j.j_kazama
+      about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,55 +1,57 @@
 name: Feature request
 description: Suggest a feature or enhancement for HellionChat
 labels:
-  - enhancement
+    - enhancement
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for the suggestion. HellionChat focuses on privacy by
-        default and a small, well-scoped feature set. Suggestions that
-        align with that scope are easier to accept than ones that pull
-        the plugin toward "do everything".
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for the suggestion. HellionChat focuses on privacy by
+              default and a small, well-scoped feature set. Suggestions that
+              align with that scope are easier to accept than ones that pull
+              the plugin toward "do everything".
 
-  - type: textarea
-    id: problem
-    attributes:
-      label: What problem are you trying to solve
-      description: The user-side problem, not the proposed solution yet
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: What you would like HellionChat to do
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives you have considered
-      description: Other plugins, manual workarounds, settings combinations
-
-  - type: dropdown
-    id: scope
-    attributes:
-      label: Scope estimate from your side
-      options:
-        - "Small (one tab, one toggle, one filter)"
-        - "Medium (a settings section, persistent state, one new file)"
-        - "Large (architectural, touches the message pipeline or the database)"
-        - "I don't know"
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: confirm
-    attributes:
-      label: Pre-flight
-      options:
-        - label: I have searched existing issues for similar requests
+    - type: textarea
+      id: problem
+      attributes:
+          label: What problem are you trying to solve
+          description: The user-side problem, not the proposed solution yet
+      validations:
           required: true
-        - label: I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat 2
+
+    - type: textarea
+      id: solution
+      attributes:
+          label: What you would like HellionChat to do
+      validations:
           required: true
+
+    - type: textarea
+      id: alternatives
+      attributes:
+          label: Alternatives you have considered
+          description: Other plugins, manual workarounds, settings combinations
+
+    - type: dropdown
+      id: scope
+      attributes:
+          label: Scope estimate from your side
+          options:
+              - "Small (one tab, one toggle, one filter)"
+              - "Medium (a settings section, persistent state, one new file)"
+              - "Large (architectural, touches the message pipeline or the database)"
+              - "I don't know"
+      validations:
+          required: true
+
+    - type: checkboxes
+      id: confirm
+      attributes:
+          label: Pre-flight
+          options:
+              - label: I have searched existing issues for similar requests
+                required: true
+              - label:
+                    I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat
+                    2
+                required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,9 +3,9 @@ Thanks for contributing to HellionChat. Please fill in the sections
 below so the review goes quickly. Delete sections that genuinely do
 not apply, but do not delete the whole template.
 
-If this is a security fix, stop here and use a private security
-advisory instead:
-https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+If this is a security fix, stop here and report it privately by
+e-mail instead of opening a public PR:
+mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
 -->
 
 ## Summary
@@ -18,12 +18,10 @@ https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
 
 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds behaviour)
-- [ ] Breaking change (config migration, removed feature, or behaviour
-      change that user-visible defaults rely on)
+- [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible defaults rely on)
 - [ ] Documentation only
 - [ ] Translation update
 - [ ] Build, CI or tooling change
-- [ ] Upstream cherry-pick from Chat 2
 
 ## Linked issue
 
@@ -53,20 +51,15 @@ new commands, new translations, removed behaviour. If none, write
   bump and is it covered by the existing migration tests?
 - Does this change the schema in MessageStore?
 - Does this change the repo.json or HellionChat.yaml manifest fields?
-- Does this affect the upstream cherry-pick path? See docs/UPSTREAM_SYNC.md.
 -->
 
 ## Checklist
 
-- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and
-      [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
+- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
 - [ ] My change matches the existing code style (`.editorconfig`).
-- [ ] I added or updated tests where the existing test infrastructure
-      made that practical, or I have explained why tests are not
-      applicable.
-- [ ] I updated the README, in-plugin strings or documentation if my
-      change is user-visible.
-- [ ] I did not include any AI-generated code without disclosing it
-      in the PR description (see [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
-- [ ] I confirm my contribution is released under the
-      [EUPL-1.2](../LICENSE).
+- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
+      are not applicable.
+- [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
+- [ ] I did not include any AI-generated code without disclosing it in the PR description (see
+      [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
+- [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).

.github/dependabot.yml

@@ -1,42 +1,42 @@
 version: 2
 
 updates:
-  # NuGet package updates for the plugin project. Weekly cadence keeps the
-  # noise down while still catching transitive security advisories within
-  # a few days of disclosure.
-  - package-ecosystem: nuget
-    directory: /HellionChat
-    schedule:
-      interval: weekly
-      day: monday
-      time: "07:00"
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 5
-    labels:
-      - dependencies
-      - nuget
-    commit-message:
-      prefix: "chore(deps)"
-    groups:
-      patches:
-        update-types:
-          - patch
-      minor:
-        update-types:
-          - minor
+    # NuGet package updates for the plugin project. Weekly cadence keeps the
+    # noise down while still catching transitive security advisories within
+    # a few days of disclosure.
+    - package-ecosystem: nuget
+      directory: /HellionChat
+      schedule:
+          interval: weekly
+          day: monday
+          time: "07:00"
+          timezone: Europe/Berlin
+      open-pull-requests-limit: 5
+      labels:
+          - dependencies
+          - nuget
+      commit-message:
+          prefix: "chore(deps)"
+      groups:
+          patches:
+              update-types:
+                  - patch
+          minor:
+              update-types:
+                  - minor
 
-  # GitHub Actions versions in .github/workflows. Lower cadence because
-  # Action releases ship less frequently and are usually safe to defer
-  # for a month.
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: monthly
-      time: "07:00"
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 3
-    labels:
-      - dependencies
-      - github-actions
-    commit-message:
-      prefix: "chore(actions)"
+    # GitHub Actions versions in .github/workflows. Lower cadence because
+    # Action releases ship less frequently and are usually safe to defer
+    # for a month.
+    - package-ecosystem: github-actions
+      directory: /
+      schedule:
+          interval: monthly
+          time: "07:00"
+          timezone: Europe/Berlin
+      open-pull-requests-limit: 3
+      labels:
+          - dependencies
+          - github-actions
+      commit-message:
+          prefix: "chore(actions)"

.github/forge-posts/v1.1.0.md

@@ -2,11 +2,16 @@
 subtitle: "Theme Foundation"
 versionsnatur: "Major-UI-Cycle"
 ---
-- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
-- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht
+
+- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint
+  Grove
+- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
+  zurück zur Übersicht
 - Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
-- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt
+- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch
+  abgelegt
 - Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
 - Plugin-Icon zum Hellion-Forge-Hammer gewechselt
-- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes
+- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings
+  → Themes
 - Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`

.github/forge-posts/v1.2.0.md

@@ -2,14 +2,23 @@
 subtitle: "Layout Refresh"
 versionsnatur: "Major-UI-Cycle"
 ---
-- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
+
+- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den
+  aktiven Tab
 - Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
 - Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
-- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe
-- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
-- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
-- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
-- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide
+- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon
+  (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher
+  Partner ergibt konsistent dieselbe
+- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
+  deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
+- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter,
+  Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
+- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner.
+  `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
+- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante
+  Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
+  beide
 - Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
 - Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben
 

.github/forge-posts/v1.2.1.md

@@ -2,15 +2,28 @@
 subtitle: "Settings Cleanup"
 versionsnatur: "UX-Polish-Cycle"
 ---
-- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
-- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
+
+- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen
+  Untertitel — kein Raten mehr wo eine Setting steckt
+- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben**
+  (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
+  Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
 - Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
 - Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
 - KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
-- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
-- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
-- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
-- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl)
-- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster
+- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle,
+  `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
+- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach
+  `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst
+  gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
+  die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
+- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
+  hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
+- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
+  Preset-Wahl)
+- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
+  Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
+  unseren Slider für das jeweilige Fenster
 
-Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant.
+Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker)
+wie ursprünglich geplant.

.github/forge-posts/v1.2.3.md

@@ -2,12 +2,22 @@
 subtitle: "Theme Expansion"
 versionsnatur: "Theme-Pack-Patch"
 ---
-- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
-- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt
-- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
-- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
-- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab
-- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter
+
+- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach
+  mehr Farboptionen
+- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
+  nicht mit den Brand-Themes beißt
+- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
+  Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
+- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
+  eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
+- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der
+  Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün);
+  die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
+  CVD-Fälle ab
+- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen
+  unverändert weiter
 - Theme-Katalog wächst damit von fünf auf neun Built-ins
 
-Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
+Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche)
+kann später nachgeliefert werden, falls Bedarf kommt.

.github/forge-posts/v1.3.0.md

@@ -2,9 +2,17 @@
 subtitle: "Plugin Integrations: Honorific"
 versionsnatur: "Plugin-Integration-Cycle 1"
 ---
+
 - Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
-- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist
+- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem
+  Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
+  aktiv ist
 - **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
-- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
-- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
-- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert
+- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
+  Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
+  (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
+  (XIVInstantMessenger)
+- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
+  Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
+- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
+  HellionChat aktualisiert

.github/forge-posts/v1.4.0.md

@@ -5,28 +5,19 @@ versionsnatur: Stability-Hotfix
 
 **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
 
-Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben
-bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
-abgearbeitet, bevor Performance- und Architektur-Refactors
-draufkommen.
+Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
+abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
 
-- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur
-  Datei-Freigabe an, Pooling=false auf der Connection macht
-  den manuellen GC.Collect überflüssig
-- **Worker-Threads** (PendingMessage, RetentionSweep) sind
-  jetzt explizit IsBackground=true, das Plugin-Domain kann
+- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
+  manuellen GC.Collect überflüssig
+- **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
   sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
-- **EmoteCache-Loader** von async-void auf async-Task mit
-  shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
+- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
   mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
-- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent
-  zu failen
-- **Plugin-Dispose** flushed pending DeferredSave bevor Services
-  abgebaut werden, Settings-Änderungen aus den letzten Frames
-  vor Disable überleben jetzt zuverlässig
-- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt
-  HellionThemeWindowOpacity in das neue WindowOpacity-Feld statt
-  auf 0.85 zurückzufallen
+- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
+- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
+  Frames vor Disable überleben jetzt zuverlässig
+- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
+  WindowOpacity-Feld statt auf 0.85 zurückzufallen
 
-Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen
-außer dass Reload und Shutdown spürbar sauberer laufen.
+Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.

.github/forge-posts/v1.4.1.md

@@ -5,35 +5,23 @@ versionsnatur: Performance-Patch
 
 **Hellion Chat 1.4.1 — Theme Engine Performance**
 
-Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure
-aus dem Theme-Engine-Render-Pfad eliminiert, Custom-Theme-
-Hot-Reload überlebt transiente File-Locks beim Editor-Save.
-Plus zehnter Built-In und überarbeitete Author-Credits.
+Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad eliminiert,
+Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
+Author-Credits.
 
-- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register
-  (Built-In oder Custom) werden alle Color-Slots einmalig in
-  ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal
-  liest aus dem Cache statt pro Slot pro Frame durch
-  ColourUtil.RgbaToAbgr zu jagen. Real gemessene
-  Frame-Time-Recovery: **~13 %** in typischer Render-Szene
+- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
+  ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem Cache statt pro Slot pro Frame durch
+  ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
   (Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
-- **Custom-Theme File-Lock-Härtung.** Wenn der User ein
-  Theme-JSON gerade speichert während HellionChat reloaden
-  will, fängt der Loader jetzt explizit Sharing-Violation
-  und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im
-  Picker, beim nächsten Tick wird automatisch retry'd —
-  vorher fiel das Theme aus der Liste bis zum Plugin-Reload
-- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein
-  Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
+- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
+  fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
+  beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
+- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
   gekommen ist, holt Switch() das beim Anwenden nach
-- **Synthwave Sunset als zehnter Built-In.** Hot Magenta +
-  Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
+- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
   Late-Night-Raids
-- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt
-  unter „Hellion Forge". Mint Grove und Forge Merchantman
+- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
   werden Carla Beleandis als Community-Geste zugeschrieben.
 
-Keine Schema-Bumps, keine User-sichtbaren Funktions-
-Änderungen außer dass die Frames in Theme-getrieben
-rendernden Szenen merklich glatter laufen und ein neues
-Theme im Picker steht.
+Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
+Szenen merklich glatter laufen und ein neues Theme im Picker steht.

.github/forge-posts/v1.4.2.md

@@ -5,39 +5,25 @@ versionsnatur: Performance-Patch
 
 **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
 
-Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei
-Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render-
-Pfad und der Settings-StatusBar eliminiert.
+Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
+und der Settings-StatusBar eliminiert.
 
-- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt
-  Theme, DrawList, Window-Left, Window-Right und die ABGR-
-  Border-Color einmalig vor den Per-Message-Loop. Bei 100
-  sichtbaren Messages sind das gut 500 redundante P/Invokes
-  und Property-Reads, die der Hoist eliminiert. Pop-Out-
-  Heavy-Setups (mehrere parallele Chat-Windows) profitieren
-  proportional, weil der Hoist pro DrawMessages-Call greift,
-  also pro Window
-- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color-
-  Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
-  zwei String-Allokationen pro Tab (eine für Tint-Hash, eine
-  für Icon-Hash). Der neue TabTintCache liest pre-computed
-  Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
-  drifted. Beide Caches haben separate Validation-Keys, also
-  keine Cross-Invalidation zwischen Tint- und Icon-Pfad.
-  AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin
-  ohne Tab-Awareness
-- **StatusBar-Aggregation hinter Cache-Gate.** Die Status-
-  Leiste am unteren Window-Rand summiert die Tab-Message-
-  Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache-
-  Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
-  liefen Sum und Count trotzdem pro Frame. Jetzt vor dem
-  Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
+- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
+  Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das gut 500 redundante P/Invokes und
+  Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
+  proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
+- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
+  zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
+  Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
+  keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
+  Tab-Awareness
+- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
+  Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
+  liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
   ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
 
-Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen,
-Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
+Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
 Multiplikation pro Window.
 
-Keine Schema-Bumps, keine User-sichtbaren Funktions-
-Änderungen außer dass die Frames im Chat-Log und in der
+Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
 Settings-Statusleiste merklich glatter laufen.

.github/forge-posts/v1.4.3.md

@@ -0,0 +1,29 @@
+---
+subtitle: Async-Lifecycle + Gitea-Cutover
+versionsnatur: Architecture-Refactor
+---
+
+**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
+
+Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
+das Custom-Repo zieht von GitHub auf Gitea um.
+
+- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
+  Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
+  LoadAsync, sodass Dalamud die UI während der schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in
+  DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
+- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
+  `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
+  XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
+  aktualisiert
+- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
+  Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
+  first"-Fehlermeldung statt eines impliziten Migrations-Pfads
+- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
+  Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
+  300-ms-Block beim Plugin-Start
+- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
+  Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und Code-Architektur-Hygiene, kein direkter User-spürbarer
+  Speed-Win in dieser Release
+
+Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.

.github/forge-posts/v1.4.4.md

@@ -0,0 +1,34 @@
+---
+subtitle: Threading- und IPC-Sicherheits-Politur
+versionsnatur: Wartung und Robustheit
+---
+
+**Hellion Chat 1.4.4 — Threading- und IPC-Sicherheits-Politur**
+
+Fünfter Sub-Patch der v1.4.x Polish-Sweep-Serie. Threading-Annahmen werden explizit pro Methode dokumentiert, ein
+Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn er fehlschlägt und der Privacy-Filter
+spricht jetzt bei unbekannten ChatTypes.
+
+- **AutoTellTabsService Hot-Path-Lock entfernt.** `ActiveTempTabCount` hat bisher pro Render-Frame ein LINQ-Count unter
+  einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der parallel zur Tabs-Liste mitgeführt wird,
+  inklusive Resync-Hook für den Snapshot-Restore-Pfad in `SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite
+  damit die Atomicity-Semantik nicht versehentlich wegrefactored wird
+- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am Klassen-Ende hat jede
+  IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den Thread-Kontext direkt am Call-Site benennt
+  (framework only, framework scheduled, any). Mehr Hilfe für künftige Reviews als ein abstraktes Threading-Kapitel
+- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure bisher als Debug
+  geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription kann den Service über Plugin-Reloads
+  hinweg leben lassen, also läuft der Log jetzt auf Warning
+- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne `IsBackground=true`
+  unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu MessageManager und RetentionSweep (beide
+  seit v1.4.0)
+- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType einführt der weder in
+  der Whitelist noch in den Defaults steht, wird er bisher silent durch den Failsafe geleitet. Jetzt loggt der Filter
+  einmalig pro Runtime eine Warning mit dem Type und dem Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein
+  Log-Spam
+- **Default-Flip für neue Installationen.** `PrivacyPersistUnknownChannels` startet bei neuen Configs jetzt auf `true`,
+  damit ein Patch-bedingt neuer ChatType nicht stillschweigend gedroppt wird bevor der User entscheiden kann. Bestehende
+  Configs behalten ihre Wahl, weil der Deserializer den Initializer überschreibt. Keine Migration, kein Schema-Bump
+
+Keine User-sichtbaren Funktions-Änderungen außer dem Default-Flip für neue Installationen. Settings, Themes, Tabs und
+das Privacy-Verhalten für Bestand bleiben unangetastet.

.github/forge-posts/v1.4.5.md

@@ -0,0 +1,28 @@
+---
+subtitle: UX und Robustheit
+versionsnatur: UX-Polish-Cycle
+---
+
+**Hellion Chat 1.4.5 — UX und Robustheit**
+
+Sechster Sub-Patch der v1.4.x Polish-Sweep-Serie. Render-Fehler im Chat-Fenster werden jetzt sichtbar, der
+First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt nicht mehr über Plugin-Reloads
+hinweg liegen, und die Statusleiste klippt in schmalen Fenstern nicht mehr.
+
+- **Fehler-Benachrichtigung im Chat-Fenster.** Wenn ein Render-Fehler in `DrawChatLog` auftritt, zeigt das Plugin jetzt
+  eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das Fenster stillschweigend leer zu lassen. Der
+  Stack-Trace selbst geht weiter via `Plugin.Log.Error` ins Logfile. De-Dup über Per-Session-Bool, damit ein
+  wiederkehrender Fehler die Notification-Stack nicht pro Frame neu vollkippt
+- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend `FirstRunCompleted=true`,
+  also lässt das X den Wizard schwebend zurück und er kommt beim nächsten Plugin-Reload wieder. Eine neue „Später —
+  Defaults behalten"-Schaltfläche im Footer ist der explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual
+  EN+DE plus Tooltip
+- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in `Plugin.DisposeAsync`
+  neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der vorigen Session den nächsten Load nicht
+  mehr erbt
+- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die Chat-Window-Breite
+  abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier linken Slots. Ab ausreichender Breite
+  taucht der Slot wieder auf
+- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource fehlt
+  (Broken-csproj-Pfad, nie ein Produktions-Build), plus expliziter Session-Only-Invariant-Kommentar für Auto-Tell-Tabs
+  in `Plugin.cs:167-168` mit einem TempTabCounter-Init-Pin in der Build-Suite. Kein Schema-Bump, keine Migration

.github/forge-posts/v1.4.6.md

@@ -0,0 +1,33 @@
+---
+subtitle: Code Hygiene and Refactor
+versionsnatur: Maintenance-Cycle
+---
+
+Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das v1.4.7-Backlog-Cleanup, plus
+zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
+
+- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt im Pre-Push-Gate,
+  statt erst beim Pre-Merge-Review aufzufallen.
+- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO, InvalidOperation,
+  ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den Atlas-Build mitzureißen. Der
+  Exception-Typ wird im Log mitgegeben für die Diagnose.
+- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden via
+  `[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt sofort beim Plugin-Load,
+  statt still beim Klick zu scheitern.
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String` wird jetzt auch dann
+  freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im early-return).
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und `TellTarget`. Vorher
+  Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
+- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
+  `ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein Sub-Pixel-Blur mehr auf
+  125/150%-Setups.
+- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale (Padding skaliert,
+  der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
+- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt durch eine
+  `IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der Build-Suite. Plus:
+  HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert nur Session-Tabs statt der ganzen
+  Tab-Liste, SettingsOverview cached den DrawList einmal pro Frame.
+- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von CRYSTALLITE) ersetzt
+  Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten Plugin-Load auf Hellion Arctic zurück.
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).

.github/forge-posts/v1.4.7.md

@@ -0,0 +1,29 @@
+---
+subtitle: Backlog Cleanup and Mid-Features
+versionsnatur: Mid-Feature-Patch
+---
+
+Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 — angepinnte Tell-Tabs
+die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
+
+- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen". Angepinnte Tabs überleben
+  Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie (wird beim Rehydrate aus dem MessageStore
+  nachgeladen) und bleiben an die gleiche /tell-Person gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool —
+  die normalen Auto-Tell-Tabs (15er Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs
+  in einer eigenen „Angepinnt"-Sektion mit eigenem Trenner.
+- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der Honorific-Titel eine Glow-Farbe
+  trägt. Opt-in via **Settings → Integrationen → Glow-Outline rendern (Honorific)** (Default OFF). Gradient (Color3 /
+  GradientColourSet / Wave / Pulse) wird geparst und im DTO weitergereicht, rendert aktuell aber statisch als
+  Primärfarbe — der volle Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
+- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44 px (icon-only), aber
+  breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt (2)" nicht abgeschnitten werden.
+- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den Chat-Input zurück auf
+  `/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom` bewahrt jetzt den Runtime-`CurrentChannel`
+  über den persistent-Tab-Merge hinweg, und `TabSwitched` deep-cloned den Seed-Channel statt sich den `UsedChannel` mit
+  dem vorigen Tab zu teilen.
+- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91 `Plugin.Log`-Call-Sites. Damit
+  läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke aus v1.4.6 geschlossen). Plus: TempTab-Counter als
+  abgeleitete Property statt gecachtes Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein
+  Lock-Free-Vorteil mehr. Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).

.github/release-footer.md

@@ -1,26 +1,27 @@
-
 ---
 
 ## How to install
 
-This release is distributed via the HellionChat custom repository, not the
-Dalamud main plugin repo. To install:
+This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
 
 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
-2. Add the URL:
-   `https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/repo.json`
+2. Add the URL: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
 3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
 
 ## Project documents
 
-- [README](https://github.com/JonKazama-Hellion/HellionChat/blob/main/README.md) — features, architecture, build
-- [Privacy notice](https://github.com/JonKazama-Hellion/HellionChat/blob/main/PRIVACY.md) — what the plugin stores and sends
-- [Third-party notices](https://github.com/JonKazama-Hellion/HellionChat/blob/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences
-- [Security policy](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SECURITY.md) — vulnerability reporting
-- [Support](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SUPPORT.md) — bug reports, questions, contact paths
+- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
+  architecture, build
+- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
+  the plugin stores and sends
+- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
+  — dependencies and licences
+- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) —
+  vulnerability reporting
+- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports,
+  questions, contact paths
 
 ## Licence
 
-[EUPL-1.2](https://github.com/JonKazama-Hellion/HellionChat/blob/main/LICENSE).
-Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna,
-also EUPL-1.2.
+[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
+[Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.

.github/workflows/build.yml

@@ -1,56 +0,0 @@
-name: Build
-
-# Verifies that every push to main and every PR still builds against the
-# current Dalamud staging branch. Does not produce release artefacts; the
-# release workflow handles that on tag.
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-
-# Minimum permissions for a build-only workflow: read the repo, nothing
-# else. Closes the CodeQL "Workflow does not contain permissions" alert
-# and matches the principle-of-least-privilege the security guide
-# recommends for workflows that don't push or create releases.
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Build (Release)
-    runs-on: windows-latest
-    timeout-minutes: 15
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Download Dalamud staging
-        shell: pwsh
-        run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
-
-      - name: Restore
-        run: dotnet restore HellionChat/HellionChat.csproj
-
-      - name: Build (Release)
-        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Upload build output
-        uses: actions/upload-artifact@v7
-        with:
-          name: HellionChat-build-${{ github.run_number }}
-          path: HellionChat/bin/Release/**/HellionChat/**
-          if-no-files-found: warn
-          retention-days: 14

.github/workflows/codeql.yml

@@ -1,93 +0,0 @@
-name: CodeQL
-
-# Replaces the GitHub default-setup CodeQL scan. The default setup runs
-# without resolving the Dalamud assemblies (they live in a user-AppData
-# path) and reports "Low C# analysis quality" because call-target
-# resolution sits at ~64%. This workflow downloads the Dalamud staging
-# distribution before the build, runs a manual dotnet build, and then
-# lets CodeQL analyse the fully-resolved compilation. Quality climbs
-# back above the 85% thresholds.
-#
-# This workflow only consumes trusted inputs: the tag/branch ref via
-# the standard checkout action, and the Dalamud distribution URL which
-# is pinned to a goatcorp-controlled GitHub Pages target. No user-
-# controlled event payload (issue title, PR body, commit message) flows
-# into a run-step.
-#
-# Disable the default setup in the repo before this workflow lands:
-# Settings -> Code security -> Code scanning -> "CodeQL analysis" tile
-# -> Switch to advanced.
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  schedule:
-    - cron: '17 6 * * 1'
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
-jobs:
-  analyze-csharp:
-    name: Analyze (csharp)
-    runs-on: windows-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-
-      - name: Setup .NET 10
-        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7  # v5.2.0
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Download Dalamud staging
-        shell: pwsh
-        run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          languages: csharp
-          build-mode: manual
-          queries: security-extended
-
-      - name: Restore
-        run: dotnet restore HellionChat/HellionChat.csproj
-
-      - name: Build (Release)
-        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          category: /language:csharp
-
-  analyze-actions:
-    name: Analyze (actions)
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          languages: actions
-          build-mode: none
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
-        with:
-          category: /language:actions

.github/workflows/forge-announce.yml

@@ -1,226 +0,0 @@
-name: Forge Announce
-
-# Triggered when a vX.Y.Z tag is pushed. Reads .github/forge-posts/<tag>.md
-# (Frontmatter + DE bullet body) and the matching English block from
-# HellionChat/HellionChat.yaml, builds a Discord-Webhook embed and posts
-# it to the Hellion Forge #changelog channel.
-#
-# Decoupled from release.yml: a fail here does not block the GitHub
-# release, and a fail there does not block the announce. Spec lives in
-# the Vault under "Hellion Chat Forge-Auto-Announce Spec".
-#
-# Security: the only user-controlled inputs that enter run-steps are the
-# tag name and the frontmatter values from a repo-internal markdown file.
-# Tag name is read via env: (TAG_NAME, $env:TAG_NAME) and validated against
-# ^v\d+\.\d+\.\d+$ before any string interpolation. Frontmatter values are
-# parsed by regex with explicit length caps. No webhook event payload data
-# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Existing tag to (re)post, e.g. v1.1.0'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  announce:
-    name: Post changelog to Hellion Forge
-    runs-on: ubuntu-latest
-    # The DISCORD_FORGE_WEBHOOK secret lives under Settings → Environments
-    # → Webhook (case-sensitive). Without this declaration the secret is
-    # not in scope for the job.
-    environment: Webhook
-    timeout-minutes: 5
-
-    steps:
-      # On push:tags github.ref points at the tag commit; on workflow_dispatch
-      # the user supplies the tag explicitly. Always check out that tag so
-      # the yaml + forge-posts file are read from the tagged tree, not main.
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-        with:
-          ref: ${{ github.event.inputs.tag || github.ref }}
-
-      # Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
-      # ships pre-installed on ubuntu-latest so we get the same scripting
-      # patterns release.yml uses on windows-latest. Tag is read via env: to
-      # treat it as a string variable rather than inline shell text, and
-      # validated against the semver regex before any interpolation.
-      - name: Build embed payload
-        id: build
-        shell: pwsh
-        env:
-          TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
-        run: |
-          $tag = $env:TAG_NAME
-          if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
-              throw "V1: Refusing to announce non-semver tag: $tag"
-          }
-          $version = $tag.Substring(1)
-
-          # ---------- Forge-Post-Datei lesen ----------
-          $forgePath = ".github/forge-posts/$tag.md"
-          if (-not (Test-Path $forgePath)) {
-              throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
-          }
-          $forgeRaw = Get-Content -Path $forgePath -Raw
-
-          # Frontmatter (--- … ---) am Datei-Anfang
-          if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
-              throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
-          }
-          $fmText = $matches[1]
-          $deBody = $matches[2].Trim()
-
-          $subtitle = $null
-          $versionsnatur = $null
-          foreach ($line in ($fmText -split "`r?`n")) {
-              if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$')      { $subtitle = $matches[1] }
-              if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
-          }
-          if ([string]::IsNullOrWhiteSpace($subtitle))      { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
-          if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
-          if ($subtitle.Length      -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
-          if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
-          if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
-
-          # ---------- EN-Block aus HellionChat.yaml ziehen ----------
-          # 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
-          # Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
-          $yamlPath = "HellionChat/HellionChat.yaml"
-          $raw = Get-Content -Path $yamlPath -Raw
-          $marker = "changelog: |-"
-          $idx = $raw.IndexOf($marker)
-          if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
-          $afterMarker = $raw.Substring($idx + $marker.Length)
-          $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-              if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
-          }) -join "`n"
-
-          $header = "**Hellion Chat $version"
-          $start = $changelogBody.IndexOf($header)
-          if ($start -lt 0) {
-              throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
-          }
-          $rest = $changelogBody.Substring($start)
-          $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
-          $trailer = $rest.IndexOf("`n`n---")
-          if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
-              $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
-          } elseif ($trailer -ge 0) {
-              $enBlock = $rest.Substring(0, $trailer).TrimEnd()
-          } else {
-              $enBlock = $rest.TrimEnd()
-          }
-
-          # ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
-          $title = "Hellion Chat $version — $subtitle"
-          $description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
-          $footerText = "Hellion Forge · $versionsnatur"
-          $totalChars = $title.Length + $description.Length + $footerText.Length
-          if ($totalChars -gt 5500) {
-              throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
-          }
-          Write-Host "Char-Cap OK: $totalChars / 5500"
-
-          # ---------- Embed-Payload bauen ----------
-          $payload = [ordered]@{
-              username = "Forge Herald"
-              avatar_url = "https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png"
-              content = "<@&1500489631555260446>"
-              allowed_mentions = [ordered]@{
-                  parse = @()
-                  roles = @("1500489631555260446")
-              }
-              embeds = @(
-                  [ordered]@{
-                      title = $title
-                      url = "https://github.com/JonKazama-Hellion/HellionChat/releases/tag/$tag"
-                      color = 12730636
-                      description = $description
-                      footer = [ordered]@{ text = $footerText }
-                      timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
-                  }
-              )
-          }
-
-          $payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
-          # Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
-          [System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
-
-          Write-Host "Payload size: $($payloadJson.Length) chars"
-          Write-Host "Embed title:  $title"
-          Write-Host "Embed footer: $footerText"
-
-      # POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
-      # so we can pipe the payload via stdin (--data-binary @-) and keep
-      # secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
-      - name: POST to Hellion Forge webhook
-        shell: pwsh
-        env:
-          DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
-        run: |
-          if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
-              throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
-          }
-
-          $payloadFile = "$PWD/embed-payload.json"
-          if (-not (Test-Path $payloadFile)) {
-              throw "Embed payload file missing — previous step did not produce embed-payload.json"
-          }
-
-          $maxAttempts = 2
-          $attempt = 0
-          while ($attempt -lt $maxAttempts) {
-              $attempt++
-              Write-Host "POST attempt $attempt of $maxAttempts"
-              $tmpResp = "$PWD/.webhook-response"
-              $tmpHeaders = "$PWD/.webhook-headers"
-              # --silent suppresses progress; --show-error prints errors so
-              # the workflow log shows what happened. -w prints HTTP status
-              # to stdout for inspection. -o captures body for diagnosis,
-              # -D captures headers.
-              $rawStatus = Get-Content $payloadFile -Raw |
-                  curl --silent --show-error `
-                       --header 'Content-Type: application/json' `
-                       --data-binary '@-' `
-                       -D $tmpHeaders `
-                       -o $tmpResp `
-                       -w '%{http_code}' `
-                       "$env:DISCORD_FORGE_WEBHOOK"
-              $status = [int]$rawStatus
-              Write-Host "HTTP status: $status"
-
-              if ($status -ge 200 -and $status -lt 300) {
-                  Write-Host "Forge announce POST succeeded."
-                  exit 0
-              }
-
-              $bodySnippet = ""
-              if (Test-Path $tmpResp) {
-                  $bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
-                  if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
-              }
-
-              if ($status -ge 400 -and $status -lt 500) {
-                  # E2: 4xx is permanent — webhook revoked, channel deleted,
-                  # payload malformed. No retry.
-                  throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
-              }
-
-              # E1: 5xx (or transport-level fail with status 0) — wait + retry once
-              if ($attempt -lt $maxAttempts) {
-                  Write-Host "Transient $status — sleeping 30s before retry."
-                  Start-Sleep -Seconds 30
-              } else {
-                  throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
-              }
-          }

.github/workflows/release.yml

@@ -1,164 +0,0 @@
-name: Release
-
-# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
-# current Dalamud staging branch, locates the latest.zip produced by
-# DalamudPackager and attaches it to the matching GitHub Release.
-#
-# User-controlled inputs touched by this workflow:
-#   - the tag name (filtered by on.tags = v*, validated again at runtime
-#     against ^v\d+\.\d+\.\d+$ before being used in any string)
-# All other values are either repo-controlled (paths under
-# HellionChat/bin/Release derived from Get-ChildItem) or pinned URLs to
-# goatcorp / GitHub. Nothing from a webhook event payload (issue/PR
-# titles, commit messages, etc.) flows into a run-step.
-
-on:
-  push:
-    tags:
-      - 'v*'
-  # Manual recovery trigger. Use when a tag was pushed but the auto-run
-  # was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
-  # The tag input is validated against the same semver regex as the
-  # auto-trigger before any string interpolation happens.
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Existing tag to (re)release, e.g. v0.6.1'
-        required: true
-        type: string
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    name: Build and attach release ZIP
-    runs-on: windows-latest
-    timeout-minutes: 20
-
-    steps:
-      # On push:tags, github.ref_name is the tag — checkout default works.
-      # On workflow_dispatch, ref defaults to the branch the action was
-      # invoked from; we need to explicitly check out the tag the user
-      # supplied so the build comes from the tagged commit, not main.
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.inputs.tag || github.ref }}
-
-      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Download Dalamud staging
-        shell: pwsh
-        run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
-
-      - name: Build (Release)
-        run: dotnet build HellionChat/HellionChat.csproj --configuration Release
-
-      - name: Locate latest.zip
-        id: locate
-        shell: pwsh
-        run: |
-          $zip = Get-ChildItem -Path HellionChat\bin\Release -Recurse -Filter latest.zip | Select-Object -First 1
-          if (-not $zip)
-          {
-              throw "latest.zip not found under HellionChat\bin\Release"
-          }
-          Write-Host "Found: $($zip.FullName)"
-          "path=$($zip.FullName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
-
-      # Build a release body from the matching changelog block in
-      # HellionChat.yaml plus a static install / docs footer. Fails the
-      # workflow if no block exists for the tagged version, which is the
-      # automated counterpart to the "yaml + repo.json + release body
-      # kept in sync" rule.
-      #
-      # GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
-      # tag value is treated as a PowerShell variable, not as inline shell
-      # text. The strict regex below rejects anything that is not a clean
-      # semver tag before it is used to build a string.
-      - name: Generate release body
-        shell: pwsh
-        env:
-          # workflow_dispatch carries the user-supplied tag in inputs.tag;
-          # push:tags carries it in github.ref_name. Either way the value
-          # is treated as a PowerShell variable (env-var pass), not as
-          # inline shell text, and validated against the semver regex
-          # below before any string interpolation.
-          TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
-        run: |
-          $tag = $env:TAG_NAME
-          if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
-              throw "Refusing to generate release body for non-semver tag: $tag"
-          }
-          $version = $tag.Substring(1)
-
-          $yamlPath = "HellionChat/HellionChat.yaml"
-          $raw = Get-Content -Path $yamlPath -Raw
-
-          $marker = "changelog: |-"
-          $idx = $raw.IndexOf($marker)
-          if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
-
-          # changelog: is the last top-level key in the manifest, so
-          # everything after the marker is the literal block. Strip the
-          # 2-space yaml indent from each line.
-          $afterMarker = $raw.Substring($idx + $marker.Length)
-          $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-              if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
-          }) -join "`n"
-
-          $header = "**Hellion Chat $version"
-          $start = $changelogBody.IndexOf($header)
-          if ($start -lt 0) {
-              throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
-          }
-
-          $rest = $changelogBody.Substring($start)
-          $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
-          $trailer = $rest.IndexOf("`n`n---")
-
-          if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
-              $currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
-          } elseif ($trailer -ge 0) {
-              $currentBlock = $rest.Substring(0, $trailer).TrimEnd()
-          } else {
-              $currentBlock = $rest.TrimEnd()
-          }
-
-          # Static install / docs / licence footer is maintained as a
-          # separate file so the workflow YAML stays clean (no embedded
-          # heredoc that would have to be indented under the run-block).
-          $footerPath = ".github/release-footer.md"
-          if (-not (Test-Path $footerPath)) {
-              throw "Release footer template not found: $footerPath"
-          }
-          $footer = Get-Content -Path $footerPath -Raw
-
-          $body = $currentBlock + "`n" + $footer
-          $body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
-
-          Write-Host "Generated release body for $tag :"
-          Write-Host "----------------------------------------"
-          Write-Host $body
-          Write-Host "----------------------------------------"
-
-      - name: Attach to GitHub release
-        uses: softprops/action-gh-release@v3
-        with:
-          # Explicit tag_name so the action targets the correct release in
-          # both push:tags (auto) and workflow_dispatch (manual recovery)
-          # modes. Without this, dispatch runs would default to the branch
-          # ref (main) and fail to find the release.
-          tag_name: ${{ github.event.inputs.tag || github.ref_name }}
-          files: ${{ steps.locate.outputs.path }}
-          body_path: release-body.md
-          fail_on_unmatched_files: true
-          generate_release_notes: false

.gitignore

@@ -9,7 +9,7 @@
 .envrc
 !.env.example
 .vscode/
-scripts/
+scripts/setup-dev-env.sh
 
 # Local test project (stays out of the published plugin repo;
 # pure-function safety net for refactor cycles)
@@ -384,3 +384,7 @@ ChatTwo.Tests
 TestResults
 *.db-shm
 *.db-wal
+
+# Claude Code projekt-spezifisches Setup (lokal, nicht committed)
+/.claude/
+/CLAUDE.md

.markdownlint.json

@@ -0,0 +1,9 @@
+{
+    "MD007": { "indent": 4 },
+    "MD013": false,
+    "MD024": { "siblings_only": true },
+    "MD029": false,
+    "MD033": false,
+    "MD036": false,
+    "MD041": false
+}

.prettierignore

@@ -0,0 +1,4 @@
+bin/
+obj/
+node_modules/
+*.Designer.cs

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4,
+    "proseWrap": "always",
+    "singleQuote": false,
+    "endOfLine": "lf"
+}

.yamllint.yaml

@@ -0,0 +1,8 @@
+extends: default
+rules:
+    line-length: disable
+    document-start: disable
+    truthy:
+        allowed-values: ["true", "false", "on"]
+    empty-lines:
+        max: 1

CODE_OF_CONDUCT.md

@@ -2,16 +2,14 @@
 
 ## A Note on This Project
 
-HellionChat is a one-person side project developed under Hellion Forge.
-I maintain this in my spare time, which means replies can take a few
-days. Please do not escalate just because a thread is quiet.
+HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare time, which means
+replies can take a few days. Please do not escalate just because a thread is quiet.
 
-When in doubt, assume good intent. Contributors come from different
-backgrounds, time zones and skill levels. A clarifying question is
-almost always a better first move than an accusation.
+When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
+clarifying question is almost always a better first move than an accusation.
 
-Please also keep discussions on topic. This project is about a Dalamud
-chat plugin. Off-topic arguments belong elsewhere.
+Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
+elsewhere.
 
 ---
 
@@ -19,88 +17,72 @@ chat plugin. Off-topic arguments belong elsewhere.
 
 We pledge to make our community welcoming, safe, and equitable for all.
 
-We are committed to fostering an environment that respects and promotes
-the dignity, rights, and contributions of all individuals, regardless
-of characteristics including race, ethnicity, caste, color, age,
-physical characteristics, neurodiversity, disability, sex or gender,
-gender identity or expression, sexual orientation, language, philosophy
-or religion, national or social origin, socio-economic position, level
-of education, or other status. The same privileges of participation are
-extended to everyone who participates in good faith and in accordance
-with this Covenant.
+We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all
+individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
+neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or
+religion, national or social origin, socio-economic position, level of education, or other status. The same privileges
+of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
 
 ## Encouraged Behaviors
 
-While acknowledging differences in social norms, we all strive to meet
-our community's expectations for positive behavior. We also understand
-that our words and actions may be interpreted differently than we intend
-based on culture, background, or native language.
+While acknowledging differences in social norms, we all strive to meet our community's expectations for positive
+behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture,
+background, or native language.
 
-With these considerations in mind, we agree to behave mindfully toward
-each other and act in ways that center our shared values, including:
+With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared
+values, including:
 
-1. Respecting the **purpose of our community**, our activities, and our
-   ways of gathering.
+1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
 2. Engaging **kindly and honestly** with others.
 3. Respecting **different viewpoints** and experiences.
 4. **Taking responsibility** for our actions and contributions.
 5. Gracefully giving and accepting **constructive feedback**.
 6. Committing to **repairing harm** when it occurs.
-7. Behaving in other ways that promote and sustain the **well-being of
-   our community**.
+7. Behaving in other ways that promote and sustain the **well-being of our community**.
 
 ## Restricted Behaviors
 
-We agree to restrict the following behaviors in our community.
-Instances, threats, and promotion of these behaviors are violations of
-this Code of Conduct.
+We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are
+violations of this Code of Conduct.
 
-1. **Harassment.** Violating explicitly expressed boundaries or engaging
-   in unnecessary personal attention after any clear request to stop.
-2. **Character attacks.** Making insulting, demeaning, or pejorative
-   comments directed at a community member or group of people.
-3. **Stereotyping or discrimination.** Characterizing anyone's
-   personality or behavior on the basis of immutable identities or
-   traits.
-4. **Sexualization.** Behaving in a way that would generally be
-   considered inappropriately intimate in the context or purpose of the
-   community.
-5. **Violating confidentiality.** Sharing or acting on someone's
-   personal or private information without their permission.
-6. **Endangerment.** Causing, encouraging, or threatening violence or
-   other harm toward any person or group.
-7. Behaving in other ways that **threaten the well-being** of our
-   community.
+1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any
+   clear request to stop.
+2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of
+   people.
+3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis of immutable
+   identities or traits.
+4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate in the context or
+   purpose of the community.
+5. **Violating confidentiality.** Sharing or acting on someone's personal or private information without their
+   permission.
+6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
+7. Behaving in other ways that **threaten the well-being** of our community.
 
 ### Other Restrictions
 
-1. **Misleading identity.** Impersonating someone else for any reason,
-   or pretending to be someone else to evade enforcement actions.
-2. **Failing to credit sources.** Not properly crediting the sources of
-   content you contribute.
-3. **Promotional materials.** Sharing marketing or other commercial
-   content in a way that is outside the norms of the community.
-4. **Irresponsible communication.** Failing to responsibly present
-   content which includes, links to, or describes any other restricted
-   behaviors.
+1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone else to evade
+   enforcement actions.
+2. **Failing to credit sources.** Not properly crediting the sources of content you contribute.
+3. **Promotional materials.** Sharing marketing or other commercial content in a way that is outside the norms of the
+   community.
+4. **Irresponsible communication.** Failing to responsibly present content which includes, links to, or describes any
+   other restricted behaviors.
 
 ## Reporting
 
-If something here is being broken, contact me directly. Do not open a
-public issue.
+If something here is being broken, contact me directly. Do not open a public issue.
 
-| Channel    | Address                  |
-| ---------- | ------------------------ |
+| Channel    | Address                    |
+| ---------- | -------------------------- |
 | Email      | `kontakt@hellion-media.de` |
-| Discord DM | `@j.j_kazama`            |
+| Discord DM | `@j.j_kazama`              |
 
-Reports stay private. I will acknowledge within a few weekdays
-(European business hours) and tell you what I plan to do.
+Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell you what I plan to do.
 
 ## Enforcement
 
-I am the sole maintainer, so enforcement is a single-person process.
-I will pick the lightest measure that actually resolves the situation:
+I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest measure that actually
+resolves the situation:
 
 1. Private note asking the behaviour to stop.
 2. Public correction in the affected thread.
@@ -109,25 +91,20 @@ I will pick the lightest measure that actually resolves the situation:
 5. Temporary block from the repository or related spaces.
 6. Permanent block.
 
-Severe cases skip the lower steps. I will not negotiate over harassment
-or threats.
+Severe cases skip the lower steps. I will not negotiate over harassment or threats.
 
 ## Scope
 
-This Code of Conduct applies to all spaces the project owns or that I
-run on its behalf: the GitHub repository, GitHub Discussions,
-project-related Discord conversations, and the maintainer contact
-listed in [`SECURITY.md`](SECURITY.md). It also applies when someone
-is identifiably representing HellionChat elsewhere, for example when
-posting as a HellionChat maintainer in the Dalamud Discord.
+This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
+Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
+It also applies when someone is identifiably representing HellionChat elsewhere, for example when posting as a
+HellionChat maintainer in the Dalamud Discord.
 
 ## Attribution
 
-This Code of Conduct is adapted from the Contributor Covenant, version
-3.0, available at
+This Code of Conduct is adapted from the Contributor Covenant, version 3.0, available at
 [https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).
 
-Contributor Covenant is stewarded by the Organization for Ethical
-Source and licensed under CC BY-SA 4.0. To view a copy of this
-license, visit
+Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA 4.0. To view a copy
+of this license, visit
 [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).

CONTRIBUTING.md

@@ -1,87 +1,69 @@
 # Contributing to HellionChat
 
-Thanks for taking a look. HellionChat is a one-person side project
-developed under Hellion Forge. It started as a fork of
-[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become
-a standalone plugin under its own namespace, IPC channels and
-source tree (standalone-cut completed in v1.0.0). Forking HellionChat
-itself is explicitly permitted under the EUPL-1.2.
+Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It started as a fork
+of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a standalone plugin under its own namespace,
+IPC channels and source tree (standalone-cut completed in v1.0.0). Forking HellionChat itself is explicitly permitted
+under the EUPL-1.2.
 
-This document explains what I am looking for, what I am not, and how
-to make a contribution land smoothly.
+This document explains what I am looking for, what I am not, and how to make a contribution land smoothly.
 
 ## Before You Open Anything
 
-- Read the [README](README.md) so you understand the scope: a
-  privacy-focused, EUPL-1.2-licensed Dalamud plugin that intentionally
-  removes the upstream webinterface and ships privacy-first defaults.
-- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Cherry-picks
-  from upstream Chat 2 are selective and deliberate; not everything
-  that lands there belongs here.
-- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes
-  through a private advisory, never a public issue or PR.
+- Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed Dalamud plugin that
+  intentionally removes the upstream webinterface and ships privacy-first defaults.
+- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2 has ended in the
+  v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
+  New contributions stand on their own and do not need to be cherry-pick-compatible.
+- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory, never a public issue
+  or PR.
 - Read the [Code of Conduct](CODE_OF_CONDUCT.md).
 
 ## What I Will Accept
 
-- Bug fixes for behaviour documented in the README, the in-plugin
-  settings or the changelog.
-- Translation contributions for Hellion-specific strings via direct
-  pull requests against
-  `HellionChat/Resources/HellionStrings.*.resx`. Translations for
-  upstream Chat 2 strings (`Language.*.resx`) are not handled here;
-  those go to the upstream Chat 2 project.
+- Bug fixes for behaviour documented in the README, the in-plugin settings or the changelog.
+- Translation contributions for Hellion-specific strings via direct pull requests against
+  `HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings (`Language.*.resx`) are not
+  handled here; those go to the upstream Chat 2 project.
 - Documentation improvements (README, comments, this file).
 - Performance fixes with a measurable before/after.
-- New features that fit the privacy-first scope and do not duplicate
-  what an existing Dalamud plugin already does well.
+- New features that fit the privacy-first scope and do not duplicate what an existing Dalamud plugin already does well.
 
 ## What I Will Probably Decline
 
-- Re-introducing the webinterface or any remote-access feature. It was
-  removed in v0.2.0 on purpose. See the README section
-  "Was gegenüber Chat 2 fehlt".
-- Features that bypass the privacy filter or weaken the default
-  retention behaviour without an explicit, documented opt-in.
-- Sweeping refactors that touch large parts of the codebase. They make
-  selective upstream cherry-picks much harder and the maintenance cost
-  outweighs the benefit for a one-person project.
-- AI-generated code dropped in without disclosure or human review. See
-  [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
-  AI assistance on my side; I expect comparable transparency from
-  contributors.
+- Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose. See the README
+  section "Was gegenüber Chat 2 fehlt".
+- Features that bypass the privacy filter or weaken the default retention behaviour without an explicit, documented
+  opt-in.
+- Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the benefit for a one-person
+  project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
+  rule still holds on its own merits.)
+- AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
+  for how I handle AI assistance on my side; I expect comparable transparency from contributors.
 
-If you are unsure whether an idea fits, open a feature-request issue
-first and ask before writing code. I would rather say "no" to a
-proposal than to a finished pull request.
+If you are unsure whether an idea fits, open a feature-request issue first and ask before writing code. I would rather
+say "no" to a proposal than to a finished pull request.
 
 ## Workflow
 
-1. Open an issue (bug or feature request) using the templates under
-   `.github/ISSUE_TEMPLATE/`. Skip this for trivial typos.
-2. Fork the repository and branch off `main`. Branch naming is
-   informal; something like `fix/auto-tell-history-empty` or
+1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip this for trivial
+   typos.
+2. Fork the repository and branch off `main`. Branch naming is informal; something like `fix/auto-tell-history-empty` or
    `feat/theme-export` is fine.
-3. Match the existing code style. The repository ships an
-   `.editorconfig` that VS Code and Rider pick up automatically.
-4. Keep commits focused. Several small commits with clear messages are
-   easier to review than one large one. Squash-on-merge happens at
-   the PR level if needed.
-5. If your change touches user-visible behaviour, update the README
-   and/or the changelog block in `HellionChat/HellionChat.yaml` and
-   `repo.json`. I bump the version number myself at release time.
-6. Open the pull request against `main`. The PR template will ask
-   you to summarise the change, the testing you did and any
-   compatibility notes.
+3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider pick up automatically.
+4. Keep commits focused. Several small commits with clear messages are easier to review than one large one.
+   Squash-on-merge happens at the PR level if needed.
+5. If your change touches user-visible behaviour, update the README and/or the changelog block in
+   `HellionChat/HellionChat.yaml` and `repo.json`. I bump the version number myself at release time.
+6. Open the pull request against `main`. The PR template will ask you to summarise the change, the testing you did and
+   any compatibility notes.
 
 ## Build and Test
 
-The project targets `net10.0-windows` against Dalamud SDK 15. To build
-locally you need:
+The project targets `net10.0-windows` against Dalamud SDK 15. To build locally you need:
 
 - .NET 10 SDK
-- A working Dalamud dev environment with `DALAMUD_HOME` set
-  (XIVLauncher installed and launched once is the simplest path)
+- A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once is the simplest
+  path)
 - VS Code with the C# Dev Kit, Rider, or Visual Studio
 
 ```bash
@@ -89,59 +71,68 @@ dotnet restore
 dotnet build HellionChat.sln -c Release
 ```
 
-There are currently no tests in `HellionChat.sln`. If you add a test
-project, point it at the relevant subsystems (privacy filter,
-configuration migration, message store) and mention it in the PR.
+There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the relevant subsystems
+(privacy filter, configuration migration, message store) and mention it in the PR.
 
-For a smoke test in-game: build, copy the output into your Dalamud
-`devPlugins/HellionChat/` directory and load it via `/xlplugins`.
+For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/` directory and load it via
+`/xlplugins`.
 
 ## Continuous Integration
 
 Every push and every pull request runs:
 
-| Workflow      | What it checks                        |
-| ------------- | ------------------------------------- |
-| `build.yml`   | `dotnet build` and `dotnet test`      |
-| `codeql.yml`  | CodeQL security analysis              |
+| Workflow     | What it checks                   |
+| ------------ | -------------------------------- |
+| `build.yml`  | `dotnet build` and `dotnet test` |
+| `codeql.yml` | CodeQL security analysis         |
 
-A pull request will not be merged while either of these is failing.
-CodeQL findings on changed code need to be addressed; pre-existing
-findings on untouched code are tracked separately.
+A pull request will not be merged while either of these is failing. CodeQL findings on changed code need to be
+addressed; pre-existing findings on untouched code are tracked separately.
 
 ## Translations
 
-Hellion-specific strings live in
-`HellionChat/Resources/HellionStrings.resx` (English source) and
-`HellionStrings.<lang>.resx` (per-language). These are accepted as
-direct pull requests.
+Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx` (English source) and
+`HellionStrings.<lang>.resx` (per-language). These are accepted as direct pull requests.
 
-The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx`
-are **not** translated here. They are owned by the upstream project
-and synced in via cherry-pick. Please contribute those to
-[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead.
+The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here. They are kept as-is
+from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
+ended in the v1.4.x cycle (see [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to
+those upstream strings will not flow into HellionChat automatically anymore. If you have improvements for the original
+Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
 
 ## Licensing
 
 By submitting a pull request you confirm that:
 
-- Your contribution is your own work, or you have the right to
-  contribute it under the project licence.
-- You agree that your contribution will be released under the
-  [EUPL-1.2](LICENSE), the same licence as the rest of the project.
+- Your contribution is your own work, or you have the right to contribute it under the project licence.
+- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence as the rest of the
+  project.
 
-There is no separate CLA. Forking HellionChat is explicitly permitted
-under the EUPL-1.2, as with any EUPL-licensed project.
+There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with any EUPL-licensed
+project.
 
 ## Response Times
 
-| Channel       | Address                    |
-| ------------- | -------------------------- |
+| Channel       | Address                                 |
+| ------------- | --------------------------------------- |
 | GitHub Issues | Preferred for bugs and feature requests |
-| Discord DM    | `@j.j_kazama`              |
-| Email         | `kontakt@hellion-media.de` |
+| Discord DM    | `@j.j_kazama`                           |
+| Email         | `kontakt@hellion-media.de`              |
 
-I respond on weekdays during European business hours and take weekends
-and FFXIV patch days off. A pull request that sits for a few days has
-not been ignored. Pinging once after a week is fine; please do not
-ping daily.
+I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A pull request that
+sits for a few days has not been ignored. Pinging once after a week is fine; please do not ping daily.
+
+## First-time setup
+
+After cloning, run once:
+
+```bash
+./scripts/setup-hooks.sh
+```
+
+This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
+
+### Test suite
+
+The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
+development, contact the maintainer.

COPYRIGHT

@@ -4,22 +4,22 @@ HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
 Source code
 ═══════════════════════════════════════════════════════════════════
 
-Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens)
-    Original ChatTwo authors and copyright holders of the upstream
-    plugin this fork is built on. Their work covers the message store,
-    the channel filtering, the sidebar tab system, the FFXIV chat
-    hooks, the localisation infrastructure and most of the
-    architecture HellionChat still relies on.
+Copyright (c) 2022-2026 **[Infiziert90 (Infi)](https://github.com/Infiziert90)** and **[Anna](https://github.com/anna-is-cute)**
+Original ChatTwo authors and copyright holders of the upstream
+plugin this fork is built on. Their work covers the message store,
+the channel filtering, the sidebar tab system, the FFXIV chat
+hooks, the localisation infrastructure and most of the
+architecture HellionChat still relies on.
 
 Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
-    HellionChat-specific modifications, including the privacy filter,
-    per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
-    German localisation and the EUPL-1.2 fork maintenance.
+HellionChat-specific modifications, including the privacy filter,
+per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
+German localisation and the EUPL-1.2 fork maintenance.
 
 Source code is licensed under the European Union Public Licence
 (EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
 file at the root of this repository. The official Licence website is
-at: https://eupl.eu/1.2/en/
+at: <https://eupl.eu/1.2/en/>
 
 This Work is provided "AS IS" without warranties of any kind. See
 Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
@@ -42,8 +42,8 @@ Bundled assets
 ═══════════════════════════════════════════════════════════════════
 
 Exo 2 font (HellionChat/Resources/HellionFont.ttf)
-    SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
-    Bundled with permission per the OFL terms.
+SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
+Bundled with permission per the OFL terms.
 
 ═══════════════════════════════════════════════════════════════════
 

HellionChat/AutoTellTabsService.cs

@@ -1,23 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Interface.ImGuiNotification;
 using HellionChat.Code;
 using HellionChat.GameFunctions.Types;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Game.Text;
-using Dalamud.Game.Text.SeStringHandling;
 
 namespace HellionChat;
 
-// Hellion Chat — Auto-Tell-Tabs.
-//
-// Spawns a session-only tab per /tell partner so a club greeter can track
-// multiple parallel conversations without losing context. Subscribes to
-// MessageManager.MessageProcessed for live tells and to ClientState.Logout
-// for the cleanup pass; everything else hangs off these two entry points.
-//
-// See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian vault).
+// Auto-Tell-Tabs: spawns session-only tabs per /tell partner.
+// Subscribes to MessageManager.MessageProcessed and ClientState.Logout.
 internal sealed class AutoTellTabsService : IDisposable
 {
     private readonly Plugin _plugin;
@@ -25,6 +21,12 @@ internal sealed class AutoTellTabsService : IDisposable
     private readonly MessageStore _store;
     private readonly object _tempTabsLock = new();
 
+    // Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
+    // of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
+    // in their own bucket. A configurable cap is a vault-backlog anchor for
+    // a later cycle if tester feedback demands it.
+    internal const int MaxPinnedTempTabs = 5;
+
     private bool _initialized;
 
     internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
@@ -34,16 +36,14 @@ internal sealed class AutoTellTabsService : IDisposable
         _store = store;
     }
 
-    internal int ActiveTempTabCount
-    {
-        get
-        {
-            lock (_tempTabsLock)
-            {
-                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
-            }
-        }
-    }
+    // Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
+    // mutate IsPinned or remove tabs — the count adapts automatically.
+    // Replaces the F2.1 Interlocked counter because the new pin-state
+    // transitions are cold-path and don't need lock-free reads.
+    internal int ActiveTempTabCount =>
+        Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
+
+    internal int PinnedTempTabCount => Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
 
     internal void Initialize()
     {
@@ -52,11 +52,53 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
+        // Pinned tabs come out of the JSON with TellTarget set but
+        // CurrentChannel reset (NonSerialized). Without re-seeding, the chat
+        // input has no tell-target on the active pinned tab, and the
+        // game-side channel hook only repaints CurrentChannel once the user
+        // triggers a /tell or channel switch.
+        RehydratePinnedTabs();
+
         _messageManager.MessageProcessed += HandleTell;
         Plugin.ClientState.Logout += OnLogout;
         _initialized = true;
     }
 
+    private void RehydratePinnedTabs()
+    {
+        var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
+        Plugin.LogProxy.Debug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
+
+        foreach (var tab in Plugin.Config.Tabs)
+        {
+            if (!TabLifecycleHelpers.IsInPinnedPool(tab))
+                continue;
+
+            if (tab.TellTarget is null || !tab.TellTarget.IsSet())
+            {
+                Plugin.LogProxy.Warning(
+                    $"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
+                        + $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
+                        + "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
+                );
+                continue;
+            }
+
+            tab.Channel ??= InputChannel.Tell;
+            tab.CurrentChannel.Channel = InputChannel.Tell;
+            tab.CurrentChannel.TellTarget = tab.TellTarget.Clone();
+
+            // MessageList is NonSerialized so pinned tabs come back empty.
+            // Preload the same history window the spawn path uses so the user
+            // sees the recent conversation, not a blank tab.
+            PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
+
+            Plugin.LogProxy.Debug(
+                $"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
+            );
+        }
+    }
+
     public void Dispose()
     {
         if (!_initialized)
@@ -76,7 +118,10 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
-        if (message.Code.Type != ChatType.TellIncoming && message.Code.Type != ChatType.TellOutgoing)
+        if (
+            message.Code.Type != ChatType.TellIncoming
+            && message.Code.Type != ChatType.TellOutgoing
+        )
         {
             return;
         }
@@ -84,15 +129,13 @@ internal sealed class AutoTellTabsService : IDisposable
         var partner = ExtractTellPartner(message);
         if (partner == null)
         {
-            // Real message without a player payload — e.g. GM tells, which
-            // we deliberately skip. The diagnostics make future regressions
-            // (FFXIV changing tell payload shape, new edge cases) findable
-            // without having to crank up debug logging at the source.
-            Plugin.Log.Warning(
-                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " +
-                $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " +
-                $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " +
-                $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}");
+            // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
+            Plugin.LogProxy.Warning(
+                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
+                    + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
+                    + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
+                    + $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"
+            );
             return;
         }
 
@@ -101,9 +144,23 @@ internal sealed class AutoTellTabsService : IDisposable
             var existing = FindTempTab(partner.Value.Name, partner.Value.World);
             if (existing != null)
             {
-                // Tab already exists; Tab.Matches has already routed this
-                // message via the MessageManager pipeline (see Task 2 sender
-                // filter).
+                // Already routed via MessageManager pipeline. Repair the
+                // tell-target if the fallback hit a pinned tab whose
+                // TellTarget didn't survive a previous round-trip — keeps
+                // FindTempTab fast on the next message.
+                if (
+                    existing.IsPinned
+                    && (existing.TellTarget is null || !existing.TellTarget.IsSet())
+                )
+                {
+                    existing.TellTarget = new TellTarget(
+                        partner.Value.Name,
+                        partner.Value.World,
+                        0,
+                        TellReason.Direct
+                    );
+                    _plugin.SaveConfig();
+                }
                 return;
             }
 
@@ -120,12 +177,10 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         if (message.Code.Type == ChatType.TellIncoming)
         {
-            // Incoming tell: the sender is the conversation partner. The
-            // PlayerPayload normally rides on a chunk's Link slot, but for
-            // some tell types FFXIV only puts it in the raw SeString —
-            // fall back to that before giving up.
-            var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender)
-                             ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+            // Sender is the partner; check chunks first, then raw SeString as fallback
+            var fromSender =
+                ChunkUtil.TryGetPlayerPayload(message.Sender)
+                ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
             if (fromSender != null)
             {
                 return (fromSender.PlayerName, fromSender.World.RowId);
@@ -133,21 +188,20 @@ internal sealed class AutoTellTabsService : IDisposable
             return null;
         }
 
-        // Outgoing tell: the local player is the sender, the partner shows
-        // up either as a payload in the content (for tells typed via the
-        // Chat 2 input bar) or as the channel's tracked tell target (set by
-        // the SetContextTellTarget game hook). Same SeString fallback.
-        var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
-                          ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
+        // Outgoing tell: check content first, then channels's TellTarget as fallback
+        var fromContent =
+            ChunkUtil.TryGetPlayerPayload(message.Content)
+            ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
+            ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
+            ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
         if (fromContent != null)
         {
             return (fromContent.PlayerName, fromContent.World.RowId);
         }
 
-        var current = _plugin.CurrentTab.CurrentChannel.TellTarget
-                      ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
+        var current =
+            _plugin.CurrentTab.CurrentChannel.TellTarget
+            ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
         if (current != null && current.IsSet())
         {
             return (current.Name, current.World);
@@ -156,24 +210,35 @@ internal sealed class AutoTellTabsService : IDisposable
         return null;
     }
 
-    private Tab? FindTempTab(string name, uint world)
+    private static Tab? FindTempTab(string name, uint world)
     {
-        return Plugin.Config.Tabs.FirstOrDefault(t =>
+        var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
             t.IsTempTab
             && t.TellTarget != null
             && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
-            && t.TellTarget.World == world);
+            && t.TellTarget.World == world
+        );
+        if (byTarget != null)
+            return byTarget;
+
+        // Fallback: match by tab name. Pinned tabs are named via
+        // FormatTabName(player, world) at spawn time, so the name is a
+        // stable secondary key when TellTarget didn't survive a save/load
+        // (older configs from a renamed pin, malformed migrations, etc.).
+        var expectedName = FormatTabName(name, world);
+        return Plugin.Config.Tabs.FirstOrDefault(t =>
+            t.IsTempTab && string.Equals(t.Name, expectedName, StringComparison.OrdinalIgnoreCase)
+        );
     }
 
-    private void DropOldestTempTab()
+    internal void DropOldestTempTab()
     {
-        // Greeted tabs are dropped before un-greeted ones (the user said
-        // "I'm done with that conversation"), and within each bucket we
-        // pick the oldest LastActivity. This protects active conversations
-        // and unfinished greetings while still freeing up a slot.
-        var victim = Plugin.Config.Tabs
-            .Select((tab, idx) => (Tab: tab, Index: idx))
-            .Where(t => t.Tab.IsTempTab)
+        // Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
+        // never drop candidates. They leave the bucket only via Unpin or
+        // PromoteToPermanent.
+        var victim = Plugin
+            .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
+            .Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
             .OrderByDescending(t => t.Tab.IsGreeted)
             .ThenBy(t => t.Tab.LastActivity)
             .FirstOrDefault();
@@ -183,16 +248,12 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
-        // v0.6.1 — if the victim is currently popped out, tear down the
-        // matching Popout window first. Otherwise the window stays in
-        // PopOutWindows + WindowSystem and renders empty / re-spawns on the
-        // next AddPopOutsToDraw tick. Latent since pop-outs were introduced;
-        // becomes visible with AutoTellTabsOpenAsPopout where dropping a
-        // popped tab is now a routine code path.
+        // Clean up pop-out window if tab is popped out
         if (victim.Tab.PopOut)
         {
-            var popout = _plugin.ChatLogWindow.ActivePopouts
-                .FirstOrDefault(p => p.TabIdentifier == victim.Tab.Identifier);
+            var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
+                p.TabIdentifier == victim.Tab.Identifier
+            );
             if (popout != null)
             {
                 popout.IsOpen = false;
@@ -201,8 +262,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
         Plugin.Config.Tabs.RemoveAt(victim.Index);
 
-        // Re-anchor the active tab so the user does not silently end up on
-        // a different conversation when their tab gets dropped or shifted.
+        // Re-anchor active tab to avoid silent switch when tab is dropped
         if (victim.Index <= _plugin.LastTab)
         {
             _plugin.WantedTab = 0;
@@ -213,22 +273,12 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         var tab = BuildTempTab(partner.Name, partner.World);
 
-        // Preload first so the tab opens with chronological history above
-        // the current message — and so a slow DB query never causes a
-        // visible "empty tab, then history pops in" effect on screen.
-        // The current message is already persisted in the store by the
-        // time MessageProcessed fires (see MessageManager.cs: UpsertMessage
-        // runs before the event), so we have to exclude it explicitly to
-        // avoid the separator landing below the live tell.
+        // Preload history: chronological order with current message already persisted
         PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id);
 
         tab.AddMessage(currentMessage, unread: true);
 
-        // Hellion Chat v0.6.1 — opt-in: open new /tell tabs directly as a
-        // pop-out window. Set BEFORE Tabs.Add so the next render-tick's
-        // AddPopOutsToDraw() sees PopOut=true and spawns the Popout window
-        // alongside the tab going into the list. No SaveConfig() because
-        // auto-tell tabs are IsTempTab (session-only, never persisted).
+        // Open as pop-out if configured (set before Tabs.Add for next render-tick)
         if (Plugin.Config.AutoTellTabsOpenAsPopout)
         {
             tab.PopOut = true;
@@ -263,9 +313,7 @@ internal sealed class AutoTellTabsService : IDisposable
         {
             return $"{playerName}@{worldRow.Name}";
         }
-        // World sheet lookup miss is rare (only for FFXIV worlds Dalamud has
-        // not yet seen). Fall back to the raw RowId so the user still has a
-        // unique, readable label.
+        // Fallback if world lookup misses (rare; only for unseen worlds)
         return $"{playerName}@World{worldRowId}";
     }
 
@@ -279,14 +327,13 @@ internal sealed class AutoTellTabsService : IDisposable
 
         try
         {
-            // Pull one extra row because the live tell that triggered this
-            // spawn is already in the store and would otherwise eat one of
-            // the user's preload-budget slots.
+            // Pull one extra row: current message is already in store and would eat a preload slot
             var history = _store.GetTellHistoryWithSender(
                 _messageManager.CurrentContentId,
                 senderName,
                 senderWorld,
-                preloadCount + 1);
+                preloadCount + 1
+            );
 
             var historicMessages = history
                 .Where(m => m.Id != currentMessageId)
@@ -295,36 +342,30 @@ internal sealed class AutoTellTabsService : IDisposable
 
             if (historicMessages.Count == 0)
             {
-                // No prior tells with this player — leave the tab to start
-                // empty so the user does not see a "history loaded" marker
-                // sitting alone above the very first message.
+                // No prior tells; leave tab empty to avoid orphaned "history loaded" marker
                 return;
             }
 
-            // The history list is already oldest-first, so a plain AddPrune
-            // loop produces the chronological order the user expects to see
-            // when the tab opens.
+            // History is oldest-first; add in order for chronological display
             foreach (var message in historicMessages)
             {
                 tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit);
             }
 
-            // Visible separator between the loaded history and the live
-            // tell that triggered this spawn. Goes in last so it sorts
-            // after the historical messages but before the current one.
+            // Separator between history and live tell (sorts after history but before current)
             tab.Messages.AddPrune(
                 MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
-                MessageManager.MessageDisplayLimit);
+                MessageManager.MessageDisplayLimit
+            );
         }
         catch (Exception ex)
         {
-            // Non-fatal: the tab still spawns, but the user gets a visible
-            // notice instead of silently missing history. The error logs
-            // once with full stack trace for diagnosis.
-            Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
+            // Non-fatal: tab still spawns with visible error notice instead of silent history loss
+            Plugin.LogProxy.Error(ex, "[AutoTellTabs] History preload failed");
             tab.Messages.AddPrune(
                 MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
-                MessageManager.MessageDisplayLimit);
+                MessageManager.MessageDisplayLimit
+            );
         }
     }
 
@@ -360,9 +401,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
         lock (_tempTabsLock)
         {
-            // Frame-race guard (E5): the sidebar might still render a tab
-            // that has already been removed by LRU drop or logout cleanup.
-            // Silently skip the toggle so we don't mutate stale state.
+            // Guard against frame-race: sidebar might render a tab already removed by LRU or logout
             if (!Plugin.Config.Tabs.Contains(tab))
             {
                 return;
@@ -376,43 +415,103 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         lock (_tempTabsLock)
         {
-            // Snapshot whether the active tab is about to be removed, BEFORE
-            // we mutate the list — index lookups would lie to us afterwards.
+            // Pinned TempTabs must survive char-switch — that's the whole point
+            // of pinning. Only unpinned ones get stripped.
             var lastIndex = _plugin.LastTab;
             var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
+            var currentWasUnpinnedTempTab =
+                lastIndexValid
+                && TabLifecycleHelpers.IsInUnpinnedPool(Plugin.Config.Tabs[lastIndex]);
 
-            // v0.6.1 — symmetric to DropOldestTempTab cleanup: tear down any
-            // popped-out temp tab windows before removing the tabs themselves,
-            // otherwise PopOutWindows + WindowSystem keep ghost entries until
-            // the next plugin reload. Especially relevant once Auto-Pop-Out is
-            // enabled — every logout would otherwise leak as many ghosts as
-            // there were active /tell pop-outs.
-            var poppedTempTabIds = Plugin.Config.Tabs
-                .Where(t => t.IsTempTab && t.PopOut)
+            var poppedTempTabIds = Plugin
+                .Config.Tabs.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t) && t.PopOut)
                 .Select(t => t.Identifier)
                 .ToList();
             if (poppedTempTabIds.Count > 0)
             {
                 var poppedSet = poppedTempTabIds.ToHashSet();
-                foreach (var popout in _plugin.ChatLogWindow.ActivePopouts
-                             .Where(p => poppedSet.Contains(p.TabIdentifier))
-                             .ToList())
+                foreach (
+                    var popout in _plugin
+                        .ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
+                        .ToList()
+                )
                 {
                     popout.IsOpen = false;
                 }
             }
 
-            Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+            Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);
 
-            // Force a switch to tab 0 if the active tab was a temp tab OR
-            // if drops before the active index pushed LastTab out of range.
-            // Otherwise the user keeps their current persistent tab.
+            // Force switch to tab 0 if active tab was an unpinned temp tab or
+            // index is now out of range. Pinned tabs survive — no switch needed.
             var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            if (currentWasTempTab || !stillValid)
+            if (currentWasUnpinnedTempTab || !stillValid)
             {
                 _plugin.WantedTab = 0;
             }
         }
     }
+
+    internal bool TryPin(Tab tab)
+    {
+        if (!tab.IsTempTab || tab.IsPinned)
+        {
+            Plugin.LogProxy.Debug(
+                $"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
+            );
+            return false;
+        }
+
+        if (PinnedTempTabCount >= MaxPinnedTempTabs)
+        {
+            WrapperUtil.AddNotification(
+                string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
+                NotificationType.Warning
+            );
+            return false;
+        }
+
+        tab.IsPinned = true;
+        Plugin.LogProxy.Debug(
+            $"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
+        );
+        _plugin.SaveConfig();
+        return true;
+    }
+
+    internal void Unpin(Tab tab)
+    {
+        if (!tab.IsPinned)
+        {
+            return;
+        }
+
+        // If the unpinned pool is already full, dropping the oldest before
+        // flipping the flag avoids counting the just-unpinned tab as a drop
+        // candidate.
+        if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
+        {
+            DropOldestTempTab();
+        }
+
+        tab.IsPinned = false;
+        Plugin.LogProxy.Debug("[Pin] Unpinned tab '{tab.Name}'");
+        _plugin.SaveConfig();
+    }
+
+    internal void PromoteToPermanent(Tab tab)
+    {
+        if (!tab.IsTempTab)
+        {
+            return;
+        }
+
+        tab.IsTempTab = false;
+        tab.IsPinned = false;
+        tab.TellTarget = TellTarget.Empty();
+        Plugin.LogProxy.Debug(
+            $"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)"
+        );
+        _plugin.SaveConfig();
+    }
 }

HellionChat/Branding/BrandingLinks.cs

@@ -1,12 +1,33 @@
-// HellionChat/Branding/BrandingLinks.cs
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Branding;
 
-// Centralised so a future invite rotation only touches one file. The same
-// link is currently hard-coded in repo.json, README.md, SUPPORT.md,
-// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
-// this constant in a separate housekeeping sweep, but that's out of scope
-// for this Cycle.
+// Centralised — a future invite/URL rotation only touches this file.
 internal static class BrandingLinks
 {
     public const string HellionForgeDiscordInvite = "https://discord.gg/X9V7Kcv5gR";
+    public const string HellionForgeGitea = "https://gitea.hellion-forge.cloud/Hellion-Forge";
+    public const string HellionChatRepo =
+        "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
+    public const string HellionForgeWebsite = "https://hellion-forge.cloud";
+    public const string HellionMediaWebsite = "https://hellion-media.de/de";
+
+    // CA2255 warns against [ModuleInitializer] in library code, but Dalamud
+    // loads the plugin DLL directly so the module-init pass is the right hook
+    // for a one-shot URL sanity check at plugin load.
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    internal static void ValidateUrls()
+    {
+        UrlValidation.ValidateAll(
+            nameof(BrandingLinks),
+            HellionForgeDiscordInvite,
+            HellionForgeGitea,
+            HellionChatRepo,
+            HellionForgeWebsite,
+            HellionMediaWebsite
+        );
+    }
 }

HellionChat/ChatTwoConflictDetector.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using HellionChat.Resources;
 using Dalamud.Plugin;
+using HellionChat.Resources;
 
 namespace HellionChat;
 
@@ -10,17 +10,19 @@ internal static class ChatTwoConflictDetector
 
     public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface)
     {
-        var conflict = pluginInterface.InstalledPlugins
-            .FirstOrDefault(p =>
-                p.InternalName == UpstreamInternalName &&
-                p.IsLoaded);
+        var conflict = pluginInterface.InstalledPlugins.FirstOrDefault(p =>
+            p.InternalName == UpstreamInternalName && p.IsLoaded
+        );
 
         if (conflict is null)
             return;
 
-        var message = HellionStrings.ChatTwoConflictTitle + "\n\n" +
-                      HellionStrings.ChatTwoConflictBody + "\n\n" +
-                      HellionStrings.ChatTwoConflictAction;
+        var message =
+            HellionStrings.ChatTwoConflictTitle
+            + "\n\n"
+            + HellionStrings.ChatTwoConflictBody
+            + "\n\n"
+            + HellionStrings.ChatTwoConflictAction;
 
         throw new System.InvalidOperationException(message);
     }

HellionChat/Chunk.cs

@@ -1,5 +1,5 @@
-using HellionChat.Code;
 using Dalamud.Game.Text.SeStringHandling;
+using HellionChat.Code;
 using MessagePack;
 
 namespace HellionChat;
@@ -25,24 +25,23 @@ public abstract class Chunk
         Link = link;
     }
 
-    internal SeString? GetSeString() => Source switch
-    {
-        ChunkSource.None => null,
-        ChunkSource.Sender => Message?.SenderSource,
-        ChunkSource.Content => Message?.ContentSource,
-        _ => null,
-    };
+    internal SeString? GetSeString() =>
+        Source switch
+        {
+            ChunkSource.None => null,
+            ChunkSource.Sender => Message?.SenderSource,
+            ChunkSource.Content => Message?.ContentSource,
+            _ => null,
+        };
 
-    /// <summary>
-    /// Get some basic text for use in generating hashes.
-    /// </summary>
+    // Returns basic text for hashing (content for TextChunk, icon name for IconChunk)
     internal string StringValue()
     {
         return this switch
         {
             TextChunk text => text.Content,
             IconChunk icon => icon.Icon.ToString(),
-            _ => ""
+            _ => "",
         };
     }
 }
@@ -57,18 +56,29 @@ public enum ChunkSource
 [MessagePackObject(AllowPrivate = true)]
 public class TextChunk : Chunk
 {
-    [Key(2)] public ChatType? FallbackColour;
-    [Key(3)] public uint? Foreground;
-    [Key(4)] public uint? Glow;
-    [Key(5)] public bool Italic;
-    [Key(6)] public string Content;
+    [Key(2)]
+    public ChatType? FallbackColour;
 
-    private TextChunk(Chunk chunk, string content) : base(chunk.Source, chunk.Link)
+    [Key(3)]
+    public uint? Foreground;
+
+    [Key(4)]
+    public uint? Glow;
+
+    [Key(5)]
+    public bool Italic;
+
+    [Key(6)]
+    public string Content;
+
+    private TextChunk(Chunk chunk, string content)
+        : base(chunk.Source, chunk.Link)
     {
         Content = content;
     }
 
-    internal TextChunk(ChunkSource source, Payload? link, string content) : base(source, link)
+    internal TextChunk(ChunkSource source, Payload? link, string content)
+        : base(source, link)
     {
         // This has been null in the past, and it broke rendering code.
         // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
@@ -76,7 +86,16 @@ public class TextChunk : Chunk
     }
 
     // ReSharper disable once UnusedMember.Global // Used by MessagePack
-    public TextChunk(ChunkSource source, Payload? link, ChatType? fallbackColour, uint? foreground, uint? glow, bool italic, string content) : base(source, link)
+    public TextChunk(
+        ChunkSource source,
+        Payload? link,
+        ChatType? fallbackColour,
+        uint? foreground,
+        uint? glow,
+        bool italic,
+        string content
+    )
+        : base(source, link)
     {
         FallbackColour = fallbackColour;
         Foreground = foreground;
@@ -87,9 +106,6 @@ public class TextChunk : Chunk
         Content = content ?? "";
     }
 
-    /// <summary>
-    /// Creates a new TextChunk with identical styling to this one.
-    /// </summary>
     public TextChunk NewWithStyle(ChunkSource source, Payload? link, string content)
     {
         return new TextChunk(source, link, content)
@@ -101,9 +117,6 @@ public class TextChunk : Chunk
         };
     }
 
-    /// <summary>
-    /// Creates a new TextChunk with identical styling to this one.
-    /// </summary>
     public TextChunk NewWithStyle(Chunk chunk, string content)
     {
         return new TextChunk(chunk, content)
@@ -122,7 +135,8 @@ public class IconChunk : Chunk
     [Key(2)]
     public BitmapFontIcon Icon { get; set; }
 
-    public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon) : base(source, link)
+    public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon)
+        : base(source, link)
     {
         Icon = icon;
     }

HellionChat/Code/ChatCode.cs

@@ -16,7 +16,7 @@ public class ChatCode
     }
 
     public ChatCode(byte type, byte source, byte target)
-        : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) {}
+        : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) { }
 
     public bool IsBattle()
     {

HellionChat/Code/ChatSource.cs

@@ -7,36 +7,36 @@ public enum ChatSource : ushort
 {
     None = 0,
 
-    /// <summary>The player currently controlled by the local client.</summary>
+    // The player controlled by this client
     LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,
 
-    /// <summary>A player in the same 4-man or 8-man party as the local player.</summary>
+    // Member of the local party
     PartyMember = 1 << XivChatRelationKind.PartyMember,
 
-    /// <summary>A player in the same alliance raid.</summary>
+    // Member of the alliance
     AllianceMember = 1 << XivChatRelationKind.AllianceMember,
 
-    /// <summary>A player not in the local player's party or alliance.</summary>
+    // Other player
     OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,
 
-    /// <summary>An enemy entity that is currently in combat with the player or party.</summary>
+    // Enemy in combat
     EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,
 
-    /// <summary>An enemy entity that is not yet in combat or claimed.</summary>
+    // Enemy out of combat
     UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,
 
-    /// <summary>An NPC that is friendly or neutral to the player (e.g., EventNPCs).</summary>
+    // Friendly NPC
     FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,
 
-    /// <summary>A pet (Summoner/Scholar) or companion (Chocobo) belonging to the local player.</summary>
+    // Own pet or companion
     PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,
 
-    /// <summary>A pet or companion belonging to a member of the local player's party.</summary>
+    // Pet or companion of party members
     PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,
 
-    /// <summary>A pet or companion belonging to a member of the alliance.</summary>
+    // Pet or companion of alliance members
     PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,
 
-    /// <summary>A pet or companion belonging to a player not in the party or alliance.</summary>
+    // Pet or companion of other players
     PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
 }

HellionChat/Code/ChatSourceExt.cs

@@ -5,24 +5,32 @@ namespace HellionChat.Code;
 internal static class ChatSourceExt
 {
     internal const ChatSource All =
-        ChatSource.LocalPlayer | ChatSource.PartyMember | ChatSource.AllianceMember |
-        ChatSource.OtherPlayer | ChatSource.EngagedEnemy | ChatSource.UnengagedEnemy |
-        ChatSource.FriendlyNpc | ChatSource.PetOrCompanion | ChatSource.PetOrCompanionParty |
-        ChatSource.PetOrCompanionAlliance | ChatSource.PetOrCompanionOther;
+        ChatSource.LocalPlayer
+        | ChatSource.PartyMember
+        | ChatSource.AllianceMember
+        | ChatSource.OtherPlayer
+        | ChatSource.EngagedEnemy
+        | ChatSource.UnengagedEnemy
+        | ChatSource.FriendlyNpc
+        | ChatSource.PetOrCompanion
+        | ChatSource.PetOrCompanionParty
+        | ChatSource.PetOrCompanionAlliance
+        | ChatSource.PetOrCompanionOther;
 
-    internal static string Name(this ChatSource source) => source switch
-    {
-        ChatSource.LocalPlayer => Language.ChatSource_Self,
-        ChatSource.PartyMember => Language.ChatSource_PartyMember,
-        ChatSource.AllianceMember => Language.ChatSource_AllianceMember,
-        ChatSource.OtherPlayer => Language.ChatSource_Other,
-        ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy,
-        ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy,
-        ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc,
-        ChatSource.PetOrCompanion => Language.ChatSource_SelfPet,
-        ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet,
-        ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet,
-        ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet,
-        _ => throw new ArgumentOutOfRangeException(nameof(source), source, null),
-    };
+    internal static string Name(this ChatSource source) =>
+        source switch
+        {
+            ChatSource.LocalPlayer => Language.ChatSource_Self,
+            ChatSource.PartyMember => Language.ChatSource_PartyMember,
+            ChatSource.AllianceMember => Language.ChatSource_AllianceMember,
+            ChatSource.OtherPlayer => Language.ChatSource_Other,
+            ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy,
+            ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy,
+            ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc,
+            ChatSource.PetOrCompanion => Language.ChatSource_SelfPet,
+            ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet,
+            ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet,
+            ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet,
+            _ => throw new ArgumentOutOfRangeException(nameof(source), source, null),
+        };
 }

HellionChat/Code/ChatTypeExt.cs

@@ -1,92 +1,98 @@
+using Dalamud.Game.Config;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Game.Config;
 
 namespace HellionChat.Code;
 
 internal static class ChatTypeExt
 {
     internal static IEnumerable<(string, ChatType[])> SortOrder =>
-    [
-        (Language.Options_Tabs_ChannelTypes_Special, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]),
-
-        (Language.Options_Tabs_ChannelTypes_Chat,
         [
-            ChatType.Say,
-            ChatType.Yell,
-            ChatType.Shout,
-            ChatType.TellIncoming,
-            ChatType.TellOutgoing,
-            ChatType.Party,
-            ChatType.CrossParty,
-            ChatType.Alliance,
-            ChatType.FreeCompany,
-            ChatType.PvpTeam,
-            ChatType.CrossLinkshell1,
-            ChatType.CrossLinkshell2,
-            ChatType.CrossLinkshell3,
-            ChatType.CrossLinkshell4,
-            ChatType.CrossLinkshell5,
-            ChatType.CrossLinkshell6,
-            ChatType.CrossLinkshell7,
-            ChatType.CrossLinkshell8,
-            ChatType.Linkshell1,
-            ChatType.Linkshell2,
-            ChatType.Linkshell3,
-            ChatType.Linkshell4,
-            ChatType.Linkshell5,
-            ChatType.Linkshell6,
-            ChatType.Linkshell7,
-            ChatType.Linkshell8,
-            ChatType.NoviceNetwork,
-            ChatType.StandardEmote,
-            ChatType.CustomEmote
-        ]),
-
-        (Language.Options_Tabs_ChannelTypes_Battle,
-        [
-            ChatType.Damage,
-            ChatType.Miss,
-            ChatType.Action,
-            ChatType.Item,
-            ChatType.Healing,
-            ChatType.GainBuff,
-            ChatType.LoseBuff,
-            ChatType.GainDebuff,
-            ChatType.LoseDebuff
-        ]),
-
-        (Language.Options_Tabs_ChannelTypes_Announcements,
-        [
-            ChatType.System,
-            ChatType.BattleSystem,
-            ChatType.GatheringSystem,
-            ChatType.Error,
-            ChatType.Echo,
-            ChatType.NoviceNetworkSystem,
-            ChatType.FreeCompanyAnnouncement,
-            ChatType.PvpTeamAnnouncement,
-            ChatType.FreeCompanyLoginLogout,
-            ChatType.PvpTeamLoginLogout,
-            ChatType.RetainerSale,
-            ChatType.NpcDialogue,
-            ChatType.NpcAnnouncement,
-            ChatType.LootNotice,
-            ChatType.Progress,
-            ChatType.LootRoll,
-            ChatType.Crafting,
-            ChatType.Gathering,
-            ChatType.PeriodicRecruitmentNotification,
-            ChatType.Sign,
-            ChatType.RandomNumber,
-            ChatType.Orchestrion,
-            ChatType.MessageBook,
-            ChatType.Alarm,
-            ChatType.GlamourNotifications
-        ])
-        // Note: ExtraChat linkshells are handled separately in the tab settings
-        // UI.
-    ];
+            (
+                Language.Options_Tabs_ChannelTypes_Special,
+                [ChatType.Debug, ChatType.Urgent, ChatType.Notice]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Chat,
+                [
+                    ChatType.Say,
+                    ChatType.Yell,
+                    ChatType.Shout,
+                    ChatType.TellIncoming,
+                    ChatType.TellOutgoing,
+                    ChatType.Party,
+                    ChatType.CrossParty,
+                    ChatType.Alliance,
+                    ChatType.FreeCompany,
+                    ChatType.PvpTeam,
+                    ChatType.CrossLinkshell1,
+                    ChatType.CrossLinkshell2,
+                    ChatType.CrossLinkshell3,
+                    ChatType.CrossLinkshell4,
+                    ChatType.CrossLinkshell5,
+                    ChatType.CrossLinkshell6,
+                    ChatType.CrossLinkshell7,
+                    ChatType.CrossLinkshell8,
+                    ChatType.Linkshell1,
+                    ChatType.Linkshell2,
+                    ChatType.Linkshell3,
+                    ChatType.Linkshell4,
+                    ChatType.Linkshell5,
+                    ChatType.Linkshell6,
+                    ChatType.Linkshell7,
+                    ChatType.Linkshell8,
+                    ChatType.NoviceNetwork,
+                    ChatType.StandardEmote,
+                    ChatType.CustomEmote,
+                ]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Battle,
+                [
+                    ChatType.Damage,
+                    ChatType.Miss,
+                    ChatType.Action,
+                    ChatType.Item,
+                    ChatType.Healing,
+                    ChatType.GainBuff,
+                    ChatType.LoseBuff,
+                    ChatType.GainDebuff,
+                    ChatType.LoseDebuff,
+                ]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Announcements,
+                [
+                    ChatType.System,
+                    ChatType.BattleSystem,
+                    ChatType.GatheringSystem,
+                    ChatType.Error,
+                    ChatType.Echo,
+                    ChatType.NoviceNetworkSystem,
+                    ChatType.FreeCompanyAnnouncement,
+                    ChatType.PvpTeamAnnouncement,
+                    ChatType.FreeCompanyLoginLogout,
+                    ChatType.PvpTeamLoginLogout,
+                    ChatType.RetainerSale,
+                    ChatType.NpcDialogue,
+                    ChatType.NpcAnnouncement,
+                    ChatType.LootNotice,
+                    ChatType.Progress,
+                    ChatType.LootRoll,
+                    ChatType.Crafting,
+                    ChatType.Gathering,
+                    ChatType.PeriodicRecruitmentNotification,
+                    ChatType.Sign,
+                    ChatType.RandomNumber,
+                    ChatType.Orchestrion,
+                    ChatType.MessageBook,
+                    ChatType.Alarm,
+                    ChatType.GlamourNotifications,
+                ]
+            ),
+            // Note: ExtraChat linkshells are handled separately in the tab settings
+            // UI.
+        ];
 
     internal static string Name(this ChatType type)
     {
@@ -143,7 +149,8 @@ internal static class ChatTypeExt
             ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement,
             ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout,
             ChatType.RetainerSale => Language.ChatType_RetainerSale,
-            ChatType.PeriodicRecruitmentNotification => Language.ChatType_PeriodicRecruitmentNotification,
+            ChatType.PeriodicRecruitmentNotification =>
+                Language.ChatType_PeriodicRecruitmentNotification,
             ChatType.Sign => Language.ChatType_Sign,
             ChatType.RandomNumber => Language.ChatType_RandomNumber,
             ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem,
@@ -306,181 +313,187 @@ internal static class ChatTypeExt
         }
     }
 
-    internal static InputChannel? ToInputChannel(this ChatType type) => type switch
-    {
-        ChatType.TellOutgoing => InputChannel.Tell,
-        ChatType.Say => InputChannel.Say,
-        ChatType.Party => InputChannel.Party,
-        ChatType.Alliance => InputChannel.Alliance,
-        ChatType.Yell => InputChannel.Yell,
-        ChatType.Shout => InputChannel.Shout,
-        ChatType.FreeCompany => InputChannel.FreeCompany,
-        ChatType.PvpTeam => InputChannel.PvpTeam,
-        ChatType.NoviceNetwork => InputChannel.NoviceNetwork,
-        ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1,
-        ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2,
-        ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3,
-        ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4,
-        ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5,
-        ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6,
-        ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7,
-        ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8,
-        ChatType.Linkshell1 => InputChannel.Linkshell1,
-        ChatType.Linkshell2 => InputChannel.Linkshell2,
-        ChatType.Linkshell3 => InputChannel.Linkshell3,
-        ChatType.Linkshell4 => InputChannel.Linkshell4,
-        ChatType.Linkshell5 => InputChannel.Linkshell5,
-        ChatType.Linkshell6 => InputChannel.Linkshell6,
-        ChatType.Linkshell7 => InputChannel.Linkshell7,
-        ChatType.Linkshell8 => InputChannel.Linkshell8,
-        _ => null,
-    };
+    internal static InputChannel? ToInputChannel(this ChatType type) =>
+        type switch
+        {
+            ChatType.TellOutgoing => InputChannel.Tell,
+            ChatType.Say => InputChannel.Say,
+            ChatType.Party => InputChannel.Party,
+            ChatType.Alliance => InputChannel.Alliance,
+            ChatType.Yell => InputChannel.Yell,
+            ChatType.Shout => InputChannel.Shout,
+            ChatType.FreeCompany => InputChannel.FreeCompany,
+            ChatType.PvpTeam => InputChannel.PvpTeam,
+            ChatType.NoviceNetwork => InputChannel.NoviceNetwork,
+            ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1,
+            ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2,
+            ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3,
+            ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4,
+            ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5,
+            ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6,
+            ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7,
+            ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8,
+            ChatType.Linkshell1 => InputChannel.Linkshell1,
+            ChatType.Linkshell2 => InputChannel.Linkshell2,
+            ChatType.Linkshell3 => InputChannel.Linkshell3,
+            ChatType.Linkshell4 => InputChannel.Linkshell4,
+            ChatType.Linkshell5 => InputChannel.Linkshell5,
+            ChatType.Linkshell6 => InputChannel.Linkshell6,
+            ChatType.Linkshell7 => InputChannel.Linkshell7,
+            ChatType.Linkshell8 => InputChannel.Linkshell8,
+            _ => null,
+        };
 
-    internal static bool IsGm(this ChatType type) => type switch
-    {
-        ChatType.GmTell => true,
-        ChatType.GmSay => true,
-        ChatType.GmShout => true,
-        ChatType.GmYell => true,
-        ChatType.GmParty => true,
-        ChatType.GmFreeCompany => true,
-        ChatType.GmLinkshell1 => true,
-        ChatType.GmLinkshell2 => true,
-        ChatType.GmLinkshell3 => true,
-        ChatType.GmLinkshell4 => true,
-        ChatType.GmLinkshell5 => true,
-        ChatType.GmLinkshell6 => true,
-        ChatType.GmLinkshell7 => true,
-        ChatType.GmLinkshell8 => true,
-        ChatType.GmNoviceNetwork => true,
-        _ => false,
-    };
+    internal static bool IsGm(this ChatType type) =>
+        type switch
+        {
+            ChatType.GmTell => true,
+            ChatType.GmSay => true,
+            ChatType.GmShout => true,
+            ChatType.GmYell => true,
+            ChatType.GmParty => true,
+            ChatType.GmFreeCompany => true,
+            ChatType.GmLinkshell1 => true,
+            ChatType.GmLinkshell2 => true,
+            ChatType.GmLinkshell3 => true,
+            ChatType.GmLinkshell4 => true,
+            ChatType.GmLinkshell5 => true,
+            ChatType.GmLinkshell6 => true,
+            ChatType.GmLinkshell7 => true,
+            ChatType.GmLinkshell8 => true,
+            ChatType.GmNoviceNetwork => true,
+            _ => false,
+        };
 
-    internal static bool IsExtraChatLinkshell(this ChatType type) => type switch
-    {
-        ChatType.ExtraChatLinkshell1 => true,
-        ChatType.ExtraChatLinkshell2 => true,
-        ChatType.ExtraChatLinkshell3 => true,
-        ChatType.ExtraChatLinkshell4 => true,
-        ChatType.ExtraChatLinkshell5 => true,
-        ChatType.ExtraChatLinkshell6 => true,
-        ChatType.ExtraChatLinkshell7 => true,
-        ChatType.ExtraChatLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsExtraChatLinkshell(this ChatType type) =>
+        type switch
+        {
+            ChatType.ExtraChatLinkshell1 => true,
+            ChatType.ExtraChatLinkshell2 => true,
+            ChatType.ExtraChatLinkshell3 => true,
+            ChatType.ExtraChatLinkshell4 => true,
+            ChatType.ExtraChatLinkshell5 => true,
+            ChatType.ExtraChatLinkshell6 => true,
+            ChatType.ExtraChatLinkshell7 => true,
+            ChatType.ExtraChatLinkshell8 => true,
+            _ => false,
+        };
 
-    public static UiConfigOption ToConfigEntry(this ChatType type) => type switch
-    {
-        ChatType.Say => UiConfigOption.ColorSay,
-        ChatType.Shout => UiConfigOption.ColorShout,
-        ChatType.TellOutgoing => UiConfigOption.ColorTell,
-        ChatType.Party => UiConfigOption.ColorParty,
-        ChatType.Linkshell1 => UiConfigOption.ColorLS1,
-        ChatType.Linkshell2 => UiConfigOption.ColorLS2,
-        ChatType.Linkshell3 => UiConfigOption.ColorLS3,
-        ChatType.Linkshell4 => UiConfigOption.ColorLS4,
-        ChatType.Linkshell5 => UiConfigOption.ColorLS5,
-        ChatType.Linkshell6 => UiConfigOption.ColorLS6,
-        ChatType.Linkshell7 => UiConfigOption.ColorLS7,
-        ChatType.Linkshell8 => UiConfigOption.ColorLS8,
-        ChatType.FreeCompany => UiConfigOption.ColorFCompany,
-        ChatType.NoviceNetwork => UiConfigOption.ColorBeginner,
-        ChatType.CustomEmote => UiConfigOption.ColorEmoteUser,
-        ChatType.StandardEmote => UiConfigOption.ColorEmote,
-        ChatType.Yell => UiConfigOption.ColorYell,
-        ChatType.GainBuff => UiConfigOption.ColorBuffGive,
-        ChatType.GainDebuff => UiConfigOption.ColorDebuffGive,
-        ChatType.System => UiConfigOption.ColorSysMsg,
-        ChatType.NpcDialogue => UiConfigOption.ColorNpcSay,
-        ChatType.LootRoll => UiConfigOption.ColorLoot,
-        ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce,
-        ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce,
-        _ => UiConfigOption.ColorSay,
-    };
+    public static UiConfigOption ToConfigEntry(this ChatType type) =>
+        type switch
+        {
+            ChatType.Say => UiConfigOption.ColorSay,
+            ChatType.Shout => UiConfigOption.ColorShout,
+            ChatType.TellOutgoing => UiConfigOption.ColorTell,
+            ChatType.Party => UiConfigOption.ColorParty,
+            ChatType.Linkshell1 => UiConfigOption.ColorLS1,
+            ChatType.Linkshell2 => UiConfigOption.ColorLS2,
+            ChatType.Linkshell3 => UiConfigOption.ColorLS3,
+            ChatType.Linkshell4 => UiConfigOption.ColorLS4,
+            ChatType.Linkshell5 => UiConfigOption.ColorLS5,
+            ChatType.Linkshell6 => UiConfigOption.ColorLS6,
+            ChatType.Linkshell7 => UiConfigOption.ColorLS7,
+            ChatType.Linkshell8 => UiConfigOption.ColorLS8,
+            ChatType.FreeCompany => UiConfigOption.ColorFCompany,
+            ChatType.NoviceNetwork => UiConfigOption.ColorBeginner,
+            ChatType.CustomEmote => UiConfigOption.ColorEmoteUser,
+            ChatType.StandardEmote => UiConfigOption.ColorEmote,
+            ChatType.Yell => UiConfigOption.ColorYell,
+            ChatType.GainBuff => UiConfigOption.ColorBuffGive,
+            ChatType.GainDebuff => UiConfigOption.ColorDebuffGive,
+            ChatType.System => UiConfigOption.ColorSysMsg,
+            ChatType.NpcDialogue => UiConfigOption.ColorNpcSay,
+            ChatType.LootRoll => UiConfigOption.ColorLoot,
+            ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce,
+            ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce,
+            _ => UiConfigOption.ColorSay,
+        };
 
-    internal static bool HasSource(this ChatType type) => type switch
-    {
-        // Battle
-        ChatType.Damage => true,
-        ChatType.Miss => true,
-        ChatType.Action => true,
-        ChatType.Item => true,
-        ChatType.Healing => true,
-        ChatType.GainBuff => true,
-        ChatType.LoseBuff => true,
-        ChatType.GainDebuff => true,
-        ChatType.LoseDebuff => true,
+    internal static bool HasSource(this ChatType type) =>
+        type switch
+        {
+            // Battle
+            ChatType.Damage => true,
+            ChatType.Miss => true,
+            ChatType.Action => true,
+            ChatType.Item => true,
+            ChatType.Healing => true,
+            ChatType.GainBuff => true,
+            ChatType.LoseBuff => true,
+            ChatType.GainDebuff => true,
+            ChatType.LoseDebuff => true,
 
-        // Announcements
-        ChatType.System => true,
-        ChatType.BattleSystem => true,
-        ChatType.Error => true,
-        ChatType.LootNotice => true,
-        ChatType.Progress => true,
-        ChatType.LootRoll => true,
-        ChatType.Crafting => true,
-        ChatType.Gathering => true,
-        ChatType.FreeCompanyLoginLogout => true,
-        ChatType.PvpTeamLoginLogout => true,
-        _ => false,
-    };
+            // Announcements
+            ChatType.System => true,
+            ChatType.BattleSystem => true,
+            ChatType.Error => true,
+            ChatType.LootNotice => true,
+            ChatType.Progress => true,
+            ChatType.LootRoll => true,
+            ChatType.Crafting => true,
+            ChatType.Gathering => true,
+            ChatType.FreeCompanyLoginLogout => true,
+            ChatType.PvpTeamLoginLogout => true,
+            _ => false,
+        };
 
-    internal static ChatType Parent(this ChatType type) => type switch
-    {
-        ChatType.Say => ChatType.Say,
-        ChatType.GmSay => ChatType.Say,
-        ChatType.Shout => ChatType.Shout,
-        ChatType.GmShout => ChatType.Shout,
-        ChatType.TellOutgoing => ChatType.TellOutgoing,
-        ChatType.TellIncoming => ChatType.TellOutgoing,
-        ChatType.GmTell => ChatType.TellOutgoing,
-        ChatType.Party => ChatType.Party,
-        ChatType.CrossParty => ChatType.Party,
-        ChatType.GmParty => ChatType.Party,
-        ChatType.Linkshell1 => ChatType.Linkshell1,
-        ChatType.GmLinkshell1 => ChatType.Linkshell1,
-        ChatType.Linkshell2 => ChatType.Linkshell2,
-        ChatType.GmLinkshell2 => ChatType.Linkshell2,
-        ChatType.Linkshell3 => ChatType.Linkshell3,
-        ChatType.GmLinkshell3 => ChatType.Linkshell3,
-        ChatType.Linkshell4 => ChatType.Linkshell4,
-        ChatType.GmLinkshell4 => ChatType.Linkshell4,
-        ChatType.Linkshell5 => ChatType.Linkshell5,
-        ChatType.GmLinkshell5 => ChatType.Linkshell5,
-        ChatType.Linkshell6 => ChatType.Linkshell6,
-        ChatType.GmLinkshell6 => ChatType.Linkshell6,
-        ChatType.Linkshell7 => ChatType.Linkshell7,
-        ChatType.GmLinkshell7 => ChatType.Linkshell7,
-        ChatType.Linkshell8 => ChatType.Linkshell8,
-        ChatType.GmLinkshell8 => ChatType.Linkshell8,
-        ChatType.FreeCompany => ChatType.FreeCompany,
-        ChatType.GmFreeCompany => ChatType.FreeCompany,
-        ChatType.NoviceNetwork => ChatType.NoviceNetwork,
-        ChatType.GmNoviceNetwork => ChatType.NoviceNetwork,
-        ChatType.CustomEmote => ChatType.CustomEmote,
-        ChatType.StandardEmote => ChatType.StandardEmote,
-        ChatType.Yell => ChatType.Yell,
-        ChatType.GmYell => ChatType.Yell,
-        ChatType.GainBuff => ChatType.GainBuff,
-        ChatType.LoseBuff => ChatType.GainBuff,
-        ChatType.GainDebuff => ChatType.GainDebuff,
-        ChatType.LoseDebuff => ChatType.GainDebuff,
-        ChatType.System => ChatType.System,
-        ChatType.Alarm => ChatType.System,
-        ChatType.GlamourNotifications => ChatType.System,
-        ChatType.RetainerSale => ChatType.System,
-        ChatType.PeriodicRecruitmentNotification => ChatType.System,
-        ChatType.Sign => ChatType.System,
-        ChatType.Orchestrion => ChatType.System,
-        ChatType.MessageBook => ChatType.System,
-        ChatType.NpcDialogue => ChatType.NpcDialogue,
-        ChatType.NpcAnnouncement => ChatType.NpcDialogue,
-        ChatType.LootRoll => ChatType.LootRoll,
-        ChatType.RandomNumber => ChatType.LootRoll,
-        ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement,
-        ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement,
-        ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement,
-        ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement,
-        _ => type,
-    };
+    internal static ChatType Parent(this ChatType type) =>
+        type switch
+        {
+            ChatType.Say => ChatType.Say,
+            ChatType.GmSay => ChatType.Say,
+            ChatType.Shout => ChatType.Shout,
+            ChatType.GmShout => ChatType.Shout,
+            ChatType.TellOutgoing => ChatType.TellOutgoing,
+            ChatType.TellIncoming => ChatType.TellOutgoing,
+            ChatType.GmTell => ChatType.TellOutgoing,
+            ChatType.Party => ChatType.Party,
+            ChatType.CrossParty => ChatType.Party,
+            ChatType.GmParty => ChatType.Party,
+            ChatType.Linkshell1 => ChatType.Linkshell1,
+            ChatType.GmLinkshell1 => ChatType.Linkshell1,
+            ChatType.Linkshell2 => ChatType.Linkshell2,
+            ChatType.GmLinkshell2 => ChatType.Linkshell2,
+            ChatType.Linkshell3 => ChatType.Linkshell3,
+            ChatType.GmLinkshell3 => ChatType.Linkshell3,
+            ChatType.Linkshell4 => ChatType.Linkshell4,
+            ChatType.GmLinkshell4 => ChatType.Linkshell4,
+            ChatType.Linkshell5 => ChatType.Linkshell5,
+            ChatType.GmLinkshell5 => ChatType.Linkshell5,
+            ChatType.Linkshell6 => ChatType.Linkshell6,
+            ChatType.GmLinkshell6 => ChatType.Linkshell6,
+            ChatType.Linkshell7 => ChatType.Linkshell7,
+            ChatType.GmLinkshell7 => ChatType.Linkshell7,
+            ChatType.Linkshell8 => ChatType.Linkshell8,
+            ChatType.GmLinkshell8 => ChatType.Linkshell8,
+            ChatType.FreeCompany => ChatType.FreeCompany,
+            ChatType.GmFreeCompany => ChatType.FreeCompany,
+            ChatType.NoviceNetwork => ChatType.NoviceNetwork,
+            ChatType.GmNoviceNetwork => ChatType.NoviceNetwork,
+            ChatType.CustomEmote => ChatType.CustomEmote,
+            ChatType.StandardEmote => ChatType.StandardEmote,
+            ChatType.Yell => ChatType.Yell,
+            ChatType.GmYell => ChatType.Yell,
+            ChatType.GainBuff => ChatType.GainBuff,
+            ChatType.LoseBuff => ChatType.GainBuff,
+            ChatType.GainDebuff => ChatType.GainDebuff,
+            ChatType.LoseDebuff => ChatType.GainDebuff,
+            ChatType.System => ChatType.System,
+            ChatType.Alarm => ChatType.System,
+            ChatType.GlamourNotifications => ChatType.System,
+            ChatType.RetainerSale => ChatType.System,
+            ChatType.PeriodicRecruitmentNotification => ChatType.System,
+            ChatType.Sign => ChatType.System,
+            ChatType.Orchestrion => ChatType.System,
+            ChatType.MessageBook => ChatType.System,
+            ChatType.NpcDialogue => ChatType.NpcDialogue,
+            ChatType.NpcAnnouncement => ChatType.NpcDialogue,
+            ChatType.LootRoll => ChatType.LootRoll,
+            ChatType.RandomNumber => ChatType.LootRoll,
+            ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement,
+            ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement,
+            ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement,
+            ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement,
+            _ => type,
+        };
 }

HellionChat/Code/InputChannelExt.cs

@@ -4,111 +4,114 @@ namespace HellionChat.Code;
 
 internal static class InputChannelExt
 {
-    internal static ChatType ToChatType(this InputChannel input) => input switch
-    {
-        InputChannel.Tell => ChatType.TellOutgoing,
-        InputChannel.Say => ChatType.Say,
-        InputChannel.Party => ChatType.Party,
-        InputChannel.Alliance => ChatType.Alliance,
-        InputChannel.Yell => ChatType.Yell,
-        InputChannel.Shout => ChatType.Shout,
-        InputChannel.FreeCompany => ChatType.FreeCompany,
-        InputChannel.PvpTeam => ChatType.PvpTeam,
-        InputChannel.NoviceNetwork => ChatType.NoviceNetwork,
-        InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1,
-        InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2,
-        InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3,
-        InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4,
-        InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5,
-        InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6,
-        InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7,
-        InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8,
-        InputChannel.Linkshell1 => ChatType.Linkshell1,
-        InputChannel.Linkshell2 => ChatType.Linkshell2,
-        InputChannel.Linkshell3 => ChatType.Linkshell3,
-        InputChannel.Linkshell4 => ChatType.Linkshell4,
-        InputChannel.Linkshell5 => ChatType.Linkshell5,
-        InputChannel.Linkshell6 => ChatType.Linkshell6,
-        InputChannel.Linkshell7 => ChatType.Linkshell7,
-        InputChannel.Linkshell8 => ChatType.Linkshell8,
-        InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1,
-        InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2,
-        InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3,
-        InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4,
-        InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5,
-        InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6,
-        InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7,
-        InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8,
-        InputChannel.Invalid => ChatType.Echo,
-        _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
-    };
+    internal static ChatType ToChatType(this InputChannel input) =>
+        input switch
+        {
+            InputChannel.Tell => ChatType.TellOutgoing,
+            InputChannel.Say => ChatType.Say,
+            InputChannel.Party => ChatType.Party,
+            InputChannel.Alliance => ChatType.Alliance,
+            InputChannel.Yell => ChatType.Yell,
+            InputChannel.Shout => ChatType.Shout,
+            InputChannel.FreeCompany => ChatType.FreeCompany,
+            InputChannel.PvpTeam => ChatType.PvpTeam,
+            InputChannel.NoviceNetwork => ChatType.NoviceNetwork,
+            InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1,
+            InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2,
+            InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3,
+            InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4,
+            InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5,
+            InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6,
+            InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7,
+            InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8,
+            InputChannel.Linkshell1 => ChatType.Linkshell1,
+            InputChannel.Linkshell2 => ChatType.Linkshell2,
+            InputChannel.Linkshell3 => ChatType.Linkshell3,
+            InputChannel.Linkshell4 => ChatType.Linkshell4,
+            InputChannel.Linkshell5 => ChatType.Linkshell5,
+            InputChannel.Linkshell6 => ChatType.Linkshell6,
+            InputChannel.Linkshell7 => ChatType.Linkshell7,
+            InputChannel.Linkshell8 => ChatType.Linkshell8,
+            InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1,
+            InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2,
+            InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3,
+            InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4,
+            InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5,
+            InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6,
+            InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7,
+            InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8,
+            InputChannel.Invalid => ChatType.Echo,
+            _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
+        };
 
-    public static uint LinkshellIndex(this InputChannel channel) => channel switch
-    {
-        InputChannel.Linkshell1 => 0,
-        InputChannel.Linkshell2 => 1,
-        InputChannel.Linkshell3 => 2,
-        InputChannel.Linkshell4 => 3,
-        InputChannel.Linkshell5 => 4,
-        InputChannel.Linkshell6 => 5,
-        InputChannel.Linkshell7 => 6,
-        InputChannel.Linkshell8 => 7,
-        InputChannel.CrossLinkshell1 => 0,
-        InputChannel.CrossLinkshell2 => 1,
-        InputChannel.CrossLinkshell3 => 2,
-        InputChannel.CrossLinkshell4 => 3,
-        InputChannel.CrossLinkshell5 => 4,
-        InputChannel.CrossLinkshell6 => 5,
-        InputChannel.CrossLinkshell7 => 6,
-        InputChannel.CrossLinkshell8 => 7,
-        InputChannel.ExtraChatLinkshell1 => 0,
-        InputChannel.ExtraChatLinkshell2 => 1,
-        InputChannel.ExtraChatLinkshell3 => 2,
-        InputChannel.ExtraChatLinkshell4 => 3,
-        InputChannel.ExtraChatLinkshell5 => 4,
-        InputChannel.ExtraChatLinkshell6 => 5,
-        InputChannel.ExtraChatLinkshell7 => 6,
-        InputChannel.ExtraChatLinkshell8 => 7,
-        _ => uint.MaxValue,
-    };
+    public static uint LinkshellIndex(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Linkshell1 => 0,
+            InputChannel.Linkshell2 => 1,
+            InputChannel.Linkshell3 => 2,
+            InputChannel.Linkshell4 => 3,
+            InputChannel.Linkshell5 => 4,
+            InputChannel.Linkshell6 => 5,
+            InputChannel.Linkshell7 => 6,
+            InputChannel.Linkshell8 => 7,
+            InputChannel.CrossLinkshell1 => 0,
+            InputChannel.CrossLinkshell2 => 1,
+            InputChannel.CrossLinkshell3 => 2,
+            InputChannel.CrossLinkshell4 => 3,
+            InputChannel.CrossLinkshell5 => 4,
+            InputChannel.CrossLinkshell6 => 5,
+            InputChannel.CrossLinkshell7 => 6,
+            InputChannel.CrossLinkshell8 => 7,
+            InputChannel.ExtraChatLinkshell1 => 0,
+            InputChannel.ExtraChatLinkshell2 => 1,
+            InputChannel.ExtraChatLinkshell3 => 2,
+            InputChannel.ExtraChatLinkshell4 => 3,
+            InputChannel.ExtraChatLinkshell5 => 4,
+            InputChannel.ExtraChatLinkshell6 => 5,
+            InputChannel.ExtraChatLinkshell7 => 6,
+            InputChannel.ExtraChatLinkshell8 => 7,
+            _ => uint.MaxValue,
+        };
 
-    public static string Prefix(this InputChannel channel) => channel switch
-    {
-        InputChannel.Tell => "/t",
-        InputChannel.Say => "/s",
-        InputChannel.Party => "/p",
-        InputChannel.Alliance => "/a",
-        InputChannel.Yell => "/y",
-        InputChannel.Shout => "/sh",
-        InputChannel.FreeCompany => "/fc",
-        InputChannel.PvpTeam => "/pt",
-        InputChannel.NoviceNetwork => "/b",
-        InputChannel.CrossLinkshell1 => "/cwl1",
-        InputChannel.CrossLinkshell2 => "/cwl2",
-        InputChannel.CrossLinkshell3 => "/cwl3",
-        InputChannel.CrossLinkshell4 => "/cwl4",
-        InputChannel.CrossLinkshell5 => "/cwl5",
-        InputChannel.CrossLinkshell6 => "/cwl6",
-        InputChannel.CrossLinkshell7 => "/cwl7",
-        InputChannel.CrossLinkshell8 => "/cwl8",
-        InputChannel.Linkshell1 => "/l1",
-        InputChannel.Linkshell2 => "/l2",
-        InputChannel.Linkshell3 => "/l3",
-        InputChannel.Linkshell4 => "/l4",
-        InputChannel.Linkshell5 => "/l5",
-        InputChannel.Linkshell6 => "/l6",
-        InputChannel.Linkshell7 => "/l7",
-        InputChannel.Linkshell8 => "/l8",
-        InputChannel.ExtraChatLinkshell1 => "/ecl1",
-        InputChannel.ExtraChatLinkshell2 => "/ecl2",
-        InputChannel.ExtraChatLinkshell3 => "/ecl3",
-        InputChannel.ExtraChatLinkshell4 => "/ecl4",
-        InputChannel.ExtraChatLinkshell5 => "/ecl5",
-        InputChannel.ExtraChatLinkshell6 => "/ecl6",
-        InputChannel.ExtraChatLinkshell7 => "/ecl7",
-        InputChannel.ExtraChatLinkshell8 => "/ecl8",
-        _ => "/e",
-    };
+    public static string Prefix(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Tell => "/t",
+            InputChannel.Say => "/s",
+            InputChannel.Party => "/p",
+            InputChannel.Alliance => "/a",
+            InputChannel.Yell => "/y",
+            InputChannel.Shout => "/sh",
+            InputChannel.FreeCompany => "/fc",
+            InputChannel.PvpTeam => "/pt",
+            InputChannel.NoviceNetwork => "/b",
+            InputChannel.CrossLinkshell1 => "/cwl1",
+            InputChannel.CrossLinkshell2 => "/cwl2",
+            InputChannel.CrossLinkshell3 => "/cwl3",
+            InputChannel.CrossLinkshell4 => "/cwl4",
+            InputChannel.CrossLinkshell5 => "/cwl5",
+            InputChannel.CrossLinkshell6 => "/cwl6",
+            InputChannel.CrossLinkshell7 => "/cwl7",
+            InputChannel.CrossLinkshell8 => "/cwl8",
+            InputChannel.Linkshell1 => "/l1",
+            InputChannel.Linkshell2 => "/l2",
+            InputChannel.Linkshell3 => "/l3",
+            InputChannel.Linkshell4 => "/l4",
+            InputChannel.Linkshell5 => "/l5",
+            InputChannel.Linkshell6 => "/l6",
+            InputChannel.Linkshell7 => "/l7",
+            InputChannel.Linkshell8 => "/l8",
+            InputChannel.ExtraChatLinkshell1 => "/ecl1",
+            InputChannel.ExtraChatLinkshell2 => "/ecl2",
+            InputChannel.ExtraChatLinkshell3 => "/ecl3",
+            InputChannel.ExtraChatLinkshell4 => "/ecl4",
+            InputChannel.ExtraChatLinkshell5 => "/ecl5",
+            InputChannel.ExtraChatLinkshell6 => "/ecl6",
+            InputChannel.ExtraChatLinkshell7 => "/ecl7",
+            InputChannel.ExtraChatLinkshell8 => "/ecl8",
+            _ => "/e",
+        };
 
     public static IEnumerable<TextCommand>? TextCommands(this InputChannel channel)
     {
@@ -145,51 +148,56 @@ internal static class InputChannelExt
         if (ids.Length == 0)
             return null;
 
-        return ids.Where(id => Sheets.TextCommandSheet.HasRow(id)).Select(id => Sheets.TextCommandSheet.GetRow(id));
+        return ids.Where(id => Sheets.TextCommandSheet.HasRow(id))
+            .Select(id => Sheets.TextCommandSheet.GetRow(id));
     }
 
-    internal static bool IsLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.Linkshell1 => true,
-        InputChannel.Linkshell2 => true,
-        InputChannel.Linkshell3 => true,
-        InputChannel.Linkshell4 => true,
-        InputChannel.Linkshell5 => true,
-        InputChannel.Linkshell6 => true,
-        InputChannel.Linkshell7 => true,
-        InputChannel.Linkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Linkshell1 => true,
+            InputChannel.Linkshell2 => true,
+            InputChannel.Linkshell3 => true,
+            InputChannel.Linkshell4 => true,
+            InputChannel.Linkshell5 => true,
+            InputChannel.Linkshell6 => true,
+            InputChannel.Linkshell7 => true,
+            InputChannel.Linkshell8 => true,
+            _ => false,
+        };
 
-    internal static bool IsCrossLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.CrossLinkshell1 => true,
-        InputChannel.CrossLinkshell2 => true,
-        InputChannel.CrossLinkshell3 => true,
-        InputChannel.CrossLinkshell4 => true,
-        InputChannel.CrossLinkshell5 => true,
-        InputChannel.CrossLinkshell6 => true,
-        InputChannel.CrossLinkshell7 => true,
-        InputChannel.CrossLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsCrossLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.CrossLinkshell1 => true,
+            InputChannel.CrossLinkshell2 => true,
+            InputChannel.CrossLinkshell3 => true,
+            InputChannel.CrossLinkshell4 => true,
+            InputChannel.CrossLinkshell5 => true,
+            InputChannel.CrossLinkshell6 => true,
+            InputChannel.CrossLinkshell7 => true,
+            InputChannel.CrossLinkshell8 => true,
+            _ => false,
+        };
 
-    internal static bool IsExtraChatLinkshell(this InputChannel channel) => channel switch
-    {
-        InputChannel.ExtraChatLinkshell1 => true,
-        InputChannel.ExtraChatLinkshell2 => true,
-        InputChannel.ExtraChatLinkshell3 => true,
-        InputChannel.ExtraChatLinkshell4 => true,
-        InputChannel.ExtraChatLinkshell5 => true,
-        InputChannel.ExtraChatLinkshell6 => true,
-        InputChannel.ExtraChatLinkshell7 => true,
-        InputChannel.ExtraChatLinkshell8 => true,
-        _ => false,
-    };
+    internal static bool IsExtraChatLinkshell(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.ExtraChatLinkshell1 => true,
+            InputChannel.ExtraChatLinkshell2 => true,
+            InputChannel.ExtraChatLinkshell3 => true,
+            InputChannel.ExtraChatLinkshell4 => true,
+            InputChannel.ExtraChatLinkshell5 => true,
+            InputChannel.ExtraChatLinkshell6 => true,
+            InputChannel.ExtraChatLinkshell7 => true,
+            InputChannel.ExtraChatLinkshell8 => true,
+            _ => false,
+        };
 
-    internal static bool IsValid(this InputChannel channel) => channel switch
-    {
-        InputChannel.Invalid => false,
-        _ => true,
-    };
+    internal static bool IsValid(this InputChannel channel) =>
+        channel switch
+        {
+            InputChannel.Invalid => false,
+            _ => true,
+        };
 }

HellionChat/Commands.cs

@@ -16,15 +16,22 @@ internal sealed class Commands : IDisposable
     {
         foreach (var wrapper in Registered.Values)
         {
-            Plugin.CommandManager.AddHandler(wrapper.Name, new CommandInfo(Invoke)
-            {
-                HelpMessage = wrapper.Description ?? string.Empty,
-                ShowInHelp = wrapper.ShowInHelp,
-            });
+            Plugin.CommandManager.AddHandler(
+                wrapper.Name,
+                new CommandInfo(Invoke)
+                {
+                    HelpMessage = wrapper.Description ?? string.Empty,
+                    ShowInHelp = wrapper.ShowInHelp,
+                }
+            );
         }
     }
 
-    internal CommandWrapper Register(string name, string? description = null, bool? showInHelp = null)
+    internal CommandWrapper Register(
+        string name,
+        string? description = null,
+        bool? showInHelp = null
+    )
     {
         if (Registered.TryGetValue(name, out var wrapper))
         {
@@ -45,7 +52,7 @@ internal sealed class Commands : IDisposable
     {
         if (!Registered.TryGetValue(command, out var wrapper))
         {
-            Plugin.Log.Warning($"Missing registration for command {command}");
+            Plugin.LogProxy.Warning($"Missing registration for command {command}");
             return;
         }
 
@@ -55,7 +62,7 @@ internal sealed class Commands : IDisposable
         }
         catch (Exception ex)
         {
-            Plugin.Log.Error(ex, $"Error while executing command {command}");
+            Plugin.LogProxy.Error(ex, $"Error while executing command {command}");
         }
     }
 }

HellionChat/Configuration.cs

@@ -1,14 +1,14 @@
 using System.Collections;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Configuration;
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.FontIdentifier;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Resources;
+using HellionChat.Util;
 
 namespace HellionChat;
 
@@ -27,43 +27,48 @@ public class ConfigKeyBind
             modString += Language.Keybind_Modifier_Shift + " + ";
         if (Modifier.HasFlag(ModifierFlag.Alt))
             modString += Language.Keybind_Modifier_Alt + " + ";
-        return modString+Key.GetFancyName();
+        return modString + Key.GetFancyName();
     }
 }
 
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 16;
+    private const int LatestVersion = 17;
 
     public int Version { get; set; } = LatestVersion;
 
-    // v1.1.0 — Theme-Engine. Slug-basiert; ThemeRegistry liefert das Objekt.
+    // Slug-based; ThemeRegistry resolves the object at runtime.
     public string Theme = "hellion-arctic";
 
-    // v1.1.0 — Globale Window-Opacity, theme-übergreifend. Migration aus
-    // HellionThemeWindowOpacity beim Bump v13 → v14.
+    // Global window opacity, applied across all themes.
     public float WindowOpacity = 0.85f;
 
-
-    // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
-    // vorab angelegt, damit später keine Migration nötig ist.
+    // Reserved for future UI toggles; pre-declared to avoid a migration later.
     public bool ReduceMotion;
-    // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
-    // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
-    // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
-    // false werden durch die v15→v16-Migration auf den neuen Default
-    // gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
-    // neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
+
+    // v1.2.1: default flipped false → true. Compact single-line layout is
+    // more readable than the card-rows layout introduced in v1.2.0.
     public bool UseCompactDensity = true;
 
-    // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
-    // Master-switch defaults to true; set false to restore upstream behavior.
+    // Privacy by Default master switch. Set false to restore upstream behaviour.
     public bool PrivacyFilterEnabled = true;
+
     // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
     public HashSet<ChatType> PrivacyPersistChannels = [];
-    // Failsafe for ChatTypes added by future FFXIV patches we don't know about.
-    public bool PrivacyPersistUnknownChannels;
+
+    // Failsafe for ChatTypes added by future FFXIV patches. New configs default
+    // to the failsafe via PrivacyDefaults; existing configs keep their saved
+    // choice because the deserializer overrides this initializer.
+    public bool PrivacyPersistUnknownChannels = Privacy
+        .PrivacyDefaults
+        .DefaultPersistUnknownChannels;
+
+    // F3.2: dedup unknown-ChatType warnings so a chatty filter doesn't spam
+    // the log every frame. NonSerialized so the warning fires once per
+    // runtime, not once-ever-per-install.
+    [NonSerialized]
+    private readonly HashSet<ChatType> _warnedUnknownChannels = new();
 
     public bool IsAllowedForStorage(ChatType type)
     {
@@ -71,78 +76,52 @@ public class Configuration : IPluginConfiguration
             return true;
         if (PrivacyPersistChannels.Contains(type))
             return true;
+
+        // F3.2: log first occurrence of a ChatType the running build doesn't
+        // recognise — i.e. one a future FFXIV patch may have added. Known
+        // types the user opted out of are routed through the failsafe
+        // silently, like before.
+        if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type))
+        {
+            Plugin.LogProxy.Warning(
+                "PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
+                type,
+                PrivacyPersistUnknownChannels
+            );
+        }
+
         return PrivacyPersistUnknownChannels;
     }
 
-    // Hellion Chat — Message retention (GDPR data minimization, time axis).
-    // Master switch defaults to false; the plugin will not delete history
-    // until the user explicitly opts in.
+    // Retention master switch defaults to false — plugin will not delete
+    // history until the user explicitly opts in.
     public bool RetentionEnabled;
     public int RetentionDefaultDays = 30;
     public Dictionary<ChatType, int> RetentionPerChannelDays = [];
     public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
-
-    // Hellion Chat first-run wizard — opens once on a fresh install. Existing
-    // ChatTwo users skip it because the v6→v7 migration sets the flag.
     public bool FirstRunCompleted;
-
-    // Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
-    // instead of whatever GlobalFontV2.FontId points at. Default ON so a
-    // fresh install gets the Hellion typography out-of-the-box; flip OFF
-    // to fall back to the user's chosen system or Dalamud font.
     public bool UseHellionFont = true;
-
-    // Cycle 1 of the plugin-integration roadmap. When Honorific is installed
-    // and reports a custom title, render it in the chat header above the
-    // message log. Auto-hides regardless when Honorific is missing or the
-    // active title is original/empty, so leaving this on is safe even for
-    // users who don't run Honorific.
     public bool ShowHonorificTitleInHeader = true;
 
-    // Hellion Chat — Auto-Tell-Tabs. When enabled, an incoming or outgoing
-    // /tell spawns a session-only tab dedicated to that conversation
-    // partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
+    // v1.4.7 opt-in: renders the Honorific glow outline when the title carries
+    // a Glow colour. Default OFF — keeps v1.4.6 visuals untouched for users
+    // who don't care, and dodges the per-frame DrawList overhead on low-end
+    // hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
+    // as the primary Color until a later cycle ports the animation.
+    public bool ShowHonorificGlow;
     public bool EnableAutoTellTabs = true;
-    // Hard cap on simultaneously open auto tell tabs. Range enforced by the
-    // settings slider (1–50). LRU drop favors greeted tabs first.
     public int AutoTellTabsLimit = 15;
-    // When true the sidebar shows only a thin separator before the temp
-    // tabs; when false a section header "Active Tells (n)" is rendered.
     public bool AutoTellTabsCompactDisplay;
-    // Number of prior tells to preload from the message store when an
-    // auto tell tab is spawned. Range 0–100; 0 disables preload.
     public int AutoTellTabsHistoryPreload = 20;
-    // Show the greeter "marked-as-greeted" toggle button next to each
-    // temp tab and dim the tab name when set. Off by default because the
-    // workflow is specific to club-greeter use cases — most users just
-    // want the auto tabs themselves without the extra UI affordance.
+
+    // Sidebar width in pixels. Default 44 mirrors the icon-only layout from
+    // v1.2.0; users can widen up to 160 to fit a section-header line like
+    // "Active Tells (3)" without truncation.
+    public int SidebarWidth = 44;
     public bool AutoTellTabsShowGreetedToggle;
-
-    // Hellion Chat — One-Time-Hint-Banner that introduces the v0.6.0 pop-out
-    // input feature. Set to true once the user dismisses the banner from a
-    // pop-out window; never reset after that.
     public bool SeenPopOutInputHint;
-
-    // Hellion Chat — v0.6.0 master switch for the pop-out input bar.
-    // Global on purpose: per-tab makes no sense for Auto-Tell-Tabs which
-    // are session-only and would force the user to re-enable it for every
-    // new conversation. Default flipped to ON in v0.6.1 (was OFF in v0.6.0)
-    // because tester feedback called the manual toggle "umständlich, wirkt
-    // unfertig". v11 → v12 migration applies the same flip to existing users.
     public bool PopOutInputEnabled = true;
-
-    // Hellion Chat — v0.6.1 One-Time-Hint-Banner that introduces the
-    // chat-header pop-out toolbar button and reminds about the pop-out
-    // input default flip. Set to true once the user dismisses the banner
-    // from the main chat window; never reset after that.
     public bool SeenPopOutHeaderHint;
-
-    // Hellion Chat — v0.6.1 opt-in: when true, AutoTellTabsService.SpawnTempTab
-    // sets tab.PopOut = true on every new auto-tell tab so the conversation
-    // pops out as its own window directly. Closing the pop-out returns the
-    // tab to the sidebar via the standard Popout.OnClose() flow. Default OFF
-    // because the existing sidebar workflow is what most users (especially
-    // club greeters tracking many parallel tells) expect by default.
     public bool AutoTellTabsOpenAsPopout;
 
     public int GetRetentionDays(ChatType type)
@@ -160,10 +139,8 @@ public class Configuration : IPluginConfiguration
     public bool HideWhenUiHidden = true;
     public bool HideInLoadingScreens;
     public bool HideInBattle;
-    // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
-    // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
-    // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
-    // Sequenzen.
+
+    // v1.2.1: default flipped false → true for consistency with other hide defaults.
     public bool HideInNewGamePlusMenu = true;
     public bool HideWhenInactive;
     public int InactivityHideTimeout = 10;
@@ -179,16 +156,8 @@ public class Configuration : IPluginConfiguration
     public bool NativeItemTooltips = true;
     public bool PrettierTimestamps = true;
     public bool MoreCompactPretty;
-    // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
-    // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
-    // Timestamp pro Minute reicht aus um die Konversation zu verorten.
     public bool HideSameTimestamps = true;
     public bool ShowNoviceNetwork;
-    // Hellion Chat — vertical sidebar tab layout reads better than the
-    // horizontal tab strip in the company of Auto-Tell-Tabs (a club
-    // greeter typically tracks 5–15 simultaneous conversations). Bestand
-    // users keep their saved value untouched — only fresh installs pick
-    // up the new default.
     public bool SidebarTabView = true;
     public bool PrintChangelog = true;
     public bool OnlyPreviewIf;
@@ -209,20 +178,10 @@ public class Configuration : IPluginConfiguration
     public bool CollapseKeepUniqueLinks;
     public bool PlaySounds = true;
     public bool KeepInputFocus = true;
-    // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
-    // Hardware bei langen Sessions spürbar langsamer (Card-Layout
-    // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
-    // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
     public int MaxLinesToRender = 2_500; // 1-10000
-    // Default ON to match a German / European 24h locale. The
-    // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
-    // CultureInfo.InvariantCulture so the result is consistent across
-    // host locales.
     public bool Use24HourClock = true;
-
     public bool ShowEmotes = true;
     public HashSet<string> BlockedEmotes = [];
-
     public bool FontsEnabled = true;
     public ExtraGlyphRanges ExtraGlyphRanges = 0;
     public float FontSizeV2 = 12.75f;
@@ -246,18 +205,15 @@ public class Configuration : IPluginConfiguration
     };
 
     public float TooltipOffset;
-    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
-    // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
-    // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
-    // Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
-    // leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
-    // Preset gehoben; User die bereits Custom-Farben haben, bleiben.
+
     public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();
 
     private static Dictionary<ChatType, uint> BuildDefaultChatColours()
     {
         var defaults = new Dictionary<ChatType, uint>();
-        foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours)
+        foreach (
+            var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours
+        )
             defaults[channel] = colour;
         return defaults;
     }
@@ -284,7 +240,10 @@ public class Configuration : IPluginConfiguration
         HideWhenInactive = other.HideWhenInactive;
         InactivityHideTimeout = other.InactivityHideTimeout;
         InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle;
-        InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(pair => pair.Key, pair => pair.Value);
+        InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(
+            pair => pair.Key,
+            pair => pair.Value
+        );
         InactivityHideExtraChatAll = other.InactivityHideExtraChatAll;
         InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet();
         ShowHideButton = other.ShowHideButton;
@@ -316,9 +275,7 @@ public class Configuration : IPluginConfiguration
         MaxLinesToRender = other.MaxLinesToRender;
         Use24HourClock = other.Use24HourClock;
         ShowEmotes = other.ShowEmotes;
-        // Deep-copy the set so the live and mutable Configuration instances don't share state
-        // — a HashSet reference assignment would cause edits in the settings window to leak
-        // into the live config before the user clicks Save.
+        // Deep-copy so settings window edits don't leak into live config before Save.
         BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
         FontsEnabled = other.FontsEnabled;
         ItalicEnabled = other.ItalicEnabled;
@@ -332,54 +289,54 @@ public class Configuration : IPluginConfiguration
         ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
         ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
 
-        // Hellion Chat — Auto-Tell-Tabs are session-only and therefore
-        // never present in a disk-loaded copy. Keep the live temp tabs of
-        // *this* configuration alive across an UpdateFrom so a settings
-        // save (or sidebar-mode toggle) does not silently destroy the
-        // user's open tell conversations.
-        //
-        // For persistent tabs we go through Tab.Clone() which intentionally
-        // does NOT copy the NonSerialized Messages list (avoids shared
-        // mutable state on disk-load). On a settings save that means the
-        // chat history for every persistent tab would be wiped — bug
-        // reported by Flo 2026-05-05. We work around it by capturing the
-        // live MessageList (and LastSendUnread counter) by Identifier
-        // before the replace, then restoring it onto the freshly cloned
-        // tabs whose Identifier survives Tab.Clone(). New tabs added in
-        // settings get a fresh empty MessageList; deleted tabs lose their
-        // history (intended).
-        var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
-        var livePersistentSession = Tabs
-            .Where(t => !t.IsTempTab)
-            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
+        // Keep live temp tabs alive across UpdateFrom — a settings save must
+        // not destroy open tell conversations. Pinned TempTabs are persistent
+        // and come through `other` like regular tabs; unpinned TempTabs are
+        // session-only and held from the local state. For persistent tabs
+        // (incl. pinned), capture live runtime state by Identifier and restore
+        // it onto the freshly cloned tabs — CurrentChannel is critical because
+        // the user may have switched channel in-game between settings-open
+        // and settings-save, and we'd otherwise overwrite that with the
+        // settings-time snapshot.
+        var liveUnpinnedTempTabs = Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
+        var livePersistentSession = Tabs.Where(t => !TabLifecycleHelpers.IsInUnpinnedPool(t))
+            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread, t.CurrentChannel));
 
-        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t =>
-        {
-            var clone = t.Clone();
-            if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+        Tabs = other
+            .Tabs.Where(t => !t.IsTempTab || t.IsPinned)
+            .Select(t =>
             {
-                clone.Messages = live.Messages;
-                clone.LastSendUnread = live.LastSendUnread;
-            }
-            return clone;
-        }).ToList();
-        Tabs.AddRange(liveTempTabs);
+                var clone = t.Clone();
+                if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+                {
+                    clone.Messages = live.Messages;
+                    clone.LastSendUnread = live.LastSendUnread;
+                    clone.CurrentChannel = live.CurrentChannel;
+                }
+                return clone;
+            })
+            .ToList();
+        Tabs.AddRange(liveUnpinnedTempTabs);
 
         ChatTabForward = other.ChatTabForward;
         ChatTabBackward = other.ChatTabBackward;
 
         PrivacyFilterEnabled = other.PrivacyFilterEnabled;
-        PrivacyPersistChannels = [..other.PrivacyPersistChannels];
+        PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
         PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;
 
         RetentionEnabled = other.RetentionEnabled;
         RetentionDefaultDays = other.RetentionDefaultDays;
-        RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(p => p.Key, p => p.Value);
+        RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
+            p => p.Key,
+            p => p.Value
+        );
         RetentionLastRunAt = other.RetentionLastRunAt;
 
         FirstRunCompleted = other.FirstRunCompleted;
         UseHellionFont = other.UseHellionFont;
         ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
+        ShowHonorificGlow = other.ShowHonorificGlow;
 
         // v1.1.0 theme engine fields
         Theme = other.Theme;
@@ -391,6 +348,7 @@ public class Configuration : IPluginConfiguration
         AutoTellTabsLimit = other.AutoTellTabsLimit;
         AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
         AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
+        SidebarWidth = other.SidebarWidth;
         AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;
 
         SeenPopOutInputHint = other.SeenPopOutInputHint;
@@ -410,21 +368,23 @@ public enum UnreadMode
 
 public static class UnreadModeExt
 {
-    internal static string Name(this UnreadMode mode) => mode switch
-    {
-        UnreadMode.All => Language.UnreadMode_All,
-        UnreadMode.Unseen => Language.UnreadMode_Unseen,
-        UnreadMode.None => Language.UnreadMode_None,
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    internal static string Name(this UnreadMode mode) =>
+        mode switch
+        {
+            UnreadMode.All => Language.UnreadMode_All,
+            UnreadMode.Unseen => Language.UnreadMode_Unseen,
+            UnreadMode.None => Language.UnreadMode_None,
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };
 
-    internal static string? Tooltip(this UnreadMode mode) => mode switch
-    {
-        UnreadMode.All => Language.UnreadMode_All_Tooltip,
-        UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
-        UnreadMode.None => Language.UnreadMode_None_Tooltip,
-        _ => null,
-    };
+    internal static string? Tooltip(this UnreadMode mode) =>
+        mode switch
+        {
+            UnreadMode.All => Language.UnreadMode_All_Tooltip,
+            UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
+            UnreadMode.None => Language.UnreadMode_None_Tooltip,
+            _ => null,
+        };
 }
 
 [Serializable]
@@ -432,9 +392,7 @@ public class Tab
 {
     public string Name = Language.Tab_DefaultName;
 
-    // v1.2.0 — optionaler FontAwesome-Glyph-Name. Null bedeutet:
-    // Default-Mapping aus TabIconMapping greift (basiert auf Tab-Name).
-    // User können hier per Settings → Tabs einen eigenen Glyph setzen.
+    // Optional FontAwesome glyph name; null falls back to TabIconMapping default.
     public string? Icon = null;
 
     [Obsolete("Removed in favor of SelectedChannels")]
@@ -465,47 +423,65 @@ public class Tab
     public bool HideWhenInactive;
 
     public bool IsTempTab;
+
+    // Pinned TempTabs survive plugin reload and logout — tester feedback from
+    // Jin (v1.4.7). Pinned tabs live in their own pool (MaxPinnedTempTabs)
+    // separate from the AutoTellTabsLimit bucket.
+    public bool IsPinned;
     public bool AllSenderMessages;
     public TellTarget TellTarget = TellTarget.Empty();
 
-    [NonSerialized] public uint Unread;
-    [NonSerialized] public uint LastSendUnread;
-    [NonSerialized] public long LastActivity;
-    [NonSerialized] public MessageList Messages = new();
+    [NonSerialized]
+    public uint Unread;
 
-    [NonSerialized] public UsedChannel CurrentChannel = new();
+    [NonSerialized]
+    public uint LastSendUnread;
 
-    [NonSerialized] public Guid Identifier = Guid.NewGuid();
+    [NonSerialized]
+    public long LastActivity;
 
-    // Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the
-    // sidebar to mark a tell partner as already greeted in the current
-    // session. NonSerialized because the temp tab itself is session-only.
-    [NonSerialized] public bool IsGreeted;
+    [NonSerialized]
+    public MessageList Messages = new();
 
-    // v1.4.2 — TabTintCache uses separate validation keys per cache so a
-    // TellTarget change picked up by GetTint can't strand GetIcon (or vice
-    // versa) with a stale entry that looks fresh on the shared key.
-    [NonSerialized] internal string? _cachedTintTellName;
-    [NonSerialized] internal uint _cachedTintTellWorld;
-    [NonSerialized] internal uint _cachedTellTint;
-    [NonSerialized] internal string? _cachedIconTellName;
-    [NonSerialized] internal uint _cachedIconTellWorld;
-    [NonSerialized] internal string? _cachedTellIcon;
+    [NonSerialized]
+    public UsedChannel CurrentChannel = new();
+
+    [NonSerialized]
+    public Guid Identifier = Guid.NewGuid();
+
+    // Session-only greeted flag for club-greeter workflows.
+    [NonSerialized]
+    public bool IsGreeted;
+
+    // Separate validation keys per cache so TellTarget changes don't
+    // cause GetTint and GetIcon to strand each other with stale entries.
+    [NonSerialized]
+    internal string? _cachedTintTellName;
+
+    [NonSerialized]
+    internal uint _cachedTintTellWorld;
+
+    [NonSerialized]
+    internal uint _cachedTellTint;
+
+    [NonSerialized]
+    internal string? _cachedIconTellName;
+
+    [NonSerialized]
+    internal uint _cachedIconTellWorld;
+
+    [NonSerialized]
+    internal string? _cachedTellIcon;
 
     public bool Matches(Message message)
     {
         if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
-        {
             return false;
-        }
 
-        // Auto-tell temp tabs are bound to a single conversation partner;
-        // every other tell that matches the channel filter must NOT land
-        // here, otherwise all temp tabs would mirror "Tell Exclusive".
+        // Temp tabs are bound to a single conversation partner — other tells
+        // matching the channel filter must not land here.
         if (IsTempTab && TellTarget?.IsSet() == true)
-        {
             return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
-        }
 
         return true;
     }
@@ -517,12 +493,17 @@ public class Tab
             return;
 
         Unread += 1;
-        if (message.Matches(Plugin.Config.InactivityHideChannelsV2, Plugin.Config.InactivityHideExtraChatAll, Plugin.Config.InactivityHideExtraChatChannels))
+        if (
+            message.Matches(
+                Plugin.Config.InactivityHideChannelsV2,
+                Plugin.Config.InactivityHideExtraChatAll,
+                Plugin.Config.InactivityHideExtraChatChannels
+            )
+        )
             LastActivity = Environment.TickCount64;
     }
 
-    public void Clear()
-        => Messages.Clear();
+    public void Clear() => Messages.Clear();
 
     public Tab Clone()
     {
@@ -543,7 +524,7 @@ public class Tab
             Opacity = Opacity,
             Identifier = Identifier,
             InputDisabled = InputDisabled,
-            CurrentChannel = CurrentChannel,
+            CurrentChannel = CurrentChannel.Clone(),
             CanMove = CanMove,
             CanResize = CanResize,
             IndependentHide = IndependentHide,
@@ -554,16 +535,14 @@ public class Tab
             HideInBattle = HideInBattle,
             HideWhenInactive = HideWhenInactive,
             IsTempTab = IsTempTab,
+            IsPinned = IsPinned,
             AllSenderMessages = AllSenderMessages,
-            TellTarget = TellTarget.From(TellTarget),
+            TellTarget = TellTarget.Clone(),
             IsGreeted = IsGreeted,
         };
     }
 
-    /// <summary>
-    /// MessageList provides an ordered list of messages with duplicate ID
-    /// tracking, sorting and mutex protection.
-    /// </summary>
+    /// Ordered message list with duplicate ID tracking, sorting and mutex protection.
     public class MessageList
     {
         private readonly SemaphoreSlim LockSlim = new(1, 1);
@@ -651,23 +630,24 @@ public class Tab
             }
         }
 
-        /// <summary>
-        /// Aktuelle Anzahl der gespeicherten Messages. Lock-acquire pro Read
-        /// ist OK für 1×/sec Status-Bar-Polling (v1.2.0).
-        /// </summary>
+        /// Current message count. Lock-per-read is acceptable for 1×/sec status bar polling.
         public int Count
         {
             get
             {
                 LockSlim.Wait(-1);
-                try { return Messages.Count; }
-                finally { LockSlim.Release(); }
+                try
+                {
+                    return Messages.Count;
+                }
+                finally
+                {
+                    LockSlim.Release();
+                }
             }
         }
 
-        /// <summary>
-        /// Returns an array copy of the message list for usage outside of main thread
-        /// </summary>
+        /// Returns an array copy of the message list for usage outside of main thread.
         public async Task<Message[]> GetCopy(int millisecondsTimeout = -1)
         {
             await LockSlim.WaitAsync(millisecondsTimeout);
@@ -681,17 +661,16 @@ public class Tab
             }
         }
 
-        /// <summary>
-        /// GetReadOnly returns a read-only list of messages while holding a
-        /// reader lock. The list should be used with a using statement.
-        /// </summary>
+        /// Returns a read-only list while holding a reader lock. Use with a using statement.
         public RLockedMessageList GetReadOnly(int millisecondsTimeout = -1)
         {
             LockSlim.Wait(millisecondsTimeout);
             return new RLockedMessageList(LockSlim, Messages);
         }
 
-        public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages) : IReadOnlyList<Message>, IDisposable
+        public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages)
+            : IReadOnlyList<Message>,
+                IDisposable
         {
             public IEnumerator<Message> GetEnumerator()
             {
@@ -736,6 +715,29 @@ public class UsedChannel
     {
         Channel = channel;
     }
+
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Deep-clone the UsedChannel so Tab.Clone() no longer shares
+    //   channel state (incl. TellTarget) with its origin Tab. Previously
+    //   a reference copy: PopOut and Temp tabs mutated each other.
+    // - Name is intentionally a reference copy (matches upstream); it
+    //   gets reassigned on every channel switch anyway.
+    // TEST-MIRROR: ../../Hellion Build test/_Helpers/UsedChannelCloneTests.cs
+    // ---------------------------------------------------------------
+    public UsedChannel Clone()
+    {
+        return new UsedChannel
+        {
+            Channel = Channel,
+            Name = Name,
+            TellTarget = TellTarget?.Clone(),
+
+            UseTempChannel = UseTempChannel,
+            TempChannel = TempChannel,
+            TempTellTarget = TempTellTarget?.Clone(),
+        };
+    }
 }
 
 [Serializable]
@@ -750,15 +752,16 @@ public enum PreviewPosition
 
 public static class PreviewPositionExt
 {
-    public static string Name(this PreviewPosition position) => position switch
-    {
-        PreviewPosition.None => Language.Options_Preview_None,
-        PreviewPosition.Inside => Language.Options_Preview_Inside,
-        PreviewPosition.Top => Language.Options_Preview_Top,
-        PreviewPosition.Bottom => Language.Options_Preview_Bottom,
-        PreviewPosition.Tooltip => Language.Options_Preview_Tooltip,
-        _ => throw new ArgumentOutOfRangeException(nameof(position), position, null),
-    };
+    public static string Name(this PreviewPosition position) =>
+        position switch
+        {
+            PreviewPosition.None => Language.Options_Preview_None,
+            PreviewPosition.Inside => Language.Options_Preview_Inside,
+            PreviewPosition.Top => Language.Options_Preview_Top,
+            PreviewPosition.Bottom => Language.Options_Preview_Bottom,
+            PreviewPosition.Tooltip => Language.Options_Preview_Tooltip,
+            _ => throw new ArgumentOutOfRangeException(nameof(position), position, null),
+        };
 }
 
 [Serializable]
@@ -771,13 +774,14 @@ public enum CommandHelpSide
 
 public static class CommandHelpSideExt
 {
-    public static string Name(this CommandHelpSide side) => side switch
-    {
-        CommandHelpSide.None => Language.CommandHelpSide_None,
-        CommandHelpSide.Left => Language.CommandHelpSide_Left,
-        CommandHelpSide.Right => Language.CommandHelpSide_Right,
-        _ => throw new ArgumentOutOfRangeException(nameof(side), side, null),
-    };
+    public static string Name(this CommandHelpSide side) =>
+        side switch
+        {
+            CommandHelpSide.None => Language.CommandHelpSide_None,
+            CommandHelpSide.Left => Language.CommandHelpSide_Left,
+            CommandHelpSide.Right => Language.CommandHelpSide_Right,
+            _ => throw new ArgumentOutOfRangeException(nameof(side), side, null),
+        };
 }
 
 [Serializable]
@@ -789,19 +793,21 @@ public enum KeybindMode
 
 public static class KeybindModeExt
 {
-    public static string Name(this KeybindMode mode) => mode switch
-    {
-        KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
-        KeybindMode.Strict => Language.KeybindMode_Strict_Name,
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Name(this KeybindMode mode) =>
+        mode switch
+        {
+            KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
+            KeybindMode.Strict => Language.KeybindMode_Strict_Name,
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };
 
-    public static string? Tooltip(this KeybindMode mode) => mode switch
-    {
-        KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
-        KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
-        _ => null,
-    };
+    public static string? Tooltip(this KeybindMode mode) =>
+        mode switch
+        {
+            KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
+            KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
+            _ => null,
+        };
 }
 
 [Serializable]
@@ -830,49 +836,51 @@ public enum LanguageOverride
 
 public static class LanguageOverrideExt
 {
-    public static string Name(this LanguageOverride mode) => mode switch
-    {
-        LanguageOverride.None => Language.LanguageOverride_None,
-        LanguageOverride.ChineseSimplified => "简体中文",
-        LanguageOverride.ChineseTraditional => "繁體中文",
-        LanguageOverride.Dutch => "Nederlands",
-        LanguageOverride.English => "English",
-        LanguageOverride.French => "Français",
-        LanguageOverride.German => "Deutsch",
-        LanguageOverride.Greek => "Ελληνικά",
-        // LanguageOverride.Italian => "Italiano",
-        LanguageOverride.Japanese => "日本語",
-        // LanguageOverride.Korean => "한국어 (Korean)",
-        // LanguageOverride.Norwegian => "Norsk",
-        LanguageOverride.PortugueseBrazil => "Português do Brasil",
-        LanguageOverride.Romanian => "Română",
-        LanguageOverride.Russian => "Русский",
-        LanguageOverride.Spanish => "Español",
-        LanguageOverride.Swedish => "Svenska",
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Name(this LanguageOverride mode) =>
+        mode switch
+        {
+            LanguageOverride.None => Language.LanguageOverride_None,
+            LanguageOverride.ChineseSimplified => "简体中文",
+            LanguageOverride.ChineseTraditional => "繁體中文",
+            LanguageOverride.Dutch => "Nederlands",
+            LanguageOverride.English => "English",
+            LanguageOverride.French => "Français",
+            LanguageOverride.German => "Deutsch",
+            LanguageOverride.Greek => "Ελληνικά",
+            // LanguageOverride.Italian => "Italiano",
+            LanguageOverride.Japanese => "日本語",
+            // LanguageOverride.Korean => "한국어 (Korean)",
+            // LanguageOverride.Norwegian => "Norsk",
+            LanguageOverride.PortugueseBrazil => "Português do Brasil",
+            LanguageOverride.Romanian => "Română",
+            LanguageOverride.Russian => "Русский",
+            LanguageOverride.Spanish => "Español",
+            LanguageOverride.Swedish => "Svenska",
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };
 
-    public static string Code(this LanguageOverride mode) => mode switch
-    {
-        LanguageOverride.None => "",
-        LanguageOverride.ChineseSimplified => "zh-hans",
-        LanguageOverride.ChineseTraditional => "zh-hant",
-        LanguageOverride.Dutch => "nl",
-        LanguageOverride.English => "en",
-        LanguageOverride.French => "fr",
-        LanguageOverride.German => "de",
-        LanguageOverride.Greek => "el",
-        // LanguageOverride.Italian => "it",
-        LanguageOverride.Japanese => "ja",
-        // LanguageOverride.Korean => "ko",
-        // LanguageOverride.Norwegian => "no",
-        LanguageOverride.PortugueseBrazil => "pt-br",
-        LanguageOverride.Romanian => "ro",
-        LanguageOverride.Russian => "ru",
-        LanguageOverride.Spanish => "es",
-        LanguageOverride.Swedish => "sv",
-        _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
-    };
+    public static string Code(this LanguageOverride mode) =>
+        mode switch
+        {
+            LanguageOverride.None => "",
+            LanguageOverride.ChineseSimplified => "zh-hans",
+            LanguageOverride.ChineseTraditional => "zh-hant",
+            LanguageOverride.Dutch => "nl",
+            LanguageOverride.English => "en",
+            LanguageOverride.French => "fr",
+            LanguageOverride.German => "de",
+            LanguageOverride.Greek => "el",
+            // LanguageOverride.Italian => "it",
+            LanguageOverride.Japanese => "ja",
+            // LanguageOverride.Korean => "ko",
+            // LanguageOverride.Norwegian => "no",
+            LanguageOverride.PortugueseBrazil => "pt-br",
+            LanguageOverride.Romanian => "ro",
+            LanguageOverride.Russian => "ru",
+            LanguageOverride.Spanish => "es",
+            LanguageOverride.Swedish => "sv",
+            _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+        };
 }
 
 [Serializable]
@@ -890,27 +898,31 @@ public enum ExtraGlyphRanges
 
 public static class ExtraGlyphRangesExt
 {
-    public static string Name(this ExtraGlyphRanges ranges) => ranges switch
-    {
-        ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
-        ExtraGlyphRanges.ChineseSimplifiedCommon => Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
-        ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
-        ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
-        ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
-        ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
-        ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
-        _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
-    };
+    public static string Name(this ExtraGlyphRanges ranges) =>
+        ranges switch
+        {
+            ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
+            ExtraGlyphRanges.ChineseSimplifiedCommon =>
+                Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
+            ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
+            ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
+            ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
+            ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
+            ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
+            _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
+        };
 
-    public static unsafe nint Range(this ExtraGlyphRanges ranges) => ranges switch
-    {
-        ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
-        ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
-        ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
-        ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
-        ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
-        ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
-        ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
-        _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
-    };
+    public static unsafe nint Range(this ExtraGlyphRanges ranges) =>
+        ranges switch
+        {
+            ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
+            ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)
+                ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
+            ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
+            ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
+            ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
+            ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
+            ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
+            _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
+        };
 }

HellionChat/EmoteCache.cs

@@ -2,10 +2,10 @@
 using System.Numerics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Textures;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Utility;
-using Dalamud.Bindings.ImGui;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -15,11 +15,31 @@ public static class EmoteCache
 {
     private static readonly string[] NotWorking =
     [
-        ":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!",
-        "POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle",
-        "z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life",
-        "peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr",
-        "DogLookingSussyAndCold", "DICKS"
+        ":tf:",
+        "(ditto)",
+        "c!",
+        "h!",
+        "l!",
+        "M&Mjc",
+        "LUL3D",
+        "p!",
+        "POLICE2",
+        "r!",
+        "Pussy",
+        "s!",
+        "v!",
+        "w!",
+        "x0r6ztGiggle",
+        "z!",
+        "xar2EDM",
+        "iron95Pls",
+        "Clap2",
+        "AlienPls3",
+        "Life",
+        "peepoPogClimbingTreeHard4House",
+        "monkaGIGAftRobertDowneyJr",
+        "DogLookingSussyAndCold",
+        "DICKS",
     ];
 
     private static readonly HttpClient Client = new();
@@ -56,10 +76,10 @@ public static class EmoteCache
     {
         Unloaded,
         Loading,
-        Done
+        Done,
     }
 
-    // All of this data is uninitalized while State is not `LoadingState.Done`
+    // All fields below are uninitialised while State != Done.
     public static LoadingState State = LoadingState.Unloaded;
 
     private static readonly Dictionary<string, Emote> Cache = new();
@@ -67,24 +87,28 @@ public static class EmoteCache
 
     public static string[] SortedCodeArray = [];
 
-    // Plugin-scoped cancellation source for in-flight emote loads. Dispose
-    // cancels every running download/texture-create so the workers don't
-    // touch a torn-down TextureProvider on plugin reload. Replaced with a
-    // fresh source on the next LoadData() call so a re-enable still works.
+    // Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
     private static CancellationTokenSource Cts = new();
     internal static CancellationToken Token => Cts.Token;
 
-    // Drain target for in-flight loads on Dispose; without this an orphan
-    // continuation could still write to a torn-down Texture/Frames field.
+    // Tracks in-flight loads so Dispose can drain them before teardown.
     private static readonly ConcurrentBag<Task> PendingLoads = new();
 
     internal static void TrackLoad(Task loadTask, string emoteCode)
     {
-        PendingLoads.Add(loadTask.ContinueWith(t =>
-        {
-            if (t.IsFaulted)
-                Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
-        }, TaskScheduler.Default));
+        PendingLoads.Add(
+            loadTask.ContinueWith(
+                t =>
+                {
+                    if (t.IsFaulted)
+                        Plugin.LogProxy.Error(
+                            t.Exception!,
+                            $"EmoteCache load failed for {emoteCode}"
+                        );
+                },
+                TaskScheduler.Default
+            )
+        );
     }
 
     public static async Task LoadData()
@@ -92,8 +116,7 @@ public static class EmoteCache
         if (State is not LoadingState.Unloaded)
             return;
 
-        // Refresh the CTS in case Dispose was called and we're being re-enabled
-        // in the same process (Dalamud /xlplugins toggle).
+        // Reset CTS if Dispose was called and the plugin is being re-enabled.
         if (Cts.IsCancellationRequested)
             Cts = new CancellationTokenSource();
 
@@ -115,13 +138,13 @@ public static class EmoteCache
                 var topList = await top.Content.ReadAsStringAsync(ct);
 
                 var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
-                // BetterTTV occasionally returns entries with a null Code; the
-                // upstream code passed those straight into Dictionary.TryAdd
-                // and tripped ArgumentNullException, killing the whole emote
-                // load. Skip them defensively so a single bad row no longer
-                // breaks the cache for everyone else.
+                // BetterTTV occasionally returns entries with a null Code;
+                // skip them so a single bad row doesn't break the whole cache.
                 foreach (var emote in jsonList)
-                    if (!string.IsNullOrEmpty(emote.Emote.Code) && !NotWorking.Contains(emote.Emote.Code))
+                    if (
+                        !string.IsNullOrEmpty(emote.Emote.Code)
+                        && !NotWorking.Contains(emote.Emote.Code)
+                    )
                         Cache.TryAdd(emote.Emote.Code, emote.Emote);
 
                 lastId = jsonList.Last().Id;
@@ -132,18 +155,13 @@ public static class EmoteCache
         }
         catch (OperationCanceledException)
         {
-            // Plugin disposed while the cache was loading; leave State on
-            // Loading so a subsequent re-enable can re-issue LoadData with
-            // a fresh CTS (handled above).
+            // Plugin disposed mid-load; State stays on Loading so re-enable can retry.
         }
         catch (Exception ex)
         {
-            // Reset to Unloaded so a later trigger (e.g. the user reopening
-            // the Emotes tab after the network recovers) can retry. Without
-            // this the State stays on Loading and the early-out at the top
-            // of LoadData blocks every further attempt until plugin reload.
+            // Reset to Unloaded so a later trigger can retry without a plugin reload.
             State = LoadingState.Unloaded;
-            Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
+            Plugin.LogProxy.Error(ex, "BetterTTV cache wasn't initialized");
         }
     }
 
@@ -199,7 +217,7 @@ public static class EmoteCache
         }
         catch
         {
-            Plugin.Log.Error("Failed to convert");
+            Plugin.LogProxy.Error("Failed to convert");
             return null;
         }
     }
@@ -220,18 +238,21 @@ public static class EmoteCache
 
         internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
         {
-            // BetterTTV-supplied Id and ImageType are interpolated straight
-            // into the filename. HTTPS protects the wire, but a compromised
-            // upstream could still hand us "../foo" and write into the
-            // pluginConfigs root (or worse). Resolve the candidate path and
-            // refuse anything that escapes the cache directory.
-            var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1"));
+            // Path-traversal guard: resolve and verify the candidate path stays
+            // inside the cache directory before reading or writing.
+            var dir = Path.GetFullPath(
+                Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
+            );
             Directory.CreateDirectory(dir);
 
-            var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar) ? dir : dir + Path.DirectorySeparatorChar;
+            var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar)
+                ? dir
+                : dir + Path.DirectorySeparatorChar;
             var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
             if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
-                throw new InvalidOperationException($"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}");
+                throw new InvalidOperationException(
+                    $"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"
+                );
 
             if (File.Exists(filePath))
             {
@@ -242,7 +263,12 @@ public static class EmoteCache
                 var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
                 RawData = await content.Content.ReadAsByteArrayAsync(ct);
 
-                await using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+                await using var stream = new FileStream(
+                    filePath,
+                    FileMode.Create,
+                    FileAccess.Write,
+                    FileShare.Read
+                );
                 await stream.WriteAsync(RawData, ct);
             }
 
@@ -271,16 +297,17 @@ public static class EmoteCache
                     return;
 
                 ct.ThrowIfCancellationRequested();
-                Texture = await Plugin.TextureProvider.CreateFromImageAsync(image, cancellationToken: ct);
+                Texture = await Plugin.TextureProvider.CreateFromImageAsync(
+                    image,
+                    cancellationToken: ct
+                );
                 IsLoaded = true;
             }
-            catch (OperationCanceledException)
-            {
-            }
+            catch (OperationCanceledException) { }
             catch (Exception ex)
             {
                 Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
             }
         }
 
@@ -357,13 +384,17 @@ public static class EmoteCache
 
                     var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;
 
-                    // Follows the same pattern as browsers, anything under 0.02s delay will be rounded up to 0.1s
+                    // Match browser behaviour: anything under 20ms rounds up to 100ms.
                     if (delay < 0.02f)
                         delay = 0.1f;
 
                     var buffer = new byte[4 * frame.Width * frame.Height];
                     frame.CopyPixelDataTo(buffer);
-                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer, cancellationToken: ct);
+                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(
+                        RawImageSpecification.Rgba32(frame.Width, frame.Height),
+                        buffer,
+                        cancellationToken: ct
+                    );
                     frames.Add((tex, delay));
                 }
 
@@ -372,8 +403,7 @@ public static class EmoteCache
             }
             catch (OperationCanceledException)
             {
-                // Plugin disposed mid-load; partial frames are released by
-                // InnerDispose on the next dispose pass.
+                // Plugin disposed mid-load; release any partial frames.
                 foreach (var f in Frames)
                     f.Texture.Dispose();
                 Frames = [];
@@ -381,8 +411,8 @@ public static class EmoteCache
             catch (Exception ex)
             {
                 Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
             }
         }
     }
-}
+}

HellionChat/Export/MessageExporter.cs

@@ -13,42 +13,42 @@ internal enum ExportFormat
 
 internal static class ExportFormatExt
 {
-    internal static string Extension(this ExportFormat fmt) => fmt switch
-    {
-        ExportFormat.Markdown => "md",
-        ExportFormat.Json => "json",
-        ExportFormat.Csv => "csv",
-        _ => "txt",
-    };
+    internal static string Extension(this ExportFormat fmt) =>
+        fmt switch
+        {
+            ExportFormat.Markdown => "md",
+            ExportFormat.Json => "json",
+            ExportFormat.Csv => "csv",
+            _ => "txt",
+        };
 
-    internal static string Filter(this ExportFormat fmt) => fmt switch
-    {
-        ExportFormat.Markdown => ".md",
-        ExportFormat.Json => ".json",
-        ExportFormat.Csv => ".csv",
-        _ => ".txt",
-    };
+    internal static string Filter(this ExportFormat fmt) =>
+        fmt switch
+        {
+            ExportFormat.Markdown => ".md",
+            ExportFormat.Json => ".json",
+            ExportFormat.Csv => ".csv",
+            _ => ".txt",
+        };
 }
 
-/// <summary>
-/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
-/// expected to filter the input enumerable; this class only handles
-/// formatting and writes to the supplied path. Sender substring filtering
-/// happens here because it requires deserialized SeString.TextValue.
-/// </summary>
+// Serializes message snapshots to Markdown, JSON, or CSV.
+// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
 internal static class MessageExporter
 {
     internal record FilterDescription(
         IReadOnlyCollection<int>? ChatTypes,
         DateTimeOffset? From,
         DateTimeOffset? To,
-        string? SenderSubstring);
+        string? SenderSubstring
+    );
 
     internal static int ExportToFile(
         string path,
         ExportFormat format,
         IEnumerable<Message> messages,
-        FilterDescription filter)
+        FilterDescription filter
+    )
     {
         var matching = filter.SenderSubstring is { Length: > 0 } needle
             ? messages.Where(m => MatchesSender(m, needle))
@@ -64,10 +64,14 @@ internal static class MessageExporter
         };
     }
 
-    private static bool MatchesSender(Message m, string needle)
-        => m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
+    private static bool MatchesSender(Message m, string needle) =>
+        m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
 
-    private static int WriteMarkdown(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteMarkdown(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
     {
         w.WriteLine("# Hellion Chat Export");
         w.WriteLine();
@@ -92,6 +96,7 @@ internal static class MessageExporter
             var chatType = (ChatType)(ushort)m.Code.Type;
             var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
             var content = m.ContentSource.TextValue;
+
             if (string.IsNullOrEmpty(sender))
                 w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
             else
@@ -107,7 +112,9 @@ internal static class MessageExporter
     private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter)
     {
         if (filter.ChatTypes is { Count: > 0 })
-            w.WriteLine($"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}");
+            w.WriteLine(
+                $"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"
+            );
         if (filter.From is not null)
             w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}");
         if (filter.To is not null)
@@ -116,10 +123,13 @@ internal static class MessageExporter
             w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\"");
     }
 
-    private static int WriteJson(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteJson(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
     {
-        // Manual JSON to avoid pulling in System.Text.Json policy choices.
-        // Output is a single object with metadata and an array of messages.
+        // Manual JSON to avoid System.Text.Json policy coupling.
         w.Write("{\n  \"exported_at\": \"");
         w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
         w.Write("\",\n  \"plugin\": \"Hellion Chat\",\n");
@@ -130,9 +140,17 @@ internal static class MessageExporter
         else
             w.Write("null");
         w.Write(",\n    \"from\": ");
-        w.Write(filter.From is null ? "null" : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\"");
+        w.Write(
+            filter.From is null
+                ? "null"
+                : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
+        );
         w.Write(",\n    \"to\": ");
-        w.Write(filter.To is null ? "null" : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\"");
+        w.Write(
+            filter.To is null
+                ? "null"
+                : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
+        );
         w.Write(",\n    \"sender_substring\": ");
         w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring));
         w.Write("\n  },\n  \"messages\": [\n");
@@ -166,9 +184,13 @@ internal static class MessageExporter
         return count;
     }
 
-    private static int WriteCsv(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter)
+    private static int WriteCsv(
+        StreamWriter w,
+        IEnumerable<Message> messages,
+        FilterDescription filter
+    )
     {
-        // Header line always written so empty exports are still importable.
+        // Header always written so empty exports remain importable.
         w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
         var count = 0;
         foreach (var m in messages)
@@ -201,13 +223,27 @@ internal static class MessageExporter
         {
             switch (c)
             {
-                case '"': sb.Append("\\\""); break;
-                case '\\': sb.Append("\\\\"); break;
-                case '\b': sb.Append("\\b"); break;
-                case '\f': sb.Append("\\f"); break;
-                case '\n': sb.Append("\\n"); break;
-                case '\r': sb.Append("\\r"); break;
-                case '\t': sb.Append("\\t"); break;
+                case '"':
+                    sb.Append("\\\"");
+                    break;
+                case '\\':
+                    sb.Append("\\\\");
+                    break;
+                case '\b':
+                    sb.Append("\\b");
+                    break;
+                case '\f':
+                    sb.Append("\\f");
+                    break;
+                case '\n':
+                    sb.Append("\\n");
+                    break;
+                case '\r':
+                    sb.Append("\\r");
+                    break;
+                case '\t':
+                    sb.Append("\\t");
+                    break;
                 default:
                     if (c < 0x20)
                         sb.Append($"\\u{(int)c:x4}");

HellionChat/FontManager.cs

@@ -1,10 +1,10 @@
 using Dalamud;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.FontIdentifier;
 using Dalamud.Interface.GameFonts;
 using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Interface.Utility;
-using Dalamud.Bindings.ImGui;
 
 namespace HellionChat;
 
@@ -23,26 +23,47 @@ public class FontManager
 
     public static readonly HashSet<float> AxisFontSizeList =
     [
-        9.6f, 10f, 12f, 14f, 16f,
-        18f, 18.4f, 20f, 23f, 34f,
-        36f, 40f, 45f, 46f, 68f, 90f,
+        9.6f,
+        10f,
+        12f,
+        14f,
+        16f,
+        18f,
+        18.4f,
+        20f,
+        23f,
+        34f,
+        36f,
+        40f,
+        45f,
+        46f,
+        68f,
+        90f,
     ];
 
-    /// <summary>
-    /// Backing bytes for the bundled Hellion font (Exo 2, OFL-1.1). Lazily
-    /// extracted from the assembly's manifest resources on first use; the
-    /// load happens inside the font atlas build callback so we keep the
-    /// allocation off the plugin constructor's hot path.
-    /// </summary>
+    // Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
     private static byte[]? HellionFontBytes;
 
-    private static byte[] GetHellionFontBytes()
+    // Returns null when the embedded font resource is missing. Should never
+    // happen on a signed release build, but a broken csproj or hand-rolled
+    // dev build can land here. Caller falls back to the system font path so
+    // the plugin still loads instead of crashing the whole UiBuilder.
+    private static byte[]? TryGetHellionFontBytes()
     {
         if (HellionFontBytes is not null)
             return HellionFontBytes;
 
-        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
-            ?? throw new FileNotFoundException("Hellion font resource not embedded in the assembly");
+        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
+            "HellionFont.ttf"
+        );
+        if (stream is null)
+        {
+            Plugin.LogProxy.Warning(
+                "Hellion font resource missing — falling back to system default font."
+            );
+            return null;
+        }
+
         using var ms = new MemoryStream();
         stream.CopyTo(ms);
         HellionFontBytes = ms.ToArray();
@@ -54,11 +75,9 @@ public class FontManager
         ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
         {
             var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
-            // text
             foreach (var range in ranges)
                 builder.AddRanges((ushort*)range);
 
-            // chars
             if (chars != null)
             {
                 for (var i = 0; i < chars.Count; i += 2)
@@ -66,8 +85,8 @@ public class FontManager
                     if (chars[i] == 0)
                         break;
 
-                    for (var j = (uint) chars[i]; j <= chars[i + 1]; j++)
-                        builder.AddChar((ushort) j);
+                    for (var j = (uint)chars[i]; j <= chars[i + 1]; j++)
+                        builder.AddChar((ushort)j);
                 }
             }
 
@@ -85,7 +104,7 @@ public class FontManager
 
             // "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
             for (var i = 0x2460; i <= 0x24B5; i++)
-                builder.AddChar((char) i);
+                builder.AddChar((char)i);
 
             builder.AddChar('⓪');
             return builder.BuildRangesToArray();
@@ -100,70 +119,93 @@ public class FontManager
         JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
     }
 
+    // CPU-bound build offloaded to Task.Run; runs parallel with theme init
+    public async Task BuildFontsAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        await Task.Run(BuildFonts, cancellationToken).ConfigureAwait(false);
+    }
+
     public void BuildFonts()
     {
         SetUpRanges();
 
-        Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2)));
-        AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
-        {
-            SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6
-        });
+        Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
+            new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
+        );
+        AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
+            new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
+            {
+                SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6,
+            }
+        );
 
         FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
         {
-            e.OnPreBuild(tk => tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() }));
+            e.OnPreBuild(tk =>
+                tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })
+            );
             e.OnPostBuild(tk => tk.FitRatio(tk.Font));
         });
 
-        RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
-            e => e.OnPreBuild(
-                tk =>
+        RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
+            e.OnPreBuild(tk =>
+            {
+                // v1.2.0: UseHellionFont controls font size selection
+                var basePt = Plugin.Config.UseHellionFont
+                    ? Plugin.Config.FontSizeV2
+                    : Plugin.Config.GlobalFontV2.SizePt;
+                var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
+                // F10.2: if the embedded font is missing, drop to the system font
+                // path rather than letting the UiBuilder throw.
+                var hellionBytes = Plugin.Config.UseHellionFont ? TryGetHellionFontBytes() : null;
+                config.MergeFont = hellionBytes is not null
+                    ? tk.AddFontFromMemory(hellionBytes, config, "Hellion-Exo2")
+                    : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
+
+                config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
+                config.GlyphRanges = JpRange;
+                AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
+
+                config.SizePt = Plugin.Config.SymbolsFontSizeV2;
+                tk.AddGameSymbol(config);
+
+                tk.Font = config.MergeFont;
+            })
+        );
+
+        if (Plugin.Config.ItalicEnabled)
+        {
+            ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
+                e.OnPreBuild(tk =>
                 {
-                    // v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
-                    // wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
-                    // Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
-                    // Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
-                    // UseHellionFont=true wirkungslos, was 4K-User mit größerer
-                    // Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
-                    var basePt = Plugin.Config.UseHellionFont
-                        ? Plugin.Config.FontSizeV2
-                        : Plugin.Config.GlobalFontV2.SizePt;
-                    var config = new SafeFontConfig {SizePt = basePt, GlyphRanges = Ranges};
-                    config.MergeFont = Plugin.Config.UseHellionFont
-                        ? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
-                        : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
+                    var config = new SafeFontConfig
+                    {
+                        SizePt = Plugin.Config.ItalicFontV2.SizePt,
+                        GlyphRanges = Ranges,
+                    };
+                    config.MergeFont = AddFontWithFallback(
+                        tk,
+                        Plugin.Config.ItalicFontV2.FontId,
+                        config,
+                        "italic"
+                    );
 
                     config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
                     config.GlyphRanges = JpRange;
-                    AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
+                    AddFontWithFallback(
+                        tk,
+                        Plugin.Config.JapaneseFontV2.FontId,
+                        config,
+                        "japanese"
+                    );
 
                     config.SizePt = Plugin.Config.SymbolsFontSizeV2;
                     tk.AddGameSymbol(config);
 
                     tk.Font = config.MergeFont;
-                }
-            ));
-
-        if (Plugin.Config.ItalicEnabled)
-        {
-            ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
-                e => e.OnPreBuild(
-                    tk =>
-                    {
-                        var config = new SafeFontConfig {SizePt = Plugin.Config.ItalicFontV2.SizePt, GlyphRanges = Ranges};
-                        config.MergeFont = AddFontWithFallback(tk, Plugin.Config.ItalicFontV2.FontId, config, "italic");
-
-                        config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
-                        config.GlyphRanges = JpRange;
-                        AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
-
-                        config.SizePt = Plugin.Config.SymbolsFontSizeV2;
-                        tk.AddGameSymbol(config);
-
-                        tk.Font = config.MergeFont;
-                    }
-                ));
+                })
+            );
         }
         else
         {
@@ -171,28 +213,46 @@ public class FontManager
         }
     }
 
-    /// <summary>
-    /// Try to add a user-configured font to the build toolkit, falling back to
-    /// the bundled NotoSansCjkRegular asset if the configured font isn't
-    /// available on the system. Without this guard a stale SystemFontId
-    /// pointing at a font the user uninstalled or that never existed on
-    /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
-    /// </summary>
-    private static ImFontPtr AddFontWithFallback(IFontAtlasBuildToolkitPreBuild tk, IFontId fontId, SafeFontConfig config, string slot)
+    // Add font with fallback to NotoSansCjkRegular if unavailable
+    private static ImFontPtr AddFontWithFallback(
+        IFontAtlasBuildToolkitPreBuild tk,
+        IFontId fontId,
+        SafeFontConfig config,
+        string slot
+    )
     {
         try
         {
             return fontId.AddToBuildToolkit(tk, config);
         }
-        catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
+        catch (Exception e)
+            when (e
+                    is FileNotFoundException
+                        or DirectoryNotFoundException
+                        or IOException
+                        or InvalidOperationException
+                        or ArgumentException
+            )
         {
-            Plugin.Log.Warning(e, $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular");
+            // Atlas-toolkit throws span IO and validation failures; routing the
+            // wider set through the fallback keeps a corrupt font config from
+            // taking down the whole atlas build.
+            Plugin.LogProxy.Warning(
+                e,
+                $"Configured {slot} font failed to load ({e.GetType().Name}), "
+                    + "falling back to NotoSansCjkRegular"
+            );
             var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
             return fallback.AddToBuildToolkit(tk, config);
         }
     }
 
-    public static float SizeInPt(float px) => (float) (px * 3.0 / 4.0);
-    public static float SizeInPx(float pt) => (float) (pt * 4.0 / 3.0);
-    public static float GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2);
+    public static float SizeInPt(float px) => (float)(px * 3.0 / 4.0);
+
+    public static float SizeInPx(float pt) => (float)(pt * 4.0 / 3.0);
+
+    public static float GetFontSize() =>
+        Plugin.Config.FontsEnabled
+            ? Plugin.Config.GlobalFontV2.SizePx
+            : SizeInPx(Plugin.Config.FontSizeV2);
 }

HellionChat/GameFunctions/Chat.cs

@@ -1,8 +1,4 @@
 using System.Text;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Game.Config;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
@@ -17,9 +13,12 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using FFXIVClientStructs.FFXIV.Client.UI.Shell;
 using FFXIVClientStructs.FFXIV.Component.GUI;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Resources;
+using HellionChat.Util;
 using InteropGenerator.Runtime;
 using Lumina.Text.ReadOnly;
-
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
 
 namespace HellionChat.GameFunctions;
@@ -28,20 +27,55 @@ internal sealed unsafe class Chat : IDisposable
 {
     // Functions
     [Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")]
-    private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ulong, ushort, byte, int, byte, void> PrintTellNative = null!;
+    private readonly delegate* unmanaged<
+        RaptureLogModule*,
+        ushort,
+        Utf8String*,
+        Utf8String*,
+        ulong,
+        ulong,
+        ushort,
+        byte,
+        int,
+        byte,
+        void> PrintTellNative = null!;
 
-    [Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24")]
-    private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, byte> SendTellNative = null!;
+    [Signature(
+        "E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24"
+    )]
+    private readonly delegate* unmanaged<
+        NetworkModule*,
+        ulong,
+        ushort,
+        Utf8String*,
+        Utf8String*,
+        ushort,
+        ushort,
+        byte> SendTellNative = null!;
 
     // Client::UI::AddonChatLog.OnRefresh
-    [Signature("40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8", DetourName = nameof(ChatLogRefreshDetour))]
+    [Signature(
+        "40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8",
+        DetourName = nameof(ChatLogRefreshDetour)
+    )]
     private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!;
     private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value);
 
     // Replace with CS version later
-    [Signature("48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9", DetourName = nameof(ContextMenuTellInForayDetour))]
+    [Signature(
+        "48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9",
+        DetourName = nameof(ContextMenuTellInForayDetour)
+    )]
     private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!;
-    private delegate void ContextMenuTellInForayDelegate(RaptureShellModule* module, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason);
+    private delegate void ContextMenuTellInForayDelegate(
+        RaptureShellModule* module,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason
+    );
 
     private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook;
     private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook;
@@ -58,7 +92,7 @@ internal sealed unsafe class Chat : IDisposable
         FullName = 0,
         SurnameAbbreviated = 1,
         ForenameAbbreviated = 2,
-        Initials = 3
+        Initials = 3,
     }
 
     private long LastPlayerNameDisplayTypeRefresh;
@@ -72,13 +106,25 @@ internal sealed unsafe class Chat : IDisposable
         ChatLogRefreshHook?.Enable();
         ContextMenuTellInForayHook?.Enable();
 
-        ChangeChannelNameHook = Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(AgentChatLog.MemberFunctionPointers.ChangeChannelName, ChangeChannelNameDetour);
+        ChangeChannelNameHook =
+            Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(
+                AgentChatLog.MemberFunctionPointers.ChangeChannelName,
+                ChangeChannelNameDetour
+            );
         ChangeChannelNameHook.Enable();
 
-        ReplyInSelectedChatModeHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode, ReplyInSelectedChatModeDetour);
+        ReplyInSelectedChatModeHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(
+                RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode,
+                ReplyInSelectedChatModeDetour
+            );
         ReplyInSelectedChatModeHook.Enable();
 
-        SetChatLogTellTargetHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(RaptureShellModule.MemberFunctionPointers.SetContextTellTarget, SetContextTellTarget);
+        SetChatLogTellTargetHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(
+                RaptureShellModule.MemberFunctionPointers.SetContextTellTarget,
+                SetContextTellTarget
+            );
         SetChatLogTellTargetHook.Enable();
 
         Plugin.ClientState.Login += Login;
@@ -108,12 +154,13 @@ internal sealed unsafe class Chat : IDisposable
         return utf == null ? null : utf->ToString();
     }
 
-    private static int GetRotateIdx(RotateMode mode) => mode switch
-    {
-        RotateMode.Forward => 1,
-        RotateMode.Reverse => -1,
-        _ => 0,
-    };
+    private static int GetRotateIdx(RotateMode mode) =>
+        mode switch
+        {
+            RotateMode.Forward => 1,
+            RotateMode.Reverse => -1,
+            _ => 0,
+        };
 
     internal static void RotateLinkshellHistory(RotateMode mode)
     {
@@ -127,8 +174,7 @@ internal sealed unsafe class Chat : IDisposable
     internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
         UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));
 
-    // This function looks up a channel's user-defined color.
-    // If this function ever returns 0, it returns null instead.
+    // Look up a channel's user-defined color, returns null if 0
     internal uint? GetChannelColor(ChatType type)
     {
         var parent = type.Parent();
@@ -168,13 +214,12 @@ internal sealed unsafe class Chat : IDisposable
 
         if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
         {
-            // FIXME: this whole system sucks
-            // FIXME v2: I hate everything about this, but it works
+            // Capture the just-typed character input
             Plugin.Framework.RunOnTick(() =>
             {
                 string? input = null;
 
-                var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter+0x4, 2);
+                var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter + 0x4, 2);
                 var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
                 if (chars.Length == 0)
                     return;
@@ -185,11 +230,13 @@ internal sealed unsafe class Chat : IDisposable
 
                 try
                 {
-                    Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input, });
+                    Plugin.ChatLogWindow.Activated(
+                        new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
+                    );
                 }
                 catch (Exception ex)
                 {
-                    Plugin.Log.Error(ex, "Error in chat Activated event");
+                    Plugin.LogProxy.Error(ex, "Error in chat Activated event");
                 }
             });
         }
@@ -197,7 +244,7 @@ internal sealed unsafe class Chat : IDisposable
         string? addIfNotPresent = null;
 
         var str = value + 2;
-        if (str != null && ((int) str->Type & 0xF) == (int) ValueType.String && str->String.HasValue)
+        if (str != null && ((int)str->Type & 0xF) == (int)ValueType.String && str->String.HasValue)
         {
             var add = str->String.ToString();
             if (add.Length > 0)
@@ -206,23 +253,23 @@ internal sealed unsafe class Chat : IDisposable
 
         try
         {
-            // We already called this function once, so we skip the duplicated call
-            // Also return the original value here so that vanilla chat receives all information
+            // Prevent duplicate calls
             if (Plugin.ChatLogWindow.TellSpecial)
-            {
-                Plugin.Log.Information("Return early to prevent duplicated call...");
                 return ChatLogRefreshHook!.Original(log, eventId, value);
-            }
 
-            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { AddIfNotPresent = addIfNotPresent, });
+            Plugin.ChatLogWindow.Activated(
+                new ChatActivatedArgs(new ChannelSwitchInfo(null))
+                {
+                    AddIfNotPresent = addIfNotPresent,
+                }
+            );
         }
         catch (Exception ex)
         {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            Plugin.LogProxy.Error(ex, "Error in chat Activated event");
         }
 
-        // prevent the game from focusing the chat log
-        return 1;
+        return 1; // Prevent vanilla chat log from gaining focus
     }
 
     private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -231,9 +278,9 @@ internal sealed unsafe class Chat : IDisposable
         if (agent == null)
             return ret;
 
-        var channel = (uint) RaptureShellModule.Instance()->ChatType;
+        var channel = (uint)RaptureShellModule.Instance()->ChatType;
         if (channel is 17 or 18)
-            channel = (uint) InputChannel.Tell;
+            channel = (uint)InputChannel.Tell;
 
         var name = SeString.Parse(agent->ChannelLabel);
         if (name.Payloads.Count == 0)
@@ -248,18 +295,18 @@ internal sealed unsafe class Chat : IDisposable
 
         string? playerName = null;
         ushort worldId = 0;
-        if (channel == (uint) InputChannel.Tell)
+        if (channel == (uint)InputChannel.Tell)
         {
             playerName = SeString.Parse(agent->TellPlayerName).TextValue;
             worldId = agent->TellWorldId;
-            Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
+            Plugin.LogProxy.Debug($"Detected tell target '[redacted]'@{worldId}");
         }
 
         Plugin.CurrentTab.CurrentChannel = new UsedChannel
         {
-            Channel = (InputChannel) channel,
+            Channel = (InputChannel)channel,
             Name = nameChunks,
-            TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null
+            TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null,
         };
 
         return ret;
@@ -274,33 +321,68 @@ internal sealed unsafe class Chat : IDisposable
             return;
         }
 
-        SetChannel((InputChannel) replyMode);
+        SetChannel((InputChannel)replyMode);
         ReplyInSelectedChatModeHook!.Original(agent);
     }
 
-    private bool SetContextTellTarget(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType)
+    private bool SetContextTellTarget(
+        RaptureShellModule* a1,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason,
+        bool setChatType
+    )
     {
         if (playerName != null)
         {
             try
             {
-                var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType))
-                {
-                    TellReason = (TellReason) reason,
-                    TellTarget = target,
-                });
+                var target = new TellTarget(
+                    playerName->ToString(),
+                    worldId,
+                    contentId,
+                    (TellReason)reason
+                );
+                Plugin.ChatLogWindow.Activated(
+                    new ChatActivatedArgs(
+                        new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
+                    )
+                    {
+                        TellReason = (TellReason)reason,
+                        TellTarget = target,
+                    }
+                );
             }
             catch (Exception ex)
             {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                Plugin.LogProxy.Error(ex, "Error in chat Activated event");
             }
         }
 
-        return SetChatLogTellTargetHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason, setChatType);
+        return SetChatLogTellTargetHook!.Original(
+            a1,
+            playerName,
+            worldName,
+            worldId,
+            accountId,
+            contentId,
+            reason,
+            setChatType
+        );
     }
 
-    private void ContextMenuTellInForayDetour(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason)
+    private void ContextMenuTellInForayDetour(
+        RaptureShellModule* a1,
+        Utf8String* playerName,
+        Utf8String* worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong contentId,
+        ushort reason
+    )
     {
         if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
             Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
@@ -309,36 +391,56 @@ internal sealed unsafe class Chat : IDisposable
         {
             try
             {
-                var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
-                {
-                    TellReason = (TellReason) reason,
-                    TellTarget = target,
-                    TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
-                });
+                var target = new TellTarget(
+                    playerName->ToString(),
+                    worldId,
+                    contentId,
+                    (TellReason)reason
+                );
+                Plugin.ChatLogWindow.Activated(
+                    new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
+                    {
+                        TellReason = (TellReason)reason,
+                        TellTarget = target,
+                        TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
+                    }
+                );
             }
             catch (Exception ex)
             {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                Plugin.LogProxy.Error(ex, "Error in chat Activated event");
             }
         }
 
-        ContextMenuTellInForayHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason);
+        ContextMenuTellInForayHook!.Original(
+            a1,
+            playerName,
+            worldName,
+            worldId,
+            accountId,
+            contentId,
+            reason
+        );
     }
 
-    /// <summary>
-    /// Returns true if the channel is any non-linkshell channel, or if the
-    /// linkshell actually exists.
-    /// </summary>
-    internal static bool ValidAnyLinkshell(InputChannel channel)
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Renamed ValidAnyLinkshell -> IsChannelOrExistingLinkshell. The
+    //   name now states intent: returns true for any non-linkshell
+    //   channel, or a linkshell index that actually exists.
+    // ---------------------------------------------------------------
+    internal static bool IsChannelOrExistingLinkshell(InputChannel channel)
     {
         var idx = channel.LinkshellIndex();
         if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
             return true;
-        if (channel.IsLinkshell() && ValidLinkshell(idx))
-            return true;
-        if (channel.IsCrossLinkshell() && ValidCrossLinkshell(idx))
-            return true;
+
+        if (channel.IsLinkshell())
+            return ValidLinkshell(idx);
+
+        if (channel.IsCrossLinkshell())
+            return ValidCrossLinkshell(idx);
+
         return false;
     }
 
@@ -346,17 +448,22 @@ internal sealed unsafe class Chat : IDisposable
     {
         if (idx > 7)
             return false;
-        return InfoProxyLinkshell.Instance()->LinkShells[(int) idx].Id != 0;
+        return InfoProxyLinkshell.Instance()->LinkShells[(int)idx].Id != 0;
     }
 
     internal static bool ValidCrossLinkshell(uint idx)
     {
         if (idx > 7)
             return false;
-        return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int) idx].Name.Length > 0;
+        return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int)idx].Name.Length
+            > 0;
     }
 
-    private static uint? RotateLinkshell(uint currentIndex, RotateMode rotate, Func<uint, bool> validFn)
+    private static uint? RotateLinkshell(
+        uint currentIndex,
+        RotateMode rotate,
+        Func<uint, bool> validFn
+    )
     {
         if (rotate == RotateMode.None)
             return null;
@@ -365,13 +472,12 @@ internal sealed unsafe class Chat : IDisposable
         {
             RotateMode.Forward => 1,
             RotateMode.Reverse => -1,
-            _ => 1
+            _ => 1,
         };
 
-        // Iterate up to 8 times to find a valid linkshell.
-        for (var i = 0; i < 8; i++)
+        for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
         {
-            currentIndex = (uint) ((8 + currentIndex + delta) % 8);
+            currentIndex = (uint)((8 + currentIndex + delta) % 8);
             if (validFn(currentIndex))
                 return currentIndex;
         }
@@ -379,30 +485,43 @@ internal sealed unsafe class Chat : IDisposable
         return null;
     }
 
-    internal static InputChannel? ResolveTempInputChannel(InputChannel? currentTempChannel, InputChannel channel, RotateMode rotate)
+    internal static InputChannel? ResolveTempInputChannel(
+        InputChannel? currentTempChannel,
+        InputChannel channel,
+        RotateMode rotate
+    )
     {
         switch (channel)
         {
-            case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
+            case InputChannel.Linkshell1
+            or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
             {
                 var module = UIModule.Instance();
 
-                var currentIndex = channel is InputChannel.Linkshell1 ? (uint) module->LinkshellCycle : (uint) module->CrossWorldLinkshellCycle;
+                var currentIndex =
+                    channel is InputChannel.Linkshell1
+                        ? (uint)module->LinkshellCycle
+                        : (uint)module->CrossWorldLinkshellCycle;
                 if (currentTempChannel != null)
                 {
                     switch (channel)
                     {
                         case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell():
-                        case InputChannel.CrossLinkshell1 when currentTempChannel.Value.IsCrossLinkshell():
+                        case InputChannel.CrossLinkshell1
+                            when currentTempChannel.Value.IsCrossLinkshell():
                             currentIndex = currentTempChannel.Value.LinkshellIndex();
                             break;
                     }
                 }
 
-                var idx = RotateLinkshell(currentIndex, rotate, channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell);
+                var idx = RotateLinkshell(
+                    currentIndex,
+                    rotate,
+                    channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell
+                );
                 // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
                 // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
-                return idx is null ? null : channel + idx.Value;
+                return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
             }
             default:
                 return channel;
@@ -411,11 +530,7 @@ internal sealed unsafe class Chat : IDisposable
 
     internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
     {
-        // ExtraChat linkshells aren't supported in game so we never want to
-        // call the ChangeChatChannel function with them.
-        //
-        // Callers should call ChatLogWindow.SetChannel() which handles
-        // ExtraChat channels
+        // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
         if (channel.IsExtraChatLinkshell())
             return;
 
@@ -424,18 +539,30 @@ internal sealed unsafe class Chat : IDisposable
         if (idx == uint.MaxValue)
             idx = 0;
 
-        if (!ValidAnyLinkshell(channel))
-            return;
+        // ---------------------------------------------------------------
+        // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+        // - Wrap ChangeChatChannel in the validity check instead of
+        //   early-returning. The previous early return skipped Dtor and
+        //   leaked the native Utf8String allocated a few lines above.
+        // ---------------------------------------------------------------
+        if (IsChannelOrExistingLinkshell(channel))
+            RaptureShellModule
+                .Instance()
+                ->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
 
-        RaptureShellModule.Instance()->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
         target->Dtor(true);
     }
 
-    internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong accountId, ulong objectId, ushort reason, bool setChatType)
+    internal void SetEurekaTellChannel(
+        string name,
+        string worldName,
+        ushort worldId,
+        ulong accountId,
+        ulong objectId,
+        ushort reason,
+        bool setChatType
+    )
     {
-        // param6 is 0 for contentId and 1 for objectId
-        // param7 is always 0 ?
-
         if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
             Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
 
@@ -446,7 +573,17 @@ internal sealed unsafe class Chat : IDisposable
         var utfName = Utf8String.FromString(name);
         var utfWorld = Utf8String.FromString(worldName);
 
-        RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, accountId, objectId, reason, setChatType);
+        RaptureShellModule
+            .Instance()
+            ->SetTellTargetInForay(
+                utfName,
+                utfWorld,
+                worldId,
+                accountId,
+                objectId,
+                reason,
+                setChatType
+            );
 
         utfName->Dtor(true);
         utfWorld->Dtor(true);
@@ -475,19 +612,30 @@ internal sealed unsafe class Chat : IDisposable
         mes->Dtor(true);
     }
 
-    internal void SendTell(TellReason reason, ulong contentId, string name, ushort homeWorld, byte[] message, string rawText)
+    internal void SendTell(
+        TellReason reason,
+        ulong contentId,
+        string name,
+        ushort homeWorld,
+        byte[] message,
+        string rawText
+    )
     {
         if (contentId == 0)
         {
             Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
-            Plugin.Log.Warning("Tried to send a tell with ContentId being 0, sorry this is an internal error.");
+            Plugin.LogProxy.Warning(
+                "Tried to send a tell with ContentId being 0, sorry this is an internal error."
+            );
             return;
         }
 
         var uName = Utf8String.FromString(name);
         var uMessage = Utf8String.FromSequence(message.NullTerminate());
 
-        var encoded = Utf8String.FromUtf8String(PronounModule.Instance()->ProcessString(uMessage, true));
+        var encoded = Utf8String.FromUtf8String(
+            PronounModule.Instance()->ProcessString(uMessage, true)
+        );
         var decoded = EncodeMessage(rawText);
         AutoTranslate.ReplaceWithPayload(ref decoded);
 
@@ -500,9 +648,28 @@ internal sealed unsafe class Chat : IDisposable
         if (reason == TellReason.Direct)
             reason = TellReason.Friend;
 
-        var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (ushort) reason, homeWorld);
+        var ok = SendTellNative(
+            networkModule,
+            contentId,
+            homeWorld,
+            uName,
+            encoded,
+            (ushort)reason,
+            homeWorld
+        );
         if (ok == 1)
-            PrintTellNative(logModule, 33, uName, &decodedUtf8String, 0, contentId, homeWorld, 255, 0, 0);
+            PrintTellNative(
+                logModule,
+                33,
+                uName,
+                &decodedUtf8String,
+                0,
+                contentId,
+                homeWorld,
+                255,
+                0,
+                0
+            );
         else
             Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
 
@@ -511,7 +678,8 @@ internal sealed unsafe class Chat : IDisposable
         uMessage->Dtor(true);
     }
 
-    private static byte[] EncodeMessage(string str) {
+    private static byte[] EncodeMessage(string str)
+    {
         using var input = new Utf8String(str);
         using var output = new Utf8String();
 
@@ -524,7 +692,7 @@ internal sealed unsafe class Chat : IDisposable
     {
         var uC = Utf8String.FromString(c.ToString());
 
-        uC->SanitizeString((AllowedEntities) 0x27F);
+        uC->SanitizeString((AllowedEntities)0x27F);
         var wasValid = uC->ToString().Length > 0;
 
         uC->Dtor(true);
@@ -537,7 +705,7 @@ internal sealed unsafe class Chat : IDisposable
         var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type);
         if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type))
             return PlayerNameDisplayType.FullName;
-        return (PlayerNameDisplayType) type;
+        return (PlayerNameDisplayType)type;
     }
 
     internal string AbbreviatePlayerName(string playerName)
@@ -557,20 +725,21 @@ internal sealed unsafe class Chat : IDisposable
 
         return CurrentPlayerNameDisplayType switch
         {
-            PlayerNameDisplayType.SurnameAbbreviated => $"{split.First()} {split.Last().FirstOrDefault('A')}.",
-            PlayerNameDisplayType.ForenameAbbreviated => $"{split.First().FirstOrDefault('A')}. {split.Last()}",
-            PlayerNameDisplayType.Initials => $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
-            _ => playerName
+            PlayerNameDisplayType.SurnameAbbreviated =>
+                $"{split.First()} {split.Last().FirstOrDefault('A')}.",
+            PlayerNameDisplayType.ForenameAbbreviated =>
+                $"{split.First().FirstOrDefault('A')}. {split.Last()}",
+            PlayerNameDisplayType.Initials =>
+                $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
+            _ => playerName,
         };
     }
 
     internal bool CheckHideFlags()
     {
-        // Only hide the chat in a cutscene when the vanilla chat would've
-        // also been hidden. This prevents Chat 2 from hiding for a split
-        // second before the cutscene actually starts, because the game sets
-        // the cutscene conditions before processing the skip.
+        // Only hide chat in cutscene when vanilla chat would also be hidden
         var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
-        return raptureAtkUnitManager == null || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
+        return raptureAtkUnitManager == null
+            || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
     }
 }

HellionChat/GameFunctions/ChatBox.cs

@@ -1,8 +1,8 @@
 using System.Text;
-using HellionChat.Resources;
 using Dalamud.Memory;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
+using HellionChat.Resources;
 
 namespace HellionChat.GameFunctions;
 
@@ -15,7 +15,15 @@ public unsafe class ChatBox
         mes->Dtor(true);
     }
 
-    public static void SendMessage(string message)
+    public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));
+
+    // sanitiserOverride allows xUnit to bypass Utf8String->SanitizeString (game memory only).
+    // Returns encoded bytes so SendMessage avoids a second GetBytes call.
+    // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
+    internal static byte[] ValidateMessage(
+        string message,
+        Func<string, string>? sanitiserOverride = null
+    )
     {
         var bytes = Encoding.UTF8.GetBytes(message);
         if (bytes.Length == 0)
@@ -24,20 +32,19 @@ public unsafe class ChatBox
         if (bytes.Length > 500)
             throw new ArgumentException(Language.ChatBox_Error_Too_Long, nameof(message));
 
-        if (message.Length != SanitiseText(message).Length)
+        var sanitiser = sanitiserOverride ?? SanitiseText;
+        if (message.Length != sanitiser(message).Length)
             throw new ArgumentException(Language.ChatBox_Error_Invalid, nameof(message));
 
-        SendMessageUnsafe(bytes);
+        return bytes;
     }
 
     private static string SanitiseText(string text)
     {
         var uText = Utf8String.FromString(text);
-
-        uText->SanitizeString((AllowedEntities) 0x27F);
+        uText->SanitizeString((AllowedEntities)0x27F);
         var sanitised = uText->ToString();
         uText->Dtor(true);
-
         return sanitised;
     }
-}
+}

HellionChat/GameFunctions/Context.cs

@@ -1,7 +1,7 @@
-using HellionChat.Util;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using HellionChat.Util;
 
 namespace HellionChat.GameFunctions;
 
@@ -10,7 +10,9 @@ internal sealed unsafe class Context
     internal static void InviteToNoviceNetwork(string name, ushort world)
     {
         // can specify content id if we have it, but there's no need
-        InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
+        InfoProxyNoviceNetwork
+            .Instance()
+            ->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
     }
 
     internal static void TryOn(uint itemId, byte stainId)

HellionChat/GameFunctions/GameFunctions.cs

@@ -23,9 +23,17 @@ internal unsafe class GameFunctions : IDisposable
     internal const string NewGamePlusAddonName = "QuestRedo";
 
     #region Hooks
-    [Signature("E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F", DetourName = nameof(ResolveTextCommandPlaceholderDetour))]
+    [Signature(
+        "E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F",
+        DetourName = nameof(ResolveTextCommandPlaceholderDetour)
+    )]
     private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!;
-    private delegate nint ResolveTextCommandPlaceholderDelegate(nint a1, byte* placeholderText, byte a3, byte a4);
+    private delegate nint ResolveTextCommandPlaceholderDelegate(
+        nint a1,
+        byte* placeholderText,
+        byte a3,
+        byte a4
+    );
     #endregion
 
     private Plugin Plugin { get; }
@@ -39,7 +47,6 @@ internal unsafe class GameFunctions : IDisposable
         Chat = new Chat(Plugin);
 
         Plugin.GameInteropProvider.InitializeFromAttributes(this);
-
         ResolveTextCommandPlaceholderHook?.Enable();
     }
 
@@ -47,41 +54,30 @@ internal unsafe class GameFunctions : IDisposable
     {
         Chat.Dispose();
         KeybindManager.Dispose();
-
         ResolveTextCommandPlaceholderHook?.Dispose();
-
         Marshal.FreeHGlobal(PlaceholderNamePtr);
     }
 
-    internal void SendFriendRequest(string name, ushort world)
-    {
+    internal void SendFriendRequest(string name, ushort world) =>
         ListCommand(name, world, "friendlist");
-    }
 
-    internal void AddToBlacklist(string name, ushort world)
-    {
-        ListCommand(name, world, "blist");
-    }
+    internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");
 
-    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId)
-    {
+    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
         AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
-    }
 
-    internal void AddToTermsList(SeString content)
-    {
+    internal void AddToTermsList(SeString content) =>
         AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
-    }
 
     private void ListCommand(string name, ushort world, string commandName)
     {
         var worldRow = Sheets.WorldSheet.GetRow(world);
-
         ReplacementName = $"{name}@{worldRow.Name.ToString()}";
         ChatBox.SendMessage($"/{commandName} add {Placeholder}");
     }
 
-    private static T* GetAddon<T>(string name) where T : unmanaged
+    private static T* GetAddon<T>(string name)
+        where T : unmanaged
     {
         var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name);
         return addon != null && addon->IsReady ? (T*)addon : null;
@@ -99,7 +95,6 @@ internal unsafe class GameFunctions : IDisposable
     {
         for (var i = 0; i < 4; i++)
             SetAddonInteractable($"ChatLogPanel_{i}", interactable);
-
         SetAddonInteractable("ChatLog", interactable);
     }
 
@@ -115,7 +110,6 @@ internal unsafe class GameFunctions : IDisposable
         var agent = AgentItemDetail.Instance();
         var addon = GetAddon<AtkUnitBase>("ItemDetail");
 
-        // atkStage ain't gonna be null or we have bigger problems
         if (agent == null || addon == null)
             return;
 
@@ -124,23 +118,19 @@ internal unsafe class GameFunctions : IDisposable
         agent->Index = 0;
         agent->Flag1 &= 0xEF;
         agent->ItemId = id;
-        // agent->Flag2 = 1;
-        // agent->Flag3 = 0;
-        // TODO: Revert whenever CS is merged
+
+        // TODO: Revert when CS offset lands in a release build.
         *(byte*)((nint)agent + 0x21A) = 1;
         *(byte*)((nint)agent + 0x21E) = 0;
 
-        // This just probably needs to be set
         agent->AddonId = addon->Id;
-
-        // Skips early return
         atkStage->TooltipManager.TooltipType |= 2;
         addon->Show(false, 15);
     }
 
     internal static void CloseItemTooltip()
     {
-        // hide addon first to prevent the "addon close" sound
+        // Hide addon first to suppress the "addon close" sound.
         var addon = GetAddon<AtkUnitBase>("ItemDetail");
         if (addon != null)
             addon->Hide(true, false, 0);
@@ -158,35 +148,31 @@ internal unsafe class GameFunctions : IDisposable
 
     internal static void OpenPartyFinder()
     {
-        // this whole method: 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
+        // 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
         var lfg = AgentLookingForGroup.Instance();
         if (lfg->IsAgentActive())
         {
             var addonId = lfg->GetAddonId();
             var atkModule = RaptureAtkModule.Instance();
-            var atkModuleVtbl = (void**) atkModule->AtkModule.VirtualTable;
-            var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>) atkModuleVtbl[27];
+            var atkModuleVtbl = (void**)atkModule->AtkModule.VirtualTable;
+            var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>)
+                atkModuleVtbl[27];
             vf27(atkModule, addonId, 1);
         }
         else
         {
             // 6.05: 8443DD
-            if (*(uint*) ((nint) lfg + 0x2C20) > 0)
+            if (*(uint*)((nint)lfg + 0x2C20) > 0)
                 lfg->Hide();
             else
                 lfg->Show();
         }
     }
 
-    internal static bool IsMentor()
-    {
-        return PlayerState.Instance()->IsMentor();
-    }
+    internal static bool IsMentor() => PlayerState.Instance()->IsMentor();
 
-    internal static InfoProxyCommonList.CharacterData[] GetFriends()
-    {
-        return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
-    }
+    internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
+        InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
 
     internal static void OpenQuestLog(RowRef<Quest> quest)
     {
@@ -197,7 +183,14 @@ internal unsafe class GameFunctions : IDisposable
             return;
         }
 
-        if (!uint.TryParse(splits[1], NumberStyles.Any, CultureInfo.InvariantCulture,  out var questId))
+        if (
+            !uint.TryParse(
+                splits[1],
+                NumberStyles.Any,
+                CultureInfo.InvariantCulture,
+                out var questId
+            )
+        )
         {
             Plugin.ChatGui.Print("Unable to parse quest id");
             return;
@@ -206,20 +199,12 @@ internal unsafe class GameFunctions : IDisposable
         AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
     }
 
-    internal static void OpenPartyFinder(uint id)
-    {
+    internal static void OpenPartyFinder(uint id) =>
         AgentLookingForGroup.Instance()->OpenListing(id);
-    }
 
-    internal static void OpenAchievement(uint id)
-    {
-        AgentAchievement.Instance()->OpenById(id);
-    }
+    internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);
 
-    internal static bool IsInInstance()
-    {
-        return Plugin.Condition[ConditionFlag.BoundByDuty56];
-    }
+    internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];
 
     internal static bool TryOpenAdventurerPlate(ulong playerId)
     {
@@ -230,7 +215,7 @@ internal unsafe class GameFunctions : IDisposable
         }
         catch (Exception e)
         {
-            Plugin.Log.Warning(e, "Unable to open adventurer plate");
+            Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
             return false;
         }
     }
@@ -238,10 +223,10 @@ internal unsafe class GameFunctions : IDisposable
     internal static void ClickNoviceNetworkButton()
     {
         var agent = AgentChatLog.Instance();
-        // case 3
-        var value = new AtkValue { Type = ValueType.Int, Int = 3, };
+        var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
         var result = 0;
-        var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*) agent->VirtualTable;
+        var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
+            agent->VirtualTable;
         vf0(agent, &result, &value, 0, 0);
     }
 
@@ -250,32 +235,35 @@ internal unsafe class GameFunctions : IDisposable
     private readonly string Placeholder = $"<{Guid.NewGuid():N}>";
     private string? ReplacementName;
 
-    private nint ResolveTextCommandPlaceholderDetour(nint a1, byte* placeholderText, byte a3, byte a4)
+    private nint ResolveTextCommandPlaceholderDetour(
+        nint a1,
+        byte* placeholderText,
+        byte a3,
+        byte a4
+    )
     {
-        // The detour is only invoked through the hook, so the hook should
-        // never be null here, but the nullable field declaration forces us
-        // to handle the theoretical race during teardown.
+        // Hook field is nullable due to the Signature attribute, but will never
+        // be null during normal execution; guard covers the teardown race only.
         if (ResolveTextCommandPlaceholderHook is null)
             return nint.Zero;
 
-        var placeholder = MemoryHelper.ReadStringNullTerminated((nint) placeholderText);
+        var placeholder = MemoryHelper.ReadStringNullTerminated((nint)placeholderText);
         if (ReplacementName == null || placeholder != Placeholder)
             return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
 
-        // The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit.
-        // FFXIV player names plus an @World suffix should never approach this
-        // limit, but a malformed ReplacementName must not overflow the buffer.
+        // Guard against a malformed ReplacementName overflowing the 128-byte buffer.
         var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
         if (byteCount >= PlaceholderBufferSize)
         {
-            Plugin.Log.Warning($"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original.");
+            Plugin.LogProxy.Warning(
+                $"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
+            );
             ReplacementName = null;
             return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
         }
 
         MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
         ReplacementName = null;
-
         return PlaceholderNamePtr;
     }
 }

HellionChat/GameFunctions/KeybindManager.cs

@@ -1,23 +1,25 @@
 using System.Numerics;
-using HellionChat.Code;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Util;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Config;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.GameFunctions.Types;
+using HellionChat.Util;
 using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
 
 namespace HellionChat.GameFunctions;
 
-internal enum KeyboardSource {
+internal enum KeyboardSource
+{
     Game,
-    ImGui
+    ImGui,
 }
 
-internal unsafe class KeybindManager : IDisposable {
+internal unsafe class KeybindManager : IDisposable
+{
     private Plugin Plugin { get; }
 
     internal bool DirectChat;
@@ -26,70 +28,79 @@ internal unsafe class KeybindManager : IDisposable {
     private bool VanillaTextInputHasFocus;
 
     private readonly Dictionary<string, Keybind> Keybinds = new();
-    private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept = new Dictionary<string, ChannelSwitchInfo>
-    {
-        ["CMD_CHAT"] = new(null),
-        ["CMD_COMMAND"] = new(null, text: "/"),
-        ["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward),
-        ["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse),
-        ["CMD_SAY"] = new(InputChannel.Say),
-        ["CMD_YELL"] = new(InputChannel.Yell),
-        ["CMD_SHOUT"] = new(InputChannel.Shout),
-        ["CMD_PARTY"] = new(InputChannel.Party),
-        ["CMD_ALLIANCE"] = new(InputChannel.Alliance),
-        ["CMD_FREECOM"] = new(InputChannel.FreeCompany),
-        ["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam),
-        ["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward),
-        ["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse),
-        ["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1),
-        ["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2),
-        ["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3),
-        ["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4),
-        ["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5),
-        ["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6),
-        ["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7),
-        ["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8),
-        ["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward),
-        ["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse),
-        ["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1),
-        ["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2),
-        ["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3),
-        ["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4),
-        ["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5),
-        ["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6),
-        ["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7),
-        ["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8),
-        ["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork),
-        ["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward),
-        ["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse),
-        ["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true),
-        ["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true),
-        ["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true),
-        ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
-        ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
-        ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
-        ["CMD_CWLINKSHELL_ALWAYS"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Forward),
-        ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse),
-        ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
-        ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
-        ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
-        ["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true),
-        ["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true),
-        ["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true),
-        ["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true),
-        ["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true),
-        ["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward),
-        ["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse),
-        ["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true),
-        ["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true),
-        ["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true),
-        ["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true),
-        ["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true),
-        ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
-        ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
-        ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
-        ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true)
-    };
+    private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
+        new Dictionary<string, ChannelSwitchInfo>
+        {
+            ["CMD_CHAT"] = new(null),
+            ["CMD_COMMAND"] = new(null, text: "/"),
+            ["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward),
+            ["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse),
+            ["CMD_SAY"] = new(InputChannel.Say),
+            ["CMD_YELL"] = new(InputChannel.Yell),
+            ["CMD_SHOUT"] = new(InputChannel.Shout),
+            ["CMD_PARTY"] = new(InputChannel.Party),
+            ["CMD_ALLIANCE"] = new(InputChannel.Alliance),
+            ["CMD_FREECOM"] = new(InputChannel.FreeCompany),
+            ["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam),
+            ["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward),
+            ["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse),
+            ["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1),
+            ["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2),
+            ["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3),
+            ["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4),
+            ["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5),
+            ["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6),
+            ["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7),
+            ["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8),
+            ["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward),
+            ["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse),
+            ["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1),
+            ["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2),
+            ["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3),
+            ["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4),
+            ["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5),
+            ["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6),
+            ["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7),
+            ["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8),
+            ["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork),
+            ["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward),
+            ["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse),
+            ["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true),
+            ["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true),
+            ["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true),
+            ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
+            ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
+            ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
+            ["CMD_CWLINKSHELL_ALWAYS"] = new(
+                InputChannel.CrossLinkshell1,
+                true,
+                RotateMode.Forward
+            ),
+            ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(
+                InputChannel.CrossLinkshell1,
+                true,
+                RotateMode.Reverse
+            ),
+            ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
+            ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
+            ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
+            ["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true),
+            ["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true),
+            ["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true),
+            ["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true),
+            ["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true),
+            ["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward),
+            ["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse),
+            ["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true),
+            ["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true),
+            ["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true),
+            ["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true),
+            ["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true),
+            ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
+            ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
+            ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
+            ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
+        };
 
     // List of keys that can be used as a part of keybinds while the chat is
     // focused WITHOUT modifiers. All other keys can only be used if their
@@ -353,12 +364,22 @@ internal unsafe class KeybindManager : IDisposable {
         return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey);
     }
 
-    private static bool ComboPressed(KeyboardSource source, VirtualKey key, ModifierFlag modifier, ModifierFlag? modifierState = null, bool modifiersOnly = false)
+    private static bool ComboPressed(
+        KeyboardSource source,
+        VirtualKey key,
+        ModifierFlag modifier,
+        ModifierFlag? modifierState = null,
+        bool modifiersOnly = false
+    )
     {
         // When we're in an input, we don't want to process any keybinds that
         // don't have a modifier (or only use shift) and are not explicitly
         // whitelisted.
-        if (modifiersOnly && !ModifierlessChatKeys.Contains(key) && modifier is ModifierFlag.None or ModifierFlag.Shift)
+        if (
+            modifiersOnly
+            && !ModifierlessChatKeys.Contains(key)
+            && modifier is ModifierFlag.None or ModifierFlag.Shift
+        )
             return false;
 
         modifierState ??= GetModifiers(source);
@@ -366,26 +387,43 @@ internal unsafe class KeybindManager : IDisposable {
         {
             KeybindMode.Strict => modifier == modifierState.Value,
             KeybindMode.Flexible => modifierState.Value.HasFlag(modifier),
-            _ => false
+            _ => false,
         };
 
         return KeyPressed(source, key) && modifierPressed;
     }
 
-    private static bool ConfigKeybindPressed(KeyboardSource source, ConfigKeyBind? bind, ModifierFlag? modifierState = null, bool modifiersOnly = false)
+    private static bool ConfigKeybindPressed(
+        KeyboardSource source,
+        ConfigKeyBind? bind,
+        ModifierFlag? modifierState = null,
+        bool modifiersOnly = false
+    )
     {
-        return bind != null && ComboPressed(source, bind.Key, bind.Modifier, modifierState: modifierState, modifiersOnly: modifiersOnly);
+        return bind != null
+            && ComboPressed(
+                source,
+                bind.Key,
+                bind.Modifier,
+                modifierState: modifierState,
+                modifiersOnly: modifiersOnly
+            );
     }
 
-    private void HandleKeybinds(IFramework _ ) => HandleKeybinds(KeyboardSource.Game);
+    private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game);
 
-    internal void HandleKeybinds(KeyboardSource source, bool ignoreChatOpen = false, bool modifiersOnly = false)
+    internal void HandleKeybinds(
+        KeyboardSource source,
+        bool ignoreChatOpen = false,
+        bool modifiersOnly = false
+    )
     {
         // Refresh current keybinds every 5s
         if (LastRefresh + 5 * 1000 < Environment.TickCount64)
         {
             UpdateKeybinds();
-            DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
+            DirectChat =
+                Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
             LastRefresh = Environment.TickCount64;
         }
 
@@ -433,10 +471,18 @@ internal unsafe class KeybindManager : IDisposable {
 
             void Intercept(VirtualKey vk, ModifierFlag modifier)
             {
-                if (!ComboPressed(source, vk, modifier, modifierState: modifierState, modifiersOnly: modifiersOnly))
+                if (
+                    !ComboPressed(
+                        source,
+                        vk,
+                        modifier,
+                        modifierState: modifierState,
+                        modifiersOnly: modifiersOnly
+                    )
+                )
                     return;
 
-                var bits = BitOperations.PopCount((uint) modifier);
+                var bits = BitOperations.PopCount((uint)modifier);
                 if (bits < currentBest.Item3)
                     return;
 
@@ -457,11 +503,11 @@ internal unsafe class KeybindManager : IDisposable {
         try
         {
             TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
-            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason, });
+            Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
         }
         catch (Exception ex)
         {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            Plugin.LogProxy.Error(ex, "Error in chat Activated event");
         }
     }
 
@@ -494,11 +540,11 @@ internal unsafe class KeybindManager : IDisposable {
         var key2 = outData.KeySettings[1];
         return new Keybind
         {
-            Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key),
-            Modifier1 = (ModifierFlag) key1.KeyModifier,
+            Key1 = RemapInvalidVirtualKey((VirtualKey)key1.Key),
+            Modifier1 = (ModifierFlag)key1.KeyModifier,
 
-            Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key),
-            Modifier2 = (ModifierFlag) key2.KeyModifier,
+            Key2 = RemapInvalidVirtualKey((VirtualKey)key2.Key),
+            Modifier2 = (ModifierFlag)key2.KeyModifier,
         };
     }
 
@@ -506,9 +552,9 @@ internal unsafe class KeybindManager : IDisposable {
     {
         return key switch
         {
-            VirtualKey.F23 => VirtualKey.OEM_2,   // /?
-            (VirtualKey) 140 => VirtualKey.OEM_7, // '"
-            _ => key
+            VirtualKey.F23 => VirtualKey.OEM_2, // /?
+            (VirtualKey)140 => VirtualKey.OEM_7, // '"
+            _ => key,
         };
     }
-}
+}

HellionChat/GameFunctions/Party.cs

@@ -1,8 +1,8 @@
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Interface.ImGuiNotification;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Client.UI.Info;
+using HellionChat.Resources;
+using HellionChat.Util;
 
 namespace HellionChat.GameFunctions;
 
@@ -11,7 +11,8 @@ internal static unsafe class Party
     internal static void InviteSameWorld(string name, ushort world, ulong contentId)
     {
         // this only works if target is on the same world
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
             InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world);
         }
     }
@@ -44,14 +45,16 @@ internal static unsafe class Party
 
     internal static void Kick(string name, ulong contentId)
     {
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
             AgentPartyMember.Instance()->Kick(namePtr, 0, contentId);
         }
     }
 
     internal static void Promote(string name, ulong contentId)
     {
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
+        fixed (byte* namePtr = name.ToTerminatedBytes())
+        {
             AgentPartyMember.Instance()->Promote(namePtr, 0, contentId);
         }
     }

HellionChat/GameFunctions/Types/ChannelSwitchInfo.cs

@@ -2,13 +2,19 @@ using HellionChat.Code;
 
 namespace HellionChat.GameFunctions.Types;
 
-internal class ChannelSwitchInfo {
+internal class ChannelSwitchInfo
+{
     internal InputChannel? Channel { get; }
     internal bool Permanent { get; }
     internal RotateMode Rotate { get; }
     internal string? Text { get; }
 
-    internal ChannelSwitchInfo(InputChannel? channel, bool permanent = false, RotateMode rotate = RotateMode.None, string? text = null)
+    internal ChannelSwitchInfo(
+        InputChannel? channel,
+        bool permanent = false,
+        RotateMode rotate = RotateMode.None,
+        string? text = null
+    )
     {
         Channel = channel;
         Permanent = permanent;

HellionChat/GameFunctions/Types/TellTarget.cs

@@ -19,14 +19,14 @@ public class TellTarget
         Reason = reason;
     }
 
-    public bool IsSet()
-        => !string.IsNullOrEmpty(Name) && World > 0;
+    public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;
 
-    public string ToWorldString()
-        => Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty;
+    public string ToWorldString() =>
+        Sheets.WorldSheet.TryGetRow(World, out var worldRow)
+            ? worldRow.Name.ToString()
+            : string.Empty;
 
-    public string ToTargetString()
-        => $"{Name}@{ToWorldString()}";
+    public string ToTargetString() => $"{Name}@{ToWorldString()}";
 
     public unsafe void FromTarget(IPlayerCharacter target)
     {
@@ -39,5 +39,12 @@ public class TellTarget
     }
 
     public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
-    public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
+
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Replaced static From(t) with an instance-style Clone() so call
+    //   sites read like a copy operation, not a factory.
+    // TEST-MIRROR: ../../../Hellion Build test/_Helpers/TellTargetCloneTests.cs
+    // ---------------------------------------------------------------
+    public TellTarget Clone() => new(Name, World, ContentId, Reason);
 }

HellionChat/HellionChat.csproj

@@ -1,36 +1,21 @@
 <Project Sdk="Dalamud.NET.Sdk/15.0.0">
     <PropertyGroup>
-        <!-- Hellion Chat versioning runs separately from upstream Chat 2.
-             0.1.0 is our bootstrap release; the underlying Chat 2 base is
-             called out in the yaml changelog so users can see what it
-             derives from. -->
-        <Version>1.4.2</Version>
+        <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
+        <Version>1.4.7</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <!-- Honor packages.lock.json on restore so floating version ranges
-             don't silently drift between machines or CI runs. -->
+        <!-- Use lock file to pin exact versions -->
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <!-- v1.0.0 standalone cut — both AssemblyName and RootNamespace
-             are HellionChat. The plugin no longer maintains source-level
-             cherry-pick compatibility with upstream Infiziert90/ChatTwo;
-             upstream changes are integrated manually if at all. -->
+        <!-- v1.0.0+: standalone fork, no upstream cherry-pick compatibility -->
         <AssemblyName>HellionChat</AssemblyName>
         <RootNamespace>HellionChat</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <!-- Closed ranges on packages with breaking-change history block a
-             surprise major bump when the lock file is regenerated. The
-             lock file pins the exact version per build; the upper bound
-             keeps the unlock path from drifting across major lines. -->
+        <!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
         <PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
-        <!-- Override the transitively-referenced native SQLite build to one
-             that ships SQLite >= 3.50.3 (CVE-2025-6965 memory corruption,
-             CVE-2025-7709 fixed in 3.50.x). Microsoft.Data.Sqlite 10.0.7
-             pulls SQLitePCLRaw 2.1.11 which carries the older lib; pinning
-             the lib package directly forces the newer native binary
-             without a major bump on the managed wrapper. -->
+        <!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
         <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
         <PackageReference Include="morelinq" Version="4.4.0" />
         <PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
@@ -38,9 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <!-- Pure-function test suites in HellionChat.Tests need access to
-             the internal helper classes (StringUtil, UriPayload, Tokenizer
-             etc.). Test assembly does not get redistributed. -->
+        <!-- Test assembly needs access to internal helpers (not redistributed) -->
         <InternalsVisibleTo Include="HellionChat.Tests" />
     </ItemGroup>
 
@@ -59,15 +42,7 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <!-- HellionChat — Hellion-specific resource bundle (HellionStrings.resx
-         + HellionStrings.<lang>.resx) is picked up automatically by the SDK
-         default include. Designer.cs is hand-maintained, no auto-gen needed. -->
-
-    <!-- Bundled Hellion font (Exo 2, OFL-1.1). Embedded as a manifest
-         resource with a fixed LogicalName so FontManager can pull the
-         bytes back at runtime via AddFontFromMemory. The OFL license
-         text travels with it inside the assembly to satisfy the
-         "license must be distributed with the font" clause. -->
+    <!-- Embedded resources: Hellion font (Exo 2, OFL-1.1) + manifest resource -->
     <ItemGroup>
         <EmbeddedResource Include="Resources\HellionFont.ttf">
             <LogicalName>HellionFont.ttf</LogicalName>
@@ -80,19 +55,10 @@
         </EmbeddedResource>
     </ItemGroup>
 
-
-    <!-- Plugin icon. Copy images/* into the build output so Dalamud
-         finds the icon next to the DLL, and let the SDK default
-         DalamudPackager pipeline include the same path in the
-         release ZIP. Earlier we shipped a custom DalamudPackager
-         targets override that explicitly set HandleImages and
-         ImagesPath; that override conflicted with the SDK 15
-         default and the resulting manifest carried no IconUrl.
-         Removed in v0.5.2. -->
+    <!-- Plugin icon: copy images/* to output for Dalamud discovery -->
     <ItemGroup>
         <None Include="images\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-
 </Project>

HellionChat/HellionChat.yaml

@@ -1,196 +1,163 @@
 name: Hellion Chat
-author: JonKazama-Hellion
-punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
+author: Jon Kazama (Hellion Forge)
+punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
 description: |-
-  Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
-  based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
-  removed (the optional webinterface) and a stack of privacy controls is
-  added on top. Tabs, channel filters, RGB colours, emotes, screenshot
-  mode, IPC integration and the chat replacement window itself work the
-  same. The webinterface is intentionally not part of Hellion Chat because
-  it serves a different use case from the smaller default footprint this
-  plugin is built around.
+    Chat replacement for FINAL FANTASY XIV with privacy controls built around
+    EU, US and JP data-protection rules.
 
-  On top of that, Hellion Chat adds privacy and data-handling controls
-  designed to align with the modern data protection rules that apply
-  across the EU, the United States and Japan. By default only your own
-  conversations are stored; messages from strangers, NPCs and system
-  spam stay out of the database. Retention windows are configurable per
-  channel, history can be wiped retroactively, and stored data can be
-  exported on demand.
+    By default only your own conversations are stored. Public chat, NPC
+    dialogue and system messages stay out of the database unless you opt in.
+    Retention windows are configurable per channel, history can be wiped
+    retroactively, and everything can be exported on demand.
 
-  Key privacy and data-handling features:
+    Features:
+    - Channel whitelist with a Privacy-First default
+    - Per-channel retention with a daily background sweep
+    - Retroactive cleanup (Ctrl+Shift confirm)
+    - Export to Markdown, JSON or CSV
+    - First-run wizard with three preset profiles
+    - Bilingual UI (EN/DE) with live language switching
+    - Own config and database — no shared state with other plugins
 
-  - Channel whitelist with a Privacy-First default
-  - Per-channel retention with a daily background sweep
-  - Retroactive cleanup with a Ctrl+Shift confirm
-  - Export to Markdown, JSON or CSV
-  - First-run wizard with three preset profiles (Privacy-First, Casual,
-    Full History)
-  - Bilingual UI (English and German) with live language switching
-  - Independent plugin state — own config file and database directory,
-    so Hellion Chat does not share state with upstream Chat 2
-
-  v1.3.0 First plugin integration cycle. Honorific custom titles
-  are shown in the chat header above the message log, with auto-detect
-  and silent fallback when Honorific is not installed.
-
-  v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown
-  are cleaner: SQLite no longer leans on GC pressure to release
-  its file, worker threads are explicitly background, deferred
-  config saves no longer get lost mid-disable, and pre-v13 config
-  backups carry the user's custom theme opacity into the v14 schema
-  instead of falling back to the default.
-
-  v1.4.1 — Theme Engine Performance plus a tenth built-in.
-  HellionStyle.PushGlobal reads pre-computed ABGR values from a
-  per-theme cache instead of converting RGBA per slot per frame
-  (~13 % render-time recovery in typical scenes). Custom-theme
-  hot-reload survives transient file locks (editor mid-save
-  keeps the last-known-good snapshot). Synthwave Sunset joins
-  as the tenth built-in theme — Hot Magenta + Cyan on midnight
-  violet, 80s neon-grid vibes.
-
-  v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
-  patterns gone from the chat-log render path: card-mode borders
-  hoist invariants out of the per-message loop, auto-tell tab
-  tint and icon get a per-tab cache, and the status bar gates
-  its tab aggregation behind the same one-second cache it uses
-  for the format strings.
-
-  Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
-
-  Modding & support: join the Hellion Forge Discord at
-  https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
-  other Hellion Online Media plugins/tools.
-repo_url: https://github.com/JonKazama-Hellion/HellionChat
+    Based on Chat 2 by Infi and Anna (EUPL-1.2).
+    Support: https://discord.gg/X9V7Kcv5gR
+repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
 accepts_feedback: true
-icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png
+icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
 image_urls:
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/chatWindow.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/settingsOverview.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/themesPicker.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
+    - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
 tags:
-  - Social
-  - UI
-  - Chat
-  - Replacement
-  - Privacy
+    - Social
+    - UI
+    - Chat
+    - Replacement
+    - Privacy
 changelog: |-
-  **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
+    **v1.4.7 — Backlog Cleanup and Mid-Features (2026-05-13)**
 
-  Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
-  allocations from the chat-log render path eliminated.
+    Eighth sub-patch of the v1.4.x polish-sweep series. First
+    user-visible feature bundle since v1.4.5 — pinned tell tabs that
+    survive relog, opt-in Honorific glow rendering, and a configurable
+    sidebar.
 
-  - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
-    borderColorAbgr out of the per-message loop. About 500
-    redundant calls per frame at 100 visible messages, multiplied
-    by every pop-out window
-  - Auto-tell tab tint and icon use a per-tab cache. Hash
-    computation and string allocation only happen when the tell
-    target name or world drifts. AutoTellTabTint stays a pure
-    hash helper; cache lives in a thin TabTintCache wrapper
-  - Status bar gates its tab aggregation behind the same
-    one-second cache it already used for the format strings.
-    LINQ Sum and Count replaced with a single foreach pass
-    that runs on roughly 1% of frames
+    - TempTell Pin: right-click a TempTell tab in the sidebar to pin
+      it. Pinned tabs survive relog, keep their conversation history
+      (loaded on demand from the message store), and stay bound to
+      the same /tell partner. Hard cap of 5 pinned tabs in a pool
+      separate from the 15-tab auto-tell pool — total ceiling is 20
+      tabs. New 'Pinned' section in the sidebar with its own divider
+      header
+    - Honorific Glow outline now renders when the title carries a
+      Glow colour. Opt-in via Settings → Integrations → 'Render glow
+      outlines (Honorific)' (default off, dodges the per-frame
+      DrawList overhead on low-end hardware). Gradient (Color3 /
+      GradientColourSet / Wave / Pulse) is parsed but rendered
+      statically — a later cycle will port the full animation
+    - Sidebar width is now configurable in Theme & Layout (range
+      44–160 px). Default stays icon-only; widen to fit section
+      headers like 'Active Tells (3)' without truncation
+    - Settings Save no longer pops the chat input back to /tell with
+      a pinned partner — Configuration.UpdateFrom now preserves the
+      runtime CurrentChannel across the persistent-tab merge, and
+      TabSwitched deep-clones the seeded channel instead of sharing
+      the previous tab's UsedChannel
+    - Util/ImGuiUtil.cs DrawArrows IconButton id now uses
+      (id + 1).ToString() instead of the operator-precedence quirk
+      id + 1.ToString() — generated IDs stay numerically stable
+    - Internal: IPluginLogProxy indirection over Dalamud's IPluginLog
+      routes all ~91 Plugin.Log call sites through a testable proxy.
+      MessageStore.Migrate0 can now run in xUnit without loading
+      Dalamud.dll, closing the gap F12.1 left in v1.4.6
+    - Internal: TempTab counter switched from an Interlocked cached
+      field to a derived Tabs.Count(predicate) — pin-state transitions
+      are cold-path and don't need lock-free reads
 
-  Realistic frame-time recovery: 2-5% in typical scenes, more
-  on pop-out-heavy setups because the card-border hoist scales
-  per window.
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
-  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
+    ---
 
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    **v1.4.6 — Code Hygiene and Refactor (2026-05-12)**
 
-  **Hellion Chat 1.4.1 — Theme Engine Performance**
+    Maintenance patch. No user-visible behaviour changes; tightens the
+    development feedback loop, fixes two upstream-inherited bugs, and
+    prepares the code for the v1.4.7 backlog cleanup.
 
-  Second sub-patch of the v1.4.x Polish Sweep series. Heap
-  pressure from the theme engine's per-frame render path
-  removed, plus a tenth built-in theme and hardening for
-  the custom-theme hot-reload.
+    - preflight.sh gains a csharpier reflow check and a markdownlint
+      pass so style drift and markdown violations are caught at the
+      pre-push gate
+    - FontManager fallback catches the full set of atlas-toolkit
+      throws (IO, InvalidOperation, ArgumentException) — a corrupt
+      font config no longer takes down the whole atlas build
+    - BrandingLinks and IntegrationLinks URLs validated on plugin
+      load — a typo in a future URL rotation now throws at startup
+    - Cherry-picked from ChatTwo upstream f35b7d3: Chat.SetChannel
+      no longer leaks the native Utf8String when the linkshell check
+      rejects the channel
+    - Cherry-picked from ChatTwo upstream f35b7d3: Tab.Clone now
+      deep-clones UsedChannel and TellTarget — PopOut and Temp tabs
+      no longer mutate each other's channel state
+    - Active-tab underline scales with DPI and rounds to physical
+      pixels for crisp rendering above 100% scaling
+    - IconButton width parameter no longer subtracts HUD-scaled
+      padding from a raw int (measured width passes through verbatim)
+    - Internal: HellionStyle ChildBgAlpha extracted to a testable
+      helper; Plugin.SaveConfig clones only the temp tabs;
+      SettingsOverview caches the draw-list per frame;
+      Dalamud.Utility.Util surface routed through an IPlatformUtil
+      indirection (MessageStore IsWine probe is now testable in
+      isolation)
+    - Built-in themes: Crystal Nocturne (sapphire and electric
+      magenta over obsidian, by CRYSTALLITE) replaces Moonlit Bloom.
+      Users with Moonlit Bloom selected fall back to Hellion Arctic
+      on first load
 
-  - Theme records carry a pre-computed ABGR-packed cache
-    for every color slot; cache is filled when the theme
-    is registered and refreshed defensively on every
-    Switch()
-  - HellionStyle.PushGlobal reads ABGR values from the
-    cache instead of calling ColourUtil.RgbaToAbgr per
-    slot per frame; ~13 % render-time recovery measured
-    in typical scenes (plan estimate was 2–6 %, real
-    ~10–15 %)
-  - ThemeRegistry custom-theme reload distinguishes a
-    recoverable file lock (editor mid-save) from a
-    permanent IO failure; locked themes keep their
-    last-known-good snapshot and retry on the next
-    lookup instead of dropping out of the picker
-  - New built-in: Synthwave Sunset — Hot Magenta + Cyan
-    on midnight violet, 80s neon-grid vibes; tenth theme
-    in the picker
-  - Author credits refreshed: brand themes are credited
-    as "Hellion Forge"; Mint Grove and Forge Merchantman
-    now credited to Carla Beleandis as a community thanks
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
-  No schema bump, no user-visible behaviour change other
-  than smoother frames on GC-sensitive setups and one
-  additional colour option.
+    ---
 
-  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
+    **v1.4.5 — UX and Robustness (2026-05-12)**
 
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    Sixth sub-patch of the v1.4.x polish-sweep series. Chat-log draw
+    failures surface as a notification, the first-run wizard has an
+    explicit "Later" option, the input history clears on plugin reload,
+    and the status bar version slot stops clipping in narrow windows.
 
-  **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
+    - Chat window draw errors now show a one-shot notification instead
+      of failing silently — stack trace stays in /xllog
+    - First-run wizard: explicit "Later — keep defaults" button.
+      Closing the X no longer silently accepts the defaults; the wizard
+      reopens on the next plugin load if nothing was picked
+    - InputHistoryService clears on plugin dispose so the previous
+      session's typed commands don't bleed into the next load
+    - Status bar hides the version slot when the chat window is too
+      narrow to fit all five slots without overlap
+    - Internal: explicit session-only Auto-Tell-Tab invariant in
+      Plugin.cs plus a pinning test in the Build-Suite
+    - Internal: FontManager falls back to the system font if the
+      embedded Hellion font resource is missing — logs a Warning
 
-  First sub-patch of the v1.4.x Polish Sweep series. Seven
-  known lifecycle and race bugs eliminated before any
-  performance refactor sits on top.
+    ---
 
-  - MessageStore disposal no longer triggers GC.Collect
-    globally; Pooling=false on the SQLite connection means
-    there's nothing left to clean up by hand
-  - PendingMessage and RetentionSweep worker threads are
-    explicitly marked IsBackground=true so the plugin domain
-    can unload during XIVLauncher reload without waiting
-    for them
-  - EmoteCache image and gif loaders moved from async-void
-    to async Task with a shared task tracker, draining
-    on Dispose so an in-flight load can no longer write
-    to a disposed EmoteImages entry
-  - DisposeAsync 10s timeout now warns loudly instead of
-    silently leaving the worker behind
-  - Plugin.Dispose flushes any pending DeferredSaveFrames
-    before tearing services down, so settings changes
-    made in the last few frames before disable are no
-    longer lost
-  - The v13→v14 config migration now reads the pre-v13
-    backup and carries HellionThemeWindowOpacity into the
-    new WindowOpacity field instead of falling back to
-    the default 0.85
+    **v1.4.4 — Threading and IPC safety polish (2026-05-12)**
 
-  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
+    Fifth sub-patch of the v1.4.x polish-sweep series. Threading
+    assumptions are documented per-method, a hot-path lock falls
+    away, and the privacy filter speaks up when an unknown ChatType
+    shows up.
 
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    - AutoTellTabs hot-path getter uses an Interlocked counter
+      instead of taking the lock on every read
+    - Honorific integration: per-method threading banners, plus
+      Warning-level log on unsubscribe failure
+    - AutoTranslate warmup thread marked IsBackground so plugin
+      unload doesn't wait for it
+    - PrivacyFilter logs once per unknown ChatType so a future
+      patch's added channel doesn't drop off the radar
+    - New installs persist unknown channels by default; existing
+      configs keep their explicit choice
 
-  **Hellion Chat 1.3.0 - Plugin Integrations: Honorific**
+    ---
 
-  First step on the plugin-integration roadmap. HellionChat now
-  listens to Honorific and shows your custom title in the chat
-  header. The slot auto-hides when Honorific is not installed,
-  when no custom title is active, or when you are using the
-  original FFXIV title.
-
-  - New "Integrations" settings tab
-  - Honorific integration with auto-detection and live updates
-  - "Coming soon" preview of the next five planned integrations:
-    context menu actions, smart notifications, RP status block,
-    ExtraChat channels, and quick DM compose
-  - Maintainer attribution buttons for Honorific repo and Caraxi
-  - New service-class pattern under HellionChat/Integrations/
-
-  Modding and support: join Hellion Forge - https://discord.gg/X9V7Kcv5gR
-
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-  ---
-
-  Earlier history: https://github.com/JonKazama-Hellion/HellionChat/releases
+    Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases

HellionChat/InputHistoryService.cs

@@ -2,14 +2,9 @@ using System.Collections.Generic;
 
 namespace HellionChat;
 
-// Hellion Chat — v0.6.0 shared input history. Replaces the embedded
-// ChatLogWindow.InputBacklog so that pop-out windows with their own
-// ChatInputBar can navigate the same Up/Down history as the main window.
-// Index semantics are kept identical to the v0.5.x InputBacklog:
-//   index 0          = oldest entry
-//   index Count - 1  = newest entry
-// Push performs move-to-newest deduplication: existing entries are
-// removed before the new one is appended at the end.
+// Shared input history for all ChatInputBars (main and pop-out windows).
+// Push deduplicates: existing entries are moved to the end when re-added.
+// TEST-MIRROR: ../../Hellion Build test/Util/InputHistoryServiceTests.cs
 public static class InputHistoryService
 {
     private const int MaxSize = 30;
@@ -26,8 +21,7 @@ public static class InputHistoryService
 
         var trimmed = entry.Trim();
 
-        // Move-to-newest: existing entries are removed before the append
-        // so the same line typed twice does not occupy two history slots.
+        // Move-to-newest: remove existing entry before adding at the end
         for (var i = 0; i < _entries.Count; i++)
         {
             if (_entries[i] == trimmed)
@@ -48,4 +42,12 @@ public static class InputHistoryService
             return null;
         return _entries[cursor];
     }
+
+    // Plugin reload doesn't reset static state automatically. Plugin.DisposeAsync
+    // calls this so the next load starts with an empty history instead of
+    // inheriting the previous session's entries.
+    public static void Reset()
+    {
+        _entries.Clear();
+    }
 }

HellionChat/Integrations/HonorificService.cs

@@ -6,25 +6,17 @@ using Newtonsoft.Json;
 
 namespace HellionChat.Integrations;
 
-// We pull Newtonsoft.Json into this single file for IPC compatibility:
-// Honorific serialises its TitleData with Newtonsoft (see
-// Honorific-master/IpcProvider.cs:9 and CustomTitle.cs:12). Using the
-// same library guarantees identical handling of System.Numerics.Vector3?
-// and the enum fields we ignore. Newtonsoft is a transitive dependency
-// via Dalamud, so no new NuGet entry is needed. The rest of HellionChat
-// keeps using System.Text.Json.
+// Newtonsoft.Json is used here for IPC compatibility with Honorific, which
+// serialises TitleData with it. It's a transitive Dalamud dependency — no
+// new NuGet entry needed. The rest of HellionChat uses System.Text.Json.
 internal sealed class HonorificService : IDisposable
 {
     private const string IpcNamespace = "Honorific";
 
-    // Major version of the Honorific IPC contract HellionChat is built against.
-    // Used both by the runtime compatibility check and by the settings tab when
-    // it tells the user which major version we expected, so the literal lives
-    // in exactly one place.
+    // Major version of the Honorific IPC contract we're built against.
     internal const uint ExpectedApiMajor = 3;
 
-    // IPC gates we subscribe to. Keep them as fields so Dispose can
-    // unsubscribe the same instances we subscribed in the constructor.
+    // IPC gates — kept as fields so Dispose can unsubscribe the same instances.
     private readonly ICallGateSubscriber<(uint, uint)> _apiVersion;
     private readonly ICallGateSubscriber<string> _getLocalCharacterTitle;
     private readonly ICallGateSubscriber<string, object> _localCharacterTitleChanged;
@@ -35,42 +27,34 @@ internal sealed class HonorificService : IDisposable
     private readonly IFramework _framework;
     private bool _versionWarningLogged;
 
+    // Thread: framework only — IPC delivery + ImGui render both run there.
     public HonorificTitleData? CurrentTitle { get; private set; }
     public bool IsAvailable { get; private set; }
     public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
 
-    public HonorificService(IDalamudPluginInterface pluginInterface, IPluginLog log, IFramework framework)
+    public HonorificService(
+        IDalamudPluginInterface pluginInterface,
+        IPluginLog log,
+        IFramework framework
+    )
     {
         _framework = framework;
         _log = log;
 
-        // Dalamud caches gate objects per-name for the lifetime of the
-        // plugin interface, so we can register subscribers even when
-        // Honorific isn't loaded yet — the gate just won't fire. Calling
-        // InvokeFunc before Honorific is up will throw, which is why the
-        // initial pull below is wrapped in try-catch.
-        //
-        // Thread-context: plugin constructors run on Dalamud's plugin-loader
-        // thread, NOT the framework thread. Honorific's IPC handlers read
-        // ObjectTable.LocalPlayer (Honorific IpcProvider.cs:61), which throws
-        // "Not on main thread!" outside the framework thread. If Honorific is
-        // already loaded when HellionChat starts, a synchronous InvokeFunc
-        // here would surface that exception, the broad catch below would
-        // mark IsAvailable=false, and OnTitleChanged's `if (!IsAvailable)`
-        // gate would block every subsequent title update. We therefore
-        // schedule the initial pull onto the framework thread via
-        // IFramework.RunOnFrameworkThread so the IPC call sees the right
-        // thread context.
-        _apiVersion = pluginInterface
-            .GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
-        _getLocalCharacterTitle = pluginInterface
-            .GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle");
-        _localCharacterTitleChanged = pluginInterface
-            .GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged");
-        _ready = pluginInterface
-            .GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
-        _disposing = pluginInterface
-            .GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
+        // Gate objects are cached per-name by Dalamud and safe to register
+        // before Honorific loads — they just won't fire until it does.
+        // Initial pull is scheduled on the framework thread because plugin
+        // constructors run on the loader thread, and Honorific's IPC handlers
+        // read ObjectTable.LocalPlayer which throws off the framework thread.
+        _apiVersion = pluginInterface.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
+        _getLocalCharacterTitle = pluginInterface.GetIpcSubscriber<string>(
+            $"{IpcNamespace}.GetLocalCharacterTitle"
+        );
+        _localCharacterTitleChanged = pluginInterface.GetIpcSubscriber<string, object>(
+            $"{IpcNamespace}.LocalCharacterTitleChanged"
+        );
+        _ready = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
+        _disposing = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
 
         _localCharacterTitleChanged.Subscribe(OnTitleChanged);
         _ready.Subscribe(OnReady);
@@ -81,16 +65,14 @@ internal sealed class HonorificService : IDisposable
 
     public void Dispose()
     {
-        // Honorific may already be gone by the time we dispose. Wrap each
-        // unsubscribe so a missing gate doesn't prevent the others from
-        // unsubscribing — leaking even one subscription leaves a callback
-        // alive that captures `this`, which keeps the whole service alive
-        // and breaks plugin reload.
+        // Wrap each unsubscribe — a missing gate must not block the others.
+        // Leaking a subscription keeps this service alive across plugin reloads.
         TryUnsubscribe(() => _localCharacterTitleChanged.Unsubscribe(OnTitleChanged));
         TryUnsubscribe(() => _ready.Unsubscribe(OnReady));
         TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
     }
 
+    // Thread: framework (scheduled from ctor and OnReady).
     private void TryInitialPull()
     {
         try
@@ -103,9 +85,11 @@ internal sealed class HonorificService : IDisposable
                 if (!_versionWarningLogged)
                 {
                     _log.Warning(
-                        "Honorific API version mismatch — expected major 3, " +
-                        "found {Major}.{Minor}. Disabling Honorific integration.",
-                        version.Item1, version.Item2);
+                        "Honorific API version mismatch — expected major 3, "
+                            + "found {Major}.{Minor}. Disabling Honorific integration.",
+                        version.Item1,
+                        version.Item2
+                    );
                     _versionWarningLogged = true;
                 }
                 IsAvailable = false;
@@ -114,67 +98,47 @@ internal sealed class HonorificService : IDisposable
 
             IsAvailable = true;
             _versionWarningLogged = false;
-            // Pull the current title once at startup; from here on we rely
-            // on LocalCharacterTitleChanged events.
             var json = _getLocalCharacterTitle.InvokeFunc();
             CurrentTitle = ParseTitleJson(json);
         }
         catch (Exception ex)
         {
-            // Honorific isn't installed or hasn't initialised yet. The Ready
-            // event will give us a second chance later. Log at Debug so
-            // users without Honorific don't see noise on every reload.
+            // Honorific not installed or not yet initialised — Ready will retry.
             _log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
             IsAvailable = false;
             CurrentTitle = null;
         }
     }
 
-    // Honorific fires LocalCharacterTitleChanged through its nameplate hook
-    // (Honorific-master/Plugin.cs:665), which means we get title updates on
-    // character switches automatically as soon as the new character is
-    // rendered. While the user is in the character-select menu, HellionChat's
-    // window is hidden by default via HideWhenNotLoggedIn (Configuration.cs:152),
-    // so the stale-title window between logout and login isn't user-visible.
+    // Thread: framework (Dalamud IPC delivery contract).
     private void OnTitleChanged(string json)
     {
-        // Don't update cached state when we've already decided we can't trust
-        // Honorific (e.g. version mismatch). Subscription stays live in case a
-        // compatible Honorific reloads, in which case Ready triggers TryInitialPull
-        // and sets IsAvailable back to true.
-        if (!IsAvailable) return;
+        // Skip updates on version mismatch; subscription stays live for reload.
+        if (!IsAvailable)
+            return;
         CurrentTitle = ParseTitleJson(json);
     }
 
+    // Thread: any (Honorific dispatches NotifyReady from its own thread).
     private void OnReady()
     {
-        // Honorific loaded after HellionChat; redo the version check and
-        // initial pull. Idempotent on purpose — Honorific can fire Ready
-        // more than once across reloads.
-        //
-        // Honorific's NotifyReady may dispatch from any thread, and
-        // TryInitialPull eventually calls IPC handlers that read
-        // ObjectTable.LocalPlayer — same "Not on main thread!" hazard as
-        // the constructor path. Schedule onto the framework thread.
         _framework.RunOnFrameworkThread(TryInitialPull);
     }
 
+    // Thread: framework (IPC delivery contract); idempotent — Disposing fires once.
     private void OnDisposing()
     {
-        // Honorific is unloading. Drop our cached state so the header
-        // hides on the next frame; subscriptions stay registered because
-        // the gates may come back later (Honorific reload).
-        //
-        // Race-note: Honorific's NotifyDisposing calls ChangedLocalCharacterTitle(null)
-        // BEFORE SendMessage on the Disposing gate (IpcProvider.cs:109-111),
-        // so OnTitleChanged is expected to fire first and already null out
-        // CurrentTitle. We re-clear here as belt-and-braces; should the
-        // ordering ever flip, ShouldRenderSlot would still gate on IsAvailable.
+        // Honorific unloading — clear cached state so the header hides next frame.
+        // Subscriptions stay registered in case Honorific reloads.
+        // CurrentTitle is already nulled by OnTitleChanged before this fires,
+        // re-clearing here is belt-and-braces.
         CurrentTitle = null;
         IsAvailable = false;
         DetectedApiVersion = null;
     }
 
+    // Thread: framework (called from Dispose, which runs on the framework
+    // cleanup block in Plugin.DisposeAsync).
     private void TryUnsubscribe(Action unsubscribe)
     {
         try
@@ -183,33 +147,15 @@ internal sealed class HonorificService : IDisposable
         }
         catch (Exception ex)
         {
-            _log.Debug(ex, "Honorific unsubscribe failed (likely already gone).");
+            // Warning not Debug — a silent unsubscribe failure leaks a live
+            // subscription across plugin reloads.
+            _log.Warning(
+                ex,
+                "Honorific unsubscribe failed (likely API break or gate already gone)."
+            );
         }
     }
 
-    // Threading note: Dalamud fires IPC events on the framework thread and
-    // ImGui renders on the framework thread, so OnTitleChanged and the
-    // render path that reads CurrentTitle never race — OnTitleChanged is
-    // safe to keep direct (no RunOnFrameworkThread wrap needed) because
-    // LocalCharacterTitleChanged delivery is framework-thread by Dalamud
-    // contract. If a future change moves either side onto a worker thread,
-    // switch to volatile/Interlocked for the CurrentTitle field.
-    //
-    // The constructor's initial pull and OnReady, on the other hand, are
-    // explicitly scheduled via IFramework.RunOnFrameworkThread because
-    // they run outside that contract: the constructor executes on the
-    // plugin-loader thread, and Honorific's NotifyReady can dispatch from
-    // any thread. Both call paths eventually invoke IPC handlers that read
-    // ObjectTable.LocalPlayer, which throws "Not on main thread!" off the
-    // framework thread — see the constructor comment block for context.
-    //
-    // Divergence from ChatTwo/Ipc/ExtraChat.cs: that file uses `volatile`
-    // on its state fields out of caution. We don't, because the framework-
-    // thread delivery is the documented Dalamud contract. If the two files
-    // ever need to share a threading audit, this is the place to revisit.
-
-    // --- Pure-logic helpers below; tested via HellionChat.Tests/Integrations. ---
-
     internal static HonorificTitleData? ParseTitleJson(string json)
     {
         if (string.IsNullOrEmpty(json))
@@ -233,13 +179,19 @@ internal sealed class HonorificService : IDisposable
     internal static bool ShouldRenderSlot(
         bool toggleEnabled,
         bool isAvailable,
-        HonorificTitleData? title)
+        HonorificTitleData? title
+    )
     {
-        if (!toggleEnabled) return false;
-        if (!isAvailable) return false;
-        if (title is null) return false;
-        if (title.IsOriginal) return false;
-        if (string.IsNullOrEmpty(title.Title)) return false;
+        if (!toggleEnabled)
+            return false;
+        if (!isAvailable)
+            return false;
+        if (title is null)
+            return false;
+        if (title.IsOriginal)
+            return false;
+        if (string.IsNullOrEmpty(title.Title))
+            return false;
         return true;
     }
 }

HellionChat/Integrations/HonorificTitleData.cs

@@ -2,16 +2,21 @@ using System.Numerics;
 
 namespace HellionChat.Integrations;
 
-// Local DTO mirroring Honorific's TitleData shape. We replicate the structure
-// instead of referencing Honorific.dll because a hard build-time dependency
-// would couple the two assemblies and break HellionChat at load time when
-// Honorific is missing. Glow, Color3, GradientColourSet and GradientAnimationStyle
-// are intentionally omitted — Cycle 1 renders text in the primary Color only;
-// the "Honorific Full Fidelity" backlog item adds them later as a pure
-// extension that won't break this DTO's existing consumers.
+// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
+// so HellionChat loads cleanly when Honorific is absent.
+//
+// v1.4.7: render Glow only. Gradient (Color3 / GradientColourSet / Style) is
+// parsed and stashed so a future cycle can render it without re-shaping the
+// JSON roundtrip — see vault anchor "Honorific Full Gradient Port" (would
+// need GradientSystem.cs + the hardcoded Pride-palette list ported, or an
+// upstream IPC PR exposing the resolved frame colour).
 internal sealed record HonorificTitleData(
     string? Title,
     bool IsPrefix,
     bool IsOriginal,
-    Vector3? Color
+    Vector3? Color,
+    Vector3? Glow,
+    Vector3? Color3,
+    int? GradientColourSet,
+    string? GradientAnimationStyle
 );

HellionChat/Integrations/IntegrationLinks.cs

@@ -1,12 +1,20 @@
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Integrations;
 
-// External URLs for the third-party plugins HellionChat integrates with.
-// Kept separate from BrandingLinks (which is for Hellion-owned URLs) so
-// future cycles can extend this file with maintainer attribution links
-// for Moodles, NotificationMaster, ExtraChat, etc. without polluting the
-// brand-links class.
+// Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
 internal static class IntegrationLinks
 {
     public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
     public const string HonorificAuthor = "https://github.com/Caraxi";
+
+    // See BrandingLinks.ValidateUrls for the CA2255 rationale.
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    internal static void ValidateUrls()
+    {
+        UrlValidation.ValidateAll(nameof(IntegrationLinks), HonorificRepo, HonorificAuthor);
+    }
 }

HellionChat/Ipc/ExtraChat.cs

@@ -15,30 +15,45 @@ public sealed class ExtraChat : IDisposable
 #pragma warning restore CS0649
 
     private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; }
-    private ICallGateSubscriber<Dictionary<string, uint>, Dictionary<string, uint>> ChannelCommandColoursGate { get; }
-    private ICallGateSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>> ChannelNamesGate { get; }
+    private ICallGateSubscriber<
+        Dictionary<string, uint>,
+        Dictionary<string, uint>
+    > ChannelCommandColoursGate { get; }
+    private ICallGateSubscriber<
+        Dictionary<Guid, string>,
+        Dictionary<Guid, string>
+    > ChannelNamesGate { get; }
 
     internal (string, uint)? ChannelOverride { get; set; }
 
-    // Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a
-    // Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections.
-    // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
-    // the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
+    // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
+    // Reference assignment is atomic on x64, but the barrier ensures visibility
+    // across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
     private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
-    internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal;
+    internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
+        ChannelCommandColoursInternal;
 
     private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
     internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;
 
     internal ExtraChat()
     {
-        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>("ExtraChat.OverrideChannelColour");
-        ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<Dictionary<string, uint>, Dictionary<string, uint>>("ExtraChat.ChannelCommandColours");
-        ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>>("ExtraChat.ChannelNames");
+        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
+            "ExtraChat.OverrideChannelColour"
+        );
+        ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<
+            Dictionary<string, uint>,
+            Dictionary<string, uint>
+        >("ExtraChat.ChannelCommandColours");
+        ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<
+            Dictionary<Guid, string>,
+            Dictionary<Guid, string>
+        >("ExtraChat.ChannelNames");
 
         OverrideChannelGate.Subscribe(OnOverrideChannel);
         ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
         ChannelNamesGate.Subscribe(OnChannelNames);
+
         try
         {
             ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
@@ -46,8 +61,11 @@ public sealed class ExtraChat : IDisposable
         }
         catch (Exception ex)
         {
-            // ExtraChat is optional; missing IPC peer is normal when the plugin isn't loaded.
-            Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
+            // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
+            Plugin.LogProxy.Verbose(
+                ex,
+                "ExtraChat IPC initial state query failed (peer not loaded?)"
+            );
         }
     }
 
@@ -60,22 +78,11 @@ public sealed class ExtraChat : IDisposable
 
     private void OnOverrideChannel(OverrideInfo info)
     {
-        if (info.Channel == null)
-        {
-            ChannelOverride = null;
-            return;
-        }
-
-        ChannelOverride = (info.Channel, info.Rgba);
+        ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
     }
 
-    private void OnChannelCommandColours(Dictionary<string, uint> obj)
-    {
+    private void OnChannelCommandColours(Dictionary<string, uint> obj) =>
         ChannelCommandColoursInternal = obj;
-    }
 
-    private void OnChannelNames(Dictionary<Guid, string> obj)
-    {
-        ChannelNamesInternal = obj;
-    }
+    private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
 }

HellionChat/Ipc/TypingIpc.cs

@@ -1,9 +1,16 @@
-using HellionChat.Code;
 using Dalamud.Plugin.Ipc;
+using HellionChat.Code;
 
 namespace HellionChat.Ipc;
 
-using ChatInputState = (bool InputVisible, bool InputFocused, bool HasText, bool IsTyping, int TextLength, ChatType ChannelType);
+using ChatInputState = (
+    bool InputVisible,
+    bool InputFocused,
+    bool HasText,
+    bool IsTyping,
+    int TextLength,
+    ChatType ChannelType
+);
 
 internal sealed class TypingIpc : IDisposable
 {
@@ -19,8 +26,12 @@ internal sealed class TypingIpc : IDisposable
     {
         Plugin = plugin;
 
-        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>("HellionChat.GetChatInputState");
-        StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>("HellionChat.ChatInputStateChanged");
+        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
+            "HellionChat.GetChatInputState"
+        );
+        StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
+            "HellionChat.ChatInputStateChanged"
+        );
 
         StateQueryGate.RegisterFunc(GetState);
     }
@@ -30,19 +41,22 @@ internal sealed class TypingIpc : IDisposable
         var log = Plugin.ChatLogWindow;
 
         var usedChannel = Plugin.CurrentTab.CurrentChannel;
-        var inputChannel = usedChannel.UseTempChannel ? usedChannel.TempChannel : usedChannel.Channel;
+        var inputChannel = usedChannel.UseTempChannel
+            ? usedChannel.TempChannel
+            : usedChannel.Channel;
         var channelType = inputChannel.ToChatType();
 
-        return (InputVisible: !log.IsHidden,
+        return (
+            InputVisible: !log.IsHidden,
             log.InputFocused,
             HasText: log.Chat.Length > 0,
             IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
             TextLength: log.Chat.Length,
-            ChannelType: channelType);
+            ChannelType: channelType
+        );
     }
 
-    private ChatInputState GetState()
-        => BuildState();
+    private ChatInputState GetState() => BuildState();
 
     internal void Update()
     {

HellionChat/IpcManager.cs

@@ -9,7 +9,15 @@ internal sealed class IpcManager : IDisposable
     private ICallGateProvider<string> RegisterGate { get; }
     private ICallGateProvider<string, object?> UnregisterGate { get; }
     private ICallGateProvider<object?> AvailableGate { get; }
-    private ICallGateProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?> InvokeGate { get; }
+    private ICallGateProvider<
+        string,
+        PlayerPayload?,
+        ulong,
+        Payload?,
+        SeString?,
+        SeString?,
+        object?
+    > InvokeGate { get; }
 
     internal List<string> Registered { get; } = [];
 
@@ -23,12 +31,27 @@ internal sealed class IpcManager : IDisposable
         UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister");
         UnregisterGate.RegisterAction(Unregister);
 
-        InvokeGate = Plugin.Interface.GetIpcProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?>("HellionChat.Invoke");
+        InvokeGate = Plugin.Interface.GetIpcProvider<
+            string,
+            PlayerPayload?,
+            ulong,
+            Payload?,
+            SeString?,
+            SeString?,
+            object?
+        >("HellionChat.Invoke");
 
         AvailableGate.SendMessage();
     }
 
-    internal void Invoke(string id, PlayerPayload? sender, ulong contentId, Payload? payload, SeString? senderString, SeString? content)
+    internal void Invoke(
+        string id,
+        PlayerPayload? sender,
+        ulong contentId,
+        Payload? payload,
+        SeString? senderString,
+        SeString? content
+    )
     {
         InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
     }

HellionChat/Message.cs

@@ -1,12 +1,12 @@
 using System.Text;
-using HellionChat.Code;
-using HellionChat.Util;
-using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
 using System.Text.RegularExpressions;
 using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
+using HellionChat.Code;
+using HellionChat.Util;
 
 namespace HellionChat;
 
@@ -33,7 +33,16 @@ public partial class Message
     public Dictionary<Guid, float?> Height { get; } = new();
     public Dictionary<Guid, bool> IsVisible { get; } = new();
 
-    public Message(ulong receiver, ulong contentId, ulong accountId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource)
+    public Message(
+        ulong receiver,
+        ulong contentId,
+        ulong accountId,
+        ChatCode code,
+        List<Chunk> sender,
+        List<Chunk> content,
+        SeString senderSource,
+        SeString contentSource
+    )
     {
         var extraChatChannel = ExtractExtraChatChannel(contentSource);
         Receiver = receiver;
@@ -56,7 +65,18 @@ public partial class Message
             chunk.Message = this;
     }
 
-    public Message(Guid id, ulong receiver, ulong contentId, DateTimeOffset date, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource, Guid extraChatChannel)
+    public Message(
+        Guid id,
+        ulong receiver,
+        ulong contentId,
+        DateTimeOffset date,
+        ChatCode code,
+        List<Chunk> sender,
+        List<Chunk> content,
+        SeString senderSource,
+        SeString contentSource,
+        Guid extraChatChannel
+    )
     {
         Id = id;
         Receiver = receiver;
@@ -82,7 +102,11 @@ public partial class Message
         return new Message(0, 0, 0, code, [], content, new SeString(), new SeString());
     }
 
-    public bool Matches(Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels, bool allExtraChatChannels, HashSet<Guid> extraChatChannels)
+    public bool Matches(
+        Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels,
+        bool allExtraChatChannels,
+        HashSet<Guid> extraChatChannels
+    )
     {
         if (ExtraChatChannel != Guid.Empty)
             return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel);
@@ -90,16 +114,21 @@ public partial class Message
         var source = (ChatSource)(1 << (int)Code.Source);
         var target = (ChatSource)(1 << (int)Code.Target);
         return Code.Type.IsGm()
-               || channels.TryGetValue(Code.Type, out var sources)
-               && (Code.Source is 0 || sources.Source.HasFlag(source) || sources.Target.HasFlag(target));
+            || channels.TryGetValue(Code.Type, out var sources)
+                && (
+                    Code.Source is 0
+                    || sources.Source.HasFlag(source)
+                    || sources.Target.HasFlag(target)
+                );
     }
 
     private int GenerateHash()
     {
-        var hash = SortCodeV2.GetHashCode()
-                   ^ ExtraChatChannel.GetHashCode()
-                   ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
-                   ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
+        var hash =
+            SortCodeV2.GetHashCode()
+            ^ ExtraChatChannel.GetHashCode()
+            ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
+            ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
 
         if (Plugin.Config.CollapseKeepUniqueLinks)
         {
@@ -124,8 +153,8 @@ public partial class Message
             }
             catch (ArgumentException ex)
             {
-                Plugin.Log.Error(ex, "Failed to parse extra chat channel GUID");
-                Plugin.Log.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
+                Plugin.LogProxy.Error(ex, "Failed to parse extra chat channel GUID");
+                Plugin.LogProxy.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
                 return Guid.Empty;
             }
         }
@@ -146,13 +175,15 @@ public partial class Message
         }
 
         var nextIsAutoTranslate = false;
-        var checkForEmotes = (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
+        var checkForEmotes =
+            (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
         foreach (var chunk in oldChunks)
         {
             // Use as is if it's not a text chunk, it already has a payload, or is auto translate
             if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate)
             {
-                nextIsAutoTranslate = chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };
+                nextIsAutoTranslate =
+                    chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };
 
                 // No need to call AddChunkWithMessage here since the chunk
                 // already has the Message field set.
@@ -173,15 +204,23 @@ public partial class Message
                 var word = wordBuilder.ToString();
                 wordBuilder.Clear();
 
-
                 var wordUsed = false;
                 var tokenUsed = false;
 
-                if (checkForEmotes && EmoteCache.Exists(word) && !Plugin.Config.BlockedEmotes.Contains(word))
+                if (
+                    checkForEmotes
+                    && EmoteCache.Exists(word)
+                    && !Plugin.Config.BlockedEmotes.Contains(word)
+                )
                 {
                     // Add the previous sentence before adding the emote
                     AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString()));
-                    AddChunkWithMessage(new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word) { FallbackColour = text.FallbackColour });
+                    AddChunkWithMessage(
+                        new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word)
+                        {
+                            FallbackColour = text.FallbackColour,
+                        }
+                    );
 
                     wordUsed = true;
                     sentenceBuilder.Clear();
@@ -190,15 +229,31 @@ public partial class Message
                 if (token.TokenType == Tokenizer.TokenType.UrlString)
                 {
                     // Add the previous sentence before adding the url
-                    AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, sentenceBuilder.Append(!wordUsed ? word : "").ToString()));
+                    AddChunkWithMessage(
+                        text.NewWithStyle(
+                            chunk.Source,
+                            chunk.Link,
+                            sentenceBuilder.Append(!wordUsed ? word : "").ToString()
+                        )
+                    );
                     try
                     {
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, UriPayload.ResolveUri(token.Value), token.Value));
+                        AddChunkWithMessage(
+                            text.NewWithStyle(
+                                chunk.Source,
+                                UriPayload.ResolveUri(token.Value),
+                                token.Value
+                            )
+                        );
                     }
                     catch (UriFormatException)
                     {
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, token.Value));
-                        Plugin.Log.Debug($"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'");
+                        AddChunkWithMessage(
+                            text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
+                        );
+                        Plugin.LogProxy.Debug(
+                            $"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
+                        );
                     }
 
                     wordUsed = true;
@@ -215,7 +270,12 @@ public partial class Message
                 }
 
                 // End of string reached, we add our leftover
-                AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.Append(!wordUsed ? word : "").ToString()));
+                AddChunkWithMessage(
+                    text.NewWithStyle(
+                        chunk,
+                        sentenceBuilder.Append(!wordUsed ? word : "").ToString()
+                    )
+                );
             }
         }
 
@@ -281,20 +341,30 @@ public partial class Message
                             < 500_000 => ItemKind.Normal,
                             < 1_000_000 => ItemKind.Collectible,
                             < 2_000_000 => ItemKind.Hq,
-                            _ => ItemKind.EventItem
+                            _ => ItemKind.EventItem,
                         };
 
-                        var name = kind != ItemKind.EventItem
-                            ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
-                            : Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();
+                        var name =
+                            kind != ItemKind.EventItem
+                                ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
+                                : Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();
 
-                        var link = new ItemPayload(item.ItemId, kind, $"{SeIconChar.LinkMarker.ToIconChar()}{name}");
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown"));
+                        var link = new ItemPayload(
+                            item.ItemId,
+                            kind,
+                            $"{SeIconChar.LinkMarker.ToIconChar()}{name}"
+                        );
+                        AddChunkWithMessage(
+                            text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")
+                        );
                     }
                     else if (split == "<status>")
                     {
                         var statusId = AgentChatLog.Instance()->ContextStatusId;
-                        if (statusId == 0 || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow))
+                        if (
+                            statusId == 0
+                            || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)
+                        )
                         {
                             AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
                             continue;
@@ -305,7 +375,7 @@ public partial class Message
                         {
                             1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}",
                             2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}",
-                            _ => nameValue
+                            _ => nameValue,
                         };
 
                         var link = new StatusPayload(statusId);
@@ -321,18 +391,32 @@ public partial class Message
                         }
 
                         var mapCoords = agentMap->FlagMapMarkers[0];
-                        var rawX = (int)(MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000);
-                        var rawY = (int)(MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000);
+                        var rawX = (int)(
+                            MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000
+                        );
+                        var rawY = (int)(
+                            MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000
+                        );
 
-                        var link = new MapLinkPayload(mapCoords.TerritoryId, mapCoords.MapId, rawX, rawY);
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"));
+                        var link = new MapLinkPayload(
+                            mapCoords.TerritoryId,
+                            mapCoords.MapId,
+                            rawX,
+                            rawY
+                        );
+                        AddChunkWithMessage(
+                            text.NewWithStyle(
+                                chunk.Source,
+                                link,
+                                $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"
+                            )
+                        );
                     }
-
                 }
                 catch (Exception)
                 {
                     AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
-                    Plugin.Log.Debug($"Failed to parse the text param: '{split}'");
+                    Plugin.LogProxy.Debug($"Failed to parse the text param: '{split}'");
                 }
             }
         }

HellionChat/MessageManager.cs

@@ -1,9 +1,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Text;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Util;
 using Dalamud.Game.Chat;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
@@ -11,6 +8,9 @@ using Dalamud.Hooking;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using HellionChat.Code;
+using HellionChat.Resources;
+using HellionChat.Util;
 using Lumina.Text.Expressions;
 using Lumina.Text.Payloads;
 using Lumina.Text.ReadOnly;
@@ -27,16 +27,7 @@ internal class MessageManager : IAsyncDisposable
     private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
     private ulong LastContentId { get; set; }
 
-    // Messages go into the PendingSync queue first, which will be consumed one
-    // at a time in the main thread. This is to delay the async processing until
-    // after we've received the content ID from the ContentIdResolver hook.
-    //
-    // After that, the message is enqueued in the PendingAsync queue, which will
-    // be consumed in a separate thread and perform more processing (emotes,
-    // URLs) as well as inserting the message into the database.
-    // LinkedList instead of Queue: ContentIdResolver hits PendingSync.Last
-    // every hook call. Queue<T>.Last() is the LINQ extension and walks the
-    // whole queue (O(n)); LinkedList<T>.Last is an O(1) node reference.
+    // PendingSync (main thread) → PendingAsync (worker thread); LinkedList for O(1) Last access
     private LinkedList<PendingMessage> PendingSync { get; } = [];
     private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
     private readonly Thread PendingMessageThread;
@@ -53,28 +44,29 @@ internal class MessageManager : IAsyncDisposable
         }
     }
 
-    // Hellion Chat — Auto-Tell-Tabs hook. Fires after a fully processed
-    // message has been routed to all matching persistent tabs and stored
-    // in the database. The AutoTellTabsService subscribes to spawn or
-    // refresh temp tabs without having to wedge itself into ProcessMessage
-    // directly.
+    // Auto-Tell-Tabs hook: fires after a message is processed and stored, allowing
+    // AutoTellTabsService to spawn or refresh temp tabs without coupling.
     public event Action<Message>? MessageProcessed;
 
     internal unsafe MessageManager(Plugin plugin)
     {
         Plugin = plugin;
 
-        Store = new MessageStore(DatabasePath());
+        Store = new MessageStore(DatabasePath(), Plugin.PlatformUtil, Plugin.LogProxy);
 
-        // IsBackground so a stuck worker never blocks plugin unload.
-        // Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
-        PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token))
+        PendingMessageThread = new Thread(() =>
+            ProcessPendingMessages(PendingThreadCancellationToken.Token)
+        )
         {
             IsBackground = true,
         };
         PendingMessageThread.Start();
 
-        ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver);
+        ContentIdResolverHook =
+            Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(
+                RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry,
+                ContentIdResolver
+            );
         ContentIdResolverHook.Enable();
 
         Plugin.ChatGui.ChatMessageUnhandled += ChatMessage;
@@ -99,13 +91,11 @@ internal class MessageManager : IAsyncDisposable
             await Task.Delay(100);
 
         if (PendingMessageThread.IsAlive)
-            Plugin.Log.Warning(
-                "PendingMessageThread did not observe cancellation within 10s. " +
-                "Worker remains on a background thread; next plugin reload releases it. " +
-                "If this recurs, file a bug with /xllog after the previous reload.");
+            Plugin.LogProxy.Warning(
+                "PendingMessageThread did not observe cancellation within 10s. "
+                    + "Worker remains on background thread; next plugin reload releases it."
+            );
 
-        // CTS owns an unmanaged WaitHandle; dispose even if the worker is
-        // alive — it checks IsCancellationRequested via the linked token.
         PendingThreadCancellationToken.Dispose();
 
         Store.Dispose();
@@ -147,7 +137,7 @@ internal class MessageManager : IAsyncDisposable
                 }
                 catch (Exception ex)
                 {
-                    Plugin.Log.Error(ex, "Error processing pending message");
+                    Plugin.LogProxy.Error(ex, "Error processing pending message");
                 }
             }
             else
@@ -159,12 +149,7 @@ internal class MessageManager : IAsyncDisposable
 
     internal void ClearAllTabs()
     {
-        // Hellion Chat — TempTabs haben keine DB-Persistenz (session-only,
-        // direkt vom AutoTellTabsService befüllt). Ein Clear+Refilter würde
-        // sie leer hinterlassen weil FilterAllTabs nichts aus der DB
-        // findet — Tells sind oft durch Privacy-Filter blockiert oder
-        // schlicht session-flüchtig. TempTabs vom Clear-Pfad ausschließen
-        // damit Settings-Save den Tell-Verlauf nicht zerstört.
+        // TempTabs are session-only (not persisted); exclude them to preserve Tell history
         foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
             tab.Clear();
     }
@@ -177,32 +162,32 @@ internal class MessageManager : IAsyncDisposable
 
         using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
 
-        // We store the pending messages to be added to the chat log in a
-        // temporary list, and apply them all at once after filtering.
-        // TempTabs werden ausgeschlossen — sie bleiben live-state aus dem
-        // AutoTellTabsService, ein DB-Refilter würde sie nur partial
-        // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
-        // Privacy-Filter sie blockiert hat.
-        var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList();
+        // TempTabs are excluded; they maintain live state from AutoTellTabsService
+        var pendingTabs = Plugin
+            .Config.Tabs.Where(t => !t.IsTempTab)
+            .Select(tab => (tab, new List<Message>()))
+            .ToList();
         foreach (var message in messages)
-            foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
-                pendingMessages.Add(message);
+        foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
+            pendingMessages.Add(message);
 
-        // Apply the messages to the chat log in one go.
+        // Apply messages to chat log all at once.
         foreach (var (tab, pendingMessages) in pendingTabs)
             tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);
 
-        if (!messages.DidError) return;
+        if (!messages.DidError)
+            return;
 
         WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error);
 
-        // Mark the failed messages as deleted so we don't try to load them
-        // again.
+        // Mark failed messages as deleted to prevent retry attempts
         var failedIds = messages.FailedMessageIds();
-        Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
+        Plugin.LogProxy.Info(
+            $"Marking {failedIds.Count} messages as deleted due to parse failures"
+        );
         foreach (var msgId in messages.FailedMessageIds())
         {
-            Plugin.Log.Debug($"Marking message '{msgId}' as deleted due to parse failure");
+            Plugin.LogProxy.Debug($"Marking message '{msgId}' as deleted due to parse failure");
             Store.DeleteMessage(msgId);
         }
     }
@@ -218,14 +203,15 @@ internal class MessageManager : IAsyncDisposable
             }
             catch (Exception ex)
             {
-                Plugin.Log.Error(ex, "Error in FilterAllTabs");
+                Plugin.LogProxy.Error(ex, "Error in FilterAllTabs");
             }
 
-            Plugin.Log.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
+            Plugin.LogProxy.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
         });
     }
 
     public (SeString? Sender, SeString? Message) LastMessage = (null, null);
+
     private void ChatMessage(IChatMessage message)
     {
         LastMessage = (message.Sender, message.Message);
@@ -244,21 +230,29 @@ internal class MessageManager : IAsyncDisposable
         // Update colour codes.
         GlobalParametersCache.Refresh();
 
-        // We delay messages to be handed off to the async processing thread
-        // in the next tick, otherwise we can't get the content ID from the hook
-        // below.
+        // Delay to next tick to get content ID from ContentIdResolver hook
         PendingSync.AddLast(pendingMessage);
     }
 
-    // This hook is called immediately after receiving a message with the
-    // message's content ID. If multiple messages are received in the same tick,
-    // this will be called for each message immediately after ChatMessage is
-    // called for each message.
-    private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType)
+    private unsafe void ContentIdResolver(
+        RaptureLogModule* agent,
+        ulong contentId,
+        ulong accountId,
+        int messageIndex,
+        ushort worldId,
+        ushort chatType
+    )
     {
         try
         {
-            ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType);
+            ContentIdResolverHook?.Original(
+                agent,
+                contentId,
+                accountId,
+                messageIndex,
+                worldId,
+                chatType
+            );
             if (PendingSync.Last is not { } last)
                 return;
 
@@ -267,13 +261,17 @@ internal class MessageManager : IAsyncDisposable
         }
         catch (Exception ex)
         {
-            Plugin.Log.Error(ex, "Error in ContentIdResolver");
+            Plugin.LogProxy.Error(ex, "Error in ContentIdResolver");
         }
     }
 
     private void ProcessMessage(PendingMessage pendingMessage)
     {
-        var chatCode = new ChatCode(pendingMessage.LogKind, pendingMessage.SourceKind, pendingMessage.TargetKind);
+        var chatCode = new ChatCode(
+            pendingMessage.LogKind,
+            pendingMessage.SourceKind,
+            pendingMessage.TargetKind
+        );
 
         NameFormatting? formatting = null;
         if (pendingMessage.Sender.Payloads.Count > 0)
@@ -282,13 +280,36 @@ internal class MessageManager : IAsyncDisposable
         var senderChunks = new List<Chunk>();
         if (formatting is { IsPresent: true })
         {
-            senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.Before) { FallbackColour = chatCode.Type });
-            senderChunks.AddRange(ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type));
-            senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.After) { FallbackColour = chatCode.Type });
+            senderChunks.Add(
+                new TextChunk(ChunkSource.None, null, formatting.Before)
+                {
+                    FallbackColour = chatCode.Type,
+                }
+            );
+            senderChunks.AddRange(
+                ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)
+            );
+            senderChunks.Add(
+                new TextChunk(ChunkSource.None, null, formatting.After)
+                {
+                    FallbackColour = chatCode.Type,
+                }
+            );
         }
 
-        var contentChunks = ChunkUtil.ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type).ToList();
-        var message = new Message(CurrentContentId, pendingMessage.ContentId, pendingMessage.AccountId, chatCode, senderChunks, contentChunks, pendingMessage.Sender, pendingMessage.Content);
+        var contentChunks = ChunkUtil
+            .ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type)
+            .ToList();
+        var message = new Message(
+            CurrentContentId,
+            pendingMessage.ContentId,
+            pendingMessage.AccountId,
+            chatCode,
+            senderChunks,
+            contentChunks,
+            pendingMessage.Sender,
+            pendingMessage.Content
+        );
 
         if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
             Store.UpsertMessage(message);
@@ -296,7 +317,9 @@ internal class MessageManager : IAsyncDisposable
         var currentMatches = Plugin.CurrentTab.Matches(message);
         foreach (var tab in Plugin.Config.Tabs)
         {
-            var unread = !(tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches);
+            var unread = !(
+                tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
+            );
 
             if (tab.Matches(message))
                 tab.AddMessage(message, unread);
@@ -313,16 +336,12 @@ internal class MessageManager : IAsyncDisposable
 
         internal static NameFormatting Empty()
         {
-            return new NameFormatting { IsPresent = false, };
+            return new NameFormatting { IsPresent = false };
         }
 
         internal static NameFormatting Of(string before, string after)
         {
-            return new NameFormatting
-            {
-                Before = before,
-                After = after,
-            };
+            return new NameFormatting { Before = before, After = after };
         }
     }
 
@@ -357,7 +376,7 @@ internal class MessageManager : IAsyncDisposable
         var after = formats
             .GetRange(firstStringParam + 1, secondStringParam - firstStringParam)
             .Where(payload => payload.Type == ReadOnlySePayloadType.Text)
-            .Select(text => Encoding.UTF8.GetString(text.Body.Span)); // Can't use `ToString()` as it defaults to macro
+            .Select(text => Encoding.UTF8.GetString(text.Body.Span));
 
         var nameFormatting = NameFormatting.Of(string.Join("", before), string.Join("", after));
         Formats[type] = nameFormatting;

HellionChat/MessageStore.cs

@@ -1,16 +1,14 @@
 using System.Buffers;
 using System.Collections;
 using System.Data.Common;
+using Dalamud.Game.Text.SeStringHandling;
 using HellionChat.Code;
 using HellionChat.Ui;
 using HellionChat.Util;
-using Dalamud.Game.Text.SeStringHandling;
 using MessagePack;
 using MessagePack.Formatters;
 using MessagePack.Resolvers;
 using Microsoft.Data.Sqlite;
-
-using DalamudUtil = Dalamud.Utility.Util;
 using Encoding = System.Text.Encoding;
 
 namespace HellionChat;
@@ -36,7 +34,11 @@ internal enum PayloadMessagePackType : byte
 
 public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
 {
-    public void Serialize(ref MessagePackWriter writer, Payload? value, MessagePackSerializerOptions options)
+    public void Serialize(
+        ref MessagePackWriter writer,
+        Payload? value,
+        MessagePackSerializerOptions options
+    )
     {
         if (value == null)
         {
@@ -100,14 +102,22 @@ public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
 
 public class SeStringMessagePackFormatter : IMessagePackFormatter<SeString?>
 {
-    public void Serialize(ref MessagePackWriter writer, SeString? value, MessagePackSerializerOptions options)
+    public void Serialize(
+        ref MessagePackWriter writer,
+        SeString? value,
+        MessagePackSerializerOptions options
+    )
     {
-        options.Resolver.GetFormatter<List<Payload>>()!.Serialize(ref writer, value?.Payloads ?? [], options);
+        options
+            .Resolver.GetFormatter<List<Payload>>()!
+            .Serialize(ref writer, value?.Payloads ?? [], options);
     }
 
     public SeString Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
     {
-        return new SeString(options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options));
+        return new SeString(
+            options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options)
+        );
     }
 }
 
@@ -116,25 +126,32 @@ internal class MessageStore : IDisposable
     private const int MessageQueryLimit = 10_000;
 
     private string DbPath { get; }
-
     private SqliteConnection Connection { get; set; }
 
-    internal static readonly MessagePackSerializerOptions MsgPackOptions = MessagePackSerializerOptions.Standard
-        .WithResolver(CompositeResolver.Create([new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()], [StandardResolver.Instance]));
+    internal static readonly MessagePackSerializerOptions MsgPackOptions =
+        MessagePackSerializerOptions.Standard.WithResolver(
+            CompositeResolver.Create(
+                [new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()],
+                [StandardResolver.Instance]
+            )
+        );
 
-    internal MessageStore(string dbPath)
+    private readonly IPlatformUtil _platformUtil;
+    private readonly IPluginLogProxy _logger;
+
+    internal MessageStore(string dbPath, IPlatformUtil platformUtil, IPluginLogProxy logger)
     {
         DbPath = dbPath;
+        _platformUtil = platformUtil;
+        _logger = logger;
         Connection = Connect();
         Migrate();
     }
 
     public void Dispose()
     {
-        // Pooling=false (set in Connect) avoids ClearAllPools, which is
-        // provider-wide and would touch other plugins' SQLite connections.
-        // GC.Collect was here as a defensive flush; removed because explicit
-        // Close already releases everything we hold.
+        // Pooling=false avoids ClearAllPools which is provider-wide and
+        // would touch other plugins' SQLite connections.
         Connection.Close();
         Connection.Dispose();
     }
@@ -153,14 +170,13 @@ internal class MessageStore : IDisposable
         conn.Open();
         conn.Execute(@"PRAGMA journal_mode=WAL;");
         conn.Execute(@"PRAGMA synchronous=NORMAL;");
-        if (DalamudUtil.IsWine())
+        if (_platformUtil.IsWine)
             conn.Execute(@"PRAGMA cache_size = 32768;");
         return conn;
     }
 
     private void Migrate()
     {
-        // Get current user_version.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = "PRAGMA user_version;";
         var userVersion = Convert.ToInt32(cmd.ExecuteScalar());
@@ -170,9 +186,7 @@ internal class MessageStore : IDisposable
         {
             case <= 0:
                 migrationsToDo.Add(Migrate0);
-
-                // Migration support was only added in version 1. Migrate 0 is
-                // idempotent.
+                // Migration support was only added in version 1. Migrate0 is idempotent.
                 migrationsToDo.Add(Migrate1);
                 migrationsToDo.Add(Migrate2);
                 migrationsToDo.Add(Migrate3);
@@ -192,8 +206,9 @@ internal class MessageStore : IDisposable
 
     private void Migrate0()
     {
-        Plugin.Log.Information("Running migration 0: Creating tables");
-        Connection.Execute(@"
+        _logger.Information("Running migration 0: Creating tables");
+        Connection.Execute(
+            @"
             CREATE TABLE IF NOT EXISTS messages (
                 Id BLOB PRIMARY KEY NOT NULL,  -- Guid
                 Receiver INTEGER NOT NULL,     -- uint64 (first bits are always 0)
@@ -210,39 +225,41 @@ internal class MessageStore : IDisposable
 
             CREATE INDEX IF NOT EXISTS idx_messages_receiver ON messages (Receiver);
             CREATE INDEX IF NOT EXISTS idx_messages_date ON messages (Date);
-        ");
+        "
+        );
 
         SetMigrationVersion(0);
     }
 
     private void Migrate1()
     {
-        Plugin.Log.Information("Running migration 1: Adding Deleted column");
-        Connection.Execute(@"
-            -- Migration 1: Add Deleted column
+        _logger.Information("Running migration 1: Adding Deleted column");
+        Connection.Execute(
+            @"
             ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
-        ");
+        "
+        );
 
         SetMigrationVersion(1);
     }
 
     private void Migrate2()
     {
-        Plugin.Log.Information("Running migration 2: Adding Channel generated column");
-        Connection.Execute(@"
-            -- Migration 2: Add Channel generated column
+        _logger.Information("Running migration 2: Adding Channel generated column");
+        Connection.Execute(
+            @"
             ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL;
             CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages (Channel);
-        ");
+        "
+        );
 
         SetMigrationVersion(2);
     }
 
     private bool ColumnExists(string table, string column)
     {
-        // PRAGMA does not accept SQLite parameter bindings. The table name is
-        // a compile-time constant fed in from internal call sites, so the
-        // interpolation cannot be reached from any user-controlled path.
+        // PRAGMA does not accept SQLite parameter bindings. Table name is a
+        // compile-time constant from internal call sites only.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = $"PRAGMA table_info({table});";
         using var reader = cmd.ExecuteReader();
@@ -256,28 +273,19 @@ internal class MessageStore : IDisposable
 
     private void Migrate3()
     {
-        Plugin.Log.Information("Running migration 3: Fix log kinds to fit the new format");
+        _logger.Information("Running migration 3: Fix log kinds to fit the new format");
 
-        // Recovery for partially-applied Migrate3: if the schema is already
-        // in its target shape (new columns exist, old Code column gone) but
-        // user_version was never bumped, just record the version and exit.
+        // Recovery for partially-applied Migrate3: schema already in target
+        // shape but user_version was never bumped -- just record and exit.
         if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
         {
-            Plugin.Log.Information("Migration 3: schema already migrated, only bumping user_version");
+            _logger.Information("Migration 3: schema already migrated, only bumping user_version");
             SetMigrationVersion(3);
             return;
         }
 
-        Connection.Execute(@"
-            -- Migration 3: Fix log kinds to fit the new format
-            -- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2
-            -- Migrate OldChatColumn
-                -- ChatType = OldChatColumn & 0x7f
-                -- SourceKind = log2(1 << ((OldChatColumn >> 11) & 0xF))
-                -- TargetKind = trunc(log2(1 << ((OldChatColumn >> 7) & 0xF)))
-                -- Virtual SortCodeV2 = ChatType << 16 | SourceKind << 8 | TargetKind
-            -- Delete OldChatColumn, Virtual Channel
-
+        Connection.Execute(
+            @"
             ALTER TABLE messages ADD COLUMN ChatType INTEGER;
             CREATE INDEX IF NOT EXISTS idx_messages_chat_type ON messages (ChatType);
             ALTER TABLE messages ADD COLUMN SourceKind INTEGER;
@@ -293,19 +301,18 @@ internal class MessageStore : IDisposable
             ALTER TABLE messages DROP COLUMN Channel;
             ALTER TABLE messages DROP COLUMN Code;
             ALTER TABLE messages DROP COLUMN SortCode;
-        ");
+        "
+        );
 
         SetMigrationVersion(3);
     }
 
     private void SetMigrationVersion(int version)
     {
-        Plugin.Log.Information($"Setting version {version}");
+        _logger.Information($"Setting version {version}");
         using var cmd = Connection.CreateCommand();
-        // PRAGMA does not accept SQLite parameter bindings, and there is no
-        // pragma_ function variant that can set the version either. The
-        // version is a compile-time int from the migration sequence, never
-        // user input.
+        // PRAGMA does not accept SQLite parameter bindings; version is a
+        // compile-time int from the migration sequence, never user input.
         cmd.CommandText = $"PRAGMA user_version = {version};";
         cmd.ExecuteNonQuery();
     }
@@ -316,16 +323,14 @@ internal class MessageStore : IDisposable
         PerformMaintenance();
     }
 
-    /// <summary>
-    /// Returns a (ChatType, count) snapshot over non-deleted messages.
-    /// Used by the Privacy tab to preview the impact of a retroactive
-    /// cleanup before the user confirms.
-    /// </summary>
+    // Returns a (ChatType, count) snapshot over non-deleted messages.
+    // Used by the Privacy tab to preview retroactive cleanup impact.
     internal Dictionary<int, long> GetMessageCountsByChatType()
     {
         var result = new Dictionary<int, long>();
         using var cmd = Connection.CreateCommand();
-        cmd.CommandText = "SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
+        cmd.CommandText =
+            "SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
         cmd.CommandTimeout = 120;
         using var reader = cmd.ExecuteReader();
         while (reader.Read())
@@ -337,19 +342,25 @@ internal class MessageStore : IDisposable
         return result;
     }
 
-    /// <summary>
-    /// Deletes messages older than the per-channel retention window, with a
-    /// global default for channels not listed explicitly. Cutoffs are
-    /// computed from "now" at call time. Runs VACUUM only if anything was
-    /// removed. Returns the number of rows deleted.
-    /// </summary>
-    internal long DeleteByRetentionPolicy(IReadOnlyDictionary<int, int> chatTypeDaysMap, int defaultDays)
+    // Deletes messages older than the per-channel retention window, with a global
+    // default for unmapped channels. Runs VACUUM only if rows were removed.
+    // Returns the number of rows deleted.
+    internal long DeleteByRetentionPolicy(
+        IReadOnlyDictionary<int, int> chatTypeDaysMap,
+        int defaultDays
+    )
     {
         if (defaultDays < 0)
-            throw new ArgumentOutOfRangeException(nameof(defaultDays), "Negative retention is not allowed.");
+            throw new ArgumentOutOfRangeException(
+                nameof(defaultDays),
+                "Negative retention is not allowed."
+            );
         foreach (var (_, days) in chatTypeDaysMap)
             if (days < 0)
-                throw new ArgumentOutOfRangeException(nameof(chatTypeDaysMap), "Negative retention is not allowed.");
+                throw new ArgumentOutOfRangeException(
+                    nameof(chatTypeDaysMap),
+                    "Negative retention is not allowed."
+                );
 
         var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
 
@@ -372,19 +383,19 @@ internal class MessageStore : IDisposable
                 index++;
             }
 
-            // Catch-all for channels without an explicit override. "0" is
-            // treated as "do not delete by default" — without an explicit
-            // user override, unmapped channels stay forever instead of
-            // getting wiped immediately.
+            // defaultDays=0 means "keep forever" for unmapped channels.
             if (defaultDays > 0)
             {
                 var defaultCutoff = nowMs - defaultDays * 86400000L;
                 cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff);
 
-                var explicitPlaceholders = chatTypeDaysMap.Count > 0
-                    ? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys)
-                    : "-1"; // empty list would produce invalid SQL
-                clauses.Add($"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)");
+                var explicitPlaceholders =
+                    chatTypeDaysMap.Count > 0
+                        ? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys)
+                        : "-1"; // empty list would produce invalid SQL
+                clauses.Add(
+                    $"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"
+                );
             }
 
             if (clauses.Count == 0)
@@ -400,19 +411,14 @@ internal class MessageStore : IDisposable
         return deleted;
     }
 
-    /// <summary>
-    /// Hard-deletes every message whose ChatType is not in the supplied
-    /// allowlist, then VACUUMs the database to reclaim disk space.
-    /// Returns the number of rows deleted.
-    /// </summary>
+    // Hard-deletes every message whose ChatType is not in the allowlist,
+    // then VACUUMs. Returns the number of rows deleted.
     internal long CleanupRetainOnly(IReadOnlyCollection<int> allowedTypes)
     {
         if (allowedTypes.Count == 0)
-        {
-            // Defensive: refuse a "delete everything" disguised as a filter.
-            // Use ClearMessages() if a full wipe is actually intended.
-            throw new InvalidOperationException("CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe.");
-        }
+            throw new InvalidOperationException(
+                "CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
+            );
 
         long deleted;
         using (var cmd = Connection.CreateCommand())
@@ -428,15 +434,19 @@ internal class MessageStore : IDisposable
 
     internal void PerformMaintenance()
     {
-        Connection.Execute(@"
+        Connection.Execute(
+            @"
             VACUUM;
             REINDEX messages;
             ANALYZE;
-        ");
+        "
+        );
     }
 
     private string LogPath => DbPath + "-wal";
+
     internal long DatabaseSize() => !File.Exists(DbPath) ? 0 : new FileInfo(DbPath).Length;
+
     internal long DatabaseLogSize() => !File.Exists(LogPath) ? 0 : new FileInfo(LogPath).Length;
 
     internal int MessageCount()
@@ -448,48 +458,22 @@ internal class MessageStore : IDisposable
 
     internal void UpsertMessage(Message message)
     {
-        // Hellion Chat privacy filter — drop disallowed ChatTypes before
-        // they reach the storage layer (single source of truth, also
-        // covers any future write paths e.g. webinterface backfill).
+        // Privacy filter -- drop disallowed ChatTypes before they reach storage.
         if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
         {
-            // Verbose-only: this fires for every dropped message, which is
-            // the common case for users with a tight privacy whitelist. Keep
-            // it for diagnostics but stay out of the default xllog stream.
-            Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
+            _logger.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
             return;
         }
 
         using var cmd = Connection.CreateCommand();
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             INSERT INTO messages (
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel,
-                Deleted
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel, Deleted
             ) VALUES (
-                $Id,
-                $Receiver,
-                $ContentId,
-                $Date,
-                $ChatType,
-                $SourceKind,
-                $TargetKind,
-                $Sender,
-                $Content,
-                $SenderSource,
-                $ContentSource,
-                $ExtraChatChannel,
-                false
+                $Id, $Receiver, $ContentId, $Date, $ChatType, $SourceKind, $TargetKind,
+                $Sender, $Content, $SenderSource, $ContentSource, $ExtraChatChannel, false
             )
             ON CONFLICT (id) DO UPDATE SET
                 Receiver = excluded.Receiver,
@@ -513,26 +497,35 @@ internal class MessageStore : IDisposable
         cmd.Parameters.AddWithValue("$ChatType", message.Code.Type);
         cmd.Parameters.AddWithValue("$SourceKind", message.Code.Source);
         cmd.Parameters.AddWithValue("$TargetKind", message.Code.Target);
-        cmd.Parameters.AddWithValue("$Sender", MessagePackSerializer.Serialize(message.Sender, MsgPackOptions));
-        cmd.Parameters.AddWithValue("$Content", MessagePackSerializer.Serialize(message.Content, MsgPackOptions));
-        cmd.Parameters.AddWithValue("$SenderSource", MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions));
-        cmd.Parameters.AddWithValue("$ContentSource", MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions));
+        cmd.Parameters.AddWithValue(
+            "$Sender",
+            MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)
+        );
+        cmd.Parameters.AddWithValue(
+            "$Content",
+            MessagePackSerializer.Serialize(message.Content, MsgPackOptions)
+        );
+        cmd.Parameters.AddWithValue(
+            "$SenderSource",
+            MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions)
+        );
+        cmd.Parameters.AddWithValue(
+            "$ContentSource",
+            MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions)
+        );
         cmd.Parameters.AddWithValue("$ExtraChatChannel", message.ExtraChatChannel);
 
         cmd.ExecuteNonQuery();
     }
 
-    /// <summary>
-    /// Streams messages for export. Optional filters:
-    /// - <paramref name="chatTypes"/>: limit to these ChatTypes
-    /// - <paramref name="from"/> / <paramref name="to"/>: inclusive date range
-    /// Result is sorted ascending by Date and excludes soft-deleted rows.
-    /// Caller is responsible for disposing the enumerator.
-    /// </summary>
+    // Streams messages for export, sorted ascending by Date, excluding soft-deleted rows.
+    // Optional filters: chatTypes, from/to inclusive date range.
+    // Caller is responsible for disposing the enumerator.
     internal MessageEnumerator StreamForExport(
         IReadOnlyCollection<int>? chatTypes,
         DateTimeOffset? from,
-        DateTimeOffset? to)
+        DateTimeOffset? to
+    )
     {
         var cmd = Connection.CreateCommand();
 
@@ -544,22 +537,15 @@ internal class MessageStore : IDisposable
         if (to is not null)
             clauses.Add("Date <= $To");
 
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
-            WHERE " + string.Join(" AND ", clauses) + @"
+            WHERE "
+            + string.Join(" AND ", clauses)
+            + @"
             ORDER BY Date ASC;";
         cmd.CommandTimeout = 600;
 
@@ -568,16 +554,18 @@ internal class MessageStore : IDisposable
         if (to is not null)
             cmd.Parameters.AddWithValue("$To", to.Value.ToUnixTimeMilliseconds());
 
-        return new MessageEnumerator(cmd.ExecuteReader());
+        return new MessageEnumerator(cmd.ExecuteReader(), _logger);
     }
 
-    /// <summary>
-    /// Get the most recent messages.
-    /// </summary>
-    /// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param>
-    /// <param name="since">Only show messages since this date. If null, no filtering is performed.</param>
-    /// <param name="count">The amount to return. Defaults to 10,000.</param>
-    internal MessageEnumerator GetMostRecentMessages(ulong? receiver = null, DateTimeOffset? since = null, int count = MessageQueryLimit)
+    // Returns the most recent messages, oldest-first.
+    // receiver: filter by receiver ContentId (null = no filter)
+    // since: only include messages after this date (null = no filter)
+    // count: max rows to return, defaults to 10,000
+    internal MessageEnumerator GetMostRecentMessages(
+        ulong? receiver = null,
+        DateTimeOffset? since = null,
+        int count = MessageQueryLimit
+    )
     {
         List<string> whereClauses = ["deleted = false"];
         if (receiver != null)
@@ -588,32 +576,24 @@ internal class MessageStore : IDisposable
         var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
 
         var cmd = Connection.CreateCommand();
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
-        cmd.CommandText = @"
+        // Select last N by date DESC, then reverse to ascending order.
+        cmd.CommandText =
+            @"
             SELECT *
             FROM (
                 SELECT
-                    Id,
-                    Receiver,
-                    ContentId,
-                    Date,
-                    ChatType,
-                    SourceKind,
-                    TargetKind,
-                    Sender,
-                    Content,
-                    SenderSource,
-                    ContentSource,
-                    ExtraChatChannel
+                    Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                    Sender, Content, SenderSource, ContentSource, ExtraChatChannel
                 FROM messages
-                " + whereClause + @"
+                "
+            + whereClause
+            + @"
                 ORDER BY Date DESC
                 LIMIT $Count
             )
             ORDER BY Date ASC;
         ";
-        cmd.CommandTimeout = 120; // this could take a while on slow computers
+        cmd.CommandTimeout = 120;
 
         if (receiver != null)
             cmd.Parameters.AddWithValue("$Receiver", receiver);
@@ -622,51 +602,30 @@ internal class MessageStore : IDisposable
 
         cmd.Parameters.AddWithValue("$Count", count);
 
-        return new MessageEnumerator(cmd.ExecuteReader());
+        return new MessageEnumerator(cmd.ExecuteReader(), _logger);
     }
 
-    /// <summary>
-    /// Hellion Chat — Auto-Tell-Tabs history preload.
-    ///
-    /// Returns up to <paramref name="limit"/> tells exchanged with the named
-    /// player, oldest-first, ready to be added to a freshly spawned auto
-    /// tell tab. The Sender column is a serialized chunk blob, so SQL on its
-    /// own cannot filter by player identity; we narrow with SQL on Receiver
-    /// + ChatType (cheap, indexed) and let the client do the final
-    /// PlayerPayload comparison on the result set.
-    ///
-    /// <paramref name="sqlScanLimit"/> caps how many recent tells we scan
-    /// before giving up. 500 covers around 10 days for an active greeter
-    /// and stays well under the 20 ms budget required to keep the spawn on
-    /// the message-processing worker thread.
-    /// </summary>
+    // Returns up to limit tells exchanged with the named player, oldest-first.
+    // SQL narrows by Receiver + ChatType (indexed); client does the final
+    // PlayerPayload comparison. sqlScanLimit caps the scan to stay within
+    // the message-processing worker thread budget.
     internal IReadOnlyList<Message> GetTellHistoryWithSender(
         ulong receiver,
         string senderName,
         uint senderWorld,
         int limit,
-        int sqlScanLimit = 500)
+        int sqlScanLimit = 500
+    )
     {
         if (limit <= 0)
-        {
             return [];
-        }
 
         using var cmd = Connection.CreateCommand();
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             WHERE deleted = false
               AND Receiver = $Receiver
@@ -681,31 +640,23 @@ internal class MessageStore : IDisposable
         cmd.Parameters.AddWithValue("$ScanLimit", sqlScanLimit);
 
         var collected = new List<Message>();
-        using var enumerator = new MessageEnumerator(cmd.ExecuteReader());
+        using var enumerator = new MessageEnumerator(cmd.ExecuteReader(), _logger);
         foreach (var message in enumerator)
         {
             if (!ChunkUtil.MatchesSender(message, senderName, senderWorld))
-            {
                 continue;
-            }
 
             collected.Add(message);
             if (collected.Count >= limit)
-            {
                 break;
-            }
         }
 
-        // SQL was DESC (newest-first) so we hit the limit on the most
-        // recent matching tells. Reverse to oldest-first for chronological
-        // display in the tab.
+        // SQL was DESC (newest-first); reverse to oldest-first for tab display.
         collected.Reverse();
         return collected;
     }
 
-    /// <summary>
-    /// Marks a message as deleted so it won't get returned in queries.
-    /// </summary>
+    // Soft-deletes a message so it won't appear in queries.
     internal void DeleteMessage(Guid id)
     {
         using var cmd = Connection.CreateCommand();
@@ -714,7 +665,12 @@ internal class MessageStore : IDisposable
         cmd.ExecuteNonQuery();
     }
 
-    internal long CountDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null)
+    internal long CountDateRange(
+        DateTime after,
+        DateTime before,
+        IEnumerable<byte> channels,
+        ulong? receiver = null
+    )
     {
         using var cmd = Connection.CreateCommand();
 
@@ -727,9 +683,8 @@ internal class MessageStore : IDisposable
 
         var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
 
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT COUNT(*)
             FROM messages
             " + whereClause;
@@ -737,14 +692,19 @@ internal class MessageStore : IDisposable
         if (receiver != null)
             cmd.Parameters.AddWithValue("$Receiver", receiver);
 
-        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
-        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
-        cmd.CommandTimeout = 120; // this could take a while on slow computers
+        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
+        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
+        cmd.CommandTimeout = 120;
 
-        return (long) cmd.ExecuteScalar()!;
+        return (long)cmd.ExecuteScalar()!;
     }
 
-    internal MessageEnumerator GetDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null)
+    internal MessageEnumerator GetDateRange(
+        DateTime after,
+        DateTime before,
+        IEnumerable<byte> channels,
+        ulong? receiver = null
+    )
     {
         var cmd = Connection.CreateCommand();
 
@@ -757,36 +717,31 @@ internal class MessageStore : IDisposable
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             " + whereClause;
-        cmd.CommandTimeout = 120; // this could take a while on slow computers
+        cmd.CommandTimeout = 120;
 
         if (receiver != null)
             cmd.Parameters.AddWithValue("$Receiver", receiver);
 
-        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
-        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
+        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
+        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
 
-        return new MessageEnumerator(cmd.ExecuteReader());
+        return new MessageEnumerator(cmd.ExecuteReader(), _logger);
     }
 
-    internal MessageEnumerator GetPagedDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null, int page = 0)
+    internal MessageEnumerator GetPagedDateRange(
+        DateTime after,
+        DateTime before,
+        IEnumerable<byte> channels,
+        ulong? receiver = null,
+        int page = 0
+    )
     {
         var cmd = Connection.CreateCommand();
 
@@ -799,44 +754,33 @@ internal class MessageStore : IDisposable
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
-            " + whereClause + @"
+            "
+            + whereClause
+            + @"
             ORDER BY Date
             LIMIT $Offset, $OffsetCount;
         ";
-        cmd.CommandTimeout = 120; // this could take a while on slow computers
+        cmd.CommandTimeout = 120;
 
         if (receiver != null)
             cmd.Parameters.AddWithValue("$Receiver", receiver);
 
-        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
-        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
+        cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
+        cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
         cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
         cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
 
-        return new MessageEnumerator(cmd.ExecuteReader());
+        return new MessageEnumerator(cmd.ExecuteReader(), _logger);
     }
 
-    // Build "$prefix0,$prefix1,..." placeholder list and bind values to
-    // the command. SQLite has no native array parameter, so we generate
-    // the list at runtime and bind each entry under its own name. Used
-    // for IN-clauses and similar dynamic-arity SQL fragments.
+    // Builds a "$prefix0,$prefix1,..." placeholder list and binds values to the command.
+    // SQLite has no native array parameter, so placeholders are generated per entry.
     private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values)
     {
         var names = new List<string>();
@@ -852,12 +796,14 @@ internal class MessageStore : IDisposable
     }
 }
 
-internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, IDisposable, IAsyncDisposable
+internal class MessageEnumerator(DbDataReader reader, IPluginLogProxy logger)
+    : IEnumerable<Message>,
+        IDisposable,
+        IAsyncDisposable
 {
     private const int MaxErrorLogs = 10;
 
-    // FailedIds and FailedCount are separate, because messages might fail to
-    // even parse the ID field.
+    private readonly IPluginLogProxy _logger = logger;
     private readonly List<Guid> FailedIds = [];
     private int FailedCount;
     public bool DidError => FailedCount > 0;
@@ -876,21 +822,37 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
                     (ulong)reader.GetInt64(1),
                     (ulong)reader.GetInt64(2),
                     DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64(3)),
-                    new ChatCode((byte)reader.GetInt32(4), (byte)reader.GetInt32(5), (byte)reader.GetInt32(6)),
-                    MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(7), MessageStore.MsgPackOptions),
-                    MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(8), MessageStore.MsgPackOptions),
-                    MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(9), MessageStore.MsgPackOptions),
-                    MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(10), MessageStore.MsgPackOptions),
+                    new ChatCode(
+                        (byte)reader.GetInt32(4),
+                        (byte)reader.GetInt32(5),
+                        (byte)reader.GetInt32(6)
+                    ),
+                    MessagePackSerializer.Deserialize<List<Chunk>>(
+                        reader.GetFieldValue<byte[]>(7),
+                        MessageStore.MsgPackOptions
+                    ),
+                    MessagePackSerializer.Deserialize<List<Chunk>>(
+                        reader.GetFieldValue<byte[]>(8),
+                        MessageStore.MsgPackOptions
+                    ),
+                    MessagePackSerializer.Deserialize<SeString>(
+                        reader.GetFieldValue<byte[]>(9),
+                        MessageStore.MsgPackOptions
+                    ),
+                    MessagePackSerializer.Deserialize<SeString>(
+                        reader.GetFieldValue<byte[]>(10),
+                        MessageStore.MsgPackOptions
+                    ),
                     reader.GetGuid(11)
                 );
             }
             catch (Exception e)
             {
                 if (FailedCount < MaxErrorLogs)
-                    Plugin.Log.Error($"Exception while reading message '{id}' from database: {e}");
+                    _logger.Error($"Exception while reading message '{id}' from database: {e}");
                 FailedCount++;
                 if (FailedCount == MaxErrorLogs)
-                    Plugin.Log.Error("Further parsing errors will not be logged");
+                    _logger.Error("Further parsing errors will not be logged");
                 if (id != Guid.Empty)
                     FailedIds.Add(id);
 
@@ -915,6 +877,7 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
     {
         reader.Dispose();
     }
+
     public async ValueTask DisposeAsync()
     {
         await reader.DisposeAsync();

HellionChat/PayloadHandler.cs

@@ -1,8 +1,5 @@
 using System.Numerics;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Ui;
-using HellionChat.Util;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -18,11 +15,14 @@ using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
+using HellionChat.Resources;
+using HellionChat.Ui;
+using HellionChat.Util;
 using Lumina.Excel.Sheets;
 using Action = System.Action;
-using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
 using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
+using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
 
 namespace HellionChat;
 
@@ -107,7 +107,9 @@ public sealed class PayloadHandler
         ImGui.Separator();
 
         var contentId = chunk.Message?.ContentId ?? 0;
-        var sender = chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload) as PlayerPayload;
+        var sender =
+            chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload)
+            as PlayerPayload;
 
         using var menu = ImRaii.Menu(Language.Context_Integrations);
         if (!menu.Success)
@@ -118,17 +120,27 @@ public sealed class PayloadHandler
         {
             try
             {
-                LogWindow.Plugin.Ipc.Invoke(id, sender, contentId, payload, chunk.Message?.SenderSource, chunk.Message?.ContentSource);
+                LogWindow.Plugin.Ipc.Invoke(
+                    id,
+                    sender,
+                    contentId,
+                    payload,
+                    chunk.Message?.SenderSource,
+                    chunk.Message?.ContentSource
+                );
             }
             catch (Exception ex)
             {
-                Plugin.Log.Error(ex, "Error executing integration");
+                Plugin.LogProxy.Error(ex, "Error executing integration");
             }
         }
 
         if (cursor == ImGui.GetCursorPos())
         {
-            using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]);
+            using var pushedColor = ImRaii.PushColor(
+                ImGuiCol.Text,
+                ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
+            );
             ImGui.Text("No integrations available");
         }
     }
@@ -168,10 +180,16 @@ public sealed class PayloadHandler
             if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent))
             {
                 ImGui.SetClipboardText(StringifyMessage(message));
-                WrapperUtil.AddNotification(Language.Context_CopyContentSuccess, NotificationType.Info);
+                WrapperUtil.AddNotification(
+                    Language.Context_CopyContentSuccess,
+                    NotificationType.Info
+                );
             }
 
-            using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]);
+            using var pushedColor = ImRaii.PushColor(
+                ImGuiCol.Text,
+                ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
+            );
             ImGui.TextUnformatted(message.Code.Type.Name());
         }
 
@@ -184,7 +202,8 @@ public sealed class PayloadHandler
             return string.Empty;
 
         var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content;
-        return chunks.Where(chunk => chunk is TextChunk)
+        return chunks
+            .Where(chunk => chunk is TextChunk)
             .Cast<TextChunk>()
             .Select(text => text.Content)
             .Aggregate(string.Concat);
@@ -255,7 +274,10 @@ public sealed class PayloadHandler
     public unsafe void MoveTooltip(AddonEvent type, AddonArgs args)
     {
         // Only move if the user has the "Next to Cursor" option selected
-        if (!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected) || selected != 0)
+        if (
+            !Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected)
+            || selected != 0
+        )
             return;
 
         if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle)
@@ -274,7 +296,10 @@ public sealed class PayloadHandler
 
         var component = atkBase->WindowNode->AtkResNode;
         var atkPos = new Vector2(component.ScreenX, component.ScreenY);
-        var atkSize = new Vector2(component.GetWidth() * component.ScaleX, component.GetHeight() * component.GetScaleY());
+        var atkSize = new Vector2(
+            component.GetWidth() * component.ScaleX,
+            component.GetHeight() * component.GetScaleY()
+        );
 
         var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize);
         var addonRect = new MathUtil.Rectangle(atkPos, atkSize);
@@ -302,7 +327,7 @@ public sealed class PayloadHandler
 
         if (!chatRect.HasOverlap(addonRect))
         {
-            atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y);
+            atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
             return;
         }
 
@@ -320,7 +345,7 @@ public sealed class PayloadHandler
 
         if (!chatRect.HasOverlap(addonRect))
         {
-            atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y);
+            atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
             return;
         }
 
@@ -329,7 +354,7 @@ public sealed class PayloadHandler
         var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue);
         y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom
 
-        atkBase->SetPosition((short) x, (short) y);
+        atkBase->SetPosition((short)x, (short)y);
     }
 
     private const float MaxInlineIconSize = 32f;
@@ -339,20 +364,25 @@ public sealed class PayloadHandler
         if (icon.Size.X <= 0 || icon.Size.Y <= 0)
             return;
 
-        var width = (float) icon.Size.X;
-        var height = (float) icon.Size.Y;
+        var width = (float)icon.Size.X;
+        var height = (float)icon.Size.Y;
         var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height));
         var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale);
 
         var cursor = ImGui.GetCursorPos();
         ImGui.Image(icon.Handle, size);
         ImGui.SameLine();
-        ImGui.SetCursorPos(cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing()));
+        ImGui.SetCursorPos(
+            cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())
+        );
     }
 
     private void HoverStatus(StatusPayload status)
     {
-        if (Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
         var builder = new SeStringBuilder();
@@ -374,7 +404,11 @@ public sealed class PayloadHandler
         LogWindow.DrawChunks(name.ToList());
         ImGui.Separator();
 
-        var desc = ChunkUtil.ToChunks(status.Status.Value.Description.ToDalamudString(), ChunkSource.None, null);
+        var desc = ChunkUtil.ToChunks(
+            status.Status.Value.Description.ToDalamudString(),
+            ChunkSource.None,
+            null
+        );
         LogWindow.DrawChunks(desc.ToList());
     }
 
@@ -389,14 +423,23 @@ public sealed class PayloadHandler
         if (!item.Item.TryGetValue(out Item resolvedItem))
             return;
 
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ))
+                .GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
         var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null);
         LogWindow.DrawChunks(name.ToList());
         ImGui.Separator();
 
-        var desc = ChunkUtil.ToChunks(resolvedItem.Description.ToDalamudString(), ChunkSource.None, null);
+        var desc = ChunkUtil.ToChunks(
+            resolvedItem.Description.ToDalamudString(),
+            ChunkSource.None,
+            null
+        );
         LogWindow.DrawChunks(desc.ToList());
     }
 
@@ -405,7 +448,12 @@ public sealed class PayloadHandler
         if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow))
             return;
 
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
         var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null);
@@ -415,7 +463,11 @@ public sealed class PayloadHandler
         if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow))
             return;
 
-        LogWindow.DrawChunks(ChunkUtil.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null).ToList());
+        LogWindow.DrawChunks(
+            ChunkUtil
+                .ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null)
+                .ToList()
+        );
     }
 
     private void HoverUri(UriPayload uri)
@@ -438,7 +490,10 @@ public sealed class PayloadHandler
                 ClickLinkPayload(chunk, payload, link);
                 break;
             case DalamudPartyFinderPayload pf:
-                if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification)
+                if (
+                    pf.LinkType
+                    == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification
+                )
                     GameFunctions.GameFunctions.OpenPartyFinder();
                 else
                     GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId);
@@ -473,9 +528,14 @@ public sealed class PayloadHandler
             return;
 
         var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList();
-        if (!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value))
+        if (
+            !Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue(
+                (link.Plugin, link.CommandId),
+                out var value
+            )
+        )
         {
-            Plugin.Log.Warning("Could not find DalamudLinkHandlers");
+            Plugin.LogProxy.Warning("Could not find DalamudLinkHandlers");
             return;
         }
 
@@ -486,7 +546,7 @@ public sealed class PayloadHandler
         }
         catch (Exception ex)
         {
-            Plugin.Log.Error(ex, "Error executing DalamudLinkPayload handler");
+            Plugin.LogProxy.Error(ex, "Error executing DalamudLinkPayload handler");
         }
     }
 
@@ -508,7 +568,12 @@ public sealed class PayloadHandler
             return;
 
         var hq = payload.Kind == ItemKind.Hq;
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq))
+                .GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
         var name = itemRow.Name.ToDalamudString();
@@ -554,10 +619,18 @@ public sealed class PayloadHandler
             return;
 
         var item = Sheets.EventItemSheet.GetRow(payload.ItemId);
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
-        LogWindow.DrawChunks(ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(), false);
+        LogWindow.DrawChunks(
+            ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(),
+            false
+        );
         ImGui.Separator();
 
         var realItemId = payload.RawItemId;
@@ -585,7 +658,7 @@ public sealed class PayloadHandler
         {
             name.AddRange([
                 new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld),
-                new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText())
+                new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()),
             ]);
         }
 
@@ -606,7 +679,15 @@ public sealed class PayloadHandler
             }
             else if (validContentId)
             {
-                LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Value.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false);
+                LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(
+                    player.PlayerName,
+                    world.Value.Name.ToString(),
+                    (ushort)world.RowId,
+                    0,
+                    chunk.Message!.ContentId,
+                    0,
+                    false
+                );
             }
 
             LogWindow.Activate = true;
@@ -615,12 +696,18 @@ public sealed class PayloadHandler
         if (world.Value.IsPublic)
         {
             var party = Plugin.PartyList;
-            var leader = party[(int) party.PartyLeaderIndex]?.ContentId;
+            var leader = party[(int)party.PartyLeaderIndex]?.ContentId;
             var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader;
-            var member = party.FirstOrDefault(member => member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId);
+            var member = party.FirstOrDefault(member =>
+                member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId
+            );
             var isInParty = member != null;
             var inInstance = GameFunctions.GameFunctions.IsInInstance();
-            var inPartyInstance = Sheets.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType).TerritoryIntendedUse.RowId is (41 or 47 or 48 or 52 or 53 or 61);
+            var inPartyInstance =
+                Sheets
+                    .TerritorySheet.GetRow(Plugin.ClientState.TerritoryType)
+                    .TerritoryIntendedUse.RowId
+                is (41 or 47 or 48 or 52 or 53 or 61);
             if (isLeader)
             {
                 if (!isInParty)
@@ -636,10 +723,20 @@ public sealed class PayloadHandler
                         if (menu.Success)
                         {
                             if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld))
-                                GameFunctions.Party.InviteSameWorld(player.PlayerName, (ushort)world.RowId, chunk.Message?.ContentId ?? 0);
+                                GameFunctions.Party.InviteSameWorld(
+                                    player.PlayerName,
+                                    (ushort)world.RowId,
+                                    chunk.Message?.ContentId ?? 0
+                                );
 
-                            if (validContentId && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld))
-                                GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId);
+                            if (
+                                validContentId
+                                && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)
+                            )
+                                GameFunctions.Party.InviteOtherWorld(
+                                    chunk.Message!.ContentId,
+                                    (ushort)world.RowId
+                                );
                         }
                     }
                 }
@@ -654,23 +751,41 @@ public sealed class PayloadHandler
                 }
             }
 
-            var isFriend = GameFunctions.GameFunctions.GetFriends().Any(friend => friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId);
+            var isFriend = GameFunctions
+                .GameFunctions.GetFriends()
+                .Any(friend =>
+                    friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId
+                );
             if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest))
-                LogWindow.Plugin.Functions.SendFriendRequest(player.PlayerName, (ushort) world.RowId);
+                LogWindow.Plugin.Functions.SendFriendRequest(
+                    player.PlayerName,
+                    (ushort)world.RowId
+                );
 
             using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions))
             {
                 if (menuBlockFunctions.Success)
                 {
                     if (ImGui.Selectable(Language.Context_AddToBlacklist))
-                        LogWindow.Plugin.Functions.AddToBlacklist(player.PlayerName, (ushort)world.RowId);
+                        LogWindow.Plugin.Functions.AddToBlacklist(
+                            player.PlayerName,
+                            (ushort)world.RowId
+                        );
 
                     if (chunk.Message != null)
                     {
                         var message = chunk.Message;
 
-                        if (message.AccountId != 0 && ImGui.Selectable(Language.Context_AddToMuteList))
-                            LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId);
+                        if (
+                            message.AccountId != 0
+                            && ImGui.Selectable(Language.Context_AddToMuteList)
+                        )
+                            LogWindow.Plugin.Functions.AddToMuteList(
+                                message.AccountId,
+                                message.ContentId,
+                                player.PlayerName,
+                                (short)world.RowId
+                            );
 
                         if (ImGui.Selectable(Language.Context_AddToTermsFilter))
                             LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource);
@@ -678,8 +793,11 @@ public sealed class PayloadHandler
                 }
             }
 
-            if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork))
-                GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort) world.RowId);
+            if (
+                GameFunctions.GameFunctions.IsMentor()
+                && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
+            )
+                GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
         }
 
         var inputChannel = chunk.Message?.Code.Type.ToInputChannel();
@@ -694,7 +812,10 @@ public sealed class PayloadHandler
 
         if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate))
             if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId))
-                WrapperUtil.AddNotification(Language.Context_AdventurerPlateError, NotificationType.Warning);
+                WrapperUtil.AddNotification(
+                    Language.Context_AdventurerPlateError,
+                    NotificationType.Warning
+                );
     }
 
     private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload)
@@ -728,13 +849,21 @@ public sealed class PayloadHandler
         if (ImGui.Selectable(Language.Context_CopyLink))
         {
             ImGui.SetClipboardText(uri.Uri.ToString());
-            WrapperUtil.AddNotification(Language.Context_CopyLinkNotification, NotificationType.Info);
+            WrapperUtil.AddNotification(
+                Language.Context_CopyLinkNotification,
+                NotificationType.Info
+            );
         }
     }
 
     private void DrawStatusPopup(StatusPayload status)
     {
-        if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon)).GetWrapOrDefault() is { } icon)
+        if (
+            Plugin
+                .TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon))
+                .GetWrapOrDefault() is
+            { } icon
+        )
             InlineIcon(icon);
 
         var builder = new SeStringBuilder();
@@ -752,7 +881,10 @@ public sealed class PayloadHandler
                 break;
         }
 
-        LogWindow.DrawChunks(ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(), false);
+        LogWindow.DrawChunks(
+            ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(),
+            false
+        );
         ImGui.Separator();
 
         if (ImGui.Selectable(Language.Context_Link))

HellionChat/Privacy/PrivacyDefaults.cs

@@ -4,10 +4,15 @@ namespace HellionChat.Privacy;
 
 internal static class PrivacyDefaults
 {
-    // Privacy-First default whitelist (DSGVO Art. 25 - Privacy by Default).
-    // Only the player's own conversations are persisted out-of-the-box.
-    // Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system
-    // logs and battle messages are NOT persisted unless the user opts in.
+    // F3.1: failsafe for ChatTypes added by future FFXIV patches. New installs
+    // persist unknown channels so a major patch's added ChatType isn't silently
+    // dropped before the user can opt in or out. Existing configs keep their
+    // explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
+    internal const bool DefaultPersistUnknownChannels = true;
+
+    // DSGVO Art. 25 (Privacy by Default): only the player's own conversations
+    // are persisted out-of-the-box. Public chat, NPC dialogue, system logs and
+    // battle messages require explicit opt-in.
     internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
     {
         ChatType.TellIncoming,
@@ -42,54 +47,54 @@ internal static class PrivacyDefaults
         ChatType.ExtraChatLinkshell8,
     };
 
-    // Default retention windows per channel (in days). Channels not listed
-    // here fall back to Configuration.RetentionDefaultDays. Reflects the
-    // design spec: Tells 365, own-conversation channels 90, everything else
-    // shorter via the global default.
-    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = new Dictionary<ChatType, int>
-    {
-        [ChatType.TellIncoming] = 365,
-        [ChatType.TellOutgoing] = 365,
+    // Per-channel retention in days. Unlisted channels fall back to
+    // Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
+    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
+        new Dictionary<ChatType, int>
+        {
+            [ChatType.TellIncoming] = 365,
+            [ChatType.TellOutgoing] = 365,
 
-        [ChatType.Party] = 90,
-        [ChatType.CrossParty] = 90,
-        [ChatType.Alliance] = 90,
-        [ChatType.PvpTeam] = 90,
-        [ChatType.FreeCompany] = 90,
+            [ChatType.Party] = 90,
+            [ChatType.CrossParty] = 90,
+            [ChatType.Alliance] = 90,
+            [ChatType.PvpTeam] = 90,
+            [ChatType.FreeCompany] = 90,
 
-        [ChatType.Linkshell1] = 90,
-        [ChatType.Linkshell2] = 90,
-        [ChatType.Linkshell3] = 90,
-        [ChatType.Linkshell4] = 90,
-        [ChatType.Linkshell5] = 90,
-        [ChatType.Linkshell6] = 90,
-        [ChatType.Linkshell7] = 90,
-        [ChatType.Linkshell8] = 90,
+            [ChatType.Linkshell1] = 90,
+            [ChatType.Linkshell2] = 90,
+            [ChatType.Linkshell3] = 90,
+            [ChatType.Linkshell4] = 90,
+            [ChatType.Linkshell5] = 90,
+            [ChatType.Linkshell6] = 90,
+            [ChatType.Linkshell7] = 90,
+            [ChatType.Linkshell8] = 90,
 
-        [ChatType.CrossLinkshell1] = 90,
-        [ChatType.CrossLinkshell2] = 90,
-        [ChatType.CrossLinkshell3] = 90,
-        [ChatType.CrossLinkshell4] = 90,
-        [ChatType.CrossLinkshell5] = 90,
-        [ChatType.CrossLinkshell6] = 90,
-        [ChatType.CrossLinkshell7] = 90,
-        [ChatType.CrossLinkshell8] = 90,
+            [ChatType.CrossLinkshell1] = 90,
+            [ChatType.CrossLinkshell2] = 90,
+            [ChatType.CrossLinkshell3] = 90,
+            [ChatType.CrossLinkshell4] = 90,
+            [ChatType.CrossLinkshell5] = 90,
+            [ChatType.CrossLinkshell6] = 90,
+            [ChatType.CrossLinkshell7] = 90,
+            [ChatType.CrossLinkshell8] = 90,
 
-        [ChatType.ExtraChatLinkshell1] = 90,
-        [ChatType.ExtraChatLinkshell2] = 90,
-        [ChatType.ExtraChatLinkshell3] = 90,
-        [ChatType.ExtraChatLinkshell4] = 90,
-        [ChatType.ExtraChatLinkshell5] = 90,
-        [ChatType.ExtraChatLinkshell6] = 90,
-        [ChatType.ExtraChatLinkshell7] = 90,
-        [ChatType.ExtraChatLinkshell8] = 90,
-    };
+            [ChatType.ExtraChatLinkshell1] = 90,
+            [ChatType.ExtraChatLinkshell2] = 90,
+            [ChatType.ExtraChatLinkshell3] = 90,
+            [ChatType.ExtraChatLinkshell4] = 90,
+            [ChatType.ExtraChatLinkshell5] = 90,
+            [ChatType.ExtraChatLinkshell6] = 90,
+            [ChatType.ExtraChatLinkshell7] = 90,
+            [ChatType.ExtraChatLinkshell8] = 90,
+        };
 
-    // Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
-    // emote types, Novice Network), kept for a short 24-hour window so the
-    // last RP scene or shout trade is still searchable but third-party data
-    // doesn't accumulate forever.
-    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist)
+    // Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
+    // Network) with a 1-day window so recent RP/trade is searchable but
+    // third-party data doesn't accumulate.
+    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
+        PrivacyFirstWhitelist
+    )
     {
         ChatType.Say,
         ChatType.Shout,
@@ -99,13 +104,14 @@ internal static class PrivacyDefaults
         ChatType.NoviceNetwork,
     };
 
-    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides = new Dictionary<ChatType, int>
-    {
-        [ChatType.Say] = 1,
-        [ChatType.Shout] = 1,
-        [ChatType.Yell] = 1,
-        [ChatType.CustomEmote] = 1,
-        [ChatType.StandardEmote] = 1,
-        [ChatType.NoviceNetwork] = 1,
-    };
+    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides =
+        new Dictionary<ChatType, int>
+        {
+            [ChatType.Say] = 1,
+            [ChatType.Shout] = 1,
+            [ChatType.Yell] = 1,
+            [ChatType.CustomEmote] = 1,
+            [ChatType.StandardEmote] = 1,
+            [ChatType.NoviceNetwork] = 1,
+        };
 }

HellionChat/Resources/ChatColourPresets.cs

@@ -4,16 +4,14 @@ using HellionChat.Util;
 
 namespace HellionChat.Resources;
 
-// Hellion Chat — v0.6.0 built-in colour presets for the ChatColours
-// settings section. Read-only static data; users apply a preset via the
-// settings UI which overwrites Configuration.ChatColours immediately.
-// Battle-channel types are intentionally NOT covered by the stylistic
-// presets so that combat-log tuning the user has done stays intact.
+// Built-in colour presets applied via Settings UI → ChatColours.
+// Battle-channel types are intentionally excluded to preserve combat-log tuning.
 public sealed record ChatColourPreset(
     string DisplayName,
     string LocalizationKey,
     bool IsBrandPreset,
-    IReadOnlyDictionary<ChatType, uint> Colours);
+    IReadOnlyDictionary<ChatType, uint> Colours
+);
 
 public static class ChatColourPresets
 {
@@ -27,43 +25,48 @@ public static class ChatColourPresets
                 DisplayName: "ChatTwo Default",
                 LocalizationKey: "ChatColourPresets_Default",
                 IsBrandPreset: false,
-                Colours: BuildDefault()),
+                Colours: BuildDefault()
+            ),
             ["HighContrast"] = new(
                 DisplayName: "High-Contrast",
                 LocalizationKey: "ChatColourPresets_HighContrast",
                 IsBrandPreset: false,
-                Colours: BuildHighContrast()),
+                Colours: BuildHighContrast()
+            ),
             ["Pastell"] = new(
                 DisplayName: "Pastell",
                 LocalizationKey: "ChatColourPresets_Pastell",
                 IsBrandPreset: false,
-                Colours: BuildPastell()),
+                Colours: BuildPastell()
+            ),
             ["DarkModeTuned"] = new(
                 DisplayName: "Dark-Mode-Tuned",
                 LocalizationKey: "ChatColourPresets_DarkModeTuned",
                 IsBrandPreset: false,
-                Colours: BuildDarkModeTuned()),
+                Colours: BuildDarkModeTuned()
+            ),
             ["Hellion"] = new(
                 DisplayName: "Hellion",
                 LocalizationKey: "ChatColourPresets_Hellion",
                 IsBrandPreset: true,
-                Colours: BuildHellion()),
+                Colours: BuildHellion()
+            ),
             ["NightBlue"] = new(
                 DisplayName: "Night Blue",
                 LocalizationKey: "ChatColourPresets_NightBlue",
                 IsBrandPreset: false,
-                Colours: BuildNightBlue()),
+                Colours: BuildNightBlue()
+            ),
             ["IndigoViolet"] = new(
                 DisplayName: "Indigo Violet",
                 LocalizationKey: "ChatColourPresets_IndigoViolet",
                 IsBrandPreset: false,
-                Colours: BuildIndigoViolet()),
+                Colours: BuildIndigoViolet()
+            ),
         };
     }
 
-    // The Default preset spiegelt 1:1 die Werte aus ChatTypeExt.DefaultColor.
-    // Channels ohne Default-Wert (return null) werden ausgelassen — wer sie
-    // anwenden will, behält seine aktuelle Farbe.
+    // Mirrors ChatTypeExt.DefaultColor; channels without a default are skipped.
     private static IReadOnlyDictionary<ChatType, uint> BuildDefault()
     {
         var dict = new Dictionary<ChatType, uint>();
@@ -175,79 +178,55 @@ public static class ChatColourPresets
         };
     }
 
-    // Hellion brand preset — Arctic Cyan + Ember Orange palette aus
-    // /mnt/ssd-fast/Projekte/hellion-media/hellion-media-website/BRANDING.md
-    // (Schema-Stand 2026-04-16). Channels sind über das ganze Brand-Spektrum
-    // verteilt damit jede Zeile auf einen Glance unterscheidbar ist:
-    // Cyan-Familie für Standard/Tell, Ember + Warning für laute Channels,
-    // Status-Farben (Success, Danger) für Linkshells. CrossLinkshells
-    // nutzen die dunkleren/sattersten Varianten derselben Hue-Familien.
+    // Hellion brand preset — Arctic Cyan + Ember Orange palette.
+    // Cyan family for Standard/Tell, Ember/Warning for loud channels,
+    // Status colours for Linkshells, darker variants for CrossLinkshells.
     private static IReadOnlyDictionary<ChatType, uint> BuildHellion()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Cyan-Familie (Brand-Primary)
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232),         // Cyan-light #4DD9E8
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8
             [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2
             [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7
-
-            // Laute Channels — Ember/Warning
-            [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78),    // Warning #F0AD4E
-            [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22),   // Brand Ember #F97316
-
-            // Gruppen-Channels — Success/Ember-dark/Cyan
-            [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92),         // Success #5CB85C
-            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4),       // Ember-dark #E85D04
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232),// Cyan-light
-
-            // Linkshells 1-8 — über das ganze Brand-Spektrum verteilt
-            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60),  // Ember-light #FB923C
-            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78),  // Warning
-            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92),   // Success
-            [ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232),  // Cyan-light
-            [ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167),   // Cyan-dark
-            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22),  // Brand Ember
-            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79),   // Danger #D9534F
-
-            // CrossWorld-Linkshells 1-8 — dunklere/sattersere Varianten
-            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4),    // Ember-dark
-            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50),  // Warning-dark
-            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60),   // Success-dark
-            [ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210),   // Brand Cyan
-            [ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167),   // Cyan-dark
-            [ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130),   // Cyan-darker
-            [ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30),   // Ember-medium
-            [ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60),   // Danger-dark
+            [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E
+            [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316
+            [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C
+            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
+            [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C
+            [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning
+            [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success
+            [ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
+            [ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
+            [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember
+            [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F
+            [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark
+            [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark
+            [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark
+            [ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
+            [ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
+            [ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130), // Cyan-darker
+            [ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30), // Ember-medium
+            [ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60), // Danger-dark
         };
     }
 
-    // Bonus preset — Night Blue, KAZAMA-Stimmungs-Theme aus
-    // /mnt/HDD-Data1/Obsidian/Vault/Systeme/KAZAMA/Theming/Night Blue + Indigo Violet Themes.md
-    // Klassisch, kühl, technisch — Marineblau-Tiefe ohne Lila-Anteil.
-    // Bewusst NICHT als Brand-Preset markiert (Vault-Boundary): die KAZAMA-Themes
-    // sind persönliche Stimmungs-Themes, nicht Teil des Hellion-Brand-Systems.
+    // Night Blue — cool nautical theme, deep navy without purple.
     private static IReadOnlyDictionary<ChatType, uint> BuildNightBlue()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Royal Blue Akzent-Familie
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247),         // text-primary
-            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255),// akzent-hot
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary
+            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot
             [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
-
-            // Laute Channels — Warning/Danger Status-Töne
-            [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),         // warning
-            [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),        // danger
-
-            // Gruppen — Success/Akzent-Variations
-            [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),        // success
-            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),    // warm-orange-light
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226),  // akzent-primary
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191),// text-dim
-
-            // Linkshells 1-8 — über Spektrum verteilt
+            [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning
+            [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger
+            [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success
+            [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191), // text-dim
             [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
             [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
             [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -256,8 +235,6 @@ public static class ChatColourPresets
             [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(100, 200, 220),
             [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(106, 176, 255),
             [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(140, 160, 191),
-
-            // CrossWorld-Linkshells — gedämpfte Variants
             [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
             [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
             [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),
@@ -269,30 +246,20 @@ public static class ChatColourPresets
         };
     }
 
-    // Bonus preset — Indigo Violet, KAZAMA-Stimmungs-Theme aus demselben
-    // Vault-Doc. Warm-mystisch, "Galaxy/Glitter/Nordlicht" — tiefes Indigo
-    // mit kräftigem Violet-Akzent. Persönlicher Favorit (siehe Vault).
-    // Auch nicht als Brand-Preset (siehe NightBlue-Note oben).
+    // Indigo Violet — warm-mystic theme, deep indigo with violet accent.
     private static IReadOnlyDictionary<ChatType, uint> BuildIndigoViolet()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Royal Violet Akzent-Familie
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255),         // text-primary (light lavender)
-            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255),// akzent-hot
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary
+            [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot
             [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
-
-            // Laute Channels — geteilt mit Night Blue (Status-Farben)
             [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),
             [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),
-
-            // Gruppen
             [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),
             [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),
-            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222),  // akzent-primary
-            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208),// text-dim
-
-            // Linkshells 1-8
+            [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
+            [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim
             [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
             [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
             [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -301,8 +268,6 @@ public static class ChatColourPresets
             [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(139, 77, 222),
             [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(130, 90, 200),
             [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(168, 144, 208),
-
-            // CrossWorld-Linkshells
             [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
             [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
             [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),

HellionChat/Resources/HellionStrings.Designer.cs

@@ -114,6 +114,8 @@ internal class HellionStrings
     internal static string Wizard_Profile_FullHistory_GdprWarning => Get(nameof(Wizard_Profile_FullHistory_GdprWarning));
     internal static string Wizard_Profile_FullHistory_Apply => Get(nameof(Wizard_Profile_FullHistory_Apply));
     internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
+    internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
+    internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));
 
     internal static string Export_Heading => Get(nameof(Export_Heading));
     internal static string Export_Help => Get(nameof(Export_Help));
@@ -168,6 +170,16 @@ internal class HellionStrings
     internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));
     internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip));
     internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
+    internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
+    internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
+    internal static string PinTab_MenuPromote => Get(nameof(PinTab_MenuPromote));
+    internal static string PinTab_PromoteTooltip => Get(nameof(PinTab_PromoteTooltip));
+    internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
+    internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
+    internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
+    internal static string PinTab_SectionHeader => Get(nameof(PinTab_SectionHeader));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Name => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Name));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Description => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Description));
 
     // Hellion Chat — Auto-Tell-Tabs Chat settings tab
     internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title));
@@ -368,6 +380,8 @@ internal class HellionStrings
     internal static string Settings_Integrations_Honorific_Status_Incompatible => Get(nameof(Settings_Integrations_Honorific_Status_Incompatible));
     internal static string Settings_Integrations_Honorific_Toggle => Get(nameof(Settings_Integrations_Honorific_Toggle));
     internal static string Settings_Integrations_Honorific_ToggleHint => Get(nameof(Settings_Integrations_Honorific_ToggleHint));
+    internal static string Settings_Integrations_Honorific_Glow_Toggle => Get(nameof(Settings_Integrations_Honorific_Glow_Toggle));
+    internal static string Settings_Integrations_Honorific_Glow_Hint => Get(nameof(Settings_Integrations_Honorific_Glow_Hint));
     internal static string Settings_Integrations_Honorific_LinkRepo => Get(nameof(Settings_Integrations_Honorific_LinkRepo));
     internal static string Settings_Integrations_Honorific_LinkAuthor => Get(nameof(Settings_Integrations_Honorific_LinkAuthor));
     internal static string Settings_Integrations_ComingSoon_SectionHeader => Get(nameof(Settings_Integrations_ComingSoon_SectionHeader));

HellionChat/Resources/HellionStrings.de.resx

@@ -222,6 +222,12 @@
   <data name="Wizard_Reopen_Button" xml:space="preserve">
     <value>Wizard erneut zeigen</value>
   </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Später — Defaults behalten</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Schließt den Wizard ohne Profil-Auswahl. Die Plugin-Defaults bleiben aktiv und der Wizard erscheint beim nächsten Plugin-Reload erneut.</value>
+  </data>
   <data name="Export_Heading" xml:space="preserve">
     <value>Export (DSGVO Art. 15 — Auskunftsrecht)</value>
   </data>
@@ -377,6 +383,36 @@
   <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
     <value>Als begrüßt markieren.</value>
   </data>
+  <data name="PinTab_MenuPin" xml:space="preserve">
+    <value>Tab anpinnen</value>
+  </data>
+  <data name="PinTab_MenuUnpin" xml:space="preserve">
+    <value>Tab lösen</value>
+  </data>
+  <data name="PinTab_MenuPromote" xml:space="preserve">
+    <value>In Standard-Tab umwandeln</value>
+  </data>
+  <data name="PinTab_PromoteTooltip" xml:space="preserve">
+    <value>Wandelt den TempTell in einen regulären Tab um. Die Tell-Bindung an die Person geht verloren, der Tab fängt dann Nachrichten anhand der Channel-Filter ein. Für „Tab überlebt Relog" stattdessen „Tab anpinnen" wählen.</value>
+  </data>
+  <data name="PinTab_LimitReached" xml:space="preserve">
+    <value>Maximal {0} angepinnte Tell-Tabs erreicht. Erst einen lösen oder dauerhaft behalten.</value>
+  </data>
+  <data name="PinTab_PinnedTooltip" xml:space="preserve">
+    <value>Angepinnt — überlebt Relog.</value>
+  </data>
+  <data name="PinTab_PinTooltip" xml:space="preserve">
+    <value>Angepinnte Tabs überleben Relog und behalten die Bindung an die Tell-Person.</value>
+  </data>
+  <data name="PinTab_SectionHeader" xml:space="preserve">
+    <value>Angepinnt</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
+    <value>Sidebar-Breite</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
+    <value>Breite der Tab-Sidebar in Pixeln. Default (44 px) ist Icon-only; breiter machen damit Sektion-Header wie „Aktive Tells (3)" nicht abgeschnitten werden.</value>
+  </data>
 
   <!-- Hellion Chat — Auto-Tell-Tabs (Chat-Einstellungstab) -->
   <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
@@ -392,7 +428,7 @@
     <value>Maximale Anzahl der Auto-Tell-Tabs</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
-    <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell.</value>
+    <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell. Diese Grenze gilt nur für den automatisch verwalteten Pool. Angepinnte Tell-Tabs (Rechtsklick → Tab anpinnen) leben in einem separaten Pool von bis zu 5 Tabs und überleben Relog.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
     <value>Kompakte Anzeige</value>
@@ -639,7 +675,7 @@
     <value>Allgemein</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value>
+    <value>Sprache, Eingabe, Audio und Performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Erscheinungsbild</value>
@@ -657,25 +693,25 @@
     <value>Fenster</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Verhalten des Fensters — wann es da ist, ob es bewegt werden kann.</value>
+    <value>Wann das Fenster sichtbar ist und ob es sich bewegen lässt.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>Wie Nachrichten angezeigt werden — Tells, Vorschau, Verhalten, Emotes.</value>
+    <value>Tells, Vorschau, Nachrichten-Verhalten und Emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab-Verwaltung — eigene Chat-Tabs anlegen und konfigurieren.</value>
+    <value>Eigene Chat-Tabs anlegen und konfigurieren.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Datenschutz</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>Was darf gespeichert werden — Privacy-Filter pro Channel.</value>
+    <value>Privacy-Filter pro Channel und was gespeichert werden darf.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Datenbank</value>
@@ -687,7 +723,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value>
+    <value>Version, Mission, Lizenz und Changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -732,25 +768,25 @@
     <value>Theme &amp; Layout</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
-    <value>Wie das Fenster aussieht — Theme, Rahmen, Zeitstempel-Style.</value>
+    <value>Theme, Fenster-Rahmen und Zeitstempel-Style.</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
     <value>Schriften &amp; Farben</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
-    <value>Lesbarkeit — Schriftart, Schriftgröße, Chat-Farben pro Channel.</value>
+    <value>Schriftart, Schriftgröße und Chat-Farben pro Channel.</value>
   </data>
   <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
     <value>Daten-Verwaltung</value>
   </data>
   <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
-    <value>Was passiert mit gespeicherten Daten — Aufbewahrung, Aufräumen, Export, DB-Stats.</value>
+    <value>Aufbewahrung, Aufräumen, Export und Datenbank-Statistiken.</value>
   </data>
   <data name="Settings_Card_Integrations_Title" xml:space="preserve">
     <value>Integrationen</value>
   </data>
   <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
-    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Auto-detected, mit Vorschau auf kommende Integrationen.</value>
+    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Kommende Integrationen in der Vorschau.</value>
   </data>
   <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
     <value>Theme</value>
@@ -821,6 +857,12 @@
   <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
     <value>Zeigt deinen Custom-Titel aus Honorific im Header über dem Chat-Log an, in der von dir gewählten Farbe.</value>
   </data>
+  <data name="Settings_Integrations_Honorific_Glow_Toggle" xml:space="preserve">
+    <value>Glow-Outline rendern (Honorific)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
+    <value>Kann die Framerate auf schwacher Hardware drücken. Rendert die Glow-Outline für Honorific-Titel, die sie nutzen. Gradient-Animation wird noch nicht unterstützt und wird stattdessen als Primärfarbe gezeichnet.</value>
+  </data>
   <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
     <value>Honorific auf GitHub</value>
   </data>

HellionChat/Resources/HellionStrings.resx

@@ -19,28 +19,28 @@
     <value>Enable privacy filter</value>
   </data>
   <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
-    <value>When enabled, only messages from whitelisted channels are persisted to the database. Disabling restores the original behavior (everything except battle messages is stored).</value>
+    <value>When enabled, only messages from allowed channels are written to the database. When disabled, the default behaviour applies — everything except battle logs is stored.</value>
   </data>
   <data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve">
-    <value>The filter only controls what is written to the local database. The chat log itself keeps showing every message live, disallowed channels just stop being saved. Use the channel hide options in your in-game chat tabs if you want to remove channels from the visible chat.</value>
+    <value>The filter only controls what is written to the local database. The chat log still shows every message live; excluded channels are simply no longer stored. If you also want to remove channels from the visible display, use the normal chat-tab filters in the game.</value>
   </data>
   <data name="Privacy_Filter_Tree_Heading" xml:space="preserve">
     <value>Privacy filter and whitelist</value>
   </data>
   <data name="Privacy_Whitelist_Help" xml:space="preserve">
-    <value>Pick which channels are stored in the local database. Privacy-First default: only your own conversations. Use the buttons below to apply a preset.</value>
+    <value>Choose which channels are saved to the local database. Default follows data minimisation: only your own conversations. Use the buttons below to apply a preset.</value>
   </data>
   <data name="Privacy_Preset_PrivacyFirst" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
   </data>
   <data name="Privacy_Preset_ClearAll" xml:space="preserve">
-    <value>Clear all</value>
+    <value>Deselect all</value>
   </data>
   <data name="Privacy_Preset_SelectAll" xml:space="preserve">
     <value>Select all</value>
   </data>
   <data name="Privacy_Group_DirectMessages" xml:space="preserve">
-    <value>Direct Messages</value>
+    <value>Direct messages</value>
   </data>
   <data name="Privacy_Group_PartyAlliance" xml:space="preserve">
     <value>Party &amp; Alliance</value>
@@ -55,52 +55,52 @@
     <value>Cross-World Linkshells</value>
   </data>
   <data name="Privacy_Group_ExtraChat" xml:space="preserve">
-    <value>ExtraChat (Encrypted)</value>
+    <value>ExtraChat (encrypted)</value>
   </data>
   <data name="Privacy_Group_PublicChat" xml:space="preserve">
-    <value>Public Chat (third-party data)</value>
+    <value>Public chat (third-party data)</value>
   </data>
   <data name="Privacy_Group_SystemLogs" xml:space="preserve">
-    <value>System &amp; Game Logs</value>
+    <value>System &amp; game logs</value>
   </data>
   <data name="Privacy_PersistUnknown_Name" xml:space="preserve">
-    <value>Persist unknown channel types</value>
+    <value>Save unknown channel types</value>
   </data>
   <data name="Privacy_PersistUnknown_Description" xml:space="preserve">
-    <value>Failsafe for ChatTypes added by future FFXIV patches that this plugin does not yet know about. Default OFF (Privacy-First). Turn ON if you want a complete log including future channels.</value>
+    <value>Safety net for ChatTypes added by future FFXIV patches that the plugin does not yet know about. Default is OFF (data minimisation). Enable if you want future channels to be fully logged as well.</value>
   </data>
   <data name="Cleanup_Heading" xml:space="preserve">
     <value>Apply filter to existing database</value>
   </data>
   <data name="Cleanup_Help_Intro" xml:space="preserve">
-    <value>The privacy filter only applies to new messages. Use the cleanup below to retroactively remove already-stored messages that don't match your saved whitelist.</value>
+    <value>The privacy filter only affects new messages. The cleanup below lets you retroactively remove already-stored messages that do not match your saved whitelist.</value>
   </data>
   <data name="Cleanup_Help_SavedNote" xml:space="preserve">
-    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved edits above. Click Save first if you want to apply your current edits.</value>
+    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved changes above. Click Save first if you want your current changes to be applied.</value>
   </data>
   <data name="Retention_Help_SavedNote" xml:space="preserve">
-    <value>The manual sweep uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current edits.</value>
+    <value>The manual run uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current changes.</value>
   </data>
   <data name="Cleanup_Preview_Stale" xml:space="preserve">
-    <value>Preview is out of date — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
+    <value>Preview is stale — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
   </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Refresh preview</value>
   </data>
   <data name="Cleanup_NoPreview" xml:space="preserve">
-    <value>No preview yet. Click Refresh to compute the impact.</value>
+    <value>No preview yet. Click Refresh to calculate the impact.</value>
   </data>
   <data name="Cleanup_TotalStored" xml:space="preserve">
     <value>Total stored messages: {0:N0}</value>
   </data>
   <data name="Cleanup_WillKeep" xml:space="preserve">
-    <value>Will keep:    {0:N0}</value>
+    <value>Keep:    {0:N0}</value>
   </data>
   <data name="Cleanup_WillDelete" xml:space="preserve">
-    <value>Will delete:  {0:N0}</value>
+    <value>Delete:  {0:N0}</value>
   </data>
   <data name="Cleanup_Breakdown" xml:space="preserve">
-    <value>Per-channel breakdown</value>
+    <value>Breakdown by channel</value>
   </data>
   <data name="Cleanup_Marker_Keep" xml:space="preserve">
     <value>[KEEP]  </value>
@@ -112,46 +112,46 @@
     <value>Apply current filter to database</value>
   </data>
   <data name="Cleanup_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: Hard-deletes {0:N0} messages, then runs VACUUM. Cannot be undone.</value>
+    <value>Ctrl+Shift: Permanently deletes {0:N0} messages and runs VACUUM afterwards. Cannot be undone.</value>
   </data>
   <data name="Cleanup_Running" xml:space="preserve">
-    <value>Cleanup running in background…</value>
+    <value>Cleanup running in the background…</value>
   </data>
   <data name="Cleanup_PreviewError" xml:space="preserve">
-    <value>Failed to compute cleanup preview, see /xllog</value>
+    <value>Preview could not be calculated, see /xllog</value>
   </data>
   <data name="Cleanup_Success" xml:space="preserve">
-    <value>Privacy cleanup complete: {0:N0} messages removed.</value>
+    <value>Cleanup complete, {0:N0} messages removed.</value>
   </data>
   <data name="Cleanup_Error" xml:space="preserve">
-    <value>Privacy cleanup failed, see /xllog</value>
+    <value>Cleanup failed, see /xllog</value>
   </data>
   <data name="Retention_Heading" xml:space="preserve">
     <value>Message retention</value>
   </data>
   <data name="Retention_Enabled_Name" xml:space="preserve">
-    <value>Auto-delete messages after a per-channel retention window</value>
+    <value>Automatically delete messages past their channel retention window</value>
   </data>
   <data name="Retention_Enabled_Description" xml:space="preserve">
-    <value>When enabled, messages older than the configured window are deleted on every plugin start (at most once per 24 hours). Off by default. The plugin never deletes history without your explicit consent.</value>
+    <value>When enabled, messages older than the configured window are deleted on each plugin start (at most once every 24 hours). Default is OFF — the plugin never deletes anything without your explicit consent.</value>
   </data>
   <data name="Retention_Default_Label" xml:space="preserve">
     <value>Default retention (days, 0 = never)</value>
   </data>
   <data name="Retention_Default_Help" xml:space="preserve">
-    <value>Applies to channels without an explicit override below.</value>
+    <value>Applies to channels that have no individual override below.</value>
   </data>
   <data name="Retention_Reset_Spec" xml:space="preserve">
     <value>Reset overrides to spec defaults</value>
   </data>
   <data name="Retention_Clear_Overrides" xml:space="preserve">
-    <value>Clear all overrides</value>
+    <value>Remove all overrides</value>
   </data>
   <data name="Retention_Tree_Heading" xml:space="preserve">
-    <value>Per-channel retention overrides</value>
+    <value>Retention per channel</value>
   </data>
   <data name="Retention_Tag_Override" xml:space="preserve">
-    <value>[override]</value>
+    <value>[custom]</value>
   </data>
   <data name="Retention_Tag_Spec" xml:space="preserve">
     <value>[spec]</value>
@@ -163,13 +163,13 @@
     <value>reset</value>
   </data>
   <data name="Retention_Apply_Label" xml:space="preserve">
-    <value>Apply retention policy now</value>
+    <value>Apply retention now</value>
   </data>
   <data name="Retention_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: runs the retention sweep immediately using the SAVED policy. Save your changes first.</value>
+    <value>Ctrl+Shift: Runs the retention cleanup immediately using the SAVED policy. Save your changes first.</value>
   </data>
   <data name="Retention_Running" xml:space="preserve">
-    <value>Retention sweep running in background…</value>
+    <value>Retention cleanup running in the background…</value>
   </data>
   <data name="Retention_LastRun_Never" xml:space="preserve">
     <value>Last run: never</value>
@@ -178,67 +178,73 @@
     <value>Last run: {0:yyyy-MM-dd HH:mm}</value>
   </data>
   <data name="Retention_Success" xml:space="preserve">
-    <value>Retention sweep complete: {0:N0} messages removed.</value>
+    <value>Retention cleanup complete, {0:N0} messages removed.</value>
   </data>
   <data name="Retention_Error" xml:space="preserve">
-    <value>Retention sweep failed, see /xllog</value>
+    <value>Retention cleanup failed, see /xllog</value>
   </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Welcome</value>
   </data>
   <data name="Wizard_Intro" xml:space="preserve">
-    <value>Pick a starting profile. You can change anything later under Settings → Privacy.</value>
+    <value>Choose a starting profile. You can adjust everything later under Settings → Privacy.</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Heading" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Description" xml:space="preserve">
-    <value>Only your own conversations are stored: Tells, Party, FC, Linkshells, Cross-World Linkshells, Alliance and ExtraChat. Public chat, NPC dialogue and system spam are dropped at the storage layer. Retention follows the spec defaults (Tells 365 days, own-conversation channels 90 days).</value>
+    <value>Only your own conversations are stored: tells, party, FC, linkshells, cross-world linkshells, alliance, and ExtraChat. Public chat, NPC dialogues, and system spam are discarded at the storage level. Retention follows spec defaults (tells 365 days, own conversation channels 90 days).</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Apply" xml:space="preserve">
-    <value>Use Privacy-First</value>
+    <value>Apply data minimisation</value>
   </data>
   <data name="Wizard_Profile_Casual_Heading" xml:space="preserve">
     <value>Casual</value>
   </data>
   <data name="Wizard_Profile_Casual_Description" xml:space="preserve">
-    <value>Privacy-First plus a 24-hour window for public chat (Say, Shout, Yell, both emote types, Novice Network). For RP players who want to look up the last scene without keeping public chat forever.</value>
+    <value>Data minimisation plus a 24-hour window for public chat (say, shout, yell, both emote types, novice network). For RP players who want to re-read the last scene without keeping public chat forever.</value>
   </data>
   <data name="Wizard_Profile_Casual_Apply" xml:space="preserve">
-    <value>Use Casual</value>
+    <value>Apply casual</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Heading" xml:space="preserve">
-    <value>Full History</value>
+    <value>Full history</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Description" xml:space="preserve">
-    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behavior). Retention is OFF, history grows forever.</value>
+    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behaviour). Retention is OFF, so the history grows indefinitely.</value>
   </data>
   <data name="Wizard_Profile_FullHistory_GdprWarning" xml:space="preserve">
-    <value>GDPR notice: storing third-party messages (Say/Shout/Yell of strangers, NPC dialogue with player names, etc.) for an unlimited time may exceed the personal/household exemption (Art. 2(2)(c)). Use this profile only if you have a clear reason to keep the full archive.</value>
+    <value>GDPR notice: Storing third-party messages (say/shout/yell from other players, NPC dialogues with player names, etc.) indefinitely may exceed the exemption for purely personal or household activities (Art. 2(2)(c)). Only use this profile if you have a clear reason to keep the full archive.</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Apply" xml:space="preserve">
-    <value>Use Full History</value>
+    <value>Apply full history</value>
   </data>
   <data name="Wizard_Reopen_Button" xml:space="preserve">
     <value>Show wizard again</value>
   </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Later — keep defaults</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Close the wizard without selecting a profile. The plugin defaults stay active and the wizard returns on next plugin load.</value>
+  </data>
   <data name="Export_Heading" xml:space="preserve">
-    <value>Export (GDPR Art. 15 — right of access)</value>
+    <value>Export (GDPR Art. 15 — Right of access)</value>
   </data>
   <data name="Export_Help" xml:space="preserve">
-    <value>Export stored messages to Markdown, JSON or CSV. Use this to fulfil a request for access from someone whose messages you have, or to take your own history with you.</value>
+    <value>Export stored messages as Markdown, JSON, or CSV. This lets you fulfil an access request from a person whose messages you have stored, or take your own history with you.</value>
   </data>
   <data name="Export_Range_Label" xml:space="preserve">
-    <value>Last X days (0 = all time)</value>
+    <value>Last X days (0 = no time limit)</value>
   </data>
   <data name="Export_Sender_Label" xml:space="preserve">
     <value>Sender contains (optional, case-insensitive)</value>
   </data>
   <data name="Export_Channels_Heading" xml:space="preserve">
-    <value>Limit to channels</value>
+    <value>Restrict to channels</value>
   </data>
   <data name="Export_Channels_AllOff" xml:space="preserve">
-    <value>(none selected = all stored channels)</value>
+    <value>(nothing selected = all stored channels)</value>
   </data>
   <data name="Export_Format_Label" xml:space="preserve">
     <value>Format</value>
@@ -259,41 +265,41 @@
     <value>Save export</value>
   </data>
   <data name="Export_Running" xml:space="preserve">
-    <value>Export running in background…</value>
+    <value>Export running in the background…</value>
   </data>
   <data name="Export_Success" xml:space="preserve">
-    <value>Export complete: {0:N0} messages written to {1}</value>
+    <value>Export complete, {0:N0} messages written to {1}</value>
   </data>
   <data name="Export_Empty" xml:space="preserve">
-    <value>Export complete: no messages matched the filter.</value>
+    <value>Export complete, no message matched the filter.</value>
   </data>
   <data name="Export_Error" xml:space="preserve">
     <value>Export failed, see /xllog</value>
   </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
-    <value>Use the Hellion theme across all plugin windows</value>
+    <value>Use Hellion theme for all plugin windows</value>
   </data>
   <data name="Theme_Enabled_Description" xml:space="preserve">
-    <value>Hellion Online Media palette of Arctic Cyan plus Ember Orange, applied across the chat log, settings, viewers and the wizard. Disable to fall back to the default Dalamud look.</value>
+    <value>Hellion Online Media palette of Arctic Cyan and Ember Orange, applied to the chat window, settings, viewer, and wizard. Disable to use the default Dalamud appearance.</value>
   </data>
   <data name="Theme_WindowOpacity_Label" xml:space="preserve">
     <value>Window opacity</value>
   </data>
   <data name="Theme_WindowOpacity_Help" xml:space="preserve">
-    <value>How opaque the plugin panes are. Lower values let the game shine through; form fields and dialogs stay opaque on top so they remain readable.</value>
+    <value>How opaque the plugin windows are. Lower values let the game show through; form fields and dialogs stay fully opaque and readable on top.</value>
   </data>
   <data name="Theme_UseHellionFont_Name" xml:space="preserve">
-    <value>Use the bundled Hellion font (Exo 2)</value>
+    <value>Use bundled Hellion font (Exo 2)</value>
   </data>
   <data name="Theme_UseHellionFont_Description" xml:space="preserve">
-    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1) which ships with the plugin. Disable to fall back to whatever font you picked under Settings → Fonts.</value>
+    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1), which ships with the plugin. Disable to fall back to the font selected under Settings → Font.</value>
   </data>
 
   <data name="About_Maintainer_Heading" xml:space="preserve">
     <value>Maintainer</value>
   </data>
   <data name="About_Maintainer_Body" xml:space="preserve">
-    <value>I maintain Hellion Chat through Hellion Online Media. The website has the contact details for licensing, legal or business questions.</value>
+    <value>I maintain Hellion Chat through Hellion Online Media. Contact details for licensing, legal, or business inquiries are on the website.</value>
   </data>
   <data name="About_Maintainer_Website_Label" xml:space="preserve">
     <value>Website:</value>
@@ -303,142 +309,172 @@
     <value>Why this fork exists</value>
   </data>
   <data name="About_Mission_P1" xml:space="preserve">
-    <value>Hellion Chat is not trying to replace Chat 2. Chat 2 ships a complete chat experience with full history available for filtering, search and replay. That default is the right one for most users. This fork takes a different stance: a smaller default footprint, with extra knobs for users who want to keep less third-party chat on disk.</value>
+    <value>Hellion Chat is not meant to replace Chat 2. Chat 2 delivers a complete chat experience with a full history available for filtering, searching, and replay. That default is the right choice for most users. This fork takes a different approach: a smaller default footprint, with additional controls for users who prefer to keep less of other people's chat on disk.</value>
   </data>
   <data name="About_Mission_P2" xml:space="preserve">
-    <value>The reason I wanted that narrower default was personal. After two years on Chat 2 my database had grown past two million messages, most of them /say, /shout and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full-history view powerful and most users are happy to keep it. For my own taste I wanted a smaller default. So I built this fork.</value>
+    <value>The desire for this narrower default was personal. After two years with Chat 2, my database had grown to over two million messages, the majority of them /say, /shout, and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full history useful, and most users are happy to keep it. My own preference was for a smaller default. So I built this fork.</value>
   </data>
   <data name="About_Mission_P3" xml:space="preserve">
-    <value>I am not chasing a big audience and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the upstream plugin. Infi, Anna or anyone else are welcome to read it, borrow ideas, ask questions, or ignore the project. All three are fine by me.</value>
+    <value>I am not targeting a large audience, and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the original. Infi, Anna, or anyone else is welcome to look around, borrow ideas, ask questions, or simply ignore the project. All three are fine by me.</value>
   </data>
 
   <data name="About_BuiltOn_Heading" xml:space="preserve">
     <value>Built on Chat 2</value>
   </data>
   <data name="About_BuiltOn_P1" xml:space="preserve">
-    <value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat replacement window, the IPC integration, the rendering engine and the entire storage core come from upstream Chat 2.</value>
+    <value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat-replacement window, IPC integration, render engine, and the entire storage core all come from the original.</value>
   </data>
   <data name="About_BuiltOn_P2" xml:space="preserve">
-    <value>The webinterface is the only major piece I removed. It is built for remote access to chat from a second device, which is a different focus than the smaller default footprint this fork is built around. Aligning it with these defaults would have meant a substantial rebuild, so removing it was the cleaner path for this particular fork.</value>
+    <value>The web interface is the only major piece I removed. It is built for remote access to the chat from a second device — a different focus from the smaller default footprint this fork pursues. Adapting it to these defaults would have required significant rework, so removing it was the clean path for this particular fork.</value>
   </data>
   <data name="About_BuiltOn_Upstream_Label" xml:space="preserve">
     <value>Upstream repository:</value>
   </data>
 
   <data name="About_License_Heading" xml:space="preserve">
-    <value>License</value>
+    <value>Licence</value>
   </data>
   <data name="About_License_P1" xml:space="preserve">
-    <value>Hellion Chat and Chat 2 both ship under the European Union Public Licence v1.2 (EUPL-1.2).</value>
+    <value>Hellion Chat and Chat 2 are both released under the European Union Public Licence v1.2 (EUPL-1.2).</value>
   </data>
   <data name="About_License_P2" xml:space="preserve">
-    <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna and the upstream contributors).</value>
+    <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna, and upstream contributors).</value>
   </data>
   <data name="About_License_P3" xml:space="preserve">
-    <value>© 2026 Hellion Online Media for the additions made in this fork.</value>
+    <value>© 2026 Hellion Online Media for the extensions in this fork.</value>
   </data>
 
   <data name="About_SE_Heading" xml:space="preserve">
-    <value>FINAL FANTASY XIV disclaimer</value>
+    <value>FINAL FANTASY XIV notice</value>
   </data>
   <data name="About_SE_P1" xml:space="preserve">
     <value>FINAL FANTASY XIV © SQUARE ENIX CO., LTD. All rights reserved.</value>
   </data>
   <data name="About_SE_P2" xml:space="preserve">
-    <value>Hellion Chat is an unofficial, fan-made plugin. It has no affiliation with Square Enix and is not endorsed, sponsored or approved by them.</value>
+    <value>Hellion Chat is an unofficial fan plugin. It is not affiliated with Square Enix and is neither endorsed, sponsored, nor approved by them.</value>
   </data>
 
   <data name="About_Localization_Heading" xml:space="preserve">
-    <value>Localization</value>
+    <value>Localisation</value>
   </data>
   <data name="About_Localization_P1" xml:space="preserve">
-    <value>The German translations of the Hellion-specific strings come from me. Other languages are not provided yet.</value>
+    <value>The translations of the Hellion-specific strings were done by me. No additional languages are currently available.</value>
   </data>
   <data name="About_Localization_P2" xml:space="preserve">
-    <value>The translator list below covers the upstream Chat 2 strings on Crowdin. Those volunteers translated Chat 2, not the Hellion additions.</value>
+    <value>The translator list below belongs to the Chat 2 strings on Crowdin. These volunteers translated Chat 2, not the Hellion extensions.</value>
   </data>
   <data name="About_Translators_TreeNode" xml:space="preserve">
     <value>Chat 2 community translators (upstream)</value>
   </data>
 
-  <!-- Hellion Chat — Auto-Tell-Tabs (runtime strings) -->
+  <!-- Hellion Chat — Auto-Tell-Tabs (Runtime strings) -->
   <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
-    <value>Active Tells</value>
+    <value>Active tells</value>
   </data>
   <data name="AutoTellTabs_HistorySeparator" xml:space="preserve">
     <value>— Earlier conversations —</value>
   </data>
   <data name="AutoTellTabs_HistoryLoadError" xml:space="preserve">
-    <value>History could not be loaded.</value>
+    <value>Could not load history.</value>
   </data>
   <data name="AutoTellTabs_GreetedTooltip" xml:space="preserve">
-    <value>Marked as greeted. Click to remove the marker.</value>
+    <value>Marked as greeted. Click to remove the mark.</value>
   </data>
   <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
     <value>Mark as greeted.</value>
   </data>
+  <data name="PinTab_MenuPin" xml:space="preserve">
+    <value>Pin Tab</value>
+  </data>
+  <data name="PinTab_MenuUnpin" xml:space="preserve">
+    <value>Unpin Tab</value>
+  </data>
+  <data name="PinTab_MenuPromote" xml:space="preserve">
+    <value>Promote to permanent</value>
+  </data>
+  <data name="PinTab_PromoteTooltip" xml:space="preserve">
+    <value>Turns this TempTell into a regular tab. The tell binding to the partner is dropped — the tab will catch messages by its channel filters from now on. For "tab survives relog while staying bound to this partner", use Pin Tab instead.</value>
+  </data>
+  <data name="PinTab_PinTooltip" xml:space="preserve">
+    <value>Pinned tabs survive relog and stay bound to this conversation partner.</value>
+  </data>
+  <data name="PinTab_SectionHeader" xml:space="preserve">
+    <value>Pinned</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
+    <value>Sidebar width</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
+    <value>Width of the tab sidebar in pixels. The default (44 px) is icon-only; widen it to fit the section headers like "Active Tells (3)" without truncation.</value>
+  </data>
+  <data name="PinTab_LimitReached" xml:space="preserve">
+    <value>Maximum of {0} pinned tell tabs reached. Unpin one first, or use Promote to permanent.</value>
+  </data>
+  <data name="PinTab_PinnedTooltip" xml:space="preserve">
+    <value>Pinned — survives relog.</value>
+  </data>
 
   <!-- Hellion Chat — Auto-Tell-Tabs (Chat settings tab) -->
   <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
     <value>Auto-Tell-Tabs</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve">
-    <value>Open a tab automatically for each tell partner</value>
+    <value>Automatically open a tab per conversation partner for every /tell</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Enable_Description" xml:space="preserve">
-    <value>When you receive or send a /tell, a temporary tab dedicated to that player is opened automatically. Tabs vanish on logout.</value>
+    <value>As soon as you receive or send a /tell, a temporary tab is automatically opened for that player. Tabs are removed on logout.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve">
-    <value>Maximum number of auto tell tabs</value>
+    <value>Maximum number of auto-tell tabs</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
-    <value>When the limit is reached, greeted tabs with the oldest activity are dropped first. The change applies on the next /tell.</value>
+    <value>When the limit is reached, greeted tabs with the oldest activity are closed first. Changes take effect on the next /tell. This limit applies to the auto-managed pool. Pinned tell tabs (right-click → Pin Tab) live in a separate pool of up to 5 and survive relog.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
     <value>Compact display</value>
   </data>
   <data name="ChatLog_AutoTellTabs_Compact_Description" xml:space="preserve">
-    <value>Show only a thin separator between persistent tabs and auto tell tabs, without the section header.</value>
+    <value>Shows only a thin separator between regular tabs and auto-tell tabs, without a section header.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve">
-    <value>Show "mark as greeted" button</value>
+    <value>Show "Mark as greeted" button</value>
   </data>
   <data name="ChatLog_AutoTellTabs_GreetedToggle_Description" xml:space="preserve">
-    <value>Adds a click-to-toggle button next to each auto tell tab to mark a partner as already greeted, dimming the tab name when set. Useful for club greeters tracking many parallel conversations; off by default.</value>
+    <value>Adds a click button next to each auto-tell tab to mark a conversation partner as already greeted — the tab name is then dimmed. Useful for club greeters managing many conversations in parallel. Off by default.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_OpenAsPopout_Name" xml:space="preserve">
-    <value>Open new /tell tabs directly as pop-out</value>
+    <value>Open new /tell tabs directly as pop-outs</value>
   </data>
   <data name="ChatLog_AutoTellTabs_OpenAsPopout_Description" xml:space="preserve">
-    <value>When enabled, each newly created /tell tab opens directly as its own window. Closing the window returns the tab to the sidebar.</value>
+    <value>When active, each newly created /tell tab is immediately opened as its own window. Closing the window returns the tab to the sidebar.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve">
-    <value>The number of preloaded tells is configured in the Privacy tab.</value>
+    <value>The number of preloaded tells can be configured in the Privacy tab.</value>
   </data>
   <data name="ChatLog_AutoTellTabs_ConflictHint" xml:space="preserve">
-    <value>Heads-up: if XIV Messanger or a similar plugin is suppressing direct messages, turn its "Suppress DMs" option off so Hellion Chat can receive tells and open the auto tabs.</value>
+    <value>Note: If XIV Messenger or a similar plugin suppresses tells, disable the "Suppress DMs" option there so that Hellion Chat can receive tells and open the auto-tabs.</value>
   </data>
 
   <!-- Hellion Chat — Auto-Tell-Tabs (Privacy settings tab) -->
   <data name="Privacy_AutoTellTabs_Section_Title" xml:space="preserve">
-    <value>Tell history in auto tabs</value>
+    <value>Tell history in auto-tabs</value>
   </data>
   <data name="Privacy_AutoTellTabs_Preload_Name" xml:space="preserve">
     <value>Number of preloaded tells</value>
   </data>
   <data name="Privacy_AutoTellTabs_Preload_Description" xml:space="preserve">
-    <value>How many earlier tell messages are loaded from the database when an auto tell tab is opened. 0 disables the preload.</value>
+    <value>How many previous tell messages are loaded from the database when an auto-tell tab is opened. 0 disables preloading.</value>
   </data>
   <data name="Privacy_AutoTellTabs_Preload_Hint" xml:space="preserve">
-    <value>Only takes effect when auto tell tabs are enabled in the Chat tab.</value>
+    <value>Only takes effect when auto-tell tabs are enabled in the Chat tab.</value>
   </data>
 
-  <!-- Hellion Chat — Settings UX Polish v10 wipe migration -->
+  <!-- Hellion Chat — Settings UX Polish v10 Wipe migration -->
   <data name="SettingsRefactor_Migration_Title" xml:space="preserve">
-    <value>Settings reorganised</value>
+    <value>Settings restructured</value>
   </data>
   <data name="SettingsRefactor_Migration_Content" xml:space="preserve">
-    <value>Hellion Chat 0.5.0 reorganised the settings into themed tabs. Your chat database and your message history stay untouched. Settings have been reset to defaults; if you want to pick a privacy profile again, the reopen button is in the Privacy tab. A backup of your previous config is at HellionChat.json.pre-v10-backup next to the live config file.</value>
+    <value>Hellion Chat 0.5.0 has restructured the settings into thematic tabs. Your chat database and message history remain unchanged. Settings have been reset to defaults. If you want to re-select your privacy profile, the Reopen button is in the Privacy tab. A backup of the previous config is located at HellionChat.json.pre-v10-backup next to the active config file.</value>
   </data>
 
   <!-- Hellion Chat — Settings UX Polish 8-tab structure -->
@@ -455,30 +491,30 @@
     <value>Chat</value>
   </data>
   <data name="Settings_Tab_Tabs" xml:space="preserve">
-    <value>Tabs</value>
+    <value>Channels</value>
   </data>
   <data name="Settings_Tab_Database" xml:space="preserve">
     <value>Database</value>
   </data>
   <data name="Settings_Tab_Information" xml:space="preserve">
-    <value>Information</value>
+    <value>About</value>
   </data>
 
-  <!-- Hellion Chat — General-Tab section headings -->
+  <!-- Hellion Chat — General tab section headings -->
   <data name="Settings_General_Input_Heading" xml:space="preserve">
     <value>Input</value>
   </data>
   <data name="Settings_General_Audio_Heading" xml:space="preserve">
-    <value>Audio &amp; Notifications</value>
+    <value>Audio &amp; notifications</value>
   </data>
   <data name="Settings_General_Performance_Heading" xml:space="preserve">
     <value>Performance</value>
   </data>
   <data name="Settings_General_Language_Heading" xml:space="preserve">
-    <value>Language &amp; Input Helpers</value>
+    <value>Language &amp; input aids</value>
   </data>
 
-  <!-- Hellion Chat — Appearance-Tab section headings -->
+  <!-- Hellion Chat — Appearance tab section headings -->
   <data name="Settings_Appearance_Theme_Heading" xml:space="preserve">
     <value>Theme</value>
   </data>
@@ -486,32 +522,32 @@
     <value>Fonts</value>
   </data>
   <data name="Settings_Appearance_Colours_Heading" xml:space="preserve">
-    <value>Chat Colours</value>
+    <value>Chat colours</value>
   </data>
   <data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve">
     <value>Timestamps</value>
   </data>
 
-  <!-- Hellion Chat — Window-Tab section headings -->
+  <!-- Hellion Chat — Window tab section headings -->
   <data name="Settings_Window_Hide_Heading" xml:space="preserve">
-    <value>Hide</value>
+    <value>Hiding</value>
   </data>
   <data name="Settings_Window_InactivityHide_Heading" xml:space="preserve">
-    <value>Inactivity Hide</value>
+    <value>Inactivity hiding</value>
   </data>
   <data name="Settings_Window_Frame_Heading" xml:space="preserve">
-    <value>Window Frame</value>
+    <value>Window frame</value>
   </data>
   <data name="Settings_Window_Tooltips_Heading" xml:space="preserve">
     <value>Tooltips</value>
   </data>
 
-  <!-- Hellion Chat — Chat-Tab section headings -->
+  <!-- Hellion Chat — Chat tab section headings -->
   <data name="Settings_Chat_AutoTellTabs_Heading" xml:space="preserve">
     <value>Auto-Tell-Tabs</value>
   </data>
   <data name="Settings_Chat_Behaviour_Heading" xml:space="preserve">
-    <value>Message Behaviour</value>
+    <value>Message behaviour</value>
   </data>
   <data name="Settings_Chat_Preview_Heading" xml:space="preserve">
     <value>Preview</value>
@@ -520,7 +556,7 @@
     <value>Emotes</value>
   </data>
 
-  <!-- Hellion Chat — Database-Tab section headings -->
+  <!-- Hellion Chat — Database tab section headings -->
   <data name="Settings_Database_Storage_Heading" xml:space="preserve">
     <value>Storage</value>
   </data>
@@ -531,9 +567,9 @@
     <value>Maintenance</value>
   </data>
 
-  <!-- Hellion Chat — Information-Tab section headings -->
+  <!-- Hellion Chat — Information tab section headings -->
   <data name="Settings_Information_VersionInfo_Heading" xml:space="preserve">
-    <value>Version Info</value>
+    <value>Version info</value>
   </data>
   <data name="Settings_Information_About_Heading" xml:space="preserve">
     <value>About HellionChat</value>
@@ -542,7 +578,7 @@
     <value>Changelog</value>
   </data>
 
-  <!-- Hellion Chat — Default tab presets (channel-themed) -->
+  <!-- Hellion Chat — Default tab presets (channel-specific) -->
   <data name="Tabs_Presets_System" xml:space="preserve">
     <value>System</value>
   </data>
@@ -553,36 +589,36 @@
     <value>Party</value>
   </data>
   <data name="Tabs_Presets_Beginner" xml:space="preserve">
-    <value>Beginner</value>
+    <value>Novice</value>
   </data>
   <data name="Tabs_Presets_Linkshell" xml:space="preserve">
     <value>Linkshell</value>
   </data>
   <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
-    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for cleaner readability. Duplicate this tab and narrow the channel selection per copy.</value>
+    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for a cleaner overview. Duplicate the tab and restrict the channel selection in each copy.</value>
   </data>
 
   <!-- Hellion Chat — v1.2.0 per-tab icon override -->
   <data name="Tabs_Icon_Label" xml:space="preserve">
-    <value>Tab-Icon</value>
+    <value>Tab icon</value>
   </data>
   <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
-    <value>FontAwesome-Glyph für die Sidebar. Default greift auf Tab-Name oder Channel-Typ.</value>
+    <value>FontAwesome glyph for the sidebar. Default falls back to the tab name or channel type.</value>
   </data>
   <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
-    <value>(Default-Mapping)</value>
+    <value>(Default mapping)</value>
   </data>
   <data name="ChatColourPresets_Default" xml:space="preserve">
-    <value>Klassik (Chat 2 Default)</value>
+    <value>Classic (Chat 2 default)</value>
   </data>
   <data name="ChatColourPresets_HighContrast" xml:space="preserve">
-    <value>High-Contrast</value>
+    <value>High contrast</value>
   </data>
   <data name="ChatColourPresets_Pastell" xml:space="preserve">
-    <value>Pastell</value>
+    <value>Pastel</value>
   </data>
   <data name="ChatColourPresets_DarkModeTuned" xml:space="preserve">
-    <value>Dark-Mode-Tuned</value>
+    <value>Dark mode tuned</value>
   </data>
   <data name="ChatColourPresets_Hellion" xml:space="preserve">
     <value>Hellion</value>
@@ -594,22 +630,22 @@
     <value>Indigo Violet</value>
   </data>
   <data name="Settings_Appearance_Colours_PresetsHint" xml:space="preserve">
-    <value>Tip: presets overwrite your current channel colours immediately.</value>
+    <value>Tip: Presets overwrite your current channel colours immediately.</value>
   </data>
   <data name="Settings_Window_PopOutInputEnabled_Name" xml:space="preserve">
     <value>Enable input in pop-outs</value>
   </data>
   <data name="Settings_Window_PopOutInputEnabled_Description" xml:space="preserve">
-    <value>Master switch: lets you type and send messages directly inside every pop-out window (including auto-tell tabs). Channel changes inside a pop-out apply globally just like in the main window; the text buffer and history cursor stay independent per pop-out.</value>
+    <value>Master switch: allows typing and sending directly in any pop-out window (including auto-tell tabs). Channel switching in a pop-out acts globally like in the main window; the text buffer and history cursor are independent per pop-out.</value>
   </data>
   <data name="Settings_Window_ResetPosition_Name" xml:space="preserve">
-    <value>Reset Window Position</value>
+    <value>Reset window position</value>
   </data>
   <data name="Settings_Window_ResetPosition_Description" xml:space="preserve">
-    <value>Snaps the chat window and every active pop-out back to the primary monitor's top-left corner. Useful when a window has drifted off-screen after a display layout change (monitor disconnected, resolution changed). The plugin also runs an automatic bounds check once per session — this button is the manual backup if anything still ends up unreachable.</value>
+    <value>Moves the chat window and all active pop-outs back to the top-left corner of the primary monitor. Useful when a window has ended up outside the visible area after a display layout change (monitor disconnected, resolution changed). The plugin also performs an automatic bounds check once per session; this button is the manual escape hatch if something still ends up unreachable.</value>
   </data>
   <data name="Popout_v060_HintText" xml:space="preserve">
-    <value>New in v0.6.0: you can type directly inside pop-out windows. Toggle the master switch in the window settings to enable it.</value>
+    <value>New in v0.6.0: You can now type directly in pop-outs. Enable the master switch in the Window settings.</value>
   </data>
   <data name="Popout_v060_HintAck" xml:space="preserve">
     <value>Got it</value>
@@ -618,19 +654,19 @@
     <value>Open window settings</value>
   </data>
   <data name="Hint_v061_PopOutHeader_Body" xml:space="preserve">
-    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is enabled by default (can be turned off under Settings → Window).</value>
+    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is active by default (can be disabled under Settings → Window).</value>
   </data>
   <data name="Hint_v061_PopOutHeader_Ack" xml:space="preserve">
     <value>Got it</value>
   </data>
   <data name="Hint_v061_PopOutHeader_OpenSettings" xml:space="preserve">
-    <value>Open Settings</value>
+    <value>Open settings</value>
   </data>
   <data name="ChatTwoConflictTitle" xml:space="preserve">
     <value>Hellion Chat cannot start while Chat 2 is loaded.</value>
   </data>
   <data name="ChatTwoConflictBody" xml:space="preserve">
-    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same in-game chat window and would conflict at runtime if loaded together.</value>
+    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same chat window in the game and would conflict at runtime.</value>
   </data>
   <data name="ChatTwoConflictAction" xml:space="preserve">
     <value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value>
@@ -639,7 +675,7 @@
     <value>General</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-wide settings — language, input, audio, performance.</value>
+    <value>Language, input, audio, and performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Appearance</value>
@@ -657,25 +693,25 @@
     <value>Window</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Window behaviour — when it shows, whether it can move.</value>
+    <value>When the window is visible and whether it can be moved.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>How messages are displayed — tells, preview, behaviour, emotes.</value>
+    <value>Tells, preview, message behaviour, and emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab management — create and configure your own chat tabs.</value>
+    <value>Create and configure custom chat tabs.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Privacy</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>What's allowed to be stored — privacy filter per channel.</value>
+    <value>Privacy filter per channel and what may be stored.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Database</value>
@@ -687,7 +723,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>About the plugin — version, mission, license, changelog.</value>
+    <value>Version, mission, licence, and changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -705,16 +741,16 @@
     <value>Open themes folder</value>
   </data>
   <data name="Settings_Themes_ExportActive" xml:space="preserve">
-    <value>Export active...</value>
+    <value>Export active…</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
-    <value>This theme suggests its own chat channel colours.</value>
+    <value>This theme suggests its own channel colours.</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
     <value>Apply</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
-    <value>Keep current</value>
+    <value>Keep</value>
   </data>
   <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
     <value>Privacy-First</value>
@@ -723,55 +759,55 @@
     <value>Open</value>
   </data>
   <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
-    <value>Compact Density</value>
+    <value>Compact density</value>
   </data>
   <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
-    <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
+    <value>Switches the message layout from the card-row default back to single-line `[HH:mm] Sender: Text` rows.</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
     <value>Theme &amp; Layout</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
-    <value>How the window looks — theme, frame, timestamp style.</value>
+    <value>Theme, window frame, and timestamp style.</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
     <value>Fonts &amp; Colours</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
-    <value>Readability — font, font size, per-channel chat colours.</value>
+    <value>Font, font size, and chat colours per channel.</value>
   </data>
   <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
-    <value>Data Management</value>
+    <value>Data management</value>
   </data>
   <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
-    <value>What happens to stored data — retention, cleanup, export, DB stats.</value>
+    <value>Retention, cleanup, export, and database statistics.</value>
   </data>
   <data name="Settings_Card_Integrations_Title" xml:space="preserve">
     <value>Integrations</value>
   </data>
   <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
-    <value>Other Dalamud plugins HellionChat reacts to. Auto-detected, with a "coming soon" preview of upcoming integrations.</value>
+    <value>Other Dalamud plugins that HellionChat works with. Upcoming integrations in preview.</value>
   </data>
   <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
     <value>Theme</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
-    <value>Window Style</value>
+    <value>Window style</value>
   </data>
   <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
-    <value>Timestamp Style</value>
+    <value>Timestamp style</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
-    <value>Window Transparency</value>
+    <value>Window transparency</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
-    <value>How transparent the window background is. Lower values let the game show through more. Tip: Dalamud's per-window menu (Hamburger in the title bar) gives you per-window overrides for opacity, background blur, click-through and pinning — those override this slider for that window.</value>
+    <value>How transparent the window background is. Lower values let more of the game show through. Tip: Dalamud's per-window menu (hamburger in the title bar) offers per-window overrides for opacity, background blur, click-through, and pinning — those take precedence over this slider for the respective window.</value>
   </data>
   <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
     <value>Fonts</value>
   </data>
   <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
-    <value>Chat Colours</value>
+    <value>Chat colours</value>
   </data>
   <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
     <value>Storage</value>
@@ -786,22 +822,22 @@
     <value>Export</value>
   </data>
   <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
-    <value>Database Viewer</value>
+    <value>Database viewer</value>
   </data>
   <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
-    <value>Advanced (Shift+Click to open)</value>
+    <value>Advanced (Shift+click to open)</value>
   </data>
   <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
     <value>Behaviour</value>
   </data>
   <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
-    <value>Hellion Chat 1.2.1 reorganised the Settings menu and removed the legacy "Style override" option (made obsolete by the Themes system in 1.1.0). Your other settings are unchanged. Window opacity was migrated to Theme &amp; Layout. A backup of your previous config is at pluginConfigs/HellionChat.json.pre-v16-backup next to the live HellionChat.json.</value>
+    <value>Hellion Chat 1.2.1 has reorganised the settings menu and removed the old "Override style" option (superseded by the theme system from 1.1.0). Your remaining settings are unchanged. Window transparency has been migrated to "Theme &amp; Layout". A backup of the previous config is located at pluginConfigs/HellionChat.json.pre-v16-backup next to the active HellionChat.json.</value>
   </data>
   <data name="Settings_Tab_Integrations" xml:space="preserve">
     <value>Integrations</value>
   </data>
   <data name="Settings_Integrations_Intro" xml:space="preserve">
-    <value>Plugin integrations let HellionChat react to other installed Dalamud plugins. Each integration auto-detects its target and silently disables itself when the target plugin is not present.</value>
+    <value>Plugin integrations let HellionChat work together with other installed Dalamud plugins. Each integration automatically detects its target and silently disables itself when the target plugin is missing.</value>
   </data>
   <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
     <value>Honorific</value>
@@ -813,13 +849,19 @@
     <value>Not installed</value>
   </data>
   <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
-    <value>Incompatible API version ({0} expected, {1}.{2} detected)</value>
+    <value>Incompatible API version ({0} expected, {1}.{2} found)</value>
   </data>
   <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
     <value>Show Honorific title in chat header</value>
   </data>
   <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
-    <value>Displays your custom title from Honorific in the header above the chat log, in your chosen colour.</value>
+    <value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Toggle" xml:space="preserve">
+    <value>Render glow outlines (Honorific)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
+    <value>May reduce frame rate on low-end hardware. Renders glow outlines for Honorific titles that use them. Gradient animation is not yet supported and will render as the primary colour.</value>
   </data>
   <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
     <value>Honorific on GitHub</value>
@@ -831,48 +873,48 @@
     <value>Coming soon</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
-    <value>These integrations are on the roadmap. The settings for each appear automatically once the underlying plugin is wired up.</value>
+    <value>These integrations are on the roadmap. The settings will appear automatically once the respective plugin is connected.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
     <value>Context menu actions</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
-    <value>Right-click a name in chat to jump to PlayerTrack, open the Lodestone profile, or compose a DM in one click.</value>
+    <value>Right-click a name in chat: jump to PlayerTrack, open the Lodestone profile, or compose a DM with one click.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve">
     <value>Smart notifications (NotificationMaster)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve">
-    <value>Route mentions and DMs through NotificationMaster for system toasts, taskbar flash, and per-channel sounds.</value>
+    <value>Mentions and DMs via NotificationMaster: system toasts, taskbar flash, and per-channel sounds.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve">
     <value>RP status block (Moodles · LightlessClient)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve">
-    <value>Show Moodles status icons and pair-badges inline next to chat names for richer roleplay context.</value>
+    <value>Show Moodles status icons and pair badges directly next to chat names for more roleplay context.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve">
     <value>ExtraChat channels</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve">
-    <value>Host end-to-end-encrypted cross-datacenter linkshells natively in HellionChat.</value>
+    <value>Host end-to-end encrypted cross-datacenter linkshells natively in HellionChat.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
-    <value>Quick DM button (XIVInstantMessenger)</value>
+    <value>Quick-DM button (XIVInstantMessenger)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
-    <value>One-click DM compose without leaving the chat window.</value>
+    <value>Quick DM access directly from the chat window, one click.</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
     <value>Got an idea?</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
-    <value>Got an idea for a plugin integration that's not on this list? Hop on the Hellion Forge Discord and tell me. Community input drives the roadmap.</value>
+    <value>Got an idea for a plugin integration that is not on the list? Come to the Hellion Forge Discord and write to me. Community input shapes the roadmap.</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
     <value>Open Hellion Forge</value>
   </data>
   <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
-    <value>Honorific custom title</value>
+    <value>Custom title from Honorific</value>
   </data>
 </root>

HellionChat/SelfTests/ThemeSwitchSelfTestStep.cs

@@ -0,0 +1,79 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin.SelfTest;
+using HellionChat.Themes;
+
+namespace HellionChat.SelfTests;
+
+// Validates the runtime theme-switch contract: polls ThemeRegistry.Active
+// per frame until the slug moves away and back, then sanity-checks that
+// the ABGR cache was recomputed on switch.
+internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
+{
+    private readonly Plugin plugin;
+    private string? initialSlug;
+    private bool switchedAway;
+
+    public ThemeSwitchSelfTestStep(Plugin plugin)
+    {
+        this.plugin = plugin;
+    }
+
+    public string Name => "Hellion Chat - Theme switch";
+
+    public SelfTestStepResult RunStep()
+    {
+        var registry = this.plugin.ThemeRegistry;
+        if (registry is null)
+            return SelfTestStepResult.Fail;
+
+        var active = registry.Active;
+        if (active is null)
+            return SelfTestStepResult.Fail;
+
+        if (!HasPopulatedCache(active))
+            return SelfTestStepResult.Fail;
+
+        if (this.initialSlug is null)
+        {
+            this.initialSlug = active.Slug;
+            ImGui.Text(
+                $"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."
+            );
+            return SelfTestStepResult.Waiting;
+        }
+
+        if (!this.switchedAway)
+        {
+            if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
+            {
+                this.switchedAway = true;
+                return SelfTestStepResult.Waiting;
+            }
+
+            ImGui.Text($"Switch the active theme away from \"{this.initialSlug}\".");
+            return SelfTestStepResult.Waiting;
+        }
+
+        if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
+        {
+            ImGui.Text($"Switch back to \"{this.initialSlug}\" to finish the test.");
+            return SelfTestStepResult.Waiting;
+        }
+
+        return SelfTestStepResult.Pass;
+    }
+
+    public void CleanUp()
+    {
+        this.initialSlug = null;
+        this.switchedAway = false;
+    }
+
+    // Any non-zero slot confirms the cache was recomputed — no reference
+    // comparison since custom themes can share slot values with built-ins.
+    private static bool HasPopulatedCache(Theme theme)
+    {
+        var cache = theme.AbgrCache;
+        return (cache.Primary | cache.WindowBg | cache.TextPrimary | cache.Border) != 0u;
+    }
+}

HellionChat/Sheets.cs

@@ -32,12 +32,12 @@ public static class Sheets
     }
 
     public static bool IsInForay() =>
-        TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row) &&
-        row.TerritoryIntendedUse.RowId is 41 or 61;
+        TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row)
+        && row.TerritoryIntendedUse.RowId is 41 or 61;
 
     public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character)
     {
         var dcRow = character.HomeWorld.Value.DataCenter.RowId;
         return WorldSheet.Where(world => world.IsPublic && world.DataCenter.RowId == dcRow);
     }
-}
+}

HellionChat/Themes/Builtin/Chat2Classic.cs

@@ -6,45 +6,47 @@ internal static class Chat2Classic
 {
     public const string Slug = "chat2-classic";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Chat 2 Klassik",
-        Author: "Upstream (Infi & Anna)",
-        Description: "Steel-blue accents on neutral dark grey, eckige Kanten. Vertraut für ChatTwo-Veteranen.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#3D6E92"),
-            Primary:        ColourUtil.HexToRgba("#4682B4"),
-            PrimaryLight:   ColourUtil.HexToRgba("#5C9DC8"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#4682B466"),
-
-            AccentDark:     ColourUtil.HexToRgba("#3D6E92"),
-            Accent:         ColourUtil.HexToRgba("#4682B4"),
-            AccentLight:    ColourUtil.HexToRgba("#5C9DC8"),
-
-            Identity:       ColourUtil.HexToRgba("#4682B4"),
-
-            WindowBg:       ColourUtil.HexToRgba("#0F0F0FF2"),
-            ChildBg:        ColourUtil.HexToRgba("#141414"),
-            FrameBg:        ColourUtil.HexToRgba("#1A1A1A"),
-            Surface:        ColourUtil.HexToRgba("#202020"),
-            SurfaceHover:   ColourUtil.HexToRgba("#2C2C2C"),
-            Border:         ColourUtil.HexToRgba("#404040"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#E6E6E6"),
-            TextMuted:      ColourUtil.HexToRgba("#999999"),
-            TextDim:        ColourUtil.HexToRgba("#666666"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
-            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
-            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
-            StatusInfo:     ColourUtil.HexToRgba("#4682B4")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 0f, ChildRounding: 0f, PopupRounding: 0f,
-            FrameRounding: 0f, GrabRounding: 0f, TabRounding: 0f,
-            ScrollbarRounding: 0f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Chat 2 Klassik",
+            Author: "Upstream (Infi & Anna)",
+            Description: "Steel-blue accents on neutral dark grey, eckige Kanten. Vertraut für ChatTwo-Veteranen.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#3D6E92"),
+                Primary: ColourUtil.HexToRgba("#4682B4"),
+                PrimaryLight: ColourUtil.HexToRgba("#5C9DC8"),
+                PrimaryGlow: ColourUtil.HexToRgba("#4682B466"),
+                AccentDark: ColourUtil.HexToRgba("#3D6E92"),
+                Accent: ColourUtil.HexToRgba("#4682B4"),
+                AccentLight: ColourUtil.HexToRgba("#5C9DC8"),
+                Identity: ColourUtil.HexToRgba("#4682B4"),
+                WindowBg: ColourUtil.HexToRgba("#0F0F0FF2"),
+                ChildBg: ColourUtil.HexToRgba("#141414"),
+                FrameBg: ColourUtil.HexToRgba("#1A1A1A"),
+                Surface: ColourUtil.HexToRgba("#202020"),
+                SurfaceHover: ColourUtil.HexToRgba("#2C2C2C"),
+                Border: ColourUtil.HexToRgba("#404040"),
+                TextPrimary: ColourUtil.HexToRgba("#E6E6E6"),
+                TextMuted: ColourUtil.HexToRgba("#999999"),
+                TextDim: ColourUtil.HexToRgba("#666666"),
+                StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
+                StatusDanger: ColourUtil.HexToRgba("#D9534F"),
+                StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
+                StatusInfo: ColourUtil.HexToRgba("#4682B4")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 0f,
+                ChildRounding: 0f,
+                PopupRounding: 0f,
+                FrameRounding: 0f,
+                GrabRounding: 0f,
+                TabRounding: 0f,
+                ScrollbarRounding: 0f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true
+        );
 }

HellionChat/Themes/Builtin/CrystalNocturne.cs

@@ -0,0 +1,82 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class CrystalNocturne
+{
+    public const string Slug = "crystal-nocturne";
+
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Crystal Nocturne",
+            Author: "CRYSTALLITE",
+            Description: "Royal sapphire and electric magenta over obsidian — a nocturne for the crystal-lit dance floor.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#1D4ED8"),
+                Primary: ColourUtil.HexToRgba("#3B82F6"),
+                PrimaryLight: ColourUtil.HexToRgba("#93C5FD"),
+                PrimaryGlow: ColourUtil.HexToRgba("#3B82F699"),
+                AccentDark: ColourUtil.HexToRgba("#A21CAF"),
+                Accent: ColourUtil.HexToRgba("#D946EF"),
+                AccentLight: ColourUtil.HexToRgba("#F0ABFC"),
+                Identity: ColourUtil.HexToRgba("#3B82F6"),
+                WindowBg: ColourUtil.HexToRgba("#08070F"),
+                ChildBg: ColourUtil.HexToRgba("#11101F"),
+                FrameBg: ColourUtil.HexToRgba("#1C1A33"),
+                Surface: ColourUtil.HexToRgba("#262340"),
+                SurfaceHover: ColourUtil.HexToRgba("#332D55"),
+                Border: ColourUtil.HexToRgba("#D946EF55"),
+                TextPrimary: ColourUtil.HexToRgba("#F5F3FF"),
+                TextMuted: ColourUtil.HexToRgba("#A5A0C0"),
+                TextDim: ColourUtil.HexToRgba("#4B4763"),
+                StatusSuccess: ColourUtil.HexToRgba("#10B981"),
+                StatusDanger: ColourUtil.HexToRgba("#F43F5E"),
+                StatusWarning: ColourUtil.HexToRgba("#FACC15"),
+                StatusInfo: ColourUtil.HexToRgba("#3B82F6")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 2f,
+                ChildRounding: 1f,
+                PopupRounding: 2f,
+                FrameRounding: 1f,
+                GrabRounding: 1f,
+                TabRounding: 1f,
+                ScrollbarRounding: 2f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Crystal Nocturne — sapphire-blue identity for party/team channels,
+                    // accent-magenta for tells, with mint/peach accents on linkshells
+                    // so the eight LS slots stay individually distinguishable on the
+                    // dark obsidian background.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F5F3FF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FACC15"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#10B981"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#10B981"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FACC15"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A5A0C0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#D946EF"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#3B82F6"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A5A0C0"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/EventHorizon.cs

@@ -6,72 +6,76 @@ internal static class EventHorizon
 {
     public const string Slug = "event-horizon";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Event Horizon",
-        Author: "Hellion Forge",
-        Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#7B3FCF"),
-            Primary:        ColourUtil.HexToRgba("#9D5CFF"),
-            PrimaryLight:   ColourUtil.HexToRgba("#B585FF"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#9D5CFF99"),
-
-            AccentDark:     ColourUtil.HexToRgba("#C9982E"),
-            Accent:         ColourUtil.HexToRgba("#E0AB36"),
-            AccentLight:    ColourUtil.HexToRgba("#F2C25C"),
-
-            Identity:       ColourUtil.HexToRgba("#9D5CFF"),
-
-            WindowBg:       ColourUtil.HexToRgba("#040308"),
-            ChildBg:        ColourUtil.HexToRgba("#0A081A"),
-            FrameBg:        ColourUtil.HexToRgba("#140F23"),
-            Surface:        ColourUtil.HexToRgba("#1B1530"),
-            SurfaceHover:   ColourUtil.HexToRgba("#251D40"),
-            Border:         ColourUtil.HexToRgba("#9D5CFF44"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#E6E0F5"),
-            TextMuted:      ColourUtil.HexToRgba("#9890B5"),
-            TextDim:        ColourUtil.HexToRgba("#5A5570"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#26A269"),
-            StatusDanger:   ColourUtil.HexToRgba("#ED333B"),
-            StatusWarning:  ColourUtil.HexToRgba("#E0AB36"),
-            StatusInfo:     ColourUtil.HexToRgba("#9D5CFF")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
-            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
-            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen
-            // Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta-
-            // Lila. Channel-Identität bleibt klar erkennbar.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#E6E0F5"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F2C25C"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FF9050"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#90A0FF"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FFAA80"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#9090E8"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A0E090"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#90A0FF"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A0E090"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0B070"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F2C25C"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0B0"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#90A0FF"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#B585FF"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#D0A0F0"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E0B870"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E0B870"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9890B5"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Event Horizon",
+            Author: "Hellion Forge",
+            Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#7B3FCF"),
+                Primary: ColourUtil.HexToRgba("#9D5CFF"),
+                PrimaryLight: ColourUtil.HexToRgba("#B585FF"),
+                PrimaryGlow: ColourUtil.HexToRgba("#9D5CFF99"),
+                AccentDark: ColourUtil.HexToRgba("#C9982E"),
+                Accent: ColourUtil.HexToRgba("#E0AB36"),
+                AccentLight: ColourUtil.HexToRgba("#F2C25C"),
+                Identity: ColourUtil.HexToRgba("#9D5CFF"),
+                WindowBg: ColourUtil.HexToRgba("#040308"),
+                ChildBg: ColourUtil.HexToRgba("#0A081A"),
+                FrameBg: ColourUtil.HexToRgba("#140F23"),
+                Surface: ColourUtil.HexToRgba("#1B1530"),
+                SurfaceHover: ColourUtil.HexToRgba("#251D40"),
+                Border: ColourUtil.HexToRgba("#9D5CFF44"),
+                TextPrimary: ColourUtil.HexToRgba("#E6E0F5"),
+                TextMuted: ColourUtil.HexToRgba("#9890B5"),
+                TextDim: ColourUtil.HexToRgba("#5A5570"),
+                StatusSuccess: ColourUtil.HexToRgba("#26A269"),
+                StatusDanger: ColourUtil.HexToRgba("#ED333B"),
+                StatusWarning: ColourUtil.HexToRgba("#E0AB36"),
+                StatusInfo: ColourUtil.HexToRgba("#9D5CFF")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 6f,
+                ChildRounding: 5f,
+                PopupRounding: 5f,
+                FrameRounding: 4f,
+                GrabRounding: 4f,
+                TabRounding: 4f,
+                ScrollbarRounding: 4f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen
+                    // Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta-
+                    // Lila. Channel-Identität bleibt klar erkennbar.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E6E0F5"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F2C25C"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF9050"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#90A0FF"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFAA80"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#9090E8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#90A0FF"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0B070"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F2C25C"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0B0"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#90A0FF"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B585FF"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A0F0"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E0B870"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E0B870"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9890B5"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/ForgeMerchantman.cs

@@ -6,71 +6,75 @@ internal static class ForgeMerchantman
 {
     public const string Slug = "forge-merchantman";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Forge Merchantman",
-        Author: "Carla Beleandis",
-        Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#1F8A82"),
-            Primary:        ColourUtil.HexToRgba("#2DB39E"),
-            PrimaryLight:   ColourUtil.HexToRgba("#4FC9B0"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#2DB39E99"),
-
-            AccentDark:     ColourUtil.HexToRgba("#B86A20"),
-            Accent:         ColourUtil.HexToRgba("#D9892C"),
-            AccentLight:    ColourUtil.HexToRgba("#E8A04A"),
-
-            Identity:       ColourUtil.HexToRgba("#1F8A82"),
-
-            WindowBg:       ColourUtil.HexToRgba("#050B0A"),
-            ChildBg:        ColourUtil.HexToRgba("#0B1413"),
-            FrameBg:        ColourUtil.HexToRgba("#11201D"),
-            Surface:        ColourUtil.HexToRgba("#182925"),
-            SurfaceHover:   ColourUtil.HexToRgba("#213631"),
-            Border:         ColourUtil.HexToRgba("#2DB39E66"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#D8EFE8"),
-            TextMuted:      ColourUtil.HexToRgba("#8FA39B"),
-            TextDim:        ColourUtil.HexToRgba("#5A6E66"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
-            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
-            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
-            StatusInfo:     ColourUtil.HexToRgba("#2DB39E")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f,
-            FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f,
-            ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
-            // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0C060"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#E8902C"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AC9B0"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8A04A"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FB8A0"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AC9B0"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8A04A"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0C060"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8B0"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AC9B0"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C880"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C880"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8FA39B"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Forge Merchantman",
+            Author: "Carla Beleandis",
+            Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#1F8A82"),
+                Primary: ColourUtil.HexToRgba("#2DB39E"),
+                PrimaryLight: ColourUtil.HexToRgba("#4FC9B0"),
+                PrimaryGlow: ColourUtil.HexToRgba("#2DB39E99"),
+                AccentDark: ColourUtil.HexToRgba("#B86A20"),
+                Accent: ColourUtil.HexToRgba("#D9892C"),
+                AccentLight: ColourUtil.HexToRgba("#E8A04A"),
+                Identity: ColourUtil.HexToRgba("#1F8A82"),
+                WindowBg: ColourUtil.HexToRgba("#050B0A"),
+                ChildBg: ColourUtil.HexToRgba("#0B1413"),
+                FrameBg: ColourUtil.HexToRgba("#11201D"),
+                Surface: ColourUtil.HexToRgba("#182925"),
+                SurfaceHover: ColourUtil.HexToRgba("#213631"),
+                Border: ColourUtil.HexToRgba("#2DB39E66"),
+                TextPrimary: ColourUtil.HexToRgba("#D8EFE8"),
+                TextMuted: ColourUtil.HexToRgba("#8FA39B"),
+                TextDim: ColourUtil.HexToRgba("#5A6E66"),
+                StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
+                StatusDanger: ColourUtil.HexToRgba("#D9534F"),
+                StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
+                StatusInfo: ColourUtil.HexToRgba("#2DB39E")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 4f,
+                ChildRounding: 3f,
+                PopupRounding: 3f,
+                FrameRounding: 2f,
+                GrabRounding: 2f,
+                TabRounding: 2f,
+                ScrollbarRounding: 2f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
+                    // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0C060"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#E8902C"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AC9B0"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8A04A"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FB8A0"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AC9B0"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8A04A"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0C060"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8B0"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AC9B0"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8FA39B"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/HellionArctic.cs

@@ -6,71 +6,75 @@ internal static class HellionArctic
 {
     public const string Slug = "hellion-arctic";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Hellion Arctic",
-        Author: "Hellion Forge",
-        Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#0097A7"),
-            Primary:        ColourUtil.HexToRgba("#00BED2"),
-            PrimaryLight:   ColourUtil.HexToRgba("#4DD9E8"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#00BED299"),
-
-            AccentDark:     ColourUtil.HexToRgba("#E85D04"),
-            Accent:         ColourUtil.HexToRgba("#F97316"),
-            AccentLight:    ColourUtil.HexToRgba("#FB923C"),
-
-            Identity:       ColourUtil.HexToRgba("#0097A7"),
-
-            WindowBg:       ColourUtil.HexToRgba("#070B12"),
-            ChildBg:        ColourUtil.HexToRgba("#0C1220"),
-            FrameBg:        ColourUtil.HexToRgba("#141E30"),
-            Surface:        ColourUtil.HexToRgba("#1A2538"),
-            SurfaceHover:   ColourUtil.HexToRgba("#22303F"),
-            Border:         ColourUtil.HexToRgba("#00BED266"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#E6F4F1"),
-            TextMuted:      ColourUtil.HexToRgba("#8FA3B5"),
-            TextDim:        ColourUtil.HexToRgba("#566273"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
-            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
-            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
-            StatusInfo:     ColourUtil.HexToRgba("#00BED2")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f,
-            FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f,
-            ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den
-            // blauen Channels (Party/FC). Channel-Identität bleibt klar.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FFE066"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FFA040"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#80C0E8"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FFB870"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4DD9E8"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#80C0E8"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#FFC080"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFE066"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8A8"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#80C0E8"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C880"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C880"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#C0C0C0"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Hellion Arctic",
+            Author: "Hellion Forge",
+            Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#0097A7"),
+                Primary: ColourUtil.HexToRgba("#00BED2"),
+                PrimaryLight: ColourUtil.HexToRgba("#4DD9E8"),
+                PrimaryGlow: ColourUtil.HexToRgba("#00BED299"),
+                AccentDark: ColourUtil.HexToRgba("#E85D04"),
+                Accent: ColourUtil.HexToRgba("#F97316"),
+                AccentLight: ColourUtil.HexToRgba("#FB923C"),
+                Identity: ColourUtil.HexToRgba("#0097A7"),
+                WindowBg: ColourUtil.HexToRgba("#070B12"),
+                ChildBg: ColourUtil.HexToRgba("#0C1220"),
+                FrameBg: ColourUtil.HexToRgba("#141E30"),
+                Surface: ColourUtil.HexToRgba("#1A2538"),
+                SurfaceHover: ColourUtil.HexToRgba("#22303F"),
+                Border: ColourUtil.HexToRgba("#00BED266"),
+                TextPrimary: ColourUtil.HexToRgba("#E6F4F1"),
+                TextMuted: ColourUtil.HexToRgba("#8FA3B5"),
+                TextDim: ColourUtil.HexToRgba("#566273"),
+                StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
+                StatusDanger: ColourUtil.HexToRgba("#D9534F"),
+                StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
+                StatusInfo: ColourUtil.HexToRgba("#00BED2")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 4f,
+                ChildRounding: 3f,
+                PopupRounding: 3f,
+                FrameRounding: 2f,
+                GrabRounding: 2f,
+                TabRounding: 2f,
+                ScrollbarRounding: 2f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den
+                    // blauen Channels (Party/FC). Channel-Identität bleibt klar.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFE066"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80C0E8"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFB870"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4DD9E8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80C0E8"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FFC080"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFE066"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80C0E8"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/HellionSpectrum.cs

@@ -2,82 +2,78 @@ using HellionChat.Util;
 
 namespace HellionChat.Themes.Builtin;
 
-// Hellion Spectrum: Deuteran/Protan-safe channel colours.
-// Palette derived from Bang Wong, "Points of view: Color blindness",
-// Nature Methods 8, 441 (2011). Channel identity (Tell pink, Yell yellow,
-// Shout orange, Party blue, FC green) is preserved per Channel-Identity-
-// Rule in docs/THEME-AUTHORING.md; tones are chosen so every channel
-// stays distinguishable under red-green colour-vision deficiency.
+// Deuteran/Protan-safe palette with preserved channel identity.
 internal static class HellionSpectrum
 {
     public const string Slug = "hellion-spectrum";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Hellion Spectrum",
-        Author: "Hellion Forge",
-        Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#005983"),
-            Primary:        ColourUtil.HexToRgba("#0072B2"),
-            PrimaryLight:   ColourUtil.HexToRgba("#3E9BD0"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#0072B299"),
-
-            AccentDark:     ColourUtil.HexToRgba("#B07F00"),
-            Accent:         ColourUtil.HexToRgba("#E69F00"),
-            AccentLight:    ColourUtil.HexToRgba("#F0B73A"),
-
-            Identity:       ColourUtil.HexToRgba("#005983"),
-
-            WindowBg:       ColourUtil.HexToRgba("#0A0F14"),
-            ChildBg:        ColourUtil.HexToRgba("#101620"),
-            FrameBg:        ColourUtil.HexToRgba("#1A222E"),
-            Surface:        ColourUtil.HexToRgba("#22303F"),
-            SurfaceHover:   ColourUtil.HexToRgba("#2D3E51"),
-            Border:         ColourUtil.HexToRgba("#0072B266"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#F0F4F8"),
-            TextMuted:      ColourUtil.HexToRgba("#9AA8B5"),
-            TextDim:        ColourUtil.HexToRgba("#5E6B78"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#009E73"),
-            StatusDanger:   ColourUtil.HexToRgba("#D55E00"),
-            StatusWarning:  ColourUtil.HexToRgba("#F0E442"),
-            StatusInfo:     ColourUtil.HexToRgba("#56B4E9")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
-            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
-            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
-            // identity. FC pulled slightly greener than vanilla cyan-teal so
-            // Party-blue and FC-green stay separable under deuteran sim.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0E442"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#D55E00"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#CC79A7"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#CC79A7"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#56B4E9"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E69F00"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#009E73"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#94CC4A"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#56B4E9"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#94CC4A"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E69F00"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0E442"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#66D9A8"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#56B4E9"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#8B7DD0"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E0A0C0"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#DAA0DA"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#C9A56F"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#C9A56F"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#C0C0C0"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Hellion Spectrum",
+            Author: "Hellion Forge",
+            Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#005983"),
+                Primary: ColourUtil.HexToRgba("#0072B2"),
+                PrimaryLight: ColourUtil.HexToRgba("#3E9BD0"),
+                PrimaryGlow: ColourUtil.HexToRgba("#0072B299"),
+                AccentDark: ColourUtil.HexToRgba("#B07F00"),
+                Accent: ColourUtil.HexToRgba("#E69F00"),
+                AccentLight: ColourUtil.HexToRgba("#F0B73A"),
+                Identity: ColourUtil.HexToRgba("#005983"),
+                WindowBg: ColourUtil.HexToRgba("#0A0F14"),
+                ChildBg: ColourUtil.HexToRgba("#101620"),
+                FrameBg: ColourUtil.HexToRgba("#1A222E"),
+                Surface: ColourUtil.HexToRgba("#22303F"),
+                SurfaceHover: ColourUtil.HexToRgba("#2D3E51"),
+                Border: ColourUtil.HexToRgba("#0072B266"),
+                TextPrimary: ColourUtil.HexToRgba("#F0F4F8"),
+                TextMuted: ColourUtil.HexToRgba("#9AA8B5"),
+                TextDim: ColourUtil.HexToRgba("#5E6B78"),
+                StatusSuccess: ColourUtil.HexToRgba("#009E73"),
+                StatusDanger: ColourUtil.HexToRgba("#D55E00"),
+                StatusWarning: ColourUtil.HexToRgba("#F0E442"),
+                StatusInfo: ColourUtil.HexToRgba("#56B4E9")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 6f,
+                ChildRounding: 5f,
+                PopupRounding: 5f,
+                FrameRounding: 4f,
+                GrabRounding: 4f,
+                TabRounding: 4f,
+                ScrollbarRounding: 4f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#CC79A7"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#CC79A7"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#56B4E9"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E69F00"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#009E73"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#94CC4A"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#56B4E9"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#94CC4A"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E69F00"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0E442"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#66D9A8"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#56B4E9"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#8B7DD0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E0A0C0"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#DAA0DA"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#C9A56F"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#C9A56F"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/IndigoViolet.cs

@@ -6,72 +6,76 @@ internal static class IndigoViolet
 {
     public const string Slug = "indigo-violet";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Indigo Violet",
-        Author: "Julia Moon",
-        Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#6B3AB0"),
-            Primary:        ColourUtil.HexToRgba("#8B4DDE"),
-            PrimaryLight:   ColourUtil.HexToRgba("#B07CFF"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#8B4DDE99"),
-
-            AccentDark:     ColourUtil.HexToRgba("#36A89C"),
-            Accent:         ColourUtil.HexToRgba("#4FC9B8"),
-            AccentLight:    ColourUtil.HexToRgba("#7AE0CF"),
-
-            Identity:       ColourUtil.HexToRgba("#6B3AB0"),
-
-            WindowBg:       ColourUtil.HexToRgba("#0D061F"),
-            ChildBg:        ColourUtil.HexToRgba("#1A0D3D"),
-            FrameBg:        ColourUtil.HexToRgba("#2A1556"),
-            Surface:        ColourUtil.HexToRgba("#3D1F78"),
-            SurfaceHover:   ColourUtil.HexToRgba("#5B2A9A"),
-            Border:         ColourUtil.HexToRgba("#8B4DDE66"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#F0E6FF"),
-            TextMuted:      ColourUtil.HexToRgba("#A890D0"),
-            TextDim:        ColourUtil.HexToRgba("#7560A0"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
-            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
-            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
-            StatusInfo:     ColourUtil.HexToRgba("#8B4DDE")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
-            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
-            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
-            // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
-            // Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#F0E6FF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0D880"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F09A60"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AB8D0"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0A878"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FC9B8"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A0E090"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AB8D0"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A0E090"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC92"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0D880"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0C0"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AB8D0"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#B07CFF"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E090FF"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#C098D8"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B590"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B590"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#A890D0"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Indigo Violet",
+            Author: "Julia Moon",
+            Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#6B3AB0"),
+                Primary: ColourUtil.HexToRgba("#8B4DDE"),
+                PrimaryLight: ColourUtil.HexToRgba("#B07CFF"),
+                PrimaryGlow: ColourUtil.HexToRgba("#8B4DDE99"),
+                AccentDark: ColourUtil.HexToRgba("#36A89C"),
+                Accent: ColourUtil.HexToRgba("#4FC9B8"),
+                AccentLight: ColourUtil.HexToRgba("#7AE0CF"),
+                Identity: ColourUtil.HexToRgba("#6B3AB0"),
+                WindowBg: ColourUtil.HexToRgba("#0D061F"),
+                ChildBg: ColourUtil.HexToRgba("#1A0D3D"),
+                FrameBg: ColourUtil.HexToRgba("#2A1556"),
+                Surface: ColourUtil.HexToRgba("#3D1F78"),
+                SurfaceHover: ColourUtil.HexToRgba("#5B2A9A"),
+                Border: ColourUtil.HexToRgba("#8B4DDE66"),
+                TextPrimary: ColourUtil.HexToRgba("#F0E6FF"),
+                TextMuted: ColourUtil.HexToRgba("#A890D0"),
+                TextDim: ColourUtil.HexToRgba("#7560A0"),
+                StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
+                StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
+                StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
+                StatusInfo: ColourUtil.HexToRgba("#8B4DDE")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 6f,
+                ChildRounding: 5f,
+                PopupRounding: 5f,
+                FrameRounding: 4f,
+                GrabRounding: 4f,
+                TabRounding: 4f,
+                ScrollbarRounding: 4f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
+                    // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
+                    // Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0E6FF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D880"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AB8D0"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0A878"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FC9B8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AB8D0"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D880"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0C0"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AB8D0"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B07CFF"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#C098D8"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A890D0"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/MintGrove.cs

@@ -6,72 +6,76 @@ internal static class MintGrove
 {
     public const string Slug = "mint-grove";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Mint Grove",
-        Author: "Carla Beleandis",
-        Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#3CB371"),
-            Primary:        ColourUtil.HexToRgba("#5DD39E"),
-            PrimaryLight:   ColourUtil.HexToRgba("#8FE0B8"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#5DD39E99"),
-
-            AccentDark:     ColourUtil.HexToRgba("#F4C870"),
-            Accent:         ColourUtil.HexToRgba("#F9D580"),
-            AccentLight:    ColourUtil.HexToRgba("#FCDD93"),
-
-            Identity:       ColourUtil.HexToRgba("#5DD39E"),
-
-            WindowBg:       ColourUtil.HexToRgba("#0A1410"),
-            ChildBg:        ColourUtil.HexToRgba("#10201A"),
-            FrameBg:        ColourUtil.HexToRgba("#162B22"),
-            Surface:        ColourUtil.HexToRgba("#1E372B"),
-            SurfaceHover:   ColourUtil.HexToRgba("#284335"),
-            Border:         ColourUtil.HexToRgba("#5DD39E55"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#E8F5EA"),
-            TextMuted:      ColourUtil.HexToRgba("#9BB5A5"),
-            TextDim:        ColourUtil.HexToRgba("#5C6F65"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#5DD39E"),
-            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
-            StatusWarning:  ColourUtil.HexToRgba("#E8B590"),
-            StatusInfo:     ColourUtil.HexToRgba("#5DA9C7")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f,
-            FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f,
-            ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie,
-            // Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität
-            // bleibt erhalten für Erkennbarkeit.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#E8F5EA"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F9D580"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F0A050"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#F098C8"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#F098C8"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#80B8D0"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0B070"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#80C8B0"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#8FE0B8"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#80B8D0"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#8FE0B8"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC80"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F9D580"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0A0"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#80B8D0"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A89DC0"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#F098C8"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#D0A8C8"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C088"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C088"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9BB5A5"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Mint Grove",
+            Author: "Carla Beleandis",
+            Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#3CB371"),
+                Primary: ColourUtil.HexToRgba("#5DD39E"),
+                PrimaryLight: ColourUtil.HexToRgba("#8FE0B8"),
+                PrimaryGlow: ColourUtil.HexToRgba("#5DD39E99"),
+                AccentDark: ColourUtil.HexToRgba("#F4C870"),
+                Accent: ColourUtil.HexToRgba("#F9D580"),
+                AccentLight: ColourUtil.HexToRgba("#FCDD93"),
+                Identity: ColourUtil.HexToRgba("#5DD39E"),
+                WindowBg: ColourUtil.HexToRgba("#0A1410"),
+                ChildBg: ColourUtil.HexToRgba("#10201A"),
+                FrameBg: ColourUtil.HexToRgba("#162B22"),
+                Surface: ColourUtil.HexToRgba("#1E372B"),
+                SurfaceHover: ColourUtil.HexToRgba("#284335"),
+                Border: ColourUtil.HexToRgba("#5DD39E55"),
+                TextPrimary: ColourUtil.HexToRgba("#E8F5EA"),
+                TextMuted: ColourUtil.HexToRgba("#9BB5A5"),
+                TextDim: ColourUtil.HexToRgba("#5C6F65"),
+                StatusSuccess: ColourUtil.HexToRgba("#5DD39E"),
+                StatusDanger: ColourUtil.HexToRgba("#D9534F"),
+                StatusWarning: ColourUtil.HexToRgba("#E8B590"),
+                StatusInfo: ColourUtil.HexToRgba("#5DA9C7")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 5f,
+                ChildRounding: 4f,
+                PopupRounding: 4f,
+                FrameRounding: 3f,
+                GrabRounding: 3f,
+                TabRounding: 3f,
+                ScrollbarRounding: 3f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie,
+                    // Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität
+                    // bleibt erhalten für Erkennbarkeit.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E8F5EA"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F9D580"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0A050"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F098C8"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F098C8"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80B8D0"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B070"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#80C8B0"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#8FE0B8"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80B8D0"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#8FE0B8"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC80"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F9D580"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0A0"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80B8D0"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A89DC0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#F098C8"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A8C8"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C088"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C088"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9BB5A5"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/MoonlitBloom.cs

@@ -1,76 +0,0 @@
-using HellionChat.Util;
-
-namespace HellionChat.Themes.Builtin;
-
-internal static class MoonlitBloom
-{
-    public const string Slug = "moonlit-bloom";
-
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Moonlit Bloom",
-        Author: "Hellion Forge",
-        Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#C957D0"),
-            Primary:        ColourUtil.HexToRgba("#E374E8"),
-            PrimaryLight:   ColourUtil.HexToRgba("#EF8AF4"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#E374E899"),
-
-            AccentDark:     ColourUtil.HexToRgba("#7AAC5C"),
-            Accent:         ColourUtil.HexToRgba("#9CCB7C"),
-            AccentLight:    ColourUtil.HexToRgba("#B6E297"),
-
-            Identity:       ColourUtil.HexToRgba("#E374E8"),
-
-            WindowBg:       ColourUtil.HexToRgba("#0E0C1F"),
-            ChildBg:        ColourUtil.HexToRgba("#15122B"),
-            FrameBg:        ColourUtil.HexToRgba("#1F1A38"),
-            Surface:        ColourUtil.HexToRgba("#28224A"),
-            SurfaceHover:   ColourUtil.HexToRgba("#332B5B"),
-            Border:         ColourUtil.HexToRgba("#E374E844"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#ECE6F5"),
-            TextMuted:      ColourUtil.HexToRgba("#9A8BB0"),
-            TextDim:        ColourUtil.HexToRgba("#554B6E"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#7AAC5C"),
-            StatusDanger:   ColourUtil.HexToRgba("#E85C6A"),
-            StatusWarning:  ColourUtil.HexToRgba("#E8B590"),
-            StatusInfo:     ColourUtil.HexToRgba("#6278FF")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
-            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
-            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork
-            // und Linkshell4. Tell-Pink-Identität bleibt sichtbar.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#ECE6F5"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0D080"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F09A60"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#EF8AF4"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#EF8AF4"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#A0B0F0"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0B090"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#A8C8E8"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#9CCB7C"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#A0B0F0"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#9CCB7C"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC92"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0D080"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#B6E297"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#A0B0F0"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#C098D8"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#EF8AF4"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0E8"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B590"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B590"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9A8BB0"),
-        })
-    );
-}

HellionChat/Themes/Builtin/NightBlue.cs

@@ -6,71 +6,75 @@ internal static class NightBlue
 {
     public const string Slug = "night-blue";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Night Blue",
-        Author: "Julia Moon",
-        Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#3576C0"),
-            Primary:        ColourUtil.HexToRgba("#4A90E2"),
-            PrimaryLight:   ColourUtil.HexToRgba("#6AB0FF"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#4A90E299"),
-
-            AccentDark:     ColourUtil.HexToRgba("#C97A2E"),
-            Accent:         ColourUtil.HexToRgba("#E8A040"),
-            AccentLight:    ColourUtil.HexToRgba("#F4B968"),
-
-            Identity:       ColourUtil.HexToRgba("#3576C0"),
-
-            WindowBg:       ColourUtil.HexToRgba("#050B18"),
-            ChildBg:        ColourUtil.HexToRgba("#0A1628"),
-            FrameBg:        ColourUtil.HexToRgba("#122039"),
-            Surface:        ColourUtil.HexToRgba("#1A2D4F"),
-            SurfaceHover:   ColourUtil.HexToRgba("#234070"),
-            Border:         ColourUtil.HexToRgba("#4A90E266"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#E6EDF7"),
-            TextMuted:      ColourUtil.HexToRgba("#8CA0BF"),
-            TextDim:        ColourUtil.HexToRgba("#5A6F8F"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
-            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
-            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
-            StatusInfo:     ColourUtil.HexToRgba("#4A90E2")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
-            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
-            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
-            // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FFD060"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FFA040"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AA8E8"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8B070"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FA8E8"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AA8E8"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8B070"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFD060"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8A8"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AA8E8"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B070"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B070"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8CA0BF"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Night Blue",
+            Author: "Julia Moon",
+            Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#3576C0"),
+                Primary: ColourUtil.HexToRgba("#4A90E2"),
+                PrimaryLight: ColourUtil.HexToRgba("#6AB0FF"),
+                PrimaryGlow: ColourUtil.HexToRgba("#4A90E299"),
+                AccentDark: ColourUtil.HexToRgba("#C97A2E"),
+                Accent: ColourUtil.HexToRgba("#E8A040"),
+                AccentLight: ColourUtil.HexToRgba("#F4B968"),
+                Identity: ColourUtil.HexToRgba("#3576C0"),
+                WindowBg: ColourUtil.HexToRgba("#050B18"),
+                ChildBg: ColourUtil.HexToRgba("#0A1628"),
+                FrameBg: ColourUtil.HexToRgba("#122039"),
+                Surface: ColourUtil.HexToRgba("#1A2D4F"),
+                SurfaceHover: ColourUtil.HexToRgba("#234070"),
+                Border: ColourUtil.HexToRgba("#4A90E266"),
+                TextPrimary: ColourUtil.HexToRgba("#E6EDF7"),
+                TextMuted: ColourUtil.HexToRgba("#8CA0BF"),
+                TextDim: ColourUtil.HexToRgba("#5A6F8F"),
+                StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
+                StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
+                StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
+                StatusInfo: ColourUtil.HexToRgba("#4A90E2")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 6f,
+                ChildRounding: 5f,
+                PopupRounding: 5f,
+                FrameRounding: 4f,
+                GrabRounding: 4f,
+                TabRounding: 4f,
+                ScrollbarRounding: 4f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
+                    // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFD060"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AA8E8"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8B070"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FA8E8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AA8E8"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8B070"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD060"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AA8E8"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B070"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B070"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8CA0BF"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/SynthwaveSunset.cs

@@ -6,71 +6,75 @@ internal static class SynthwaveSunset
 {
     public const string Slug = "synthwave-sunset";
 
-    public static Theme Build() => new(
-        Slug: Slug,
-        Name: "Synthwave Sunset",
-        Author: "Hellion Forge",
-        Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.",
-        Colors: new ThemeColors(
-            PrimaryDark:    ColourUtil.HexToRgba("#C71585"),
-            Primary:        ColourUtil.HexToRgba("#FF2D95"),
-            PrimaryLight:   ColourUtil.HexToRgba("#FF6BB6"),
-            PrimaryGlow:    ColourUtil.HexToRgba("#FF2D9599"),
-
-            AccentDark:     ColourUtil.HexToRgba("#0098B8"),
-            Accent:         ColourUtil.HexToRgba("#00F0FF"),
-            AccentLight:    ColourUtil.HexToRgba("#5CFFFE"),
-
-            Identity:       ColourUtil.HexToRgba("#FF2D95"),
-
-            WindowBg:       ColourUtil.HexToRgba("#13041F"),
-            ChildBg:        ColourUtil.HexToRgba("#1E0A35"),
-            FrameBg:        ColourUtil.HexToRgba("#2A1247"),
-            Surface:        ColourUtil.HexToRgba("#3A1860"),
-            SurfaceHover:   ColourUtil.HexToRgba("#4A2475"),
-            Border:         ColourUtil.HexToRgba("#FF2D9566"),
-
-            TextPrimary:    ColourUtil.HexToRgba("#F0DFFF"),
-            TextMuted:      ColourUtil.HexToRgba("#A88BC4"),
-            TextDim:        ColourUtil.HexToRgba("#6F4D8E"),
-
-            StatusSuccess:  ColourUtil.HexToRgba("#39FF14"),
-            StatusDanger:   ColourUtil.HexToRgba("#FF3838"),
-            StatusWarning:  ColourUtil.HexToRgba("#FFD700"),
-            StatusInfo:     ColourUtil.HexToRgba("#00F0FF")
-        ),
-        Layout: new ThemeLayout(
-            WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f,
-            FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f,
-            ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f
-        ),
-        Typography: new ThemeTypography(),
-        IsBuiltIn: true,
-        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
-        {
-            // Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
-            // Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
-            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#F0DFFF"),
-            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FF2D95"),
-            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FF6BB6"),
-            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#00F0FF"),
-            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#5CFFFE"),
-            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#5CFFFE"),
-            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FF8C00"),
-            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#FF2D95"),
-            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#39FF14"),
-            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#5CFFFE"),
-            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#39FF14"),
-            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#FF8C00"),
-            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFD700"),
-            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#00F0FF"),
-            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#FF6BB6"),
-            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#FF2D95"),
-            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#A88BC4"),
-            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#5CFFFE"),
-            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#FF6BB6"),
-            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#A88BC4"),
-            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#A88BC4"),
-        })
-    );
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Synthwave Sunset",
+            Author: "Zoe Moon",
+            Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#C71585"),
+                Primary: ColourUtil.HexToRgba("#FF2D95"),
+                PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"),
+                PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"),
+                AccentDark: ColourUtil.HexToRgba("#0098B8"),
+                Accent: ColourUtil.HexToRgba("#00F0FF"),
+                AccentLight: ColourUtil.HexToRgba("#5CFFFE"),
+                Identity: ColourUtil.HexToRgba("#FF2D95"),
+                WindowBg: ColourUtil.HexToRgba("#13041F"),
+                ChildBg: ColourUtil.HexToRgba("#1E0A35"),
+                FrameBg: ColourUtil.HexToRgba("#2A1247"),
+                Surface: ColourUtil.HexToRgba("#3A1860"),
+                SurfaceHover: ColourUtil.HexToRgba("#4A2475"),
+                Border: ColourUtil.HexToRgba("#FF2D9566"),
+                TextPrimary: ColourUtil.HexToRgba("#F0DFFF"),
+                TextMuted: ColourUtil.HexToRgba("#A88BC4"),
+                TextDim: ColourUtil.HexToRgba("#6F4D8E"),
+                StatusSuccess: ColourUtil.HexToRgba("#39FF14"),
+                StatusDanger: ColourUtil.HexToRgba("#FF3838"),
+                StatusWarning: ColourUtil.HexToRgba("#FFD700"),
+                StatusInfo: ColourUtil.HexToRgba("#00F0FF")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 5f,
+                ChildRounding: 4f,
+                PopupRounding: 4f,
+                FrameRounding: 3f,
+                GrabRounding: 3f,
+                TabRounding: 3f,
+                ScrollbarRounding: 3f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
+                    // Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0DFFF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FF2D95"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF6BB6"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#00F0FF"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#5CFFFE"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#5CFFFE"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FF8C00"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#FF2D95"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#39FF14"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#5CFFFE"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#39FF14"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FF8C00"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD700"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#00F0FF"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#FF6BB6"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#FF2D95"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#A88BC4"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#5CFFFE"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"),
+                }
+            )
+        );
 }

HellionChat/Themes/Builtin/example-theme.json

@@ -1,41 +1,41 @@
 {
-  "schemaVersion": 1,
-  "slug": "example-custom",
-  "name": "Example Custom",
-  "author": "You",
-  "description": "Starting template — duplicate, rename, edit colors and reload.",
-  "colors": {
-    "primaryDark":   "#0097A7",
-    "primary":       "#00BED2",
-    "primaryLight":  "#4DD9E8",
-    "primaryGlow":   "#00BED299",
-    "accentDark":    "#E85D04",
-    "accent":        "#F97316",
-    "accentLight":   "#FB923C",
-    "identity":      "#0097A7",
-    "windowBg":      "#070B12",
-    "childBg":       "#0C1220",
-    "frameBg":       "#141E30",
-    "surface":       "#1A2538",
-    "surfaceHover":  "#22303F",
-    "border":        "#00BED266",
-    "textPrimary":   "#E6F4F1",
-    "textMuted":     "#8FA3B5",
-    "textDim":       "#566273",
-    "statusSuccess": "#5CB85C",
-    "statusDanger":  "#D9534F",
-    "statusWarning": "#F0AD4E",
-    "statusInfo":    "#00BED2"
-  },
-  "layout": {
-    "windowRounding": 4,
-    "childRounding": 3,
-    "popupRounding": 3,
-    "frameRounding": 2,
-    "grabRounding": 2,
-    "tabRounding": 2,
-    "scrollbarRounding": 2,
-    "windowBorderSize": 1,
-    "frameBorderSize": 1
-  }
+    "schemaVersion": 1,
+    "slug": "example-custom",
+    "name": "Example Custom",
+    "author": "You",
+    "description": "Starting template — duplicate, rename, edit colors and reload.",
+    "colors": {
+        "primaryDark": "#0097A7",
+        "primary": "#00BED2",
+        "primaryLight": "#4DD9E8",
+        "primaryGlow": "#00BED299",
+        "accentDark": "#E85D04",
+        "accent": "#F97316",
+        "accentLight": "#FB923C",
+        "identity": "#0097A7",
+        "windowBg": "#070B12",
+        "childBg": "#0C1220",
+        "frameBg": "#141E30",
+        "surface": "#1A2538",
+        "surfaceHover": "#22303F",
+        "border": "#00BED266",
+        "textPrimary": "#E6F4F1",
+        "textMuted": "#8FA3B5",
+        "textDim": "#566273",
+        "statusSuccess": "#5CB85C",
+        "statusDanger": "#D9534F",
+        "statusWarning": "#F0AD4E",
+        "statusInfo": "#00BED2"
+    },
+    "layout": {
+        "windowRounding": 4,
+        "childRounding": 3,
+        "popupRounding": 3,
+        "frameRounding": 2,
+        "grabRounding": 2,
+        "tabRounding": 2,
+        "scrollbarRounding": 2,
+        "windowBorderSize": 1,
+        "frameBorderSize": 1
+    }
 }

HellionChat/Themes/Theme.cs

@@ -21,38 +21,53 @@ public sealed record Theme(
     public void RecomputeAbgrCache()
     {
         AbgrCache = new ThemeAbgrCache(
-            PrimaryDark:   ColourUtil.RgbaToAbgr(Colors.PrimaryDark),
-            Primary:       ColourUtil.RgbaToAbgr(Colors.Primary),
-            PrimaryLight:  ColourUtil.RgbaToAbgr(Colors.PrimaryLight),
-            PrimaryGlow:   ColourUtil.RgbaToAbgr(Colors.PrimaryGlow),
-            AccentDark:    ColourUtil.RgbaToAbgr(Colors.AccentDark),
-            Accent:        ColourUtil.RgbaToAbgr(Colors.Accent),
-            AccentLight:   ColourUtil.RgbaToAbgr(Colors.AccentLight),
-            Identity:      ColourUtil.RgbaToAbgr(Colors.Identity),
-            WindowBg:      ColourUtil.RgbaToAbgr(Colors.WindowBg),
-            ChildBg:       ColourUtil.RgbaToAbgr(Colors.ChildBg),
-            FrameBg:       ColourUtil.RgbaToAbgr(Colors.FrameBg),
-            Surface:       ColourUtil.RgbaToAbgr(Colors.Surface),
-            SurfaceHover:  ColourUtil.RgbaToAbgr(Colors.SurfaceHover),
-            Border:        ColourUtil.RgbaToAbgr(Colors.Border),
-            TextPrimary:   ColourUtil.RgbaToAbgr(Colors.TextPrimary),
-            TextMuted:     ColourUtil.RgbaToAbgr(Colors.TextMuted),
-            TextDim:       ColourUtil.RgbaToAbgr(Colors.TextDim),
+            PrimaryDark: ColourUtil.RgbaToAbgr(Colors.PrimaryDark),
+            Primary: ColourUtil.RgbaToAbgr(Colors.Primary),
+            PrimaryLight: ColourUtil.RgbaToAbgr(Colors.PrimaryLight),
+            PrimaryGlow: ColourUtil.RgbaToAbgr(Colors.PrimaryGlow),
+            AccentDark: ColourUtil.RgbaToAbgr(Colors.AccentDark),
+            Accent: ColourUtil.RgbaToAbgr(Colors.Accent),
+            AccentLight: ColourUtil.RgbaToAbgr(Colors.AccentLight),
+            Identity: ColourUtil.RgbaToAbgr(Colors.Identity),
+            WindowBg: ColourUtil.RgbaToAbgr(Colors.WindowBg),
+            ChildBg: ColourUtil.RgbaToAbgr(Colors.ChildBg),
+            FrameBg: ColourUtil.RgbaToAbgr(Colors.FrameBg),
+            Surface: ColourUtil.RgbaToAbgr(Colors.Surface),
+            SurfaceHover: ColourUtil.RgbaToAbgr(Colors.SurfaceHover),
+            Border: ColourUtil.RgbaToAbgr(Colors.Border),
+            TextPrimary: ColourUtil.RgbaToAbgr(Colors.TextPrimary),
+            TextMuted: ColourUtil.RgbaToAbgr(Colors.TextMuted),
+            TextDim: ColourUtil.RgbaToAbgr(Colors.TextDim),
             StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
-            StatusDanger:  ColourUtil.RgbaToAbgr(Colors.StatusDanger),
+            StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger),
             StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
-            StatusInfo:    ColourUtil.RgbaToAbgr(Colors.StatusInfo));
+            StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)
+        );
     }
 }
 
 // Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the
 // contract — a new slot without its mirror fails the build.
 public readonly record struct ThemeAbgrCache(
-    uint PrimaryDark, uint Primary, uint PrimaryLight, uint PrimaryGlow,
-    uint AccentDark, uint Accent, uint AccentLight,
+    uint PrimaryDark,
+    uint Primary,
+    uint PrimaryLight,
+    uint PrimaryGlow,
+    uint AccentDark,
+    uint Accent,
+    uint AccentLight,
     uint Identity,
-    uint WindowBg, uint ChildBg, uint FrameBg,
-    uint Surface, uint SurfaceHover, uint Border,
-    uint TextPrimary, uint TextMuted, uint TextDim,
-    uint StatusSuccess, uint StatusDanger, uint StatusWarning, uint StatusInfo
+    uint WindowBg,
+    uint ChildBg,
+    uint FrameBg,
+    uint Surface,
+    uint SurfaceHover,
+    uint Border,
+    uint TextPrimary,
+    uint TextMuted,
+    uint TextDim,
+    uint StatusSuccess,
+    uint StatusDanger,
+    uint StatusWarning,
+    uint StatusInfo
 );

HellionChat/Themes/ThemeChatColors.cs

@@ -2,10 +2,6 @@ using HellionChat.Code;
 
 namespace HellionChat.Themes;
 
-// Optional pro Theme. Wenn ein Theme ChatColors mitliefert, kann der
-// User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden.
-// Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel-
-// Farben unverändert.
-public sealed record ThemeChatColors(
-    IReadOnlyDictionary<ChatType, uint> Channels
-);
+// Optional per-theme chat colours applied to Configuration.ChatColours on user request.
+// Themes without this leave channel colours untouched.
+public sealed record ThemeChatColors(IReadOnlyDictionary<ChatType, uint> Channels);

HellionChat/Themes/ThemeColors.cs

@@ -1,29 +1,24 @@
 namespace HellionChat.Themes;
 
-// Color-Werte als 0xRRGGBBAA, RgbaToAbgr handled den Byte-Swap zu ImGui.
+// Colour values as 0xRRGGBBAA — RgbaToAbgr handles the byte-swap for ImGui.
 public sealed record ThemeColors(
     uint PrimaryDark,
     uint Primary,
     uint PrimaryLight,
     uint PrimaryGlow,
-
     uint AccentDark,
     uint Accent,
     uint AccentLight,
-
     uint Identity,
-
     uint WindowBg,
     uint ChildBg,
     uint FrameBg,
     uint Surface,
     uint SurfaceHover,
     uint Border,
-
     uint TextPrimary,
     uint TextMuted,
     uint TextDim,
-
     uint StatusSuccess,
     uint StatusDanger,
     uint StatusWarning,

HellionChat/Themes/ThemeJsonLoader.cs

@@ -13,8 +13,14 @@ internal static class ThemeJsonLoader
             throw new FormatException("Theme JSON is empty");
 
         JsonDocument doc;
-        try { doc = JsonDocument.Parse(json); }
-        catch (JsonException ex) { throw new FormatException("Theme JSON is not valid JSON", ex); }
+        try
+        {
+            doc = JsonDocument.Parse(json);
+        }
+        catch (JsonException ex)
+        {
+            throw new FormatException("Theme JSON is not valid JSON", ex);
+        }
 
         using (doc)
         {
@@ -22,21 +28,36 @@ internal static class ThemeJsonLoader
 
             var schemaVersion = ReadInt(root, "schemaVersion");
             if (schemaVersion != SupportedSchemaVersion)
-                throw new FormatException($"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}");
+                throw new FormatException(
+                    $"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}"
+                );
 
-            var slug        = ReadString(root, "slug");
-            var name        = ReadString(root, "name");
-            var author      = ReadString(root, "author");
+            var slug = ReadString(root, "slug");
+            var name = ReadString(root, "name");
+            var author = ReadString(root, "author");
             var description = ReadString(root, "description");
 
             var colors = ReadColors(root.GetProperty("colors"));
             var layout = ReadLayout(root.GetProperty("layout"));
 
             ThemeChatColors? chatColors = null;
-            if (root.TryGetProperty("chatChannels", out var ch) && ch.ValueKind == JsonValueKind.Object)
+            if (
+                root.TryGetProperty("chatChannels", out var ch)
+                && ch.ValueKind == JsonValueKind.Object
+            )
                 chatColors = ReadChatColors(ch);
 
-            return new Theme(slug, name, author, description, colors, layout, new ThemeTypography(), IsBuiltIn: false, ChatColors: chatColors);
+            return new Theme(
+                slug,
+                name,
+                author,
+                description,
+                colors,
+                layout,
+                new ThemeTypography(),
+                IsBuiltIn: false,
+                ChatColors: chatColors
+            );
         }
     }
 
@@ -45,11 +66,15 @@ internal static class ThemeJsonLoader
         var dict = new Dictionary<HellionChat.Code.ChatType, uint>();
         foreach (var prop in el.EnumerateObject())
         {
-            // Property-Name ist der ChatType-Name als String (z.B. "Say", "Tell"),
-            // Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names
-            // werden still übersprungen — Forward-Compat falls SE neue Channels
-            // einführt.
-            if (!Enum.TryParse<HellionChat.Code.ChatType>(prop.Name, ignoreCase: true, out var channel))
+            // Property name is the ChatType name (e.g. "Say", "Tell"), value is hex like theme colours.
+            // Unknown channel names are silently skipped for forward-compat with future SE channels.
+            if (
+                !Enum.TryParse<HellionChat.Code.ChatType>(
+                    prop.Name,
+                    ignoreCase: true,
+                    out var channel
+                )
+            )
                 continue;
             if (prop.Value.ValueKind != JsonValueKind.String)
                 continue;
@@ -71,46 +96,43 @@ internal static class ThemeJsonLoader
         return LoadFromString(json);
     }
 
-    private static ThemeColors ReadColors(JsonElement el) => new(
-        PrimaryDark:   ColourUtil.HexToRgba(ReadString(el, "primaryDark")),
-        Primary:       ColourUtil.HexToRgba(ReadString(el, "primary")),
-        PrimaryLight:  ColourUtil.HexToRgba(ReadString(el, "primaryLight")),
-        PrimaryGlow:   ColourUtil.HexToRgba(ReadString(el, "primaryGlow")),
+    private static ThemeColors ReadColors(JsonElement el) =>
+        new(
+            PrimaryDark: ColourUtil.HexToRgba(ReadString(el, "primaryDark")),
+            Primary: ColourUtil.HexToRgba(ReadString(el, "primary")),
+            PrimaryLight: ColourUtil.HexToRgba(ReadString(el, "primaryLight")),
+            PrimaryGlow: ColourUtil.HexToRgba(ReadString(el, "primaryGlow")),
+            AccentDark: ColourUtil.HexToRgba(ReadString(el, "accentDark")),
+            Accent: ColourUtil.HexToRgba(ReadString(el, "accent")),
+            AccentLight: ColourUtil.HexToRgba(ReadString(el, "accentLight")),
+            Identity: ColourUtil.HexToRgba(ReadString(el, "identity")),
+            WindowBg: ColourUtil.HexToRgba(ReadString(el, "windowBg")),
+            ChildBg: ColourUtil.HexToRgba(ReadString(el, "childBg")),
+            FrameBg: ColourUtil.HexToRgba(ReadString(el, "frameBg")),
+            Surface: ColourUtil.HexToRgba(ReadString(el, "surface")),
+            SurfaceHover: ColourUtil.HexToRgba(ReadString(el, "surfaceHover")),
+            Border: ColourUtil.HexToRgba(ReadString(el, "border")),
+            TextPrimary: ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
+            TextMuted: ColourUtil.HexToRgba(ReadString(el, "textMuted")),
+            TextDim: ColourUtil.HexToRgba(ReadString(el, "textDim")),
+            StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
+            StatusDanger: ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
+            StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
+            StatusInfo: ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
+        );
 
-        AccentDark:    ColourUtil.HexToRgba(ReadString(el, "accentDark")),
-        Accent:        ColourUtil.HexToRgba(ReadString(el, "accent")),
-        AccentLight:   ColourUtil.HexToRgba(ReadString(el, "accentLight")),
-
-        Identity:      ColourUtil.HexToRgba(ReadString(el, "identity")),
-
-        WindowBg:      ColourUtil.HexToRgba(ReadString(el, "windowBg")),
-        ChildBg:       ColourUtil.HexToRgba(ReadString(el, "childBg")),
-        FrameBg:       ColourUtil.HexToRgba(ReadString(el, "frameBg")),
-        Surface:       ColourUtil.HexToRgba(ReadString(el, "surface")),
-        SurfaceHover:  ColourUtil.HexToRgba(ReadString(el, "surfaceHover")),
-        Border:        ColourUtil.HexToRgba(ReadString(el, "border")),
-
-        TextPrimary:   ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
-        TextMuted:     ColourUtil.HexToRgba(ReadString(el, "textMuted")),
-        TextDim:       ColourUtil.HexToRgba(ReadString(el, "textDim")),
-
-        StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
-        StatusDanger:  ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
-        StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
-        StatusInfo:    ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
-    );
-
-    private static ThemeLayout ReadLayout(JsonElement el) => new(
-        WindowRounding:    ReadFloat(el, "windowRounding"),
-        ChildRounding:     ReadFloat(el, "childRounding"),
-        PopupRounding:     ReadFloat(el, "popupRounding"),
-        FrameRounding:     ReadFloat(el, "frameRounding"),
-        GrabRounding:      ReadFloat(el, "grabRounding"),
-        TabRounding:       ReadFloat(el, "tabRounding"),
-        ScrollbarRounding: ReadFloat(el, "scrollbarRounding"),
-        WindowBorderSize:  ReadFloat(el, "windowBorderSize"),
-        FrameBorderSize:   ReadFloat(el, "frameBorderSize")
-    );
+    private static ThemeLayout ReadLayout(JsonElement el) =>
+        new(
+            WindowRounding: ReadFloat(el, "windowRounding"),
+            ChildRounding: ReadFloat(el, "childRounding"),
+            PopupRounding: ReadFloat(el, "popupRounding"),
+            FrameRounding: ReadFloat(el, "frameRounding"),
+            GrabRounding: ReadFloat(el, "grabRounding"),
+            TabRounding: ReadFloat(el, "tabRounding"),
+            ScrollbarRounding: ReadFloat(el, "scrollbarRounding"),
+            WindowBorderSize: ReadFloat(el, "windowBorderSize"),
+            FrameBorderSize: ReadFloat(el, "frameBorderSize")
+        );
 
     private static string ReadString(JsonElement el, string name)
     {

HellionChat/Themes/ThemeJsonWriter.cs

@@ -17,39 +17,39 @@ internal static class ThemeJsonWriter
             writer.WriteString("description", theme.Description);
 
             writer.WriteStartObject("colors");
-            WriteColor(writer, "primaryDark",   theme.Colors.PrimaryDark);
-            WriteColor(writer, "primary",       theme.Colors.Primary);
-            WriteColor(writer, "primaryLight",  theme.Colors.PrimaryLight);
-            WriteColor(writer, "primaryGlow",   theme.Colors.PrimaryGlow);
-            WriteColor(writer, "accentDark",    theme.Colors.AccentDark);
-            WriteColor(writer, "accent",        theme.Colors.Accent);
-            WriteColor(writer, "accentLight",   theme.Colors.AccentLight);
-            WriteColor(writer, "identity",      theme.Colors.Identity);
-            WriteColor(writer, "windowBg",      theme.Colors.WindowBg);
-            WriteColor(writer, "childBg",       theme.Colors.ChildBg);
-            WriteColor(writer, "frameBg",       theme.Colors.FrameBg);
-            WriteColor(writer, "surface",       theme.Colors.Surface);
-            WriteColor(writer, "surfaceHover",  theme.Colors.SurfaceHover);
-            WriteColor(writer, "border",        theme.Colors.Border);
-            WriteColor(writer, "textPrimary",   theme.Colors.TextPrimary);
-            WriteColor(writer, "textMuted",     theme.Colors.TextMuted);
-            WriteColor(writer, "textDim",       theme.Colors.TextDim);
+            WriteColor(writer, "primaryDark", theme.Colors.PrimaryDark);
+            WriteColor(writer, "primary", theme.Colors.Primary);
+            WriteColor(writer, "primaryLight", theme.Colors.PrimaryLight);
+            WriteColor(writer, "primaryGlow", theme.Colors.PrimaryGlow);
+            WriteColor(writer, "accentDark", theme.Colors.AccentDark);
+            WriteColor(writer, "accent", theme.Colors.Accent);
+            WriteColor(writer, "accentLight", theme.Colors.AccentLight);
+            WriteColor(writer, "identity", theme.Colors.Identity);
+            WriteColor(writer, "windowBg", theme.Colors.WindowBg);
+            WriteColor(writer, "childBg", theme.Colors.ChildBg);
+            WriteColor(writer, "frameBg", theme.Colors.FrameBg);
+            WriteColor(writer, "surface", theme.Colors.Surface);
+            WriteColor(writer, "surfaceHover", theme.Colors.SurfaceHover);
+            WriteColor(writer, "border", theme.Colors.Border);
+            WriteColor(writer, "textPrimary", theme.Colors.TextPrimary);
+            WriteColor(writer, "textMuted", theme.Colors.TextMuted);
+            WriteColor(writer, "textDim", theme.Colors.TextDim);
             WriteColor(writer, "statusSuccess", theme.Colors.StatusSuccess);
-            WriteColor(writer, "statusDanger",  theme.Colors.StatusDanger);
+            WriteColor(writer, "statusDanger", theme.Colors.StatusDanger);
             WriteColor(writer, "statusWarning", theme.Colors.StatusWarning);
-            WriteColor(writer, "statusInfo",    theme.Colors.StatusInfo);
+            WriteColor(writer, "statusInfo", theme.Colors.StatusInfo);
             writer.WriteEndObject();
 
             writer.WriteStartObject("layout");
-            writer.WriteNumber("windowRounding",    theme.Layout.WindowRounding);
-            writer.WriteNumber("childRounding",     theme.Layout.ChildRounding);
-            writer.WriteNumber("popupRounding",     theme.Layout.PopupRounding);
-            writer.WriteNumber("frameRounding",     theme.Layout.FrameRounding);
-            writer.WriteNumber("grabRounding",      theme.Layout.GrabRounding);
-            writer.WriteNumber("tabRounding",       theme.Layout.TabRounding);
+            writer.WriteNumber("windowRounding", theme.Layout.WindowRounding);
+            writer.WriteNumber("childRounding", theme.Layout.ChildRounding);
+            writer.WriteNumber("popupRounding", theme.Layout.PopupRounding);
+            writer.WriteNumber("frameRounding", theme.Layout.FrameRounding);
+            writer.WriteNumber("grabRounding", theme.Layout.GrabRounding);
+            writer.WriteNumber("tabRounding", theme.Layout.TabRounding);
             writer.WriteNumber("scrollbarRounding", theme.Layout.ScrollbarRounding);
-            writer.WriteNumber("windowBorderSize",  theme.Layout.WindowBorderSize);
-            writer.WriteNumber("frameBorderSize",   theme.Layout.FrameBorderSize);
+            writer.WriteNumber("windowBorderSize", theme.Layout.WindowBorderSize);
+            writer.WriteNumber("frameBorderSize", theme.Layout.FrameBorderSize);
             writer.WriteEndObject();
 
             if (theme.ChatColors is { Channels.Count: > 0 } cc)

HellionChat/Themes/ThemeLayout.cs

@@ -1,6 +1,6 @@
 namespace HellionChat.Themes;
 
-// Layout-Werte spiegeln die ImGuiStyleVar-Slots, die HellionStyle pusht.
+// Layout values mirror the ImGuiStyleVar slots pushed by HellionStyle.
 public sealed record ThemeLayout(
     float WindowRounding,
     float ChildRounding,

HellionChat/Themes/ThemeRegistry.cs

@@ -7,27 +7,33 @@ public sealed class ThemeRegistry
     public const string DefaultSlug = HellionArctic.Slug;
 
     private readonly Dictionary<string, Theme> _builtIns;
-    private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(
+        StringComparer.OrdinalIgnoreCase
+    );
     private readonly string? _customThemesDir;
     private Theme _active;
 
     public ThemeRegistry(string? customThemesDir = null)
     {
+        // Insertion order drives the Theme-Picker grid layout (3 columns).
+        // Row 1: blue family. Row 2: purple to magenta family.
+        // Row 3: green / warm / classic. Row 4: Synthwave Sunset as a
+        // retro bonus on its own line.
         _builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase)
         {
-            { HellionArctic.Slug,     HellionArctic.Build() },
-            { HellionSpectrum.Slug,   HellionSpectrum.Build() },
-            { Chat2Classic.Slug,      Chat2Classic.Build() },
-            { EventHorizon.Slug,      EventHorizon.Build() },
-            { MoonlitBloom.Slug,      MoonlitBloom.Build() },
-            { NightBlue.Slug,         NightBlue.Build() },
-            { IndigoViolet.Slug,      IndigoViolet.Build() },
-            { ForgeMerchantman.Slug,  ForgeMerchantman.Build() },
-            { MintGrove.Slug,         MintGrove.Build() },
-            { SynthwaveSunset.Slug,   SynthwaveSunset.Build() },
+            { HellionArctic.Slug, HellionArctic.Build() },
+            { HellionSpectrum.Slug, HellionSpectrum.Build() },
+            { NightBlue.Slug, NightBlue.Build() },
+            { EventHorizon.Slug, EventHorizon.Build() },
+            { IndigoViolet.Slug, IndigoViolet.Build() },
+            { CrystalNocturne.Slug, CrystalNocturne.Build() },
+            { MintGrove.Slug, MintGrove.Build() },
+            { ForgeMerchantman.Slug, ForgeMerchantman.Build() },
+            { Chat2Classic.Slug, Chat2Classic.Build() },
+            { SynthwaveSunset.Slug, SynthwaveSunset.Build() },
         };
 
-        // Centralised so the ten .Build() factories stay free of cache plumbing.
+        // Centralised so Build() factories stay free of cache plumbing.
         foreach (var theme in _builtIns.Values)
             theme.RecomputeAbgrCache();
 
@@ -39,10 +45,12 @@ public sealed class ThemeRegistry
 
     public Theme Get(string slug)
     {
-        if (_builtIns.TryGetValue(slug, out var b)) return b;
+        if (_builtIns.TryGetValue(slug, out var b))
+            return b;
 
         var custom = LoadCustomBySlug(slug);
-        if (custom != null) return custom;
+        if (custom != null)
+            return custom;
 
         return _builtIns[DefaultSlug];
     }
@@ -54,14 +62,13 @@ public sealed class ThemeRegistry
     public void Switch(string slug)
     {
         var theme = Get(slug);
-        // Defensive — idempotent and cheap, so any future theme source
-        // that forgets the cache fill still ends up with a populated one.
+        // Defensive — ensures any future theme source always gets a populated cache.
         theme.RecomputeAbgrCache();
         _active = theme;
     }
 
-    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION. Other
-    // IO failures are permanent and get the theme dropped instead of retried.
+    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION.
+    // Other IO failures are permanent — theme is dropped instead of retried.
     internal static bool IsRecoverableFileLock(Exception? ex)
     {
         if (ex is not IOException io)
@@ -70,13 +77,14 @@ public sealed class ThemeRegistry
         return code == 0x80070020u || code == 0x80070021u;
     }
 
-    // Custom-Themes werden lazy aus dem Verzeichnis geladen, Cache mit
-    // LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup
-    // neu eingelesen.
+    // Custom themes are loaded lazily, cached by LastWriteTime.
+    // A changed JSON is reloaded on the next lookup.
     private Theme? LoadCustomBySlug(string slug)
     {
-        if (_customThemesDir is null) return null;
-        if (!Directory.Exists(_customThemesDir)) return null;
+        if (_customThemesDir is null)
+            return null;
+        if (!Directory.Exists(_customThemesDir))
+            return null;
 
         foreach (var theme in RefreshCustomCache())
             if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
@@ -109,9 +117,10 @@ public sealed class ThemeRegistry
                 }
                 catch (Exception ex) when (IsRecoverableFileLock(ex))
                 {
-                    // Editor mid-save: keep the cached snapshot, leave the stamp
-                    // alone so the next refresh retries automatically.
-                    Plugin.Log.Debug($"Custom theme {Path.GetFileName(path)} is locked, keeping last known good");
+                    // Editor mid-save: keep last known good, retry on next refresh.
+                    Plugin.LogProxy.Debug(
+                        $"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
+                    );
                     if (cached.Theme is not null)
                         theme = cached.Theme;
                 }