Merge fix/release-workflow-ref-guard into main

Guards release.yml against non-tag refs and fixes the silent
ignore of body_path / tag_name that left every Gitea release
since v1.4.1 with an empty body.

.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
+* 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,225 @@
+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()
+                  }
+
+                  # ---------- 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://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 = "https://gitea.hellion-forge.cloud/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"
+                      }
+                  }

.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

@@ -8,7 +8,7 @@ body:
           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)
+              report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
               instead.
 
     - type: input

.github/ISSUE_TEMPLATE/config.yml

@@ -2,12 +2,13 @@ blank_issues_enabled: false
 
 contact_links:
     - name: Security vulnerability
-    url: https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+      url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
-    about: Do not open a public issue for security problems. Use the private advisory instead.
+      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.
+      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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -51,5 +51,7 @@ body:
           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
+              - 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
+If this is a security fix, stop here and report it privately by
-advisory instead:
+e-mail instead of opening a public PR:
-https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+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
+- [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible defaults rely on)
-      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
+- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
-      [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
+- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
-      made that practical, or I have explained why tests are not
+      are not applicable.
-      applicable.
+- [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
-- [ ] I updated the README, in-plugin strings or documentation if my
+- [ ] I did not include any AI-generated code without disclosing it in the PR description (see
-      change is user-visible.
+      [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
-- [ ] I did not include any AI-generated code without disclosing it
+- [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).
-      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/forge-posts/v1.1.0.md

@@ -0,0 +1,17 @@
+---
+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
+- 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
+- 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
+- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`

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

@@ -0,0 +1,25 @@
+---
+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
+- 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
+- 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
+
+Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) folgt in v1.3.0.

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

@@ -0,0 +1,29 @@
+---
+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)
+- 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
+
+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

@@ -0,0 +1,23 @@
+---
+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
+- 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.

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

@@ -0,0 +1,18 @@
+---
+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
+- **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

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

@@ -0,0 +1,23 @@
+---
+subtitle: Critical Lifecycle Fixes
+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.
+
+- **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
+  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
+
+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

@@ -0,0 +1,27 @@
+---
+subtitle: Theme Engine Performance
+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.
+
+- **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
+  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
+  Late-Night-Raids
+- **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.

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

@@ -0,0 +1,29 @@
+---
+subtitle: ChatLog Frame-Hot-Path
+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.
+
+- **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-
+Multiplikation pro Window.
+
+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,35 @@
+---
+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/release-footer.md

@@ -1,26 +1,27 @@
-
 ---
 
 ## How to install
 
-This release is distributed via the HellionChat custom repository, not the
+This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
-Dalamud main plugin repo. To install:
 
 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
-2. Add the URL:
+2. Add the URL: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
-   `https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/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
+- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
-- [Privacy notice](https://github.com/JonKazama-Hellion/HellionChat/blob/main/PRIVACY.md) — what the plugin stores and sends
+  architecture, build
-- [Third-party notices](https://github.com/JonKazama-Hellion/HellionChat/blob/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences
+- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
-- [Security policy](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SECURITY.md) — vulnerability reporting
+  the plugin stores and sends
-- [Support](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SUPPORT.md) — bug reports, questions, contact paths
+- [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).
+[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
-Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna,
+[Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
-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@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: Initialize CodeQL
-        uses: github/codeql-action/init@v4
-        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@v4
-        with:
-          category: /language:csharp
-
-  analyze-actions:
-    name: Analyze (actions)
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
-        with:
-          languages: actions
-          build-mode: none
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
-        with:
-          category: /language:actions

.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,11 @@
 .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)
+HellionChat.Tests/
 
 # Packaging
 pack/
@@ -380,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,7 @@
+{
+    "MD007": { "indent": 4 },
+    "MD013": false,
+    "MD029": false,
+    "MD033": 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

@@ -1,71 +1,110 @@
-# Code of conduct
+# Code of Conduct
 
-HellionChat is a small hobby project. The contributor base is tiny and
+## A Note on This Project
-the moderation overhead I can afford is equally small, so this document
-is short and direct.
 
-## What I expect from contributors
+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.
 
-- Be respectful in issues, pull requests, discussions and any other
+When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
-  project space (Discord, email).
+clarifying question is almost always a better first move than an accusation.
-- Keep feedback focused on the code, the design or the documentation.
-  Critique the work, not the person.
-- Assume good intent. People come from different backgrounds, time
-  zones and skill levels. A clarifying question is almost always a
-  better first move than an accusation.
-- Stay on topic. This project is about a Dalamud chat plugin. Off-topic
-  arguments belong elsewhere.
-- Respect that I maintain this in my spare time. Replies can take a
-  few days. Please do not escalate just because a thread is quiet.
 
-## What is not welcome
+Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
+elsewhere.
 
-- Personal attacks, slurs, doxxing, sustained disruption of threads.
+---
-- Unsolicited private contact after I have asked someone to stop.
-- Sharing of private conversations without consent.
-- Any content that would put other contributors or end users at risk.
 
-## Scope
+## Our Pledge
 
-This applies to every space the project owns or that I run on its
+We pledge to make our community welcoming, safe, and equitable for all.
-behalf: the GitHub repository, GitHub Discussions, project-related
-Discord conversations and the maintainer email address listed in
-`SECURITY.md`.
 
-It also applies when someone is identifiably representing the project
+We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all
-in another space, for example posting as a HellionChat maintainer in
+individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
-the Dalamud Discord.
+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.
+
+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.
+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**.
+
+## 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.
+
+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.
 
 ## Reporting
 
-If something here is being broken, contact me directly. Do not open a
+If something here is being broken, contact me directly. Do not open a public issue.
-public issue.
 
-- Email: `kontakt@hellion-media.de`
+| Channel    | Address                    |
-- Discord DM: `@j.j_kazama`
+| ---------- | -------------------------- |
+| Email      | `kontakt@hellion-media.de` |
+| Discord DM | `@j.j_kazama`              |
 
-Reports stay private. I will acknowledge within a few weekdays
+Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell you what I plan to do.
-(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 am the sole maintainer, so enforcement is a single-person process. I will pick the lightest measure that actually
-Depending on what happened and how the person responds, I will pick
+resolves the situation:
-the lightest measure that resolves the issue:
 
 1. Private note asking the behaviour to stop.
 2. Public correction in the affected thread.
 3. Edit or removal of the offending content.
-4. Temporary block from the repository or related spaces.
+4. Private written warning with a cooldown period.
-5. Permanent block.
+5. Temporary block from the repository or related spaces.
+6. Permanent block.
 
-Severe cases skip the lower steps. I will not negotiate over
+Severe cases skip the lower steps. I will not negotiate over harassment or threats.
-harassment or threats.
 
-## Acknowledgement
+## Scope
 
-This document is intentionally short and project-specific rather than
+This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
-a copy of a longer template. If you need a more formal reference, the
+Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
-[Contributor Covenant](https://www.contributor-covenant.org/) is a
+It also applies when someone is identifiably representing HellionChat elsewhere, for example when posting as a
-widely adopted starting point and the spirit of this document is
+HellionChat maintainer in the Dalamud Discord.
-compatible with it.
+
+## Attribution
+
+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
+[https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).

CONTRIBUTING.md

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

@@ -1,6 +1,10 @@
 HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
 
-Copyright (c) 2024-2025 Infiziert90 (Infi) and Anna Clemens (ascclemens)
+═══════════════════════════════════════════════════════════════════
+Source code
+═══════════════════════════════════════════════════════════════════
+
+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
@@ -10,18 +14,38 @@ Copyright (c) 2024-2025 Infiziert90 (Infi) and Anna Clemens (ascclemens)
 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,
-    Hellion theme and font integration, German localisation and the
+German localisation and the EUPL-1.2 fork maintenance.
-    EUPL-1.2 fork maintenance.
 
-Licensed under the European Union Public Licence (EUPL), Version 1.2
+Source code is licensed under the European Union Public Licence
-only. The full Licence text lives in the LICENSE file at the root of
+(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
-this repository. The official Licence website is at:
+file at the root of this repository. The official Licence website is
-
+at: <https://eupl.eu/1.2/en/>
-    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
 Liability) of the Licence for the legally binding wording.
 
+═══════════════════════════════════════════════════════════════════
+Visual assets
+═══════════════════════════════════════════════════════════════════
+Copyright (c) 2026 Florian Eck
+
+    Designer of the Hellion Forge logo and Hellion Online Media logo
+    (variants located in docs/images and HellionChat/images).
+    Exclusive usage and marketing rights licensed to Hellion Online
+    Media. These assets are NOT covered by the EUPL-1.2 source code
+    licence above and may not be reused, modified, or redistributed
+    without separate permission from the copyright holder.
+
+═══════════════════════════════════════════════════════════════════
+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.
+
+═══════════════════════════════════════════════════════════════════
+
 Acknowledgements directed at the upstream ChatTwo authors live in
 NOTICE.md. The manual upstream-sync workflow lives in UPSTREAM_SYNC.md.

HellionChat.sln

@@ -1,16 +1,31 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HellionChat", "HellionChat\HellionChat.csproj", "{739F75E6-B65F-41EF-9D90-F7BC519E4875}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x64.Build.0 = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x86.Build.0 = Debug|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x64.ActiveCfg = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x64.Build.0 = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x86.ActiveCfg = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

HellionChat/AutoTellTabsService.cs

@@ -1,23 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
 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.
+// Auto-Tell-Tabs: spawns session-only tabs per /tell partner.
-//
+// Subscribes to MessageManager.MessageProcessed and ClientState.Logout.
-// 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).
 internal sealed class AutoTellTabsService : IDisposable
 {
     private readonly Plugin _plugin;
@@ -25,6 +20,14 @@ internal sealed class AutoTellTabsService : IDisposable
     private readonly MessageStore _store;
     private readonly object _tempTabsLock = new();
 
+    // F2.1: lock-free counter mirrors Config.Tabs.Count(IsTempTab) so the
+    // hot-path getter doesn't contend with HandleTell on every render frame.
+    // Bumped from inside the existing mutation paths so it stays consistent
+    // with the underlying list — see SpawnTempTab, DropOldestTempTab, OnLogout
+    // and ResyncTempTabCounter (used by Plugin.cs snapshot-restore).
+    // TEST-MIRROR: ../../Hellion Build test/_Helpers/TempTabCounterTests.cs
+    private int _activeTempTabCount;
+
     private bool _initialized;
 
     internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
@@ -34,16 +37,7 @@ internal sealed class AutoTellTabsService : IDisposable
         _store = store;
     }
 
-    internal int ActiveTempTabCount
+    internal int ActiveTempTabCount => Volatile.Read(ref _activeTempTabCount);
-    {
-        get
-        {
-            lock (_tempTabsLock)
-            {
-                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
-            }
-        }
-    }
 
     internal void Initialize()
     {
@@ -52,11 +46,25 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
+        // Seed the counter from the persisted Tabs list so a config that already
+        // contains TempTabs from a prior session starts in sync. Plugin.cs:168
+        // crash-recovery has already dropped TempTabs by the time we get here,
+        // so the snapshot reflects post-recovery reality.
+        Interlocked.Exchange(ref _activeTempTabCount, Plugin.Config.Tabs.Count(t => t.IsTempTab));
+
         _messageManager.MessageProcessed += HandleTell;
         Plugin.ClientState.Logout += OnLogout;
         _initialized = true;
     }
 
+    // F2.1: callable from outside paths that mutate Config.Tabs directly
+    // (Plugin.cs snapshot-restore). Atomically re-pegs the counter to the
+    // live IsTempTab count.
+    internal void ResyncTempTabCounter()
+    {
+        Interlocked.Exchange(ref _activeTempTabCount, Plugin.Config.Tabs.Count(t => t.IsTempTab));
+    }
+
     public void Dispose()
     {
         if (!_initialized)
@@ -76,7 +84,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 +95,13 @@ internal sealed class AutoTellTabsService : IDisposable
         var partner = ExtractTellPartner(message);
         if (partner == null)
         {
-            // Real message without a player payload — e.g. GM tells, which
+            // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
-            // 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}, " +
+                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
-                $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " +
+                    + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
-                $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " +
+                    + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
-                $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}");
+                    + $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"
+            );
             return;
         }
 
@@ -101,9 +110,7 @@ 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
+                // Already routed via MessageManager pipeline
-                // message via the MessageManager pipeline (see Task 2 sender
-                // filter).
                 return;
             }
 
@@ -120,11 +127,9 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         if (message.Code.Type == ChatType.TellIncoming)
         {
-            // Incoming tell: the sender is the conversation partner. The
+            // Sender is the partner; check chunks first, then raw SeString as fallback
-            // PlayerPayload normally rides on a chunk's Link slot, but for
+            var fromSender =
-            // some tell types FFXIV only puts it in the raw SeString —
+                ChunkUtil.TryGetPlayerPayload(message.Sender)
-            // fall back to that before giving up.
-            var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender)
                 ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
             if (fromSender != null)
             {
@@ -133,11 +138,9 @@ internal sealed class AutoTellTabsService : IDisposable
             return null;
         }
 
-        // Outgoing tell: the local player is the sender, the partner shows
+        // Outgoing tell: check content first, then channels's TellTarget as fallback
-        // up either as a payload in the content (for tells typed via the
+        var fromContent =
-        // Chat 2 input bar) or as the channel's tracked tell target (set by
+            ChunkUtil.TryGetPlayerPayload(message.Content)
-        // 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);
@@ -146,7 +149,8 @@ internal sealed class AutoTellTabsService : IDisposable
             return (fromContent.PlayerName, fromContent.World.RowId);
         }
 
-        var current = _plugin.CurrentTab.CurrentChannel.TellTarget
+        var current =
+            _plugin.CurrentTab.CurrentChannel.TellTarget
             ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
         if (current != null && current.IsSet())
         {
@@ -162,17 +166,15 @@ internal sealed class AutoTellTabsService : IDisposable
             t.IsTempTab
             && t.TellTarget != null
             && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
-            && t.TellTarget.World == world);
+            && t.TellTarget.World == world
+        );
     }
 
     private void DropOldestTempTab()
     {
-        // Greeted tabs are dropped before un-greeted ones (the user said
+        // Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity
-        // "I'm done with that conversation"), and within each bucket we
+        var victim = Plugin
-        // pick the oldest LastActivity. This protects active conversations
+            .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
-        // 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)
             .OrderByDescending(t => t.Tab.IsGreeted)
             .ThenBy(t => t.Tab.LastActivity)
@@ -183,16 +185,12 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
-        // v0.6.1 — if the victim is currently popped out, tear down the
+        // Clean up pop-out window if tab is popped out
-        // 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.
         if (victim.Tab.PopOut)
         {
-            var popout = _plugin.ChatLogWindow.ActivePopouts
+            var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
-                .FirstOrDefault(p => p.TabIdentifier == victim.Tab.Identifier);
+                p.TabIdentifier == victim.Tab.Identifier
+            );
             if (popout != null)
             {
                 popout.IsOpen = false;
@@ -200,9 +198,9 @@ internal sealed class AutoTellTabsService : IDisposable
         }
 
         Plugin.Config.Tabs.RemoveAt(victim.Index);
+        Interlocked.Decrement(ref _activeTempTabCount);
 
-        // Re-anchor the active tab so the user does not silently end up on
+        // Re-anchor active tab to avoid silent switch when tab is dropped
-        // a different conversation when their tab gets dropped or shifted.
         if (victim.Index <= _plugin.LastTab)
         {
             _plugin.WantedTab = 0;
@@ -213,28 +211,19 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         var tab = BuildTempTab(partner.Name, partner.World);
 
-        // Preload first so the tab opens with chronological history above
+        // Preload history: chronological order with current message already persisted
-        // 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.
         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
+        // Open as pop-out if configured (set before Tabs.Add for next render-tick)
-        // 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).
         if (Plugin.Config.AutoTellTabsOpenAsPopout)
         {
             tab.PopOut = true;
         }
 
         Plugin.Config.Tabs.Add(tab);
+        Interlocked.Increment(ref _activeTempTabCount);
     }
 
     private static Tab BuildTempTab(string playerName, uint worldRowId)
@@ -263,9 +252,7 @@ internal sealed class AutoTellTabsService : IDisposable
         {
             return $"{playerName}@{worldRow.Name}";
         }
-        // World sheet lookup miss is rare (only for FFXIV worlds Dalamud has
+        // Fallback if world lookup misses (rare; only for unseen worlds)
-        // not yet seen). Fall back to the raw RowId so the user still has a
-        // unique, readable label.
         return $"{playerName}@World{worldRowId}";
     }
 
@@ -279,14 +266,13 @@ internal sealed class AutoTellTabsService : IDisposable
 
         try
         {
-            // Pull one extra row because the live tell that triggered this
+            // Pull one extra row: current message is already in store and would eat a preload slot
-            // spawn is already in the store and would otherwise eat one of
-            // the user's preload-budget slots.
             var history = _store.GetTellHistoryWithSender(
                 _messageManager.CurrentContentId,
                 senderName,
                 senderWorld,
-                preloadCount + 1);
+                preloadCount + 1
+            );
 
             var historicMessages = history
                 .Where(m => m.Id != currentMessageId)
@@ -295,36 +281,30 @@ internal sealed class AutoTellTabsService : IDisposable
 
             if (historicMessages.Count == 0)
             {
-                // No prior tells with this player — leave the tab to start
+                // No prior tells; leave tab empty to avoid orphaned "history loaded" marker
-                // empty so the user does not see a "history loaded" marker
-                // sitting alone above the very first message.
                 return;
             }
 
-            // The history list is already oldest-first, so a plain AddPrune
+            // History is oldest-first; add in order for chronological display
-            // loop produces the chronological order the user expects to see
-            // when the tab opens.
             foreach (var message in historicMessages)
             {
                 tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit);
             }
 
-            // Visible separator between the loaded history and the live
+            // Separator between history and live tell (sorts after history but before current)
-            // tell that triggered this spawn. Goes in last so it sorts
-            // after the historical messages but before the current one.
             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
+            // Non-fatal: tab still spawns with visible error notice instead of silent history loss
-            // notice instead of silently missing history. The error logs
-            // once with full stack trace for diagnosis.
             Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
             tab.Messages.AddPrune(
                 MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
-                MessageManager.MessageDisplayLimit);
+                MessageManager.MessageDisplayLimit
+            );
         }
     }
 
@@ -360,9 +340,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
         lock (_tempTabsLock)
         {
-            // Frame-race guard (E5): the sidebar might still render a tab
+            // Guard against frame-race: sidebar might render a tab already removed by LRU or logout
-            // that has already been removed by LRU drop or logout cleanup.
-            // Silently skip the toggle so we don't mutate stale state.
             if (!Plugin.Config.Tabs.Contains(tab))
             {
                 return;
@@ -376,38 +354,33 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         lock (_tempTabsLock)
         {
-            // Snapshot whether the active tab is about to be removed, BEFORE
+            // Snapshot active tab index before mutating list
-            // we mutate the list — index lookups would lie to us afterwards.
             var lastIndex = _plugin.LastTab;
             var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
             var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
 
-            // v0.6.1 — symmetric to DropOldestTempTab cleanup: tear down any
+            // Clean up pop-out windows before removing temp tabs
-            // popped-out temp tab windows before removing the tabs themselves,
+            var poppedTempTabIds = Plugin
-            // otherwise PopOutWindows + WindowSystem keep ghost entries until
+                .Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
-            // 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)
                 .Select(t => t.Identifier)
                 .ToList();
             if (poppedTempTabIds.Count > 0)
             {
                 var poppedSet = poppedTempTabIds.ToHashSet();
-                foreach (var popout in _plugin.ChatLogWindow.ActivePopouts
+                foreach (
-                             .Where(p => poppedSet.Contains(p.TabIdentifier))
+                    var popout in _plugin
-                             .ToList())
+                        .ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
+                        .ToList()
+                )
                 {
                     popout.IsOpen = false;
                 }
             }
 
-            Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+            var removed = Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+            Interlocked.Add(ref _activeTempTabCount, -removed);
 
-            // Force a switch to tab 0 if the active tab was a temp tab OR
+            // Force switch to tab 0 if active tab was temp or index is now out of range
-            // if drops before the active index pushed LastTab out of range.
-            // Otherwise the user keeps their current persistent tab.
             var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
             if (currentWasTempTab || !stillValid)
             {

HellionChat/Branding/BrandingLinks.cs

@@ -0,0 +1,12 @@
+namespace HellionChat.Branding;
+
+// 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";
+}

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
+        var conflict = pluginInterface.InstalledPlugins.FirstOrDefault(p =>
-            .FirstOrDefault(p =>
+            p.InternalName == UpstreamInternalName && p.IsLoaded
-                p.InternalName == UpstreamInternalName &&
+        );
-                p.IsLoaded);
 
         if (conflict is null)
             return;
 
-        var message = HellionStrings.ChatTwoConflictTitle + "\n\n" +
+        var message =
-                      HellionStrings.ChatTwoConflictBody + "\n\n" +
+            HellionStrings.ChatTwoConflictTitle
-                      HellionStrings.ChatTwoConflictAction;
+            + "\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,7 +25,8 @@ public abstract class Chunk
         Link = link;
     }
 
-    internal SeString? GetSeString() => Source switch
+    internal SeString? GetSeString() =>
+        Source switch
         {
             ChunkSource.None => null,
             ChunkSource.Sender => Message?.SenderSource,
@@ -33,16 +34,14 @@ public abstract class Chunk
             _ => null,
         };
 
-    /// <summary>
+    // Returns basic text for hashing (content for TextChunk, icon name for IconChunk)
-    /// Get some basic text for use in generating hashes.
-    /// </summary>
     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(2)]
-    [Key(3)] public uint? Foreground;
+    public ChatType? FallbackColour;
-    [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)
+    [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/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,12 +5,20 @@ namespace HellionChat.Code;
 internal static class ChatSourceExt
 {
     internal const ChatSource All =
-        ChatSource.LocalPlayer | ChatSource.PartyMember | ChatSource.AllianceMember |
+        ChatSource.LocalPlayer
-        ChatSource.OtherPlayer | ChatSource.EngagedEnemy | ChatSource.UnengagedEnemy |
+        | ChatSource.PartyMember
-        ChatSource.FriendlyNpc | ChatSource.PetOrCompanion | ChatSource.PetOrCompanionParty |
+        | ChatSource.AllianceMember
-        ChatSource.PetOrCompanionAlliance | ChatSource.PetOrCompanionOther;
+        | 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
+    internal static string Name(this ChatSource source) =>
+        source switch
         {
             ChatSource.LocalPlayer => Language.ChatSource_Self,
             ChatSource.PartyMember => Language.ChatSource_PartyMember,

HellionChat/Code/ChatTypeExt.cs

@@ -1,6 +1,6 @@
+using Dalamud.Game.Config;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Game.Config;
 
 namespace HellionChat.Code;
 
@@ -8,9 +8,12 @@ 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_Special,
-        (Language.Options_Tabs_ChannelTypes_Chat,
+                [ChatType.Debug, ChatType.Urgent, ChatType.Notice]
+            ),
+            (
+                Language.Options_Tabs_ChannelTypes_Chat,
                 [
                     ChatType.Say,
                     ChatType.Yell,
@@ -40,10 +43,11 @@ internal static class ChatTypeExt
                     ChatType.Linkshell8,
                     ChatType.NoviceNetwork,
                     ChatType.StandardEmote,
-            ChatType.CustomEmote
+                    ChatType.CustomEmote,
-        ]),
+                ]
-
+            ),
-        (Language.Options_Tabs_ChannelTypes_Battle,
+            (
+                Language.Options_Tabs_ChannelTypes_Battle,
                 [
                     ChatType.Damage,
                     ChatType.Miss,
@@ -53,10 +57,11 @@ internal static class ChatTypeExt
                     ChatType.GainBuff,
                     ChatType.LoseBuff,
                     ChatType.GainDebuff,
-            ChatType.LoseDebuff
+                    ChatType.LoseDebuff,
-        ]),
+                ]
-
+            ),
-        (Language.Options_Tabs_ChannelTypes_Announcements,
+            (
+                Language.Options_Tabs_ChannelTypes_Announcements,
                 [
                     ChatType.System,
                     ChatType.BattleSystem,
@@ -82,8 +87,9 @@ internal static class ChatTypeExt
                     ChatType.Orchestrion,
                     ChatType.MessageBook,
                     ChatType.Alarm,
-            ChatType.GlamourNotifications
+                    ChatType.GlamourNotifications,
-        ])
+                ]
+            ),
             // Note: ExtraChat linkshells are handled separately in the tab settings
             // UI.
         ];
@@ -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,7 +313,8 @@ internal static class ChatTypeExt
         }
     }
 
-    internal static InputChannel? ToInputChannel(this ChatType type) => type switch
+    internal static InputChannel? ToInputChannel(this ChatType type) =>
+        type switch
         {
             ChatType.TellOutgoing => InputChannel.Tell,
             ChatType.Say => InputChannel.Say,
@@ -336,7 +344,8 @@ internal static class ChatTypeExt
             _ => null,
         };
 
-    internal static bool IsGm(this ChatType type) => type switch
+    internal static bool IsGm(this ChatType type) =>
+        type switch
         {
             ChatType.GmTell => true,
             ChatType.GmSay => true,
@@ -356,7 +365,8 @@ internal static class ChatTypeExt
             _ => false,
         };
 
-    internal static bool IsExtraChatLinkshell(this ChatType type) => type switch
+    internal static bool IsExtraChatLinkshell(this ChatType type) =>
+        type switch
         {
             ChatType.ExtraChatLinkshell1 => true,
             ChatType.ExtraChatLinkshell2 => true,
@@ -369,7 +379,8 @@ internal static class ChatTypeExt
             _ => false,
         };
 
-    public static UiConfigOption ToConfigEntry(this ChatType type) => type switch
+    public static UiConfigOption ToConfigEntry(this ChatType type) =>
+        type switch
         {
             ChatType.Say => UiConfigOption.ColorSay,
             ChatType.Shout => UiConfigOption.ColorShout,
@@ -398,7 +409,8 @@ internal static class ChatTypeExt
             _ => UiConfigOption.ColorSay,
         };
 
-    internal static bool HasSource(this ChatType type) => type switch
+    internal static bool HasSource(this ChatType type) =>
+        type switch
         {
             // Battle
             ChatType.Damage => true,
@@ -425,7 +437,8 @@ internal static class ChatTypeExt
             _ => false,
         };
 
-    internal static ChatType Parent(this ChatType type) => type switch
+    internal static ChatType Parent(this ChatType type) =>
+        type switch
         {
             ChatType.Say => ChatType.Say,
             ChatType.GmSay => ChatType.Say,

HellionChat/Code/InputChannelExt.cs

@@ -4,7 +4,8 @@ namespace HellionChat.Code;
 
 internal static class InputChannelExt
 {
-    internal static ChatType ToChatType(this InputChannel input) => input switch
+    internal static ChatType ToChatType(this InputChannel input) =>
+        input switch
         {
             InputChannel.Tell => ChatType.TellOutgoing,
             InputChannel.Say => ChatType.Say,
@@ -43,7 +44,8 @@ internal static class InputChannelExt
             _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
         };
 
-    public static uint LinkshellIndex(this InputChannel channel) => channel switch
+    public static uint LinkshellIndex(this InputChannel channel) =>
+        channel switch
         {
             InputChannel.Linkshell1 => 0,
             InputChannel.Linkshell2 => 1,
@@ -72,7 +74,8 @@ internal static class InputChannelExt
             _ => uint.MaxValue,
         };
 
-    public static string Prefix(this InputChannel channel) => channel switch
+    public static string Prefix(this InputChannel channel) =>
+        channel switch
         {
             InputChannel.Tell => "/t",
             InputChannel.Say => "/s",
@@ -145,10 +148,12 @@ 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
+    internal static bool IsLinkshell(this InputChannel channel) =>
+        channel switch
         {
             InputChannel.Linkshell1 => true,
             InputChannel.Linkshell2 => true,
@@ -161,7 +166,8 @@ internal static class InputChannelExt
             _ => false,
         };
 
-    internal static bool IsCrossLinkshell(this InputChannel channel) => channel switch
+    internal static bool IsCrossLinkshell(this InputChannel channel) =>
+        channel switch
         {
             InputChannel.CrossLinkshell1 => true,
             InputChannel.CrossLinkshell2 => true,
@@ -174,7 +180,8 @@ internal static class InputChannelExt
             _ => false,
         };
 
-    internal static bool IsExtraChatLinkshell(this InputChannel channel) => channel switch
+    internal static bool IsExtraChatLinkshell(this InputChannel channel) =>
+        channel switch
         {
             InputChannel.ExtraChatLinkshell1 => true,
             InputChannel.ExtraChatLinkshell2 => true,
@@ -187,7 +194,8 @@ internal static class InputChannelExt
             _ => false,
         };
 
-    internal static bool IsValid(this InputChannel channel) => channel switch
+    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)
+            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))
         {

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;
 
@@ -34,17 +34,41 @@ public class ConfigKeyBind
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 12;
+    private const int LatestVersion = 16;
 
     public int Version { get; set; } = LatestVersion;
 
-    // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
+    // Slug-based; ThemeRegistry resolves the object at runtime.
-    // Master-switch defaults to true; set false to restore upstream behavior.
+    public string Theme = "hellion-arctic";
+
+    // Global window opacity, applied across all themes.
+    public float WindowOpacity = 0.85f;
+
+    // Reserved for future UI toggles; pre-declared to avoid a migration later.
+    public bool ReduceMotion;
+
+    // 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;
+
+    // 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)
     {
@@ -52,82 +76,40 @@ 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.Log.Warning(
+                "PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
+                type,
+                PrivacyPersistUnknownChannels
+            );
+        }
+
         return PrivacyPersistUnknownChannels;
     }
 
-    // Hellion Chat — Message retention (GDPR data minimization, time axis).
+    // Retention master switch defaults to false — plugin will not delete
-    // Master switch defaults to false; the plugin will not delete history
+    // history until the user explicitly opts in.
-    // 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;
-
-    // Hellion Chat global ImGui theme — applied to every plugin window in
-    // Plugin.Draw. Default ON; users who prefer the upstream Dalamud look
-    // can flip this off in the Privacy tab.
-    public bool HellionThemeEnabled = true;
-
-    // Window background opacity, 0.5–1.0. Lower values make the plugin
-    // panes more glass-like so the game shines through. Default 0.5
-    // matches the maintainer's daily-driver preference; users who want
-    // a less translucent look bump it up in Aussehen → Theme.
-    public float HellionThemeWindowOpacity = 0.5f;
-
-    // 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;
-
+    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).
     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.
     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)
@@ -145,7 +127,9 @@ public class Configuration : IPluginConfiguration
     public bool HideWhenUiHidden = true;
     public bool HideInLoadingScreens;
     public bool HideInBattle;
-    public bool HideInNewGamePlusMenu;
+
+    // v1.2.1: default flipped false → true for consistency with other hide defaults.
+    public bool HideInNewGamePlusMenu = true;
     public bool HideWhenInactive;
     public int InactivityHideTimeout = 10;
     public bool InactivityHideActiveDuringBattle = true;
@@ -160,13 +144,8 @@ public class Configuration : IPluginConfiguration
     public bool NativeItemTooltips = true;
     public bool PrettierTimestamps = true;
     public bool MoreCompactPretty;
-    public bool HideSameTimestamps;
+    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;
@@ -187,16 +166,10 @@ public class Configuration : IPluginConfiguration
     public bool CollapseKeepUniqueLinks;
     public bool PlaySounds = true;
     public bool KeepInputFocus = true;
-    public int MaxLinesToRender = 5_000; // 1-10000
+    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;
@@ -220,14 +193,22 @@ public class Configuration : IPluginConfiguration
     };
 
     public float TooltipOffset;
-    public float WindowAlpha = 100f;
+
-    public Dictionary<ChatType, uint> ChatColours = new();
+    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
+        )
+            defaults[channel] = colour;
+        return defaults;
+    }
+
     public bool ColorSelectedInputChannelButton = true;
     public List<Tab> Tabs = [];
 
-    public bool OverrideStyle;
-    public string? ChosenStyle;
-
     public ConfigKeyBind? ChatTabForward;
     public ConfigKeyBind? ChatTabBackward;
 
@@ -247,7 +228,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;
@@ -279,7 +263,8 @@ public class Configuration : IPluginConfiguration
         MaxLinesToRender = other.MaxLinesToRender;
         Use24HourClock = other.Use24HourClock;
         ShowEmotes = other.ShowEmotes;
-        BlockedEmotes = other.BlockedEmotes;
+        // 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;
         ExtraGlyphRanges = other.ExtraGlyphRanges;
@@ -289,22 +274,33 @@ public class Configuration : IPluginConfiguration
         ItalicFontV2 = other.ItalicFontV2;
         SymbolsFontSizeV2 = other.SymbolsFontSizeV2;
         TooltipOffset = other.TooltipOffset;
-        WindowAlpha = other.WindowAlpha;
         ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
         ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
 
-        // Hellion Chat — Auto-Tell-Tabs are session-only and therefore
+        // Keep live temp tabs alive across UpdateFrom — a settings save must
-        // never present in a disk-loaded copy. Keep the live temp tabs of
+        // not destroy open tell conversations. For persistent tabs, capture
-        // *this* configuration alive across an UpdateFrom so a settings
+        // the live MessageList and LastSendUnread by Identifier before the
-        // save (or sidebar-mode toggle) does not silently destroy the
+        // replace and restore them onto the freshly cloned tabs; new tabs
-        // user's open tell conversations. Persistent tabs from `other`
+        // get an empty MessageList, deleted tabs lose their history (intended).
-        // still get the regular clone-replace treatment.
         var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
-        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t => t.Clone()).ToList();
+        var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
+            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
+
+        Tabs = other
+            .Tabs.Where(t => !t.IsTempTab)
+            .Select(t =>
+            {
+                var clone = t.Clone();
+                if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+                {
+                    clone.Messages = live.Messages;
+                    clone.LastSendUnread = live.LastSendUnread;
+                }
+                return clone;
+            })
+            .ToList();
         Tabs.AddRange(liveTempTabs);
 
-        OverrideStyle = other.OverrideStyle;
-        ChosenStyle = other.ChosenStyle;
         ChatTabForward = other.ChatTabForward;
         ChatTabBackward = other.ChatTabBackward;
 
@@ -314,13 +310,21 @@ public class Configuration : IPluginConfiguration
 
         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;
-        HellionThemeEnabled = other.HellionThemeEnabled;
-        HellionThemeWindowOpacity = other.HellionThemeWindowOpacity;
         UseHellionFont = other.UseHellionFont;
+        ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
+
+        // v1.1.0 theme engine fields
+        Theme = other.Theme;
+        WindowOpacity = other.WindowOpacity;
+        ReduceMotion = other.ReduceMotion;
+        UseCompactDensity = other.UseCompactDensity;
 
         EnableAutoTellTabs = other.EnableAutoTellTabs;
         AutoTellTabsLimit = other.AutoTellTabsLimit;
@@ -345,7 +349,8 @@ public enum UnreadMode
 
 public static class UnreadModeExt
 {
-    internal static string Name(this UnreadMode mode) => mode switch
+    internal static string Name(this UnreadMode mode) =>
+        mode switch
         {
             UnreadMode.All => Language.UnreadMode_All,
             UnreadMode.Unseen => Language.UnreadMode_Unseen,
@@ -353,7 +358,8 @@ public static class UnreadModeExt
             _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
         };
 
-    internal static string? Tooltip(this UnreadMode mode) => mode switch
+    internal static string? Tooltip(this UnreadMode mode) =>
+        mode switch
         {
             UnreadMode.All => Language.UnreadMode_All_Tooltip,
             UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
@@ -367,6 +373,9 @@ public class Tab
 {
     public string Name = Language.Tab_DefaultName;
 
+    // Optional FontAwesome glyph name; null falls back to TabIconMapping default.
+    public string? Icon = null;
+
     [Obsolete("Removed in favor of SelectedChannels")]
     public Dictionary<ChatType, ChatSource> ChatCodes = new();
 
@@ -398,34 +407,57 @@ public class Tab
     public bool AllSenderMessages;
     public TellTarget TellTarget = TellTarget.Empty();
 
-    [NonSerialized] public uint Unread;
+    [NonSerialized]
-    [NonSerialized] public uint LastSendUnread;
+    public uint Unread;
-    [NonSerialized] public long LastActivity;
-    [NonSerialized] public MessageList Messages = new();
 
-    [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
+    [NonSerialized]
-    // sidebar to mark a tell partner as already greeted in the current
+    public MessageList Messages = new();
-    // session. NonSerialized because the temp tab itself is session-only.
+
-    [NonSerialized] public bool IsGreeted;
+    [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;
+        // Temp tabs are bound to a single conversation partner — other tells
-        // every other tell that matches the channel filter must NOT land
+        // matching the channel filter must not land here.
-        // here, otherwise all temp tabs would mirror "Tell Exclusive".
         if (IsTempTab && TellTarget?.IsSet() == true)
-        {
             return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
-        }
 
         return true;
     }
@@ -437,12 +469,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()
+    public void Clear() => Messages.Clear();
-        => Messages.Clear();
 
     public Tab Clone()
     {
@@ -480,10 +517,7 @@ public class Tab
         };
     }
 
-    /// <summary>
+    /// Ordered message list with duplicate ID tracking, sorting and mutex protection.
-    /// MessageList provides an ordered list of messages with duplicate ID
-    /// tracking, sorting and mutex protection.
-    /// </summary>
     public class MessageList
     {
         private readonly SemaphoreSlim LockSlim = new(1, 1);
@@ -571,9 +605,24 @@ public class Tab
             }
         }
 
-        /// <summary>
+        /// Current message count. Lock-per-read is acceptable for 1×/sec status bar polling.
-        /// Returns an array copy of the message list for usage outside of main thread
+        public int Count
-        /// </summary>
+        {
+            get
+            {
+                LockSlim.Wait(-1);
+                try
+                {
+                    return Messages.Count;
+                }
+                finally
+                {
+                    LockSlim.Release();
+                }
+            }
+        }
+
+        /// 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);
@@ -587,17 +636,16 @@ public class Tab
             }
         }
 
-        /// <summary>
+        /// Returns a read-only list while holding a reader lock. Use with a using statement.
-        /// GetReadOnly returns a read-only list of messages while holding a
-        /// reader lock. The list should be used with a using statement.
-        /// </summary>
         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()
             {
@@ -656,7 +704,8 @@ public enum PreviewPosition
 
 public static class PreviewPositionExt
 {
-    public static string Name(this PreviewPosition position) => position switch
+    public static string Name(this PreviewPosition position) =>
+        position switch
         {
             PreviewPosition.None => Language.Options_Preview_None,
             PreviewPosition.Inside => Language.Options_Preview_Inside,
@@ -677,7 +726,8 @@ public enum CommandHelpSide
 
 public static class CommandHelpSideExt
 {
-    public static string Name(this CommandHelpSide side) => side switch
+    public static string Name(this CommandHelpSide side) =>
+        side switch
         {
             CommandHelpSide.None => Language.CommandHelpSide_None,
             CommandHelpSide.Left => Language.CommandHelpSide_Left,
@@ -695,14 +745,16 @@ public enum KeybindMode
 
 public static class KeybindModeExt
 {
-    public static string Name(this KeybindMode mode) => mode switch
+    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
+    public static string? Tooltip(this KeybindMode mode) =>
+        mode switch
         {
             KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
             KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
@@ -736,7 +788,8 @@ public enum LanguageOverride
 
 public static class LanguageOverrideExt
 {
-    public static string Name(this LanguageOverride mode) => mode switch
+    public static string Name(this LanguageOverride mode) =>
+        mode switch
         {
             LanguageOverride.None => Language.LanguageOverride_None,
             LanguageOverride.ChineseSimplified => "简体中文",
@@ -758,7 +811,8 @@ public static class LanguageOverrideExt
             _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
         };
 
-    public static string Code(this LanguageOverride mode) => mode switch
+    public static string Code(this LanguageOverride mode) =>
+        mode switch
         {
             LanguageOverride.None => "",
             LanguageOverride.ChineseSimplified => "zh-hans",
@@ -796,10 +850,12 @@ public enum ExtraGlyphRanges
 
 public static class ExtraGlyphRangesExt
 {
-    public static string Name(this ExtraGlyphRanges ranges) => ranges switch
+    public static string Name(this ExtraGlyphRanges ranges) =>
+        ranges switch
         {
             ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
-        ExtraGlyphRanges.ChineseSimplifiedCommon => Language.ExtraGlyphRanges_ChineseSimplifiedCommon_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,
@@ -808,10 +864,12 @@ public static class ExtraGlyphRangesExt
             _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
         };
 
-    public static unsafe nint Range(this ExtraGlyphRanges ranges) => ranges switch
+    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.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(),

HellionChat/EmoteCache.cs

@@ -1,10 +1,11 @@
-using System.Numerics;
+using System.Collections.Concurrent;
+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;
 
@@ -14,11 +15,31 @@ public static class EmoteCache
 {
     private static readonly string[] NotWorking =
     [
-        ":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!",
+        ":tf:",
-        "POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle",
+        "(ditto)",
-        "z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life",
+        "c!",
-        "peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr",
+        "h!",
-        "DogLookingSussyAndCold", "DICKS"
+        "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();
@@ -55,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();
@@ -66,16 +87,42 @@ public static class EmoteCache
 
     public static string[] SortedCodeArray = [];
 
+    // Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
+    private static CancellationTokenSource Cts = new();
+    internal static CancellationToken Token => Cts.Token;
+
+    // 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
+            )
+        );
+    }
+
     public static async Task LoadData()
     {
         if (State is not LoadingState.Unloaded)
             return;
 
+        // Reset CTS if Dispose was called and the plugin is being re-enabled.
+        if (Cts.IsCancellationRequested)
+            Cts = new CancellationTokenSource();
+
         State = LoadingState.Loading;
+        var ct = Cts.Token;
         try
         {
-            var global = await Client.GetAsync(GlobalEmotes);
+            var global = await Client.GetAsync(GlobalEmotes, ct);
-            var globalList = await global.Content.ReadAsStringAsync();
+            var globalList = await global.Content.ReadAsStringAsync(ct);
 
             foreach (var emote in JsonSerializer.Deserialize<Emote[]>(globalList)!)
                 if (!string.IsNullOrEmpty(emote.Code) && !NotWorking.Contains(emote.Code))
@@ -84,17 +131,17 @@ public static class EmoteCache
             var lastId = string.Empty;
             for (var i = 0; i < 15; i++)
             {
-                var top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId));
+                var top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId), ct);
-                var topList = await top.Content.ReadAsStringAsync();
+                var topList = await top.Content.ReadAsStringAsync(ct);
 
                 var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
-                // BetterTTV occasionally returns entries with a null Code; the
+                // BetterTTV occasionally returns entries with a null Code;
-                // upstream code passed those straight into Dictionary.TryAdd
+                // skip them so a single bad row doesn't break the whole cache.
-                // and tripped ArgumentNullException, killing the whole emote
-                // load. Skip them defensively so a single bad row no longer
-                // breaks the cache for everyone else.
                 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;
@@ -103,12 +150,13 @@ public static class EmoteCache
             SortedCodeArray = Cache.Keys.Order().ToArray();
             State = LoadingState.Done;
         }
+        catch (OperationCanceledException)
+        {
+            // 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
+            // Reset to Unloaded so a later trigger can retry without a plugin reload.
-            // 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.
             State = LoadingState.Unloaded;
             Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
         }
@@ -116,6 +164,20 @@ public static class EmoteCache
 
     public static void Dispose()
     {
+        Cts.Cancel();
+
+        // 5s upper bound; anything still running gets abandoned.
+        try
+        {
+            Task.WaitAll(PendingLoads.ToArray(), TimeSpan.FromSeconds(5));
+        }
+        catch (AggregateException)
+        {
+            // Faults already logged in TrackLoad.
+        }
+
+        while (PendingLoads.TryTake(out _)) { }
+
         foreach (var emote in EmoteImages.Values)
             emote.InnerDispose();
     }
@@ -171,32 +233,40 @@ public static class EmoteCache
             ImGui.Image(Texture!.Handle, size);
         }
 
-        internal async Task<byte[]> LoadAsync(Emote emote)
+        internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
         {
-            // BetterTTV-supplied Id and ImageType are interpolated straight
+            // Path-traversal guard: resolve and verify the candidate path stays
-            // into the filename. HTTPS protects the wire, but a compromised
+            // inside the cache directory before reading or writing.
-            // upstream could still hand us "../foo" and write into the
+            var dir = Path.GetFullPath(
-            // pluginConfigs root (or worse). Resolve the candidate path and
+                Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
-            // refuse anything that escapes the cache directory.
+            );
-            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))
             {
-                RawData = await File.ReadAllBytesAsync(filePath);
+                RawData = await File.ReadAllBytesAsync(filePath, ct);
             }
             else
             {
-                var content = await Client.GetAsync(EmotePath.Format(emote.Id));
+                var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
-                RawData = await content.Content.ReadAsByteArrayAsync();
+                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(
-                stream.Write(RawData, 0, RawData.Length);
+                    filePath,
+                    FileMode.Create,
+                    FileAccess.Write,
+                    FileShare.Read
+                );
+                await stream.WriteAsync(RawData, ct);
             }
 
             return RawData;
@@ -209,21 +279,28 @@ public static class EmoteCache
     {
         public ImGuiEmote Prepare(Emote emote)
         {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            // Task.Run keeps the sync prefix off the ImGui render thread.
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
             return this;
         }
 
-        private async void Load(Emote emote)
+        private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
         {
             try
             {
-                var image = await LoadAsync(emote);
+                var image = await LoadAsync(emote, ct);
                 if (image.Length <= 0)
                     return;
 
-                Texture = await Plugin.TextureProvider.CreateFromImageAsync(image);
+                ct.ThrowIfCancellationRequested();
+                Texture = await Plugin.TextureProvider.CreateFromImageAsync(
+                    image,
+                    cancellationToken: ct
+                );
                 IsLoaded = true;
             }
+            catch (OperationCanceledException) { }
             catch (Exception ex)
             {
                 Failed = true;
@@ -279,15 +356,16 @@ public static class EmoteCache
 
         public ImGuiGif Prepare(Emote emote)
         {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
             return this;
         }
 
-        private async void Load(Emote emote)
+        private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
         {
             try
             {
-                var image = await LoadAsync(emote);
+                var image = await LoadAsync(emote, ct);
                 if (image.Length <= 0)
                     return;
 
@@ -299,21 +377,34 @@ public static class EmoteCache
                 var frames = new List<(IDalamudTextureWrap Tex, float Delay)>();
                 foreach (var frame in img.Frames)
                 {
+                    ct.ThrowIfCancellationRequested();
+
                     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);
+                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(
+                        RawImageSpecification.Rgba32(frame.Width, frame.Height),
+                        buffer,
+                        cancellationToken: ct
+                    );
                     frames.Add((tex, delay));
                 }
 
                 Frames = frames;
                 IsLoaded = true;
             }
+            catch (OperationCanceledException)
+            {
+                // Plugin disposed mid-load; release any partial frames.
+                foreach (var f in Frames)
+                    f.Texture.Dispose();
+                Frames = [];
+            }
             catch (Exception ex)
             {
                 Failed = true;

HellionChat/Export/MessageExporter.cs

@@ -13,7 +13,8 @@ internal enum ExportFormat
 
 internal static class ExportFormatExt
 {
-    internal static string Extension(this ExportFormat fmt) => fmt switch
+    internal static string Extension(this ExportFormat fmt) =>
+        fmt switch
         {
             ExportFormat.Markdown => "md",
             ExportFormat.Json => "json",
@@ -21,7 +22,8 @@ internal static class ExportFormatExt
             _ => "txt",
         };
 
-    internal static string Filter(this ExportFormat fmt) => fmt switch
+    internal static string Filter(this ExportFormat fmt) =>
+        fmt switch
         {
             ExportFormat.Markdown => ".md",
             ExportFormat.Json => ".json",
@@ -30,25 +32,23 @@ internal static class ExportFormatExt
         };
 }
 
-/// <summary>
+// Serializes message snapshots to Markdown, JSON, or CSV.
-/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
+// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
-/// 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>
 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)
+    private static bool MatchesSender(Message m, string needle) =>
-        => m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
+        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.
+        // Manual JSON to avoid System.Text.Json policy coupling.
-        // Output is a single object with metadata and an array of messages.
         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 '"':
-                case '\\': sb.Append("\\\\"); break;
+                    sb.Append("\\\"");
-                case '\b': sb.Append("\\b"); break;
+                    break;
-                case '\f': sb.Append("\\f"); break;
+                case '\\':
-                case '\n': sb.Append("\\n"); break;
+                    sb.Append("\\\\");
-                case '\r': sb.Append("\\r"); break;
+                    break;
-                case '\t': sb.Append("\\t"); 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;
 
@@ -18,50 +18,30 @@ public class FontManager
 
     internal IFontHandle FontAwesome = null!;
 
-    internal readonly byte[] GameSymFont;
-
     private ushort[] Ranges = [];
     private ushort[] JpRange = [];
 
     public static readonly HashSet<float> AxisFontSizeList =
     [
-        9.6f, 10f, 12f, 14f, 16f,
+        9.6f,
-        18f, 18.4f, 20f, 23f, 34f,
+        10f,
-        36f, 40f, 45f, 46f, 68f, 90f,
+        12f,
+        14f,
+        16f,
+        18f,
+        18.4f,
+        20f,
+        23f,
+        34f,
+        36f,
+        40f,
+        45f,
+        46f,
+        68f,
+        90f,
     ];
 
-    public FontManager()
+    // Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
-    {
-        var filePath = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "FFXIV_Lodestone_SSF.ttf");
-        if (File.Exists(filePath))
-        {
-            GameSymFont = File.ReadAllBytes(filePath);
-        }
-        else
-        {
-            // Dispose HttpClient and HttpResponseMessage to avoid socket
-            // exhaustion on repeated cold-start downloads. GetAwaiter().GetResult()
-            // unwraps AggregateException so failures surface cleanly. A full
-            // async refactor of the constructor would be cleaner but is out of
-            // scope for v1.0.0 — tracked in the backlog.
-            using var client = new HttpClient();
-            using var response = client
-                .GetAsync("https://img.finalfantasyxiv.com/lds/pc/global/fonts/FFXIV_Lodestone_SSF.ttf")
-                .GetAwaiter()
-                .GetResult();
-            response.EnsureSuccessStatusCode();
-            GameSymFont = response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
-
-            Dalamud.Utility.FilesystemUtil.WriteAllBytesSafe(filePath, GameSymFont);
-        }
-    }
-
-    /// <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>
     private static byte[]? HellionFontBytes;
 
     private static byte[] GetHellionFontBytes()
@@ -69,8 +49,11 @@ public class FontManager
         if (HellionFontBytes is not null)
             return HellionFontBytes;
 
-        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
+        using var stream =
-            ?? throw new FileNotFoundException("Hellion font resource not embedded in the assembly");
+            typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
+            ?? throw new FileNotFoundException(
+                "Hellion font resource not embedded in the assembly"
+            );
         using var ms = new MemoryStream();
         stream.CopyTo(ms);
         HellionFontBytes = ms.ToArray();
@@ -82,11 +65,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)
@@ -128,27 +109,43 @@ 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)));
+        Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
-        AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
+            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
+                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(
+        RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
-            e => e.OnPreBuild(
+            e.OnPreBuild(tk =>
-                tk =>
             {
-                    var config = new SafeFontConfig {SizePt = Plugin.Config.GlobalFontV2.SizePt, GlyphRanges = Ranges};
+                // 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 };
                 config.MergeFont = Plugin.Config.UseHellionFont
                     ? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
                     : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
@@ -161,28 +158,41 @@ public class FontManager
                 tk.AddGameSymbol(config);
 
                 tk.Font = config.MergeFont;
-                }
+            })
-            ));
+        );
 
         if (Plugin.Config.ItalicEnabled)
         {
-            ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
+            ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
-                e => e.OnPreBuild(
+                e.OnPreBuild(tk =>
-                    tk =>
                 {
-                        var config = new SafeFontConfig {SizePt = Plugin.Config.ItalicFontV2.SizePt, GlyphRanges = Ranges};
+                    var config = new SafeFontConfig
-                        config.MergeFont = AddFontWithFallback(tk, Plugin.Config.ItalicFontV2.FontId, config, "italic");
+                    {
+                        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;
-                    }
+                })
-                ));
+            );
         }
         else
         {
@@ -190,28 +200,36 @@ public class FontManager
         }
     }
 
-    /// <summary>
+    // Add font with fallback to NotoSansCjkRegular if unavailable
-    /// Try to add a user-configured font to the build toolkit, falling back to
+    private static ImFontPtr AddFontWithFallback(
-    /// the bundled NotoSansCjkRegular asset if the configured font isn't
+        IFontAtlasBuildToolkitPreBuild tk,
-    /// available on the system. Without this guard a stale SystemFontId
+        IFontId fontId,
-    /// pointing at a font the user uninstalled or that never existed on
+        SafeFontConfig config,
-    /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
+        string slot
-    /// </summary>
+    )
-    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)
         {
-            Plugin.Log.Warning(e, $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular");
+            Plugin.Log.Warning(
+                e,
+                $"Configured {slot} font unavailable, 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 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")]
+    [Signature(
-    private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, byte> SendTellNative = null!;
+        "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,7 +154,8 @@ internal sealed unsafe class Chat : IDisposable
         return utf == null ? null : utf->ToString();
     }
 
-    private static int GetRotateIdx(RotateMode mode) => mode switch
+    private static int GetRotateIdx(RotateMode mode) =>
+        mode switch
         {
             RotateMode.Forward => 1,
             RotateMode.Reverse => -1,
@@ -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.
+    // Look up a channel's user-defined color, returns null if 0
-    // If this function ever returns 0, it returns null instead.
     internal uint? GetChannelColor(ChatType type)
     {
         var parent = type.Parent();
@@ -168,8 +214,7 @@ internal sealed unsafe class Chat : IDisposable
 
         if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
         {
-            // FIXME: this whole system sucks
+            // Capture the just-typed character input
-            // FIXME v2: I hate everything about this, but it works
             Plugin.Framework.RunOnTick(() =>
             {
                 string? input = null;
@@ -185,7 +230,9 @@ 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)
                 {
@@ -206,23 +253,23 @@ internal sealed unsafe class Chat : IDisposable
 
         try
         {
-            // We already called this function once, so we skip the duplicated call
+            // Prevent duplicate calls
-            // Also return the original value here so that vanilla chat receives all information
             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");
         }
 
-        // prevent the game from focusing the chat log
+        return 1; // Prevent vanilla chat log from gaining focus
-        return 1;
     }
 
     private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -252,14 +299,14 @@ internal sealed unsafe class Chat : IDisposable
         {
             playerName = SeString.Parse(agent->TellPlayerName).TextValue;
             worldId = agent->TellWorldId;
-            Plugin.Log.Debug($"Detected tell target '{playerName}'@{worldId}");
+            Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
         }
 
         Plugin.CurrentTab.CurrentChannel = new UsedChannel
         {
             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;
@@ -278,18 +325,36 @@ internal sealed unsafe class Chat : IDisposable
         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);
+                var target = new TellTarget(
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType))
+                    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)
             {
@@ -297,10 +362,27 @@ internal sealed unsafe class Chat : IDisposable
             }
         }
 
-        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,13 +391,20 @@ internal sealed unsafe class Chat : IDisposable
         {
             try
             {
-                var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
+                var target = new TellTarget(
-                Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
+                    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)
             {
@@ -323,13 +412,18 @@ internal sealed unsafe class Chat : IDisposable
             }
         }
 
-        ContextMenuTellInForayHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason);
+        ContextMenuTellInForayHook!.Original(
+            a1,
+            playerName,
+            worldName,
+            worldId,
+            accountId,
+            contentId,
+            reason
+        );
     }
 
-    /// <summary>
+    // Check if channel is valid (non-linkshell or existing linkshell)
-    /// Returns true if the channel is any non-linkshell channel, or if the
-    /// linkshell actually exists.
-    /// </summary>
     internal static bool ValidAnyLinkshell(InputChannel channel)
     {
         var idx = channel.LinkshellIndex();
@@ -353,10 +447,15 @@ internal sealed unsafe class Chat : IDisposable
     {
         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,11 +464,10 @@ 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++) // Find valid linkshell within 8 iterations
-        for (var i = 0; i < 8; i++)
         {
             currentIndex = (uint)((8 + currentIndex + delta) % 8);
             if (validFn(currentIndex))
@@ -379,28 +477,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(
-                return channel + idx;
+                    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; // null if not found, otherwise new channel
             }
             default:
                 return channel;
@@ -409,11 +522,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
+        // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
-        // call the ChangeChatChannel function with them.
-        //
-        // Callers should call ChatLogWindow.SetChannel() which handles
-        // ExtraChat channels
         if (channel.IsExtraChatLinkshell())
             return;
 
@@ -425,15 +534,22 @@ internal sealed unsafe class Chat : IDisposable
         if (!ValidAnyLinkshell(channel))
             return;
 
-        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;
 
@@ -444,7 +560,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);
@@ -473,19 +599,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.Log.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);
 
@@ -498,9 +635,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);
 
@@ -509,7 +665,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();
 
@@ -555,20 +712,21 @@ internal sealed unsafe class Chat : IDisposable
 
         return CurrentPlayerNameDisplayType switch
         {
-            PlayerNameDisplayType.SurnameAbbreviated => $"{split.First()} {split.Last().FirstOrDefault('A')}.",
+            PlayerNameDisplayType.SurnameAbbreviated =>
-            PlayerNameDisplayType.ForenameAbbreviated => $"{split.First().FirstOrDefault('A')}. {split.Last()}",
+                $"{split.First()} {split.Last().FirstOrDefault('A')}.",
-            PlayerNameDisplayType.Initials => $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
+            PlayerNameDisplayType.ForenameAbbreviated =>
-            _ => playerName
+                $"{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
+        // Only hide chat in cutscene when vanilla chat would also be hidden
-        // 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.
         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);
         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)
+    internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");
-    {
-        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 when CS offset lands in a release build.
-        // TODO: Revert whenever CS is merged
         *(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,14 +148,15 @@ 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 vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>)
+                atkModuleVtbl[27];
             vf27(atkModule, addonId, 1);
         }
         else
@@ -178,15 +169,10 @@ internal unsafe class GameFunctions : IDisposable
         }
     }
 
-    internal static bool IsMentor()
+    internal static bool IsMentor() => PlayerState.Instance()->IsMentor();
-    {
-        return PlayerState.Instance()->IsMentor();
-    }
 
-    internal static InfoProxyCommonList.CharacterData[] GetFriends()
+    internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
-    {
+        InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
-        return 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)
+    internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);
-    {
-        AgentAchievement.Instance()->OpenById(id);
-    }
 
-    internal static bool IsInInstance()
+    internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];
-    {
-        return Plugin.Condition[ConditionFlag.BoundByDuty56];
-    }
 
     internal static bool TryOpenAdventurerPlate(ulong playerId)
     {
@@ -238,22 +223,27 @@ internal unsafe class GameFunctions : IDisposable
     internal static void ClickNoviceNetworkButton()
     {
         var agent = AgentChatLog.Instance();
-        // case 3
+        var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
-        var value = new AtkValue { Type = ValueType.Int, Int = 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);
     }
 
-    private readonly nint PlaceholderNamePtr = Marshal.AllocHGlobal(128);
+    private const int PlaceholderBufferSize = 128;
+    private readonly nint PlaceholderNamePtr = Marshal.AllocHGlobal(PlaceholderBufferSize);
     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
+        // Hook field is nullable due to the Signature attribute, but will never
-        // never be null here, but the nullable field declaration forces us
+        // be null during normal execution; guard covers the teardown race only.
-        // to handle the theoretical race during teardown.
         if (ResolveTextCommandPlaceholderHook is null)
             return nint.Zero;
 
@@ -261,9 +251,19 @@ internal unsafe class GameFunctions : IDisposable
         if (ReplacementName == null || placeholder != Placeholder)
             return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
 
+        // 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."
+            );
+            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 Dalamud.Bindings.ImGui;
-using HellionChat.GameFunctions.Types;
-using HellionChat.Util;
 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,7 +28,8 @@ 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>
+    private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
+        new Dictionary<string, ChannelSwitchInfo>
         {
             ["CMD_CHAT"] = new(null),
             ["CMD_COMMAND"] = new(null, text: "/"),
@@ -68,8 +71,16 @@ internal unsafe class KeybindManager : IDisposable {
             ["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"] = new(
-        ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse),
+                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),
@@ -88,7 +99,7 @@ internal unsafe class KeybindManager : IDisposable {
             ["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)
+            ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
         };
 
     // List of keys that can be used as a part of keybinds while the chat is
@@ -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);
 
-    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,7 +471,15 @@ 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);
@@ -457,7 +503,7 @@ 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)
         {
@@ -508,7 +554,7 @@ internal unsafe class KeybindManager : IDisposable {
         {
             VirtualKey.F23 => VirtualKey.OEM_2, // /?
             (VirtualKey)140 => VirtualKey.OEM_7, // '"
-            _ => key
+            _ => 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()
+    public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;
-        => Name.Length > 0 && World > 0;
 
-    public string ToWorldString()
+    public string ToWorldString() =>
-        => Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty;
+        Sheets.WorldSheet.TryGetRow(World, out var worldRow)
+            ? worldRow.Name.ToString()
+            : string.Empty;
 
-    public string ToTargetString()
+    public string ToTargetString() => $"{Name}@{ToWorldString()}";
-        => $"{Name}@{ToWorldString()}";
 
     public unsafe void FromTarget(IPlayerCharacter target)
     {
@@ -39,5 +39,6 @@ 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);
 }

HellionChat/HellionChat.csproj

@@ -1,35 +1,30 @@
 <Project Sdk="Dalamud.NET.Sdk/15.0.0">
     <PropertyGroup>
-        <!-- Hellion Chat versioning runs separately from upstream Chat 2.
+        <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
-             0.1.0 is our bootstrap release; the underlying Chat 2 base is
+        <Version>1.4.4</Version>
-             called out in the yaml changelog so users can see what it
-             derives from. -->
-        <Version>1.0.2</Version>
         <ImplicitUsings>enable</ImplicitUsings>
-        <!-- Honor packages.lock.json on restore so floating version ranges
+        <Nullable>enable</Nullable>
-             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
+        <!-- v1.0.0+: standalone fork, no upstream cherry-pick compatibility -->
-             are HellionChat. The plugin no longer maintains source-level
-             cherry-pick compatibility with upstream Infiziert90/ChatTwo;
-             upstream changes are integrated manually if at all. -->
         <AssemblyName>HellionChat</AssemblyName>
         <RootNamespace>HellionChat</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MessagePack" Version="3.1.4" />
+        <!-- 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
+        <!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
-             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. -->
         <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
         <PackageReference Include="morelinq" Version="4.4.0" />
-        <PackageReference Include="Pidgin" Version="3.5.1" />
+        <PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12, 4.0.0)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <!-- Test assembly needs access to internal helpers (not redistributed) -->
+        <InternalsVisibleTo Include="HellionChat.Tests" />
     </ItemGroup>
 
     <ItemGroup>
@@ -47,15 +42,7 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <!-- HellionChat — Hellion-specific resource bundle (HellionStrings.resx
+    <!-- Embedded resources: Hellion font (Exo 2, OFL-1.1) + manifest resource -->
-         + 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. -->
     <ItemGroup>
         <EmbeddedResource Include="Resources\HellionFont.ttf">
             <LogicalName>HellionFont.ttf</LogicalName>
@@ -63,21 +50,15 @@
         <EmbeddedResource Include="Resources\HellionFont-OFL.txt">
             <LogicalName>HellionFont-OFL.txt</LogicalName>
         </EmbeddedResource>
+        <EmbeddedResource Include="Themes\Builtin\example-theme.json">
+            <LogicalName>HellionChat.Themes.Builtin.example-theme.json</LogicalName>
+        </EmbeddedResource>
     </ItemGroup>
 
-
+    <!-- Plugin icon: copy images/* to output for Dalamud discovery -->
-    <!-- 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. -->
     <ItemGroup>
         <None Include="images\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-
 </Project>

HellionChat/HellionChat.yaml

@@ -1,47 +1,33 @@
 name: Hellion Chat
-author: JonKazama-Hellion
+author: Jon Kazama (Hellion Forge)
-punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
+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
+    Chat replacement for FINAL FANTASY XIV with privacy controls built around
-  based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
+    EU, US and JP data-protection rules.
-  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.
 
-  On top of that, Hellion Chat adds privacy and data-handling controls
+    By default only your own conversations are stored. Public chat, NPC
-  designed to align with the modern data protection rules that apply
+    dialogue and system messages stay out of the database unless you opt in.
-  across the EU, the United States and Japan. By default only your own
+    Retention windows are configurable per channel, history can be wiped
-  conversations are stored; messages from strangers, NPCs and system
+    retroactively, and everything can be exported on demand.
-  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.
-
-  Key privacy and data-handling features:
 
+    Features:
     - Channel whitelist with a Privacy-First default
     - Per-channel retention with a daily background sweep
-  - Retroactive cleanup with a Ctrl+Shift confirm
+    - Retroactive cleanup (Ctrl+Shift confirm)
     - Export to Markdown, JSON or CSV
-  - First-run wizard with three preset profiles (Privacy-First, Casual,
+    - First-run wizard with three preset profiles
-    Full History)
+    - Bilingual UI (EN/DE) with live language switching
-  - Bilingual UI (English and German) with live language switching
+    - Own config and database — no shared state with other plugins
-  - Independent plugin state — own config file and database directory,
-    so Hellion Chat does not share state with upstream Chat 2
 
-  Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
+    Based on Chat 2 by Infi and Anna (EUPL-1.2).
-
+    Support: https://discord.gg/X9V7Kcv5gR
-  Modding & support: join the Hellion Forge Discord at
+repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
-  https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
-  other Hellion Online Media plugins/tools.
-repo_url: https://github.com/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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/withSimpleTweaks.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
@@ -49,189 +35,50 @@ tags:
     - Replacement
     - Privacy
 changelog: |-
-  **Hellion Chat 1.0.2 — Polish patch**
+    **v1.4.4 — Threading and IPC safety polish (2026-05-12)**
 
-  - New: optionally hide chat (and every other plugin window) while the
+    Fifth sub-patch of the v1.4.x polish-sweep series. Threading
-    New Game+ menu is open. Toggle in Settings → Window → Frame, default
+    assumptions are documented per-method, a hot-path lock falls
-    off. Closing the menu restores all windows.
+    away, and the privacy filter speaks up when an unknown ChatType
-  - New: optionally tint the channel selector button next to the input
+    shows up.
-    field with the currently active channel's colour. Toggle in
-    Settings → Appearance → Colours, default on. Matches the existing
-    input-text tint and respects ExtraChat overrides.
-  - Fix: status, item and other inline hover icons keep their original
-    aspect ratio. Debuff icons with non-square dimensions are no longer
-    visually squished into a 32×32 box.
-  - Diagnostic: hide-state transitions (battle, cutscene, user-hide,
-    cutscene override) are now logged on Verbose level for easier bug
-    reports — off by default, enable with `/xllog set HellionChat verbose`.
 
-  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
-  **Hellion Chat 1.0.1 — Window Position Recovery**
+    - Honorific integration: per-method threading banners, plus
-
+      Warning-level log on unsubscribe failure
-  - Automatic bounds check on the first draw after plugin load.
+    - AutoTranslate warmup thread marked IsBackground so plugin
-    When the persisted window position has no overlap with the
+      unload doesn't wait for it
-    primary viewport, the window snaps to a safe top-left default.
+    - PrivacyFilter logs once per unknown ChatType so a future
-    Helpful after a monitor disconnect, resolution change or
+      patch's added channel doesn't drop off the radar
-    multi-monitor layout switch between sessions.
+    - New installs persist unknown channels by default; existing
-  - New "Reset Window Position" button in Settings → Window → Frame
+      configs keep their explicit choice
-    as a manual escape hatch for edge cases the automatic check
-    doesn't catch.
-
-  Tested on Linux/Wayland with a hard-cut three-monitor reduction;
-  window recovers cleanly without manual JSON editing.
-
-  Housekeeping carried over since v1.0.0:
-
-  - Documentation restructured into docs/ folder. New CHANGELOG,
-    CONTRIBUTORS, LEARNING-JOURNEY and ROADMAP added
-  - Stale ChatTwo/* paths in repo configs updated to HellionChat/*
-  - Pidgin parser library bumped from 3.3.0 to 3.5.1 (CIString
-    Unicode fix relevant for non-ASCII channel/tab names)
-  - GitHub Actions: actions/setup-dotnet bumped 4 → 5,
-    github/codeql-action bumped 3 → 4
-
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-  **Hellion Chat 1.0.0 — Standalone Major Release**
-
-  First fully standalone release. Internal cleanup plus a sweep of
-  pre-existing correctness, security, threading and resource-leak
-  fixes carried over from the upstream codebase. No user action
-  required — auto-update applies cleanly, configuration and database
-  paths unchanged.
-
-  Standalone identity:
-
-  - Code namespace consolidated from ChatTwo.* to HellionChat.* across
-    all source files
-  - IPC channels migrated from ChatTwo.* to HellionChat.* (6 channels:
-    Register, Available, Unregister, Invoke, GetChatInputState,
-    ChatInputStateChanged) — third-party plugins that bound to the old
-    channels need to be updated; none known at release time
-  - ImGui popup ID renamed to hellionchat-context-popup
-  - Repository folder restructured (ChatTwo/ → HellionChat/), all CI
-    and build paths updated accordingly
-  - Public-facing descriptions reworded from upstream-fork framing to
-    standalone framing (Chat 2 attribution preserved per EUPL-1.2)
-  - Colour preset 'ChatTwo Default' is now 'Klassik (Chat 2 Default)'
-
-  Safety:
-
-  - Plugin now refuses to load when upstream Chat 2 is also active —
-    bilingual conflict message in EN/DE, throw before any subsystem
-    initialization, prevents the runtime crash that previously occurred
-    when both plugins replaced the same chat window in parallel
-  - SQLite native binary bumped to 3.50.3 (CVE-2025-6965 memory
-    corruption from aggregate-term overflow, CVE-2025-7709)
-  - NuGet restore now honors packages.lock.json so transitive
-    dependencies don't drift between machines or CI runs
-
-  Default tab layout sharpened (one-time tab reset on first start):
-
-  The first-run tab layout is reorganized into five thematic tabs
-  based on external tester feedback. General contains only Say,
-  Yell and Shout (immediate-surroundings public chat). System
-  absorbs the gameplay-event streams (NpcDialogue, Loot, Crafting,
-  Gathering, PF recruitment pings) and announcement noise
-  (BattleSystem, FreeCompanyAnnouncement, PvpTeamAnnouncement)
-  that previously lived in General. FreeCompany, Group and
-  Linkshell each own their channel set. The static Tell tab is
-  gone — Auto-Tell-Tabs spawns per-conversation tabs on demand.
-  The Beginner / Novice-Network preset is no longer added by
-  default but is still available via Settings, Tabs.
-
-  This is a one-time tab-layout reset for users on config version
-  12 or older. Privacy, Retention, Theme and every other setting
-  is preserved. Your previous tab configuration is written to
-  pluginConfigs/HellionChat.json.pre-v13-backup so you can restore
-  it manually if you prefer the old layout.
-
-  Crash-class fixes (formerly latent in upstream):
-
-  - MathUtil.HasOverlap now uses a correct AABB test; identical or
-    edge-touching rectangles are no longer reported as non-overlapping
-  - ChatCode.Equals compares fields directly instead of GetHashCode;
-    removes the hash-collision anti-pattern
-  - IpcManager.Dispose uses UnregisterAction to match the matching
-    RegisterAction call; previous mismatch leaked the action
-    subscription on every plugin reload
-  - ExtraChat.Dispose now unsubscribes all three IPC subscriptions
-    (was only the first); leaks closed
-  - TellTarget.FromTarget guards against a zero IPlayerCharacter.Address
-    before dereferencing the unsafe Character* cast
-  - GameFunctions ResolveTextCommandPlaceholderDetour null-checks the
-    Hook reference instead of using the null-forgiving operator
-  - Popout.cs and SettingsTabs/Tabs.cs bounds-check list indexing so
-    a tab drop or empty-worlds list no longer crashes the UI
-  - Debugger.cs now declares IDisposable so the existing Dispose runs
-
-  Correctness fixes:
-
-  - GlobalParametersCache.GetValue captures Cache into a local before
-    the bounds check, so a concurrent Refresh can't slip a different
-    array between check and read
-  - IconUtil binary search bounds initialized to entries.Length-1 and
-    reset on redirect-restart; entries.Length==0 short-circuits
-  - Sheets.WorldsOnDatacenter now compares DataCenter.RowId (was
-    Region.RowId) so it actually returns same-DC worlds
-  - Message.cs back-reference loop iterates the processed Sender/Content
-    properties so chunks added by CheckMessageContent get Message set
-  - Language.zh-Hans Webinterface_Start_Success corrected to
-    "网页界面已启动" (was "网页界面已停止")
-
-  Threading and async:
-
-  - AutoTranslate Entries/ValidEntries are now serialized behind a
-    single lock; the preload worker thread and main thread no longer
-    race on the underlying dictionary/hash set
-  - Privacy retention and cleanup workers bound their framework-refresh
-    waits to 5 seconds with a logged timeout; a hung framework tick can
-    no longer deadlock the background worker
-
-  Resource handling:
-
-  - EmoteCache reuses the static HttpClient instead of allocating a new
-    one per call (closed socket leak)
-  - FontManager wraps HttpClient/HttpResponseMessage in using-blocks
-    and adds EnsureSuccessStatusCode; failed downloads no longer
-    silently produce a zero-byte font file
-  - SearchSelector mixes the row index into the ImGui ID stack so
-    selectables don't collapse to a single ambiguous ID
-  - SettingsTabs/Chat blocked-emote add-button now opens its selector
-    popup on left-click
-
-  Performance:
-
-  - DbViewer text export caches filteredHistory.Count once instead of
-    re-enumerating the IEnumerable on every batch (O(N) instead of
-    O(N²) on large histories)
-
-  License attribution (NOTICE.md, COPYRIGHT, THIRD_PARTY_NOTICES.md
-  and the Credits section in README) is unchanged.
-
-  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-  **Hellion Chat 0.6.1 — Pop-Out Discoverability & /tell Auto-Pop-Out**
-
-  - Pop-out button now visible in the chat header (no more hunting
-    through the right-click menu)
-  - One-time hint banner explains pop-out tabs and the right-click
-    shortcut
-  - New setting: open new /tell tabs directly as pop-out windows
-    (Settings → Chat → Auto-Tell-Tabs)
-  - Pop-out input is now enabled by default — closing a pop-out still
-    returns the tab to the sidebar
-  - Bugfix: dropping or logging out with an LRU/popped auto-tell tab
-    now also closes its pop-out window (no more ghost windows)
-  - Bugfix: dead zone below the chat input bar when the v0.6.0 pop-out
-    hint banner was visible (also fixed retroactively for the v0.6.0
-    banner inside pop-outs)
-
-  Modding & 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
+    **v1.4.3 — Faster plugin load + new repo (2026-05-08)**
+
+    Heavy startup work (migrations, hooks, windows) now runs async so
+    Dalamud's UI stays responsive during load. Load time is comparable
+    to v1.4.2 — this is the foundation for v1.4.4 optimisations.
+
+    - Two-phase async load via IAsyncDalamudPlugin
+    - Schema-gate replaces the v9→v16 migration chain; old configs
+      require a v1.4.2 install first
+    - AutoTranslate cache loads on first use instead of every startup
+    - Custom font (Hellion-Exo2) appears with a brief pop after load
+    - Repo moved to gitea.hellion-forge.cloud — update your custom-repo URL
+
+    ---
+
+    **v1.4.2 — Smoother frames in the chat log**
+
+    Per-frame allocations in the chat-log render path eliminated.
+    2–5% frame-time recovery in typical scenes, more on pop-out-heavy setups.
+
+    - Card-mode: theme/border invariants hoisted out of the per-message loop
+    - Auto-tell tab tint and icon cached per tab
+    - Status bar aggregation runs on ~1% of frames instead of every frame
+
+    ---
+
+    Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases

HellionChat/InputHistoryService.cs

@@ -2,14 +2,8 @@ using System.Collections.Generic;
 
 namespace HellionChat;
 
-// Hellion Chat — v0.6.0 shared input history. Replaces the embedded
+// Shared input history for all ChatInputBars (main and pop-out windows).
-// ChatLogWindow.InputBacklog so that pop-out windows with their own
+// Push deduplicates: existing entries are moved to the end when re-added.
-// 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.
 public static class InputHistoryService
 {
     private const int MaxSize = 30;
@@ -26,8 +20,7 @@ public static class InputHistoryService
 
         var trimmed = entry.Trim();
 
-        // Move-to-newest: existing entries are removed before the append
+        // Move-to-newest: remove existing entry before adding at the end
-        // so the same line typed twice does not occupy two history slots.
         for (var i = 0; i < _entries.Count; i++)
         {
             if (_entries[i] == trimmed)

HellionChat/Integrations/HonorificService.cs

@@ -0,0 +1,197 @@
+using System;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Ipc;
+using Dalamud.Plugin.Services;
+using Newtonsoft.Json;
+
+namespace HellionChat.Integrations;
+
+// 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 we're built against.
+    internal const uint ExpectedApiMajor = 3;
+
+    // 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;
+    private readonly ICallGateSubscriber<object> _ready;
+    private readonly ICallGateSubscriber<object> _disposing;
+
+    private readonly IPluginLog _log;
+    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
+    )
+    {
+        _framework = framework;
+        _log = log;
+
+        // 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);
+        _disposing.Subscribe(OnDisposing);
+
+        _framework.RunOnFrameworkThread(TryInitialPull);
+    }
+
+    public void Dispose()
+    {
+        // 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
+        {
+            var version = _apiVersion.InvokeFunc();
+            DetectedApiVersion = version;
+
+            if (!IsApiVersionCompatible(version))
+            {
+                if (!_versionWarningLogged)
+                {
+                    _log.Warning(
+                        "Honorific API version mismatch — expected major 3, "
+                            + "found {Major}.{Minor}. Disabling Honorific integration.",
+                        version.Item1,
+                        version.Item2
+                    );
+                    _versionWarningLogged = true;
+                }
+                IsAvailable = false;
+                return;
+            }
+
+            IsAvailable = true;
+            _versionWarningLogged = false;
+            var json = _getLocalCharacterTitle.InvokeFunc();
+            CurrentTitle = ParseTitleJson(json);
+        }
+        catch (Exception ex)
+        {
+            // 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;
+        }
+    }
+
+    // Thread: framework (Dalamud IPC delivery contract).
+    private void OnTitleChanged(string json)
+    {
+        // 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()
+    {
+        _framework.RunOnFrameworkThread(TryInitialPull);
+    }
+
+    // Thread: framework (IPC delivery contract); idempotent — Disposing fires once.
+    private void OnDisposing()
+    {
+        // 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
+        {
+            unsubscribe();
+        }
+        catch (Exception ex)
+        {
+            // 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)."
+            );
+        }
+    }
+
+    internal static HonorificTitleData? ParseTitleJson(string json)
+    {
+        if (string.IsNullOrEmpty(json))
+            return null;
+
+        try
+        {
+            return JsonConvert.DeserializeObject<HonorificTitleData>(json);
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+
+    internal static bool IsApiVersionCompatible((uint Major, uint Minor) apiVersion)
+    {
+        return apiVersion.Major == ExpectedApiMajor;
+    }
+
+    internal static bool ShouldRenderSlot(
+        bool toggleEnabled,
+        bool isAvailable,
+        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;
+        return true;
+    }
+}

HellionChat/Integrations/HonorificTitleData.cs

@@ -0,0 +1,13 @@
+using System.Numerics;
+
+namespace HellionChat.Integrations;
+
+// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
+// so HellionChat loads cleanly when Honorific is absent.
+// Glow/gradient fields omitted; Cycle 1 renders primary Color only.
+internal sealed record HonorificTitleData(
+    string? Title,
+    bool IsPrefix,
+    bool IsOriginal,
+    Vector3? Color
+);

HellionChat/Integrations/IntegrationLinks.cs

@@ -0,0 +1,8 @@
+namespace HellionChat.Integrations;
+
+// 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";
+}

HellionChat/Ipc/ExtraChat.cs

@@ -15,34 +15,54 @@ 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<
-    private ICallGateSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>> ChannelNamesGate { get; }
+        Dictionary<string, uint>,
+        Dictionary<string, uint>
+    > ChannelCommandColoursGate { get; }
+    private ICallGateSubscriber<
+        Dictionary<Guid, string>,
+        Dictionary<Guid, string>
+    > ChannelNamesGate { get; }
 
     internal (string, uint)? ChannelOverride { get; set; }
 
-    private Dictionary<string, uint> ChannelCommandColoursInternal { get; set; } = new();
+    // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
-    internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal;
+    // 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;
 
-    private Dictionary<Guid, string> ChannelNamesInternal { get; set; } = new();
+    private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
     internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;
 
     internal ExtraChat()
     {
-        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>("ExtraChat.OverrideChannelColour");
+        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
-        ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<Dictionary<string, uint>, Dictionary<string, uint>>("ExtraChat.ChannelCommandColours");
+            "ExtraChat.OverrideChannelColour"
-        ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>>("ExtraChat.ChannelNames");
+        );
+        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!);
             ChannelNamesInternal = ChannelNamesGate.InvokeFunc(null!);
         }
-        catch (Exception)
+        catch (Exception ex)
         {
-            // no-op
+            // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
+            Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
         }
     }
 
@@ -55,22 +75,11 @@ public sealed class ExtraChat : IDisposable
 
     private void OnOverrideChannel(OverrideInfo info)
     {
-        if (info.Channel == null)
+        ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
-        {
-            ChannelOverride = null;
-            return;
     }
 
-        ChannelOverride = (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)
+    private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = 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");
+        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
-        StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>("HellionChat.ChatInputStateChanged");
+            "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()
+    private ChatInputState GetState() => BuildState();
-        => 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);
@@ -91,12 +115,17 @@ public partial class Message
         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));
+                && (
+                    Code.Source is 0
+                    || sources.Source.HasFlag(source)
+                    || sources.Target.HasFlag(target)
+                );
     }
 
     private int GenerateHash()
     {
-        var hash = SortCodeV2.GetHashCode()
+        var hash =
+            SortCodeV2.GetHashCode()
             ^ ExtraChatChannel.GetHashCode()
             ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
             ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
@@ -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));
+                        AddChunkWithMessage(
-                        Plugin.Log.Debug($"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'");
+                            text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
+                        );
+                        Plugin.Log.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
+                        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}");
+                        var link = new ItemPayload(
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown"));
+                            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,13 +391,27 @@ public partial class Message
                         }
 
                         var mapCoords = agentMap->FlagMapMarkers[0];
-                        var rawX = (int)(MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000);
+                        var rawX = (int)(
-                        var rawY = (int)(MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000);
+                            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);
+                        var link = new MapLinkPayload(
-                        AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"));
+                            mapCoords.TerritoryId,
+                            mapCoords.MapId,
+                            rawX,
+                            rawY
+                        );
+                        AddChunkWithMessage(
+                            text.NewWithStyle(
+                                chunk.Source,
+                                link,
+                                $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"
+                            )
+                        );
                     }
-
                 }
                 catch (Exception)
                 {

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,14 +27,8 @@ 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
+    // PendingSync (main thread) → PendingAsync (worker thread); LinkedList for O(1) Last access
-    // at a time in the main thread. This is to delay the async processing until
+    private LinkedList<PendingMessage> PendingSync { get; } = [];
-    // 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.
-    private Queue<PendingMessage> PendingSync { get; } = [];
     private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
     private readonly Thread PendingMessageThread;
     private readonly CancellationTokenSource PendingThreadCancellationToken = new();
@@ -50,11 +44,8 @@ internal class MessageManager : IAsyncDisposable
         }
     }
 
-    // Hellion Chat — Auto-Tell-Tabs hook. Fires after a fully processed
+    // Auto-Tell-Tabs hook: fires after a message is processed and stored, allowing
-    // message has been routed to all matching persistent tabs and stored
+    // AutoTellTabsService to spawn or refresh temp tabs without coupling.
-    // in the database. The AutoTellTabsService subscribes to spawn or
-    // refresh temp tabs without having to wedge itself into ProcessMessage
-    // directly.
     public event Action<Message>? MessageProcessed;
 
     internal unsafe MessageManager(Plugin plugin)
@@ -63,10 +54,19 @@ internal class MessageManager : IAsyncDisposable
 
         Store = new MessageStore(DatabasePath());
 
-        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;
@@ -82,16 +82,21 @@ internal class MessageManager : IAsyncDisposable
         Plugin.ChatGui.ChatMessageUnhandled -= ChatMessage;
 
         await PendingThreadCancellationToken.CancelAsync();
-        var timeout = 10_000; // 10s
-        while (timeout > 0)
-        {
-            if (!PendingMessageThread.IsAlive)
-                break;
 
-            timeout -= 100;
+        // 10s cooperative window; Thread.Abort is gone since .NET 5, so a
+        // stuck worker has to ride out the next AppDomain unload.
+        var deadline = TimeSpan.FromSeconds(10);
+        var stopwatch = Stopwatch.StartNew();
+        while (stopwatch.Elapsed < deadline && PendingMessageThread.IsAlive)
             await Task.Delay(100);
-            Plugin.Log.Debug("Sleeping because PendingMessageThread thread still alive");
+
-        }
+        if (PendingMessageThread.IsAlive)
+            Plugin.Log.Warning(
+                "PendingMessageThread did not observe cancellation within 10s. "
+                    + "Worker remains on background thread; next plugin reload releases it."
+            );
+
+        PendingThreadCancellationToken.Dispose();
 
         Store.Dispose();
     }
@@ -113,8 +118,11 @@ internal class MessageManager : IAsyncDisposable
             LastContentId = contentId;
 
         // Drain the PendingSync queue into the PendingAsync queue.
-        while (PendingSync.TryDequeue(out var pending))
+        while (PendingSync.First is { } first)
-            PendingAsync.Enqueue(pending);
+        {
+            PendingSync.RemoveFirst();
+            PendingAsync.Enqueue(first.Value);
+        }
     }
 
     private void ProcessPendingMessages(CancellationToken token)
@@ -141,7 +149,8 @@ internal class MessageManager : IAsyncDisposable
 
     internal void ClearAllTabs()
     {
-        foreach (var tab in Plugin.Config.Tabs)
+        // 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();
     }
 
@@ -153,23 +162,25 @@ 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
+        // TempTabs are excluded; they maintain live state from AutoTellTabsService
-        // temporary list, and apply them all at once after filtering.
+        var pendingTabs = Plugin
-        var pendingTabs = Plugin.Config.Tabs.Select(tab => (tab, new List<Message>())).ToList();
+            .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);
 
-        // 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
+        // Mark failed messages as deleted to prevent retry attempts
-        // again.
         var failedIds = messages.FailedMessageIds();
         Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
         foreach (var msgId in messages.FailedMessageIds())
@@ -198,6 +209,7 @@ internal class MessageManager : IAsyncDisposable
     }
 
     public (SeString? Sender, SeString? Message) LastMessage = (null, null);
+
     private void ChatMessage(IChatMessage message)
     {
         LastMessage = (message.Sender, message.Message);
@@ -216,26 +228,34 @@ internal class MessageManager : IAsyncDisposable
         // Update colour codes.
         GlobalParametersCache.Refresh();
 
-        // We delay messages to be handed off to the async processing thread
+        // Delay to next tick to get content ID from ContentIdResolver hook
-        // in the next tick, otherwise we can't get the content ID from the hook
+        PendingSync.AddLast(pendingMessage);
-        // below.
-        PendingSync.Enqueue(pendingMessage);
     }
 
-    // This hook is called immediately after receiving a message with the
+    private unsafe void ContentIdResolver(
-    // message's content ID. If multiple messages are received in the same tick,
+        RaptureLogModule* agent,
-    // this will be called for each message immediately after ChatMessage is
+        ulong contentId,
-    // called for each message.
+        ulong accountId,
-    private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType)
+        int messageIndex,
+        ushort worldId,
+        ushort chatType
+    )
     {
         try
         {
-            ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType);
+            ContentIdResolverHook?.Original(
-            if (PendingSync.Count == 0)
+                agent,
+                contentId,
+                accountId,
+                messageIndex,
+                worldId,
+                chatType
+            );
+            if (PendingSync.Last is not { } last)
                 return;
 
-            PendingSync.Last().ContentId = contentId;
+            last.Value.ContentId = contentId;
-            PendingSync.Last().AccountId = accountId;
+            last.Value.AccountId = accountId;
         }
         catch (Exception ex)
         {
@@ -245,7 +265,11 @@ internal class MessageManager : IAsyncDisposable
 
     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)
@@ -254,13 +278,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.Add(
-            senderChunks.AddRange(ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type));
+                new TextChunk(ChunkSource.None, null, formatting.Before)
-            senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.After) { FallbackColour = chatCode.Type });
+                {
+                    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 contentChunks = ChunkUtil
-        var message = new Message(CurrentContentId, pendingMessage.ContentId, pendingMessage.AccountId, chatCode, senderChunks, contentChunks, pendingMessage.Sender, pendingMessage.Content);
+            .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);
@@ -268,7 +315,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);
@@ -285,16 +334,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
+            return new NameFormatting { Before = before, After = after };
-            {
-                Before = before,
-                After = after,
-            };
         }
     }
 
@@ -329,7 +374,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,15 +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;
 
@@ -36,7 +35,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 +103,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,11 +127,15 @@ 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
+    internal static readonly MessagePackSerializerOptions MsgPackOptions =
-        .WithResolver(CompositeResolver.Create([new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()], [StandardResolver.Instance]));
+        MessagePackSerializerOptions.Standard.WithResolver(
+            CompositeResolver.Create(
+                [new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()],
+                [StandardResolver.Instance]
+            )
+        );
 
     internal MessageStore(string dbPath)
     {
@@ -131,11 +146,10 @@ internal class MessageStore : IDisposable
 
     public void Dispose()
     {
+        // Pooling=false avoids ClearAllPools which is provider-wide and
+        // would touch other plugins' SQLite connections.
         Connection.Close();
         Connection.Dispose();
-        // Closing the connection doesn't immediately release the file.
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
     }
 
     private SqliteConnection Connect()
@@ -159,7 +173,6 @@ internal class MessageStore : IDisposable
 
     private void Migrate()
     {
-        // Get current user_version.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = "PRAGMA user_version;";
         var userVersion = Convert.ToInt32(cmd.ExecuteScalar());
@@ -169,9 +182,7 @@ internal class MessageStore : IDisposable
         {
             case <= 0:
                 migrationsToDo.Add(Migrate0);
-
+                // Migration support was only added in version 1. Migrate0 is idempotent.
-                // Migration support was only added in version 1. Migrate 0 is
-                // idempotent.
                 migrationsToDo.Add(Migrate1);
                 migrationsToDo.Add(Migrate2);
                 migrationsToDo.Add(Migrate3);
@@ -192,7 +203,8 @@ internal class MessageStore : IDisposable
     private void Migrate0()
     {
         Plugin.Log.Information("Running migration 0: Creating tables");
-        Connection.Execute(@"
+        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)
@@ -209,7 +221,8 @@ 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);
     }
@@ -217,10 +230,11 @@ internal class MessageStore : IDisposable
     private void Migrate1()
     {
         Plugin.Log.Information("Running migration 1: Adding Deleted column");
-        Connection.Execute(@"
+        Connection.Execute(
-            -- Migration 1: Add Deleted column
+            @"
             ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
-        ");
+        "
+        );
 
         SetMigrationVersion(1);
     }
@@ -228,20 +242,20 @@ internal class MessageStore : IDisposable
     private void Migrate2()
     {
         Plugin.Log.Information("Running migration 2: Adding Channel generated column");
-        Connection.Execute(@"
+        Connection.Execute(
-            -- Migration 2: Add Channel generated column
+            @"
             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
+        // PRAGMA does not accept SQLite parameter bindings. Table name is a
-        // a compile-time constant fed in from internal call sites, so the
+        // compile-time constant from internal call sites only.
-        // interpolation cannot be reached from any user-controlled path.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = $"PRAGMA table_info({table});";
         using var reader = cmd.ExecuteReader();
@@ -257,26 +271,19 @@ internal class MessageStore : IDisposable
     {
         Plugin.Log.Information("Running migration 3: Fix log kinds to fit the new format");
 
-        // Recovery for partially-applied Migrate3: if the schema is already
+        // Recovery for partially-applied Migrate3: schema already in target
-        // in its target shape (new columns exist, old Code column gone) but
+        // shape but user_version was never bumped -- just record and exit.
-        // user_version was never bumped, just record the version and exit.
         if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
         {
-            Plugin.Log.Information("Migration 3: schema already migrated, only bumping user_version");
+            Plugin.Log.Information(
+                "Migration 3: schema already migrated, only bumping user_version"
+            );
             SetMigrationVersion(3);
             return;
         }
 
-        Connection.Execute(@"
+        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
-
             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;
@@ -292,7 +299,8 @@ internal class MessageStore : IDisposable
             ALTER TABLE messages DROP COLUMN Channel;
             ALTER TABLE messages DROP COLUMN Code;
             ALTER TABLE messages DROP COLUMN SortCode;
-        ");
+        "
+        );
 
         SetMigrationVersion(3);
     }
@@ -301,10 +309,8 @@ internal class MessageStore : IDisposable
     {
         Plugin.Log.Information($"Setting version {version}");
         using var cmd = Connection.CreateCommand();
-        // PRAGMA does not accept SQLite parameter bindings, and there is no
+        // PRAGMA does not accept SQLite parameter bindings; version is a
-        // pragma_ function variant that can set the version either. The
+        // compile-time int from the migration sequence, never user input.
-        // version is a compile-time int from the migration sequence, never
-        // user input.
         cmd.CommandText = $"PRAGMA user_version = {version};";
         cmd.ExecuteNonQuery();
     }
@@ -315,16 +321,14 @@ internal class MessageStore : IDisposable
         PerformMaintenance();
     }
 
-    /// <summary>
+    // Returns a (ChatType, count) snapshot over non-deleted messages.
-    /// Returns a (ChatType, count) snapshot over non-deleted messages.
+    // Used by the Privacy tab to preview retroactive cleanup impact.
-    /// Used by the Privacy tab to preview the impact of a retroactive
-    /// cleanup before the user confirms.
-    /// </summary>
     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())
@@ -336,19 +340,25 @@ internal class MessageStore : IDisposable
         return result;
     }
 
-    /// <summary>
+    // Deletes messages older than the per-channel retention window, with a global
-    /// Deletes messages older than the per-channel retention window, with a
+    // default for unmapped channels. Runs VACUUM only if rows were removed.
-    /// global default for channels not listed explicitly. Cutoffs are
+    // Returns the number of rows deleted.
-    /// computed from "now" at call time. Runs VACUUM only if anything was
+    internal long DeleteByRetentionPolicy(
-    /// removed. Returns the number of rows deleted.
+        IReadOnlyDictionary<int, int> chatTypeDaysMap,
-    /// </summary>
+        int defaultDays
-    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();
 
@@ -371,19 +381,19 @@ internal class MessageStore : IDisposable
                 index++;
             }
 
-            // Catch-all for channels without an explicit override. "0" is
+            // defaultDays=0 means "keep forever" for unmapped channels.
-            // treated as "do not delete by default" — without an explicit
-            // user override, unmapped channels stay forever instead of
-            // getting wiped immediately.
             if (defaultDays > 0)
             {
                 var defaultCutoff = nowMs - defaultDays * 86400000L;
                 cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff);
 
-                var explicitPlaceholders = chatTypeDaysMap.Count > 0
+                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)");
+                clauses.Add(
+                    $"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"
+                );
             }
 
             if (clauses.Count == 0)
@@ -399,19 +409,14 @@ internal class MessageStore : IDisposable
         return deleted;
     }
 
-    /// <summary>
+    // Hard-deletes every message whose ChatType is not in the allowlist,
-    /// Hard-deletes every message whose ChatType is not in the supplied
+    // then VACUUMs. Returns the number of rows deleted.
-    /// allowlist, then VACUUMs the database to reclaim disk space.
-    /// Returns the number of rows deleted.
-    /// </summary>
     internal long CleanupRetainOnly(IReadOnlyCollection<int> allowedTypes)
     {
         if (allowedTypes.Count == 0)
-        {
+            throw new InvalidOperationException(
-            // Defensive: refuse a "delete everything" disguised as a filter.
+                "CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
-            // 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.");
-        }
 
         long deleted;
         using (var cmd = Connection.CreateCommand())
@@ -427,15 +432,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()
@@ -447,45 +456,22 @@ internal class MessageStore : IDisposable
 
     internal void UpsertMessage(Message message)
     {
-        // Hellion Chat privacy filter — drop disallowed ChatTypes before
+        // Privacy filter -- drop disallowed ChatTypes before they reach storage.
-        // they reach the storage layer (single source of truth, also
-        // covers any future write paths e.g. webinterface backfill).
         if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
         {
-            Plugin.Log.Debug($"Privacy filter dropped message: ChatType={message.Code.Type}");
+            Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
             return;
         }
 
         using var cmd = Connection.CreateCommand();
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             INSERT INTO messages (
-                Id,
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                Receiver,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel, Deleted
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel,
-                Deleted
             ) VALUES (
-                $Id,
+                $Id, $Receiver, $ContentId, $Date, $ChatType, $SourceKind, $TargetKind,
-                $Receiver,
+                $Sender, $Content, $SenderSource, $ContentSource, $ExtraChatChannel, false
-                $ContentId,
-                $Date,
-                $ChatType,
-                $SourceKind,
-                $TargetKind,
-                $Sender,
-                $Content,
-                $SenderSource,
-                $ContentSource,
-                $ExtraChatChannel,
-                false
             )
             ON CONFLICT (id) DO UPDATE SET
                 Receiver = excluded.Receiver,
@@ -509,26 +495,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(
-        cmd.Parameters.AddWithValue("$Content", MessagePackSerializer.Serialize(message.Content, MsgPackOptions));
+            "$Sender",
-        cmd.Parameters.AddWithValue("$SenderSource", MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions));
+            MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)
-        cmd.Parameters.AddWithValue("$ContentSource", MessagePackSerializer.Serialize(message.ContentSource, 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, sorted ascending by Date, excluding soft-deleted rows.
-    /// Streams messages for export. Optional filters:
+    // Optional filters: chatTypes, from/to inclusive date range.
-    /// - <paramref name="chatTypes"/>: limit to these ChatTypes
+    // Caller is responsible for disposing the enumerator.
-    /// - <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>
     internal MessageEnumerator StreamForExport(
         IReadOnlyCollection<int>? chatTypes,
         DateTimeOffset? from,
-        DateTimeOffset? to)
+        DateTimeOffset? to
+    )
     {
         var cmd = Connection.CreateCommand();
 
@@ -540,22 +535,15 @@ internal class MessageStore : IDisposable
         if (to is not null)
             clauses.Add("Date <= $To");
 
-        cmd.CommandText = @"
+        cmd.CommandText =
+            @"
             SELECT
-                Id,
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                Receiver,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
-                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;
 
@@ -567,13 +555,15 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    /// <summary>
+    // Returns the most recent messages, oldest-first.
-    /// Get the most recent messages.
+    // receiver: filter by receiver ContentId (null = no filter)
-    /// </summary>
+    // since: only include messages after this date (null = no filter)
-    /// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param>
+    // count: max rows to return, defaults to 10,000
-    /// <param name="since">Only show messages since this date. If null, no filtering is performed.</param>
+    internal MessageEnumerator GetMostRecentMessages(
-    /// <param name="count">The amount to return. Defaults to 10,000.</param>
+        ulong? receiver = null,
-    internal MessageEnumerator GetMostRecentMessages(ulong? receiver = null, DateTimeOffset? since = null, int count = MessageQueryLimit)
+        DateTimeOffset? since = null,
+        int count = MessageQueryLimit
+    )
     {
         List<string> whereClauses = ["deleted = false"];
         if (receiver != null)
@@ -584,32 +574,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
+        // Select last N by date DESC, then reverse to ascending order.
-        // them in ascending order.
+        cmd.CommandText =
-        cmd.CommandText = @"
+            @"
             SELECT *
             FROM (
                 SELECT
-                    Id,
+                    Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                    Receiver,
+                    Sender, Content, SenderSource, ContentSource, ExtraChatChannel
-                    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);
@@ -621,48 +603,27 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    /// <summary>
+    // Returns up to limit tells exchanged with the named player, oldest-first.
-    /// Hellion Chat — Auto-Tell-Tabs history preload.
+    // SQL narrows by Receiver + ChatType (indexed); client does the final
-    ///
+    // PlayerPayload comparison. sqlScanLimit caps the scan to stay within
-    /// Returns up to <paramref name="limit"/> tells exchanged with the named
+    // the message-processing worker thread budget.
-    /// 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>
     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,
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                Receiver,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
             FROM messages
             WHERE deleted = false
               AND Receiver = $Receiver
@@ -681,27 +642,19 @@ internal class MessageStore : IDisposable
         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
+        // SQL was DESC (newest-first); reverse to oldest-first for tab display.
-        // recent matching tells. Reverse to oldest-first for chronological
-        // display in the tab.
         collected.Reverse();
         return collected;
     }
 
-    /// <summary>
+    // Soft-deletes a message so it won't appear in queries.
-    /// Marks a message as deleted so it won't get returned in queries.
-    /// </summary>
     internal void DeleteMessage(Guid id)
     {
         using var cmd = Connection.CreateCommand();
@@ -710,7 +663,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();
 
@@ -723,9 +681,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
+        cmd.CommandText =
-        // them in ascending order.
+            @"
-        cmd.CommandText = @"
             SELECT COUNT(*)
             FROM messages
             " + whereClause;
@@ -735,12 +692,17 @@ internal class MessageStore : IDisposable
 
         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.CommandTimeout = 120;
 
         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();
 
@@ -753,25 +715,14 @@ internal class MessageStore : IDisposable
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        // Select last N messages by date DESC, but reverse the order to get
+        cmd.CommandText =
-        // them in ascending order.
+            @"
-        cmd.CommandText = @"
             SELECT
-                Id,
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                Receiver,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
-                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);
@@ -782,7 +733,13 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    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();
 
@@ -795,28 +752,19 @@ internal class MessageStore : IDisposable
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        // Select last N messages by date DESC, but reverse the order to get
+        cmd.CommandText =
-        // them in ascending order.
+            @"
-        cmd.CommandText = @"
             SELECT
-                Id,
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
-                Receiver,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
-                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);
@@ -829,10 +777,8 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    // Build "$prefix0,$prefix1,..." placeholder list and bind values to
+    // Builds a "$prefix0,$prefix1,..." placeholder list and binds values to the command.
-    // the command. SQLite has no native array parameter, so we generate
+    // SQLite has no native array parameter, so placeholders are generated per entry.
-    // the list at runtime and bind each entry under its own name. Used
-    // for IN-clauses and similar dynamic-arity SQL fragments.
     private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values)
     {
         var names = new List<string>();
@@ -848,12 +794,13 @@ internal class MessageStore : IDisposable
     }
 }
 
-internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, IDisposable, IAsyncDisposable
+internal class MessageEnumerator(DbDataReader reader)
+    : 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 List<Guid> FailedIds = [];
     private int FailedCount;
     public bool DidError => FailedCount > 0;
@@ -872,11 +819,27 @@ 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)),
+                    new ChatCode(
-                    MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(7), MessageStore.MsgPackOptions),
+                        (byte)reader.GetInt32(4),
-                    MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(8), MessageStore.MsgPackOptions),
+                        (byte)reader.GetInt32(5),
-                    MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(9), MessageStore.MsgPackOptions),
+                        (byte)reader.GetInt32(6)
-                    MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(10), MessageStore.MsgPackOptions),
+                    ),
+                    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)
                 );
             }
@@ -911,6 +874,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 Dalamud.Bindings.ImGui;
-using HellionChat.Resources;
-using HellionChat.Ui;
-using HellionChat.Util;
 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,7 +120,14 @@ 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)
             {
@@ -128,7 +137,10 @@ public sealed class PayloadHandler
 
         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);
@@ -347,12 +372,17 @@ public sealed class PayloadHandler
         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,7 +528,12 @@ 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");
             return;
@@ -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;
@@ -617,10 +698,16 @@ public sealed class PayloadHandler
             var party = Plugin.PartyList;
             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))
+                            if (
-                                GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId);
+                                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))
+                        if (
-                            LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId);
+                            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,7 +793,10 @@ public sealed class PayloadHandler
                 }
             }
 
-            if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork))
+            if (
+                GameFunctions.GameFunctions.IsMentor()
+                && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
+            )
                 GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
         }
 
@@ -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/Plugin.cs

@@ -2,85 +2,131 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
-using HellionChat.Ipc;
+using System.Runtime.ExceptionServices;
-using HellionChat.Resources;
+using Dalamud.Bindings.ImGui;
-using HellionChat.Ui;
-using HellionChat.Util;
 using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Windowing;
 using Dalamud.IoC;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Ipc;
-using Dalamud.Interface.ImGuiFileDialog;
+using HellionChat.Resources;
+using HellionChat.Ui;
+using HellionChat.Util;
 
 namespace HellionChat;
 
 // ReSharper disable once ClassNeverInstantiated.Global
-public sealed class Plugin : IDalamudPlugin
+public sealed class Plugin : IAsyncDalamudPlugin
 {
     public const string PluginName = "Hellion Chat";
 
-    [PluginService] public static IPluginLog Log { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static IDalamudPluginInterface Interface { get; private set; } = null!;
+    public static IPluginLog Log { get; private set; } = null!;
-    [PluginService] public static IChatGui ChatGui { get; private set; } = null!;
+
-    [PluginService] public static IClientState ClientState { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static ICommandManager CommandManager { get; private set; } = null!;
+    public static IDalamudPluginInterface Interface { get; private set; } = null!;
-    [PluginService] public static ICondition Condition { get; private set; } = null!;
+
-    [PluginService] public static IDataManager DataManager { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static IFramework Framework { get; private set; } = null!;
+    public static IChatGui ChatGui { get; private set; } = null!;
-    [PluginService] public static IGameGui GameGui { get; private set; } = null!;
+
-    [PluginService] public static IKeyState KeyState { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static IObjectTable ObjectTable { get; private set; } = null!;
+    public static IClientState ClientState { get; private set; } = null!;
-    [PluginService] public static IPartyList PartyList { get; private set; } = null!;
+
-    [PluginService] public static ITargetManager TargetManager { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static ITextureProvider TextureProvider { get; private set; } = null!;
+    public static ICommandManager CommandManager { get; private set; } = null!;
-    [PluginService] public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
+
-    [PluginService] public static IGameConfig GameConfig { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static INotificationManager Notification { get; private set; } = null!;
+    public static ICondition Condition { get; private set; } = null!;
-    [PluginService] public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
+
-    [PluginService] public static IPlayerState PlayerState { get; private set; } = null!;
+    [PluginService]
-    [PluginService] public static ISeStringEvaluator Evaluator { get; private set; } = null!;
+    public static IDataManager DataManager { get; private set; } = null!;
+
+    [PluginService]
+    public static IFramework Framework { get; private set; } = null!;
+
+    [PluginService]
+    public static IGameGui GameGui { get; private set; } = null!;
+
+    [PluginService]
+    public static IKeyState KeyState { get; private set; } = null!;
+
+    [PluginService]
+    public static IObjectTable ObjectTable { get; private set; } = null!;
+
+    [PluginService]
+    public static IPartyList PartyList { get; private set; } = null!;
+
+    [PluginService]
+    public static ITargetManager TargetManager { get; private set; } = null!;
+
+    [PluginService]
+    public static ITextureProvider TextureProvider { get; private set; } = null!;
+
+    [PluginService]
+    public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
+
+    [PluginService]
+    public static IGameConfig GameConfig { get; private set; } = null!;
+
+    [PluginService]
+    public static INotificationManager Notification { get; private set; } = null!;
+
+    [PluginService]
+    public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
+
+    [PluginService]
+    public static IPlayerState PlayerState { get; private set; } = null!;
+
+    [PluginService]
+    public static ISeStringEvaluator Evaluator { get; private set; } = null!;
+
+    [PluginService]
+    public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
 
     public static Configuration Config = null!;
     public static FileDialogManager FileDialogManager { get; private set; } = null!;
 
     public readonly WindowSystem WindowSystem = new(PluginName);
-    public SettingsWindow SettingsWindow { get; }
-    public ChatLogWindow ChatLogWindow { get; }
-    public DbViewer DbViewer { get; }
-    public InputPreview InputPreview { get; }
-    public CommandHelpWindow CommandHelpWindow { get; }
-    public SeStringDebugger SeStringDebugger { get; }
-    public FirstRunWizard FirstRunWizard { get; }
-    public DebuggerWindow DebuggerWindow { get; }
 
-    internal Commands Commands { get; }
+    // Phase-2 services are constructed in LoadAsync; null! shape is kept
-    internal GameFunctions.GameFunctions Functions { get; }
+    // consistent across all properties for clarity.
-    internal MessageManager MessageManager { get; }
+    public SettingsWindow SettingsWindow { get; private set; } = null!;
-    internal AutoTellTabsService AutoTellTabsService { get; }
+    public ChatLogWindow ChatLogWindow { get; private set; } = null!;
-    internal IpcManager Ipc { get; }
+    public DbViewer DbViewer { get; private set; } = null!;
-    internal ExtraChat ExtraChat { get; }
+    public InputPreview InputPreview { get; private set; } = null!;
-    internal TypingIpc TypingIpc { get; }
+    public CommandHelpWindow CommandHelpWindow { get; private set; } = null!;
-    internal FontManager FontManager { get; }
+    public SeStringDebugger SeStringDebugger { get; private set; } = null!;
+    public FirstRunWizard FirstRunWizard { get; private set; } = null!;
+    public DebuggerWindow DebuggerWindow { get; private set; } = null!;
+
+    internal Commands Commands { get; private set; } = null!;
+    internal GameFunctions.GameFunctions Functions { get; private set; } = null!;
+    internal MessageManager MessageManager { get; private set; } = null!;
+    internal AutoTellTabsService AutoTellTabsService { get; private set; } = null!;
+    internal IpcManager Ipc { get; private set; } = null!;
+    internal ExtraChat ExtraChat { get; private set; } = null!;
+    internal TypingIpc TypingIpc { get; private set; } = null!;
+    internal FontManager FontManager { get; private set; } = null!;
+    internal Themes.ThemeRegistry ThemeRegistry { get; private set; } = null!;
+    internal Ui.StatusBar StatusBar { get; private set; } = null!;
+    internal Integrations.HonorificService HonorificService { get; private set; } = null!;
+
+    // Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
+    private int _disposeStarted;
 
     internal int DeferredSaveFrames = -1;
 
-    // Serialises retention sweeps. The 24h auto-sweep on plugin load and
+    // Serialises retention sweeps so a manual trigger and the 24h auto-sweep
-    // the manual button in the Privacy tab both run on background threads;
+    // can't run in parallel. Volatile because the ImGui thread reads it outside
-    // without this gate, hitting the manual button moments after a fresh
+    // the lock to gate the manual button.
-    // plugin start would launch two sweeps in parallel and the second one
-    // would just re-do work the first one already finished. The lock guards
-    // the flag — the flag check itself bails before we touch the database.
-    // Volatile because the ImGui thread reads the flag outside the lock to
-    // gate the manual button; without it the JIT may cache the value in a
-    // register and miss the background-thread update.
     internal readonly object RetentionSweepLock = new();
     internal volatile bool RetentionSweepRunning;
 
     internal DateTime GameStarted { get; }
 
-    // Tab management needs to happen outside the chatlog window class for access reasons
+    // Tab management lives here rather than in ChatLogWindow for access reasons.
     internal int LastTab { get; set; }
     internal int? WantedTab { get; set; }
     internal Tab CurrentTab
@@ -94,157 +140,47 @@ public sealed class Plugin : IDalamudPlugin
 
     public Plugin()
     {
-        // Refuse to start if upstream Chat 2 is loaded — prevents IPC
+        // Phase-1 ctor: bootstrap-essentials only (conflict gate, config load,
-        // channel collisions and double-replacement of the in-game chat
+        // language + ImGui init). All service/window allocation lives in LoadAsync.
-        // window. Throwing here makes Dalamud abort the load cleanly with
+
-        // our localized message instead of crashing FFXIV mid-frame.
+        // Block load if upstream Chat 2 is active — prevents IPC collisions
+        // and double-replacement of the in-game chat window.
         ChatTwoConflictDetector.ThrowIfChatTwoIsLoaded(Interface);
 
-        try
-        {
         GameStarted = Process.GetCurrentProcess().StartTime.ToUniversalTime();
 
-            // Hellion Chat: take over config + database from upstream ChatTwo
+        // Migrate config + database from upstream ChatTwo on first start.
-            // before Dalamud loads our plugin config. Idempotent: only acts on
-            // the first start where the legacy paths exist and ours don't.
         MigrateFromChatTwoLayout();
 
         Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
 
-            // Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig
+        // Schema gate: v1.4.x requires config v16. Users on older schemas
-            // already strips temp tabs before persistence, but a previous
+        // must install v1.4.2 first to run the migration chain.
-            // crash or external write could have left them in the JSON.
+        if (Config.Version < 16)
-            // Drop them on load to guarantee the session-only invariant.
+        {
+            throw new InvalidOperationException(
+                $"HellionChat v1.4.4 requires config schema v16, got v{Config.Version}. "
+                    + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.4."
+            );
+        }
+
+        // Drop session-only Auto-Tell-Tabs that a previous crash may have persisted.
         Config.Tabs.RemoveAll(t => t.IsTempTab);
 
-            // Hellion Chat v9 → v10 — wipes the configuration so the new 8-tab
+        LanguageChanged(Interface.UiLanguage);
-            // layout starts from defaults instead of mapping every previous setting
+        ImGuiUtil.Initialize(this);
-            // to its new position. Backup-Failure ist non-fatal, der Wipe läuft
+
-            // trotzdem; dem User fehlt dann nur das manuelle Restore-Sicherheitsnetz.
+        DeferredSaveFrames = -1;
-            if (Config.Version < 10)
+    }
+
+    public async Task LoadAsync(CancellationToken cancellationToken)
     {
-                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
+        cancellationToken.ThrowIfCancellationRequested();
-                if (pluginConfigsDir is not null)
-                {
-                    var liveConfigPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json");
-                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v10-backup");
 
         try
         {
-                        if (File.Exists(liveConfigPath))
+            // Default tab layout on fresh install. Tells are handled by
-                        {
+            // Auto-Tell-Tabs; Novice Network has no preset tab by design.
-                            File.Copy(liveConfigPath, backupPath, overwrite: true);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Warning(ex, "HellionChat: pre-v10 config backup failed");
-                    }
-                }
-
-                Config = new Configuration
-                {
-                    Version = 10,
-                    FirstRunCompleted = true,
-                };
-                SaveConfig();
-
-                Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
-                {
-                    Title = HellionStrings.SettingsRefactor_Migration_Title,
-                    Content = HellionStrings.SettingsRefactor_Migration_Content,
-                    Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(25),
-                });
-            }
-
-            // Hellion Chat v10 → v11 — adds the global Configuration.PopOutInputEnabled
-            // master switch and SeenPopOutInputHint flag for the v0.6.0 pop-out
-            // input feature. Lightweight migration: defaults both fields,
-            // no user-facing notification because the change is opt-in only.
-            if (Config.Version < 11)
-            {
-                Config.PopOutInputEnabled = false;
-                Config.SeenPopOutInputHint = false;
-                Config.Version = 11;
-                SaveConfig();
-                Log.Information(
-                    "Migrated config v10 → v11: PopOutInputEnabled added (global, default off), " +
-                    "SeenPopOutInputHint added (default false)");
-            }
-
-            // Hellion Chat v11 → v12 — flips Configuration.PopOutInputEnabled from
-            // the v0.6.0 opt-in default (false) to opt-out (true) per v0.6.1 UX
-            // polish. Hard-flip is a deliberate design call (see Spec section 5.7);
-            // users are notified via the v0.6.1 hint banner (SeenPopOutHeaderHint
-            // reset). Re-toggle after migration is preserved because this block
-            // only fires for Version < 12.
-            if (Config.Version < 12)
-            {
-                Config.PopOutInputEnabled = true;
-                Config.SeenPopOutHeaderHint = false;
-                Config.Version = 12;
-                SaveConfig();
-                Log.Information(
-                    "Migrated config v11 → v12: PopOutInputEnabled hard-flipped to true (v0.6.1 default), " +
-                    "SeenPopOutHeaderHint reset to false (v0.6.1 banner re-armed)");
-            }
-
-            // Hellion Chat v12 → v13 — hard-resets the tab layout to the
-            // sharpened v1.0.0 defaults (5 thematic tabs, see TabsUtil and
-            // the default-fill block below). Existing tab state is wiped
-            // because per-channel mapping from the old General preset to
-            // the new General/System split would be ambiguous and would
-            // produce subtly wrong results for users who tweaked the old
-            // layout. A timestamped backup of the live config is written
-            // alongside it as a manual restore safety net. The wipe scope
-            // is intentionally narrow: only Config.Tabs is reset; Privacy,
-            // Retention, Theme and every other knob keeps its current value.
-            if (Config.Version < 13)
-            {
-                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
-                if (pluginConfigsDir is not null)
-                {
-                    var liveConfigPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json");
-                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v13-backup");
-
-                    try
-                    {
-                        if (File.Exists(liveConfigPath))
-                            File.Copy(liveConfigPath, backupPath, overwrite: true);
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Warning(ex, "HellionChat: pre-v13 config backup failed");
-                    }
-                }
-
-                Config.Tabs.Clear();
-                Config.Version = 13;
-                SaveConfig();
-
-                Log.Information(
-                    "Migrated config v12 → v13: tab layout hard-reset to v1.0.0 defaults; " +
-                    "pre-v13 config backup written next to the live file. " +
-                    "Default tabs will be populated by the Tabs.Count == 0 block.");
-
-                Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
-                {
-                    Title = HellionStrings.SettingsRefactor_Migration_Title,
-                    Content = HellionStrings.SettingsRefactor_Migration_Content,
-                    Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(25),
-                });
-            }
-
-            // Hellion v1.0.0 default tab layout. Five thematically separated
-            // tabs: General catches the immediate-surroundings public chat
-            // (Say/Yell/Shout) only; System absorbs the rest of the technical
-            // and gameplay-event noise; FreeCompany, Group and Linkshell each
-            // own their respective channel set. Tells are not in a static
-            // tab anymore — Auto-Tell-Tabs spawns dedicated per-conversation
-            // tabs on demand. Novice-Network gets no preset tab; users who
-            // want it can add HellionBeginner from Settings → Tabs.
             if (Config.Tabs.Count == 0)
             {
                 Config.Tabs.Add(TabsUtil.VanillaGeneral);
@@ -254,32 +190,43 @@ public sealed class Plugin : IDalamudPlugin
                 Config.Tabs.Add(TabsUtil.HellionLinkshell);
             }
 
-            LanguageChanged(Interface.UiLanguage);
+            cancellationToken.ThrowIfCancellationRequested();
-            ImGuiUtil.Initialize(this);
 
+            // BuildFonts registers handles with Dalamud's FontAtlas; the atlas
+            // rebuilds async a few frames later (visible "font-pop" on first load).
+            FontManager = new FontManager();
+            FontManager.BuildFonts();
+
+            // ThemeRegistry must be wired before the first Draw tick.
+            var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
+            Directory.CreateDirectory(customThemesDir);
+            SeedExampleThemeIfEmpty(customThemesDir);
+            ThemeRegistry = new Themes.ThemeRegistry(customThemesDir);
+            ThemeRegistry.Switch(Config.Theme);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Service allocations — order encodes dependencies.
+            // HonorificService registers IPC subscribers early to catch
+            // Ready/Disposing events from the first frame.
             FileDialogManager = new FileDialogManager();
-
             Commands = new Commands();
             Functions = new GameFunctions.GameFunctions(this);
             Ipc = new IpcManager();
             TypingIpc = new TypingIpc(this);
             ExtraChat = new ExtraChat();
-            FontManager = new FontManager();
+            HonorificService = new Integrations.HonorificService(Interface, Log, Framework);
+            StatusBar = new Ui.StatusBar();
+            MessageManager = new MessageManager(this);
 
-            MessageManager = new MessageManager(this); // Does it require UI?
+            AutoTellTabsService = new AutoTellTabsService(
-
+                this,
-            // Hellion Chat — Auto-Tell-Tabs service. Subscribes to the
+                MessageManager,
-            // MessageManager's MessageProcessed event for live tells and
+                MessageManager.Store
-            // to ClientState.Logout for the cleanup pass. Created after
+            );
-            // MessageManager so the constructor can hand off the live
-            // store and event source.
-            AutoTellTabsService = new AutoTellTabsService(this, MessageManager, MessageManager.Store);
             AutoTellTabsService.Initialize();
 
-            // Hellion Chat — daily retention sweep, off-thread so it never
+            SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);
-            // blocks plugin load. Skips itself when disabled or already ran
-            // within the past 24 hours.
-            RunRetentionSweepIfDue();
 
             ChatLogWindow = new ChatLogWindow(this);
             SettingsWindow = new SettingsWindow(this);
@@ -299,82 +246,166 @@ public sealed class Plugin : IDalamudPlugin
             WindowSystem.AddWindow(DebuggerWindow);
             WindowSystem.AddWindow(FirstRunWizard);
 
-            // Open the wizard on a fresh install. Existing ChatTwo users have
-            // FirstRunCompleted set to true by the v6→v7 migration above.
             if (!Config.FirstRunCompleted)
                 FirstRunWizard.IsOpen = true;
 
-            FontManager.BuildFonts();
+            cancellationToken.ThrowIfCancellationRequested();
 
-            Interface.UiBuilder.DisableCutsceneUiHide = true;
-            Interface.UiBuilder.DisableGposeUiHide = true;
-
-            // let all the other components register, then initialize commands
             Commands.Initialise();
 
+            // Daily retention sweep — fire-and-forget, skips when disabled
+            // or already ran within the past 24 hours.
+            RunRetentionSweepIfDue();
+
+            if (Config.ShowEmotes)
+                _ = EmoteCache.LoadData();
+
             if (Interface.Reason is not PluginLoadReason.Boot)
                 MessageManager.FilterAllTabsAsync();
 
+            Interface.UiBuilder.DisableCutsceneUiHide = true;
+            Interface.UiBuilder.DisableGposeUiHide = true;
+
+#if !DEBUG
+            // Fire-and-forget — first auto-translate use may have a sub-second
+            // hitch if the cache hasn't filled yet, but avoids blocking load.
+            _ = Task.Run(AutoTranslate.PreloadCache, cancellationToken);
+#endif
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Hooks last — all services and windows must be live before
+            // the first Draw / FrameworkUpdate tick fires.
             Framework.Update += FrameworkUpdate;
             Interface.UiBuilder.Draw += Draw;
             Interface.LanguageChanged += LanguageChanged;
-            // Hellion Chat — surface a "main UI" entry point so Dalamud's
-            // plugin list shows the Open-Plugin button. Settings is the
-            // most useful landing place; OpenConfigUi is already wired to
-            // the same toggle inside SettingsWindow.
             Interface.UiBuilder.OpenMainUi += OpenMainUi;
-
-            if (Config.ShowEmotes)
-                _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
-
-            #if !DEBUG
-            // Avoid 300ms hitch when sending first message by preloading the
-            // auto-translate cache. Don't do this in debug because it makes
-            // profiling difficult.
-            AutoTranslate.PreloadCache();
-            #endif
         }
-        catch (Exception ex)
+        catch
         {
-            Log.Error(ex, "Plugin load threw an error, turning off plugin");
+            try
-            Dispose();
+            {
-
+                await DisposeAsync().ConfigureAwait(false);
-            // Re-throw the exception to fail the plugin load.
+            }
+            catch
+            { /* keep original failure */
+            }
             throw;
         }
     }
 
-    // Suppressing this warning because Dispose() is called in Plugin() if the
-    // load fails, so some values may not be initialized.
     [SuppressMessage("ReSharper", "ConditionalAccessQualifierIsNonNullableAccordingToAPIContract")]
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
-        Interface.UiBuilder.OpenMainUi -= OpenMainUi;
+        // Idempotency guard — second call short-circuits on reload race.
-        Interface.LanguageChanged -= LanguageChanged;
+        if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
-        Interface.UiBuilder.Draw -= Draw;
+            return;
-        Framework.Update -= FrameworkUpdate;
-        GameFunctions.GameFunctions.SetChatInteractable(true);
 
-        WindowSystem?.RemoveAllWindows();
+        Exception? failure = null;
-        ChatLogWindow?.Dispose();
-        DbViewer?.Dispose();
-        InputPreview?.Dispose();
-        SettingsWindow?.Dispose();
-        DebuggerWindow?.Dispose();
-        SeStringDebugger?.Dispose();
 
-        TypingIpc?.Dispose();
+        // Unsubscribe hooks first — mirrors the hooks-last subscribe order in LoadAsync.
-        ExtraChat?.Dispose();
+        failure = CaptureFailure(failure, () => Interface.UiBuilder.OpenMainUi -= OpenMainUi);
-        Ipc?.Dispose();
+        failure = CaptureFailure(failure, () => Interface.LanguageChanged -= LanguageChanged);
-        // Dispose the Auto-Tell-Tabs service before MessageManager so it
+        failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw);
-        // can cleanly unsubscribe from the MessageProcessed event before
+        failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate);
-        // its source goes away.
-        AutoTellTabsService?.Dispose();
-        MessageManager?.DisposeAsync().AsTask().Wait();
-        Functions?.Dispose();
-        Commands?.Dispose();
 
-        EmoteCache.Dispose();
+        // Flush a pending DeferredSave — FrameworkUpdate won't fire it anymore.
+        failure = CaptureFailure(
+            failure,
+            () =>
+            {
+                if (DeferredSaveFrames >= 0)
+                {
+                    SaveConfig();
+                    DeferredSaveFrames = -1;
+                }
+            }
+        );
+
+        // Unsubscribe AutoTellTabs before MessageManager goes away.
+        failure = CaptureFailure(failure, () => AutoTellTabsService?.Dispose());
+
+        // MessageManager has its own async dispose path (DB flush, thread shutdown).
+        if (MessageManager is not null)
+        {
+            failure = await CaptureFailureAsync(
+                    failure,
+                    () => MessageManager.DisposeAsync().AsTask()
+                )
+                .ConfigureAwait(false);
+        }
+
+        // Game-function / IPC / window cleanup must run on the framework thread.
+        try
+        {
+            await Framework
+                .RunOnFrameworkThread(() =>
+                {
+                    failure = CaptureFailure(
+                        failure,
+                        () => GameFunctions.GameFunctions.SetChatInteractable(true)
+                    );
+
+                    // IPC subscribers before windows — prevents a final IPC event
+                    // from reaching a half-torn ChatLogWindow.
+                    failure = CaptureFailure(failure, () => HonorificService?.Dispose());
+                    failure = CaptureFailure(failure, () => TypingIpc?.Dispose());
+                    failure = CaptureFailure(failure, () => ExtraChat?.Dispose());
+                    failure = CaptureFailure(failure, () => Ipc?.Dispose());
+
+                    failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows());
+                    failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose());
+                    failure = CaptureFailure(failure, () => DbViewer?.Dispose());
+                    failure = CaptureFailure(failure, () => InputPreview?.Dispose());
+                    failure = CaptureFailure(failure, () => SettingsWindow?.Dispose());
+                    failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose());
+                    failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose());
+                })
+                .ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        // Pure-memory cleanups — no Framework / UI / IPC touch.
+        failure = CaptureFailure(failure, () => Functions?.Dispose());
+        failure = CaptureFailure(failure, () => Commands?.Dispose());
+        failure = CaptureFailure(failure, () => EmoteCache.Dispose());
+
+        if (failure is not null)
+            ExceptionDispatchInfo.Capture(failure).Throw();
+    }
+
+    // Run cleanup actions individually so a single failure doesn't strand
+    // the remaining teardown steps.
+    private static Exception? CaptureFailure(Exception? failure, Action action)
+    {
+        try
+        {
+            action();
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+        return failure;
+    }
+
+    private static async ValueTask<Exception?> CaptureFailureAsync(
+        Exception? failure,
+        Func<Task> action
+    )
+    {
+        try
+        {
+            await action().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+        return failure;
     }
 
     private static void MigrateFromChatTwoLayout()
@@ -388,9 +419,6 @@ public sealed class Plugin : IDalamudPlugin
         var ourConfigFile = Path.Combine(pluginConfigsDir, "HellionChat.json");
         var ourConfigDir = Interface.ConfigDirectory.FullName;
 
-        // Track whether anything legitimately blocked us. The most common
-        // cause is upstream Chat 2 still being loaded — its SQLite handle
-        // keeps chat-sqlite.db locked and File.Move throws IOException.
         var lockedBlocker = false;
 
         try
@@ -398,22 +426,20 @@ public sealed class Plugin : IDalamudPlugin
             if (!File.Exists(ourConfigFile) && File.Exists(legacyConfigFile))
             {
                 File.Move(legacyConfigFile, ourConfigFile);
-                Log.Information($"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}");
+                Log.Information(
+                    $"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}"
+                );
             }
         }
         catch (IOException e)
         {
-            Log.Warning(e, $"HellionChat: config file move blocked, leaving {legacyConfigFile} in place");
+            Log.Warning(
+                e,
+                $"HellionChat: config file move blocked, leaving {legacyConfigFile} in place"
+            );
             lockedBlocker = true;
         }
 
-        // The plugin's ConfigDirectory may already exist on first load
-        // (Dalamud creates it), so check at the file level instead of
-        // skipping when the directory is present. Move every legacy
-        // entry whose target name is not occupied yet, then remove the
-        // source dir if it ends up empty. Each move is wrapped on its
-        // own so a single locked file (the SQLite db while ChatTwo still
-        // runs) does not abandon the rest of the migration.
         if (!Directory.Exists(legacyConfigDir))
             return;
 
@@ -421,6 +447,8 @@ public sealed class Plugin : IDalamudPlugin
         {
             Directory.CreateDirectory(ourConfigDir);
 
+            // Move each file individually so a single locked file (e.g. the
+            // SQLite db while ChatTwo is still loaded) doesn't abort the rest.
             foreach (var file in Directory.EnumerateFiles(legacyConfigDir))
             {
                 var target = Path.Combine(ourConfigDir, Path.GetFileName(file));
@@ -433,7 +461,10 @@ public sealed class Plugin : IDalamudPlugin
                 }
                 catch (IOException e)
                 {
-                    Log.Warning(e, $"HellionChat: file move blocked for {file}, will retry on next load");
+                    Log.Warning(
+                        e,
+                        $"HellionChat: file move blocked for {file}, will retry on next load"
+                    );
                     lockedBlocker = true;
                 }
             }
@@ -450,7 +481,10 @@ public sealed class Plugin : IDalamudPlugin
                 }
                 catch (IOException e)
                 {
-                    Log.Warning(e, $"HellionChat: subdir move blocked for {dir}, will retry on next load");
+                    Log.Warning(
+                        e,
+                        $"HellionChat: subdir move blocked for {dir}, will retry on next load"
+                    );
                     lockedBlocker = true;
                 }
             }
@@ -468,27 +502,23 @@ public sealed class Plugin : IDalamudPlugin
 
         if (lockedBlocker)
         {
-            // Surface the most common cause to the user as a notification
+            Notification.AddNotification(
-            // so they don't think Hellion Chat lost their history when in
+                new Dalamud.Interface.ImGuiNotification.Notification
-            // fact upstream Chat 2 was still holding the database file.
-            Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
                 {
                     Title = "Hellion Chat",
-                Content = "Could not migrate the Chat 2 database — the file appears to be in use. " +
+                    Content =
-                          "Disable Chat 2, fully close the game, then start it again. " +
+                        "Could not migrate the Chat 2 database — the file appears to be in use. "
-                          "See the README troubleshooting section if the issue persists.",
+                        + "Disable Chat 2, fully close the game, then start it again. "
+                        + "See the README troubleshooting section if the issue persists.",
                     Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning,
                     InitialDuration = TimeSpan.FromSeconds(30),
-            });
+                }
+            );
         }
     }
 
     private void OpenMainUi()
     {
-        // Settings is the most useful landing surface — same target as the
-        // Configure button. SettingsWindow.Toggle is internal and already
-        // wired to OpenConfigUi, so re-using IsOpen keeps both entry points
-        // behaviourally identical.
         SettingsWindow.IsOpen = !SettingsWindow.IsOpen;
     }
 
@@ -499,8 +529,7 @@ public sealed class Plugin : IDalamudPlugin
         if (DateTimeOffset.UtcNow - Config.RetentionLastRunAt < TimeSpan.FromHours(24))
             return;
 
-        // Snapshot the policy so the user can edit settings while we run.
+        // Snapshot the policy so the user can edit settings while the sweep runs.
-        // Spec defaults form the baseline; explicit user overrides win.
         var policy = new Dictionary<int, int>();
         foreach (var (type, days) in Privacy.PrivacyDefaults.DefaultRetentionDays)
             policy[(int)(ushort)type] = days;
@@ -508,11 +537,10 @@ public sealed class Plugin : IDalamudPlugin
             policy[(int)(ushort)type] = days;
         var defaultDays = Config.RetentionDefaultDays;
 
+        // IsBackground = true so a stuck sweep never blocks plugin unload.
         new Thread(() =>
         {
-            // Bail out cheaply if a manual sweep is already in flight; the
+            // Bail early if a manual sweep is already in flight.
-            // lock around the actual work would queue us up otherwise and
-            // we would just re-do whatever the manual run already did.
             lock (RetentionSweepLock)
             {
                 if (RetentionSweepRunning)
@@ -529,11 +557,15 @@ public sealed class Plugin : IDalamudPlugin
                 if (deleted > 0)
                 {
                     Log.Information($"Retention sweep deleted {deleted} expired messages.");
-                    Framework.Run(() =>
+                    // Run clear+refilter on the framework thread — FilterAllTabsAsync
+                    // is fire-and-forget and would race the next sweep cycle.
+                    Framework
+                        .Run(() =>
                         {
                             MessageManager.ClearAllTabs();
-                        MessageManager.FilterAllTabsAsync();
+                            MessageManager.FilterAllTabs();
-                    }).Wait();
+                        })
+                        .Wait();
                 }
                 else
                 {
@@ -549,18 +581,19 @@ public sealed class Plugin : IDalamudPlugin
                 lock (RetentionSweepLock)
                     RetentionSweepRunning = false;
             }
-        }) { IsBackground = true }.Start();
+        })
+        {
+            IsBackground = true,
+        }.Start();
     }
 
     private void Draw()
     {
-        // Hellion theme is pushed once per frame here so every plugin window
+        // Theme engine is always active; Classic is a theme, not a disabled state.
-        // (chat log, settings, viewers, wizard, file dialog) renders with
+        using IDisposable _style = HellionStyle.PushGlobal(
-        // the same palette. Skipping the push leaves the upstream Dalamud
+            ThemeRegistry.Active,
-        // look untouched for users who flipped the toggle off.
+            Config.WindowOpacity
-        using IDisposable? _style = Config.HellionThemeEnabled
+        );
-            ? HellionStyle.PushGlobal(Config.HellionThemeWindowOpacity)
-            : null;
 
         ChatLogWindow.BeginFrame();
 
@@ -571,10 +604,13 @@ public sealed class Plugin : IDalamudPlugin
             return;
         }
 
-        // v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is
+        // Hide all plugin windows while the New Game+ menu is open.
-        // open. Hides every plugin window in one shot (chat log, pop-outs,
+        if (
-        // settings, db viewer, etc.), matching the LoadingScreens pattern.
+            Config.HideInNewGamePlusMenu
-        if (Config.HideInNewGamePlusMenu && GameFunctions.GameFunctions.IsAddonInteractable(GameFunctions.GameFunctions.NewGamePlusAddonName))
+            && GameFunctions.GameFunctions.IsAddonInteractable(
+                GameFunctions.GameFunctions.NewGamePlusAddonName
+            )
+        )
         {
             ChatLogWindow.FinalizeFrame();
             TypingIpc.Update();
@@ -597,10 +633,7 @@ public sealed class Plugin : IDalamudPlugin
 
     internal void SaveConfig()
     {
-        // Hellion Chat — Auto-Tell-Tabs are session-only. Strip them out
+        // Strip session-only Auto-Tell-Tabs before serialization; restore after.
-        // before serialization so a crash mid-session can never persist
-        // them. We snapshot the full tab list first and restore it after
-        // the save, preserving the user's order and open conversations.
         var snapshot = Config.Tabs.ToList();
         Config.Tabs.RemoveAll(t => t.IsTempTab);
 
@@ -608,11 +641,17 @@ public sealed class Plugin : IDalamudPlugin
 
         Config.Tabs.Clear();
         Config.Tabs.AddRange(snapshot);
+
+        // F2.1: snapshot-restore preserves IsTempTab tabs but the mid-step
+        // RemoveAll bypasses AutoTellTabsService, so re-peg the counter.
+        // Null-conditional because SaveConfig can fire before Phase-2 init.
+        AutoTellTabsService?.ResyncTempTabCounter();
     }
 
     internal void LanguageChanged(string langCode)
     {
-        var info = Config.LanguageOverride is LanguageOverride.None
+        var info =
+            Config.LanguageOverride is LanguageOverride.None
                 ? new CultureInfo(langCode)
                 : new CultureInfo(Config.LanguageOverride.Code());
 
@@ -626,7 +665,7 @@ public sealed class Plugin : IDalamudPlugin
         "ChatLogPanel_0",
         "ChatLogPanel_1",
         "ChatLogPanel_2",
-        "ChatLogPanel_3"
+        "ChatLogPanel_3",
     ];
 
     private void FrameworkUpdate(IFramework framework)
@@ -644,5 +683,43 @@ public sealed class Plugin : IDalamudPlugin
 
     public static bool InBattle => Condition[ConditionFlag.InCombat];
     public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene];
-    public static bool CutsceneActive => Condition[ConditionFlag.OccupiedInCutSceneEvent] || Condition[ConditionFlag.WatchingCutscene78];
+    public static bool CutsceneActive =>
+        Condition[ConditionFlag.OccupiedInCutSceneEvent]
+        || Condition[ConditionFlag.WatchingCutscene78];
+
+    // Seeds example-theme.json into the themes dir on first run.
+    // Skipped if any custom JSON already exists.
+    private static void SeedExampleThemeIfEmpty(string dir)
+    {
+        if (Directory.EnumerateFiles(dir, "*.json").Any())
+            return;
+
+        var examplePath = Path.Combine(dir, "example-theme.json");
+        var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream(
+            "HellionChat.Themes.Builtin.example-theme.json"
+        );
+        if (resourceStream is null)
+        {
+            Log.Warning("Themes example template not found in assembly resources; skipping seed.");
+            return;
+        }
+
+        try
+        {
+            using var fileStream = File.Create(examplePath);
+            resourceStream.CopyTo(fileStream);
+            Log.Information($"Seeded example-theme.json into {dir}");
+        }
+        catch (IOException ex)
+        {
+            Log.Warning(
+                ex,
+                "Failed to seed example-theme.json; user can create custom themes manually."
+            );
+        }
+        finally
+        {
+            resourceStream.Dispose();
+        }
+    }
 }

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).
+    // F3.1: failsafe for ChatTypes added by future FFXIV patches. New installs
-    // Only the player's own conversations are persisted out-of-the-box.
+    // persist unknown channels so a major patch's added ChatType isn't silently
-    // Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system
+    // dropped before the user can opt in or out. Existing configs keep their
-    // logs and battle messages are NOT persisted unless the user opts in.
+    // 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,11 +47,10 @@ internal static class PrivacyDefaults
         ChatType.ExtraChatLinkshell8,
     };
 
-    // Default retention windows per channel (in days). Channels not listed
+    // Per-channel retention in days. Unlisted channels fall back to
-    // here fall back to Configuration.RetentionDefaultDays. Reflects the
+    // Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
-    // design spec: Tells 365, own-conversation channels 90, everything else
+    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
-    // shorter via the global default.
+        new Dictionary<ChatType, int>
-    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = new Dictionary<ChatType, int>
         {
             [ChatType.TellIncoming] = 365,
             [ChatType.TellOutgoing] = 365,
@@ -85,11 +89,12 @@ internal static class PrivacyDefaults
             [ChatType.ExtraChatLinkshell8] = 90,
         };
 
-    // Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
+    // Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
-    // emote types, Novice Network), kept for a short 24-hour window so the
+    // Network) with a 1-day window so recent RP/trade is searchable but
-    // last RP scene or shout trade is still searchable but third-party data
+    // third-party data doesn't accumulate.
-    // doesn't accumulate forever.
+    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
-    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist)
+        PrivacyFirstWhitelist
+    )
     {
         ChatType.Say,
         ChatType.Shout,
@@ -99,7 +104,8 @@ internal static class PrivacyDefaults
         ChatType.NoviceNetwork,
     };
 
-    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides = new Dictionary<ChatType, int>
+    internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides =
+        new Dictionary<ChatType, int>
         {
             [ChatType.Say] = 1,
             [ChatType.Shout] = 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
+// Built-in colour presets applied via Settings UI → ChatColours.
-// settings section. Read-only static data; users apply a preset via the
+// Battle-channel types are intentionally excluded to preserve combat-log tuning.
-// 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.
 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.
+    // Mirrors ChatTypeExt.DefaultColor; channels without a default are skipped.
-    // Channels ohne Default-Wert (return null) werden ausgelassen — wer sie
-    // anwenden will, behält seine aktuelle Farbe.
     private static IReadOnlyDictionary<ChatType, uint> BuildDefault()
     {
         var dict = new Dictionary<ChatType, uint>();
@@ -175,33 +178,22 @@ public static class ChatColourPresets
         };
     }
 
-    // Hellion brand preset — Arctic Cyan + Ember Orange palette aus
+    // Hellion brand preset — Arctic Cyan + Ember Orange palette.
-    // /mnt/ssd-fast/Projekte/hellion-media/hellion-media-website/BRANDING.md
+    // Cyan family for Standard/Tell, Ember/Warning for loud channels,
-    // (Schema-Stand 2026-04-16). Channels sind über das ganze Brand-Spektrum
+    // Status colours for Linkshells, darker variants for CrossLinkshells.
-    // 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.
     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.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
@@ -210,8 +202,6 @@ public static class ChatColourPresets
             [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
@@ -223,31 +213,20 @@ public static class ChatColourPresets
         };
     }
 
-    // Bonus preset — Night Blue, KAZAMA-Stimmungs-Theme aus
+    // Night Blue — cool nautical theme, deep navy without purple.
-    // /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.
     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.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.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
+    // Indigo Violet — warm-mystic theme, deep indigo with violet accent.
-    // 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).
     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
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255),         // text-primary (light lavender)
             [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.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

@@ -203,6 +203,37 @@ internal class HellionStrings
     internal static string Settings_Tab_Database => Get(nameof(Settings_Tab_Database));
     internal static string Settings_Tab_Information => Get(nameof(Settings_Tab_Information));
 
+    // v1.1.0 — Settings card-grid overview
+    internal static string Settings_Card_General_Title => Get(nameof(Settings_Card_General_Title));
+    internal static string Settings_Card_General_Subtext => Get(nameof(Settings_Card_General_Subtext));
+    internal static string Settings_Card_Appearance_Title => Get(nameof(Settings_Card_Appearance_Title));
+    internal static string Settings_Card_Appearance_Subtext => Get(nameof(Settings_Card_Appearance_Subtext));
+    internal static string Settings_Card_Themes_Title => Get(nameof(Settings_Card_Themes_Title));
+    internal static string Settings_Card_Themes_Subtext => Get(nameof(Settings_Card_Themes_Subtext));
+    internal static string Settings_Card_Window_Title => Get(nameof(Settings_Card_Window_Title));
+    internal static string Settings_Card_Window_Subtext => Get(nameof(Settings_Card_Window_Subtext));
+    internal static string Settings_Card_Chat_Title => Get(nameof(Settings_Card_Chat_Title));
+    internal static string Settings_Card_Chat_Subtext => Get(nameof(Settings_Card_Chat_Subtext));
+    internal static string Settings_Card_Tabs_Title => Get(nameof(Settings_Card_Tabs_Title));
+    internal static string Settings_Card_Tabs_Subtext => Get(nameof(Settings_Card_Tabs_Subtext));
+    internal static string Settings_Card_Privacy_Title => Get(nameof(Settings_Card_Privacy_Title));
+    internal static string Settings_Card_Privacy_Subtext => Get(nameof(Settings_Card_Privacy_Subtext));
+    internal static string Settings_Card_Database_Title => Get(nameof(Settings_Card_Database_Title));
+    internal static string Settings_Card_Database_Subtext => Get(nameof(Settings_Card_Database_Subtext));
+    internal static string Settings_Card_Information_Title => Get(nameof(Settings_Card_Information_Title));
+    internal static string Settings_Card_Information_Subtext => Get(nameof(Settings_Card_Information_Subtext));
+
+    // v1.1.0 — Themes-Settings-Tab
+    internal static string Settings_Tab_Themes => Get(nameof(Settings_Tab_Themes));
+    internal static string Settings_Themes_Active => Get(nameof(Settings_Themes_Active));
+    internal static string Settings_Themes_BuiltIns => Get(nameof(Settings_Themes_BuiltIns));
+    internal static string Settings_Themes_Custom => Get(nameof(Settings_Themes_Custom));
+    internal static string Settings_Themes_OpenFolder => Get(nameof(Settings_Themes_OpenFolder));
+    internal static string Settings_Themes_ExportActive => Get(nameof(Settings_Themes_ExportActive));
+    internal static string Settings_Themes_ApplyChatColors_Hint => Get(nameof(Settings_Themes_ApplyChatColors_Hint));
+    internal static string Settings_Themes_ApplyChatColors_Apply => Get(nameof(Settings_Themes_ApplyChatColors_Apply));
+    internal static string Settings_Themes_ApplyChatColors_Keep => Get(nameof(Settings_Themes_ApplyChatColors_Keep));
+
     // Hellion Chat — General-Tab section headings
     internal static string Settings_General_Input_Heading => Get(nameof(Settings_General_Input_Heading));
     internal static string Settings_General_Audio_Heading => Get(nameof(Settings_General_Audio_Heading));
@@ -245,6 +276,11 @@ internal class HellionStrings
     internal static string Tabs_Presets_Linkshell => Get(nameof(Tabs_Presets_Linkshell));
     internal static string Tabs_Presets_Linkshell_Hint => Get(nameof(Tabs_Presets_Linkshell_Hint));
 
+    // Hellion Chat — v1.2.0 per-tab icon override
+    internal static string Tabs_Icon_Label => Get(nameof(Tabs_Icon_Label));
+    internal static string Tabs_Icon_HelpMarker => Get(nameof(Tabs_Icon_HelpMarker));
+    internal static string Tabs_Icon_DefaultOption => Get(nameof(Tabs_Icon_DefaultOption));
+
     // Hellion Chat — v0.6.0 chat colour presets (display labels)
     internal static string ChatColourPresets_Default => Get(nameof(ChatColourPresets_Default));
     internal static string ChatColourPresets_HighContrast => Get(nameof(ChatColourPresets_HighContrast));
@@ -279,4 +315,77 @@ internal class HellionStrings
     internal static string ChatTwoConflictTitle => Get(nameof(ChatTwoConflictTitle));
     internal static string ChatTwoConflictBody => Get(nameof(ChatTwoConflictBody));
     internal static string ChatTwoConflictAction => Get(nameof(ChatTwoConflictAction));
+
+    // Hellion Chat — v1.2.0 Bottom-Status-Bar Privacy-Badge labels
+    internal static string StatusBar_Privacy_Enabled => Get(nameof(StatusBar_Privacy_Enabled));
+    internal static string StatusBar_Privacy_Open => Get(nameof(StatusBar_Privacy_Open));
+
+    // Hellion Chat — v1.2.0 Appearance / Compact-Density toggle
+    internal static string Appearance_UseCompactDensity_Name => Get(nameof(Appearance_UseCompactDensity_Name));
+    internal static string Appearance_UseCompactDensity_Description => Get(nameof(Appearance_UseCompactDensity_Description));
+
+    // Hellion Chat — v1.2.1 Settings Cleanup: new card titles + subtexts
+    internal static string Settings_Card_ThemeAndLayout_Title => Get(nameof(Settings_Card_ThemeAndLayout_Title));
+    internal static string Settings_Card_ThemeAndLayout_Subtext => Get(nameof(Settings_Card_ThemeAndLayout_Subtext));
+    internal static string Settings_Card_FontsAndColours_Title => Get(nameof(Settings_Card_FontsAndColours_Title));
+    internal static string Settings_Card_FontsAndColours_Subtext => Get(nameof(Settings_Card_FontsAndColours_Subtext));
+    internal static string Settings_Card_DataManagement_Title => Get(nameof(Settings_Card_DataManagement_Title));
+    internal static string Settings_Card_DataManagement_Subtext => Get(nameof(Settings_Card_DataManagement_Subtext));
+    internal static string Settings_Card_Integrations_Title => Get(nameof(Settings_Card_Integrations_Title));
+    internal static string Settings_Card_Integrations_Subtext => Get(nameof(Settings_Card_Integrations_Subtext));
+
+    // Hellion Chat — v1.2.1 Theme & Layout tab section headings + WindowOpacity slider
+    internal static string Settings_ThemeAndLayout_Theme_Heading => Get(nameof(Settings_ThemeAndLayout_Theme_Heading));
+    internal static string Settings_ThemeAndLayout_WindowStyle_Heading => Get(nameof(Settings_ThemeAndLayout_WindowStyle_Heading));
+    internal static string Settings_ThemeAndLayout_TimestampStyle_Heading => Get(nameof(Settings_ThemeAndLayout_TimestampStyle_Heading));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Name));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Description));
+
+    // Hellion Chat — v1.2.1 Fonts & Colours tab section headings
+    internal static string Settings_FontsAndColours_Fonts_Heading => Get(nameof(Settings_FontsAndColours_Fonts_Heading));
+    internal static string Settings_FontsAndColours_Colours_Heading => Get(nameof(Settings_FontsAndColours_Colours_Heading));
+
+    // Hellion Chat — v1.2.1 Data Management tab section headings
+    internal static string Settings_DataManagement_Storage_Heading => Get(nameof(Settings_DataManagement_Storage_Heading));
+    internal static string Settings_DataManagement_Retention_Heading => Get(nameof(Settings_DataManagement_Retention_Heading));
+    internal static string Settings_DataManagement_Cleanup_Heading => Get(nameof(Settings_DataManagement_Cleanup_Heading));
+    internal static string Settings_DataManagement_Export_Heading => Get(nameof(Settings_DataManagement_Export_Heading));
+    internal static string Settings_DataManagement_DbViewer_Heading => Get(nameof(Settings_DataManagement_DbViewer_Heading));
+    internal static string Settings_DataManagement_Advanced_Heading => Get(nameof(Settings_DataManagement_Advanced_Heading));
+
+    // Hellion Chat — v1.2.1 Window-tab Behaviour heading (replaces Frame heading)
+    internal static string Settings_Window_Frame_Behaviour_Heading => Get(nameof(Settings_Window_Frame_Behaviour_Heading));
+
+    // Hellion Chat — v1.2.1 Migration v15 → v16 toast
+    internal static string Migration_v16_OverrideStyle_Toast => Get(nameof(Migration_v16_OverrideStyle_Toast));
+
+    // Hellion Chat — v1.3.0 Integrations tab (Honorific + Coming-Soon roadmap)
+    internal static string Settings_Tab_Integrations => Get(nameof(Settings_Tab_Integrations));
+    internal static string Settings_Integrations_Intro => Get(nameof(Settings_Integrations_Intro));
+    internal static string Settings_Integrations_Honorific_SectionHeader => Get(nameof(Settings_Integrations_Honorific_SectionHeader));
+    internal static string Settings_Integrations_Honorific_Status_Detected => Get(nameof(Settings_Integrations_Honorific_Status_Detected));
+    internal static string Settings_Integrations_Honorific_Status_NotInstalled => Get(nameof(Settings_Integrations_Honorific_Status_NotInstalled));
+    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_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));
+    internal static string Settings_Integrations_ComingSoon_Intro => Get(nameof(Settings_Integrations_ComingSoon_Intro));
+    internal static string Settings_Integrations_ComingSoon_ContextMenu_Title => Get(nameof(Settings_Integrations_ComingSoon_ContextMenu_Title));
+    internal static string Settings_Integrations_ComingSoon_ContextMenu_Description => Get(nameof(Settings_Integrations_ComingSoon_ContextMenu_Description));
+    internal static string Settings_Integrations_ComingSoon_Notifications_Title => Get(nameof(Settings_Integrations_ComingSoon_Notifications_Title));
+    internal static string Settings_Integrations_ComingSoon_Notifications_Description => Get(nameof(Settings_Integrations_ComingSoon_Notifications_Description));
+    internal static string Settings_Integrations_ComingSoon_RPStatus_Title => Get(nameof(Settings_Integrations_ComingSoon_RPStatus_Title));
+    internal static string Settings_Integrations_ComingSoon_RPStatus_Description => Get(nameof(Settings_Integrations_ComingSoon_RPStatus_Description));
+    internal static string Settings_Integrations_ComingSoon_ExtraChat_Title => Get(nameof(Settings_Integrations_ComingSoon_ExtraChat_Title));
+    internal static string Settings_Integrations_ComingSoon_ExtraChat_Description => Get(nameof(Settings_Integrations_ComingSoon_ExtraChat_Description));
+    internal static string Settings_Integrations_ComingSoon_QuickDM_Title => Get(nameof(Settings_Integrations_ComingSoon_QuickDM_Title));
+    internal static string Settings_Integrations_ComingSoon_QuickDM_Description => Get(nameof(Settings_Integrations_ComingSoon_QuickDM_Description));
+    internal static string Settings_Integrations_GotAnIdea_SectionHeader => Get(nameof(Settings_Integrations_GotAnIdea_SectionHeader));
+    internal static string Settings_Integrations_GotAnIdea_Body => Get(nameof(Settings_Integrations_GotAnIdea_Body));
+    internal static string Settings_Integrations_GotAnIdea_LinkLabel => Get(nameof(Settings_Integrations_GotAnIdea_LinkLabel));
+
+    // Hellion Chat — v1.3.0 Honorific title slot tooltip
+    internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip));
 }

HellionChat/Resources/HellionStrings.de.resx

@@ -561,6 +561,17 @@
   <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
     <value>Wenn du mehrere Linkshells benutzt, empfiehlt der Maintainer einen Tab pro Shell für eine sauberere Übersicht. Tab duplizieren und je Kopie die Kanalauswahl einschränken.</value>
   </data>
+
+  <!-- Hellion Chat — v1.2.0 per-tab icon override -->
+  <data name="Tabs_Icon_Label" xml:space="preserve">
+    <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>
+  </data>
+  <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
+    <value>(Default-Mapping)</value>
+  </data>
   <data name="ChatColourPresets_Default" xml:space="preserve">
     <value>Klassik (Chat 2 Default)</value>
   </data>
@@ -624,4 +635,244 @@
   <data name="ChatTwoConflictAction" xml:space="preserve">
     <value>Chat 2 in /xlplugins deaktivieren, danach Hellion Chat erneut aktivieren.</value>
   </data>
+  <data name="Settings_Card_General_Title" xml:space="preserve">
+    <value>Allgemein</value>
+  </data>
+  <data name="Settings_Card_General_Subtext" xml:space="preserve">
+    <value>Sprache, Eingabe, Audio und Performance.</value>
+  </data>
+  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
+    <value>Erscheinungsbild</value>
+  </data>
+  <data name="Settings_Card_Appearance_Subtext" xml:space="preserve">
+    <value>Fensterdeckkraft, Schriften, Bewegung</value>
+  </data>
+  <data name="Settings_Card_Themes_Title" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Card_Themes_Subtext" xml:space="preserve">
+    <value>Theme wählen oder eigenes importieren</value>
+  </data>
+  <data name="Settings_Card_Window_Title" xml:space="preserve">
+    <value>Fenster</value>
+  </data>
+  <data name="Settings_Card_Window_Subtext" xml:space="preserve">
+    <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>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>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>Privacy-Filter pro Channel und was gespeichert werden darf.</value>
+  </data>
+  <data name="Settings_Card_Database_Title" xml:space="preserve">
+    <value>Datenbank</value>
+  </data>
+  <data name="Settings_Card_Database_Subtext" xml:space="preserve">
+    <value>Speicher, Migration, alte Bereinigung</value>
+  </data>
+  <data name="Settings_Card_Information_Title" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
+    <value>Version, Mission, Lizenz und Changelog.</value>
+  </data>
+  <data name="Settings_Tab_Themes" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Themes_Active" xml:space="preserve">
+    <value>Aktiv: {0}</value>
+  </data>
+  <data name="Settings_Themes_BuiltIns" xml:space="preserve">
+    <value>Eingebaute Themes</value>
+  </data>
+  <data name="Settings_Themes_Custom" xml:space="preserve">
+    <value>Eigene Themes</value>
+  </data>
+  <data name="Settings_Themes_OpenFolder" xml:space="preserve">
+    <value>Themes-Ordner öffnen</value>
+  </data>
+  <data name="Settings_Themes_ExportActive" xml:space="preserve">
+    <value>Aktives exportieren...</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
+    <value>Dieses Theme schlägt eigene Channel-Farben vor.</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
+    <value>Übernehmen</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
+    <value>Behalten</value>
+  </data>
+  <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
+    <value>Privacy-First</value>
+  </data>
+  <data name="StatusBar_Privacy_Open" xml:space="preserve">
+    <value>Offen</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
+    <value>Kompakte Dichte</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>
+  </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>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>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>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. Kommende Integrationen in der Vorschau.</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>Fenster-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Zeitstempel-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Fenster-Transparenz</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <value>Wie durchsichtig der Fensterhintergrund ist. Niedrigere Werte lassen mehr vom Spiel durchscheinen. Tipp: Dalamud's Per-Window-Menü (Hamburger in der Titelleiste) bietet pro Fenster eigene Overrides für Deckkraft, Hintergrund-Blur, Durchklick und Anpinnen — die haben Vorrang über diesen Slider für das jeweilige Fenster.</value>
+  </data>
+  <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
+    <value>Schriftarten</value>
+  </data>
+  <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
+    <value>Chat-Farben</value>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Speicherung</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Aufbewahrung</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Datenbank-Viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <value>Erweitert (Shift+Klick zum Öffnen)</value>
+  </data>
+  <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
+    <value>Verhalten</value>
+  </data>
+  <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
+    <value>Hellion Chat 1.2.1 hat das Settings-Menü neu sortiert und die alte „Stilüberschreiben"-Option entfernt (überholt durch das Theme-System aus 1.1.0). Deine restlichen Einstellungen bleiben unverändert. Die Fenster-Transparenz ist nach „Theme &amp; Layout" migriert. Ein Backup der vorherigen Config liegt unter pluginConfigs/HellionChat.json.pre-v16-backup neben der aktiven HellionChat.json.</value>
+  </data>
+  <data name="Settings_Tab_Integrations" xml:space="preserve">
+    <value>Integrationen</value>
+  </data>
+  <data name="Settings_Integrations_Intro" xml:space="preserve">
+    <value>Plugin-Integrationen lassen HellionChat mit anderen installierten Dalamud-Plugins zusammenarbeiten. Jede Integration erkennt ihr Ziel automatisch und deaktiviert sich still, wenn das Ziel-Plugin fehlt.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
+    <value>Honorific</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Detected" xml:space="preserve">
+    <value>Erkannt (v{0}.{1})</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_NotInstalled" xml:space="preserve">
+    <value>Nicht installiert</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
+    <value>Inkompatible API-Version ({0} erwartet, {1}.{2} gefunden)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
+    <value>Honorific-Titel im Chat-Header anzeigen</value>
+  </data>
+  <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_LinkRepo" xml:space="preserve">
+    <value>Honorific auf GitHub</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkAuthor" xml:space="preserve">
+    <value>von Caraxi</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_SectionHeader" xml:space="preserve">
+    <value>Demnächst</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
+    <value>Diese Integrationen sind auf der Roadmap. Die Einstellungen erscheinen automatisch, sobald das jeweilige Plugin angebunden ist.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
+    <value>Kontextmenü-Aktionen</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
+    <value>Rechtsklick auf einen Namen im Chat: zu PlayerTrack springen, Lodestone-Profil öffnen oder mit einem Klick eine DM verfassen.</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>Mentions und DMs über NotificationMaster: System-Toasts, Taskbar-Flash und Sounds pro Channel.</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>Moodles-Status-Icons und Pair-Badges direkt neben den Chat-Namen anzeigen, für mehr Roleplay-Kontext.</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>End-to-End-verschlüsselte Cross-Datacenter-Linkshells nativ in HellionChat hosten.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
+    <value>Quick-DM-Button (XIVInstantMessenger)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
+    <value>DM-Schnellzugriff direkt aus dem Chat-Fenster, ein Klick.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
+    <value>Idee?</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
+    <value>Idee für eine Plugin-Integration, die nicht auf der Liste steht? Komm auf den Hellion-Forge-Discord und schreib mir. Community-Input bestimmt die Roadmap.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
+    <value>Hellion Forge öffnen</value>
+  </data>
+  <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
+    <value>Custom-Titel von Honorific</value>
+  </data>
 </root>

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,67 @@
     <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="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 +259,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,76 +303,76 @@
     <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>
@@ -383,62 +383,62 @@
     <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.</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 +455,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 +486,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 +520,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 +531,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 +542,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,25 +553,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>
+  </data>
+  <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
+    <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>
   </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>
@@ -583,22 +594,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>
@@ -607,21 +618,261 @@
     <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>
   </data>
+  <data name="Settings_Card_General_Title" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="Settings_Card_General_Subtext" xml:space="preserve">
+    <value>Language, input, audio, and performance.</value>
+  </data>
+  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="Settings_Card_Appearance_Subtext" xml:space="preserve">
+    <value>Window opacity, fonts, motion</value>
+  </data>
+  <data name="Settings_Card_Themes_Title" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Card_Themes_Subtext" xml:space="preserve">
+    <value>Choose a theme or import your own</value>
+  </data>
+  <data name="Settings_Card_Window_Title" xml:space="preserve">
+    <value>Window</value>
+  </data>
+  <data name="Settings_Card_Window_Subtext" xml:space="preserve">
+    <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>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>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>Privacy filter per channel and what may be stored.</value>
+  </data>
+  <data name="Settings_Card_Database_Title" xml:space="preserve">
+    <value>Database</value>
+  </data>
+  <data name="Settings_Card_Database_Subtext" xml:space="preserve">
+    <value>Storage, migration, legacy cleanup</value>
+  </data>
+  <data name="Settings_Card_Information_Title" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
+    <value>Version, mission, licence, and changelog.</value>
+  </data>
+  <data name="Settings_Tab_Themes" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Themes_Active" xml:space="preserve">
+    <value>Active: {0}</value>
+  </data>
+  <data name="Settings_Themes_BuiltIns" xml:space="preserve">
+    <value>Built-in themes</value>
+  </data>
+  <data name="Settings_Themes_Custom" xml:space="preserve">
+    <value>Custom themes</value>
+  </data>
+  <data name="Settings_Themes_OpenFolder" xml:space="preserve">
+    <value>Open themes folder</value>
+  </data>
+  <data name="Settings_Themes_ExportActive" xml:space="preserve">
+    <value>Export active…</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
+    <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</value>
+  </data>
+  <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
+    <value>Privacy-First</value>
+  </data>
+  <data name="StatusBar_Privacy_Open" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
+    <value>Compact density</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
+    <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>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>Font, font size, and chat colours per channel.</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
+    <value>Data management</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
+    <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 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>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Timestamp style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Window transparency</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <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>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Storage</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Retention</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Database viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <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 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 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>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Detected" xml:space="preserve">
+    <value>Detected (v{0}.{1})</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_NotInstalled" xml:space="preserve">
+    <value>Not installed</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
+    <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>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_LinkRepo" xml:space="preserve">
+    <value>Honorific on GitHub</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkAuthor" xml:space="preserve">
+    <value>by Caraxi</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_SectionHeader" xml:space="preserve">
+    <value>Coming soon</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
+    <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: 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>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 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>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
+    <value>Quick-DM button (XIVInstantMessenger)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
+    <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 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>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,8 +32,8 @@ public static class Sheets
     }
 
     public static bool IsInForay() =>
-        TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row) &&
+        TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row)
-        row.TerritoryIntendedUse.RowId is 41 or 61;
+        && row.TerritoryIntendedUse.RowId is 41 or 61;
 
     public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character)
     {

HellionChat/Themes/Builtin/Chat2Classic.cs

@@ -0,0 +1,52 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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
+        );
+}

HellionChat/Themes/Builtin/EventHorizon.cs

@@ -0,0 +1,81 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/ForgeMerchantman.cs

@@ -0,0 +1,80 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/HellionArctic.cs

@@ -0,0 +1,80 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/HellionSpectrum.cs

@@ -0,0 +1,79 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+// 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>
+                {
+                    [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

@@ -0,0 +1,81 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/MintGrove.cs

@@ -0,0 +1,81 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/MoonlitBloom.cs

@@ -0,0 +1,80 @@
+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

@@ -0,0 +1,80 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+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"),
+                }
+            )
+        );
+}

HellionChat/Themes/Builtin/SynthwaveSunset.cs

@@ -0,0 +1,80 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class SynthwaveSunset
+{
+    public const string Slug = "synthwave-sunset";
+
+    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

@@ -0,0 +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
+    }
+}

HellionChat/Themes/Theme.cs

@@ -0,0 +1,73 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes;
+
+public sealed record Theme(
+    string Slug,
+    string Name,
+    string Author,
+    string Description,
+    ThemeColors Colors,
+    ThemeLayout Layout,
+    ThemeTypography Typography,
+    bool IsBuiltIn,
+    ThemeChatColors? ChatColors = null
+)
+{
+    // Pre-computed ABGR mirror of ThemeColors so PushGlobal can skip the
+    // RgbaToAbgr conversion per slot per frame.
+    public ThemeAbgrCache AbgrCache { get; private set; }
+
+    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),
+            StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
+            StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger),
+            StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
+            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 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
+);

HellionChat/Themes/ThemeChatColors.cs

@@ -0,0 +1,7 @@
+using HellionChat.Code;
+
+namespace HellionChat.Themes;
+
+// 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

@@ -0,0 +1,26 @@
+namespace HellionChat.Themes;
+
+// 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,
+    uint StatusInfo
+);

HellionChat/Themes/ThemeJsonLoader.cs

@@ -0,0 +1,157 @@
+using System.Text.Json;
+using HellionChat.Util;
+
+namespace HellionChat.Themes;
+
+internal static class ThemeJsonLoader
+{
+    public const int SupportedSchemaVersion = 1;
+
+    public static Theme LoadFromString(string json)
+    {
+        if (string.IsNullOrWhiteSpace(json))
+            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);
+        }
+
+        using (doc)
+        {
+            var root = doc.RootElement;
+
+            var schemaVersion = ReadInt(root, "schemaVersion");
+            if (schemaVersion != 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 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
+            )
+                chatColors = ReadChatColors(ch);
+
+            return new Theme(
+                slug,
+                name,
+                author,
+                description,
+                colors,
+                layout,
+                new ThemeTypography(),
+                IsBuiltIn: false,
+                ChatColors: chatColors
+            );
+        }
+    }
+
+    private static ThemeChatColors ReadChatColors(JsonElement el)
+    {
+        var dict = new Dictionary<HellionChat.Code.ChatType, uint>();
+        foreach (var prop in el.EnumerateObject())
+        {
+            // 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;
+            var hex = prop.Value.GetString();
+            if (string.IsNullOrWhiteSpace(hex))
+                continue;
+            dict[channel] = HellionChat.Util.ColourUtil.HexToRgba(hex);
+        }
+        return new ThemeChatColors(dict);
+    }
+
+    public static Theme LoadFromFile(string path)
+    {
+        // FileShare.Read lets concurrent readers and well-behaved editors share
+        // the handle; atomic-replace editors still raise IOException, caught upstream.
+        using var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+        using var reader = new StreamReader(stream);
+        var json = reader.ReadToEnd();
+        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")),
+            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 string ReadString(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.String)
+            throw new FormatException($"Theme JSON missing string property '{name}'");
+        return v.GetString() ?? throw new FormatException($"Theme JSON property '{name}' is null");
+    }
+
+    private static int ReadInt(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.Number)
+            throw new FormatException($"Theme JSON missing number property '{name}'");
+        return v.GetInt32();
+    }
+
+    private static float ReadFloat(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.Number)
+            throw new FormatException($"Theme JSON missing number property '{name}'");
+        return (float)v.GetDouble();
+    }
+}

HellionChat/Themes/ThemeJsonWriter.cs

@@ -0,0 +1,73 @@
+using System.Text.Json;
+
+namespace HellionChat.Themes;
+
+internal static class ThemeJsonWriter
+{
+    public static string Serialize(Theme theme)
+    {
+        using var ms = new MemoryStream();
+        using (var writer = new Utf8JsonWriter(ms, new JsonWriterOptions { Indented = true }))
+        {
+            writer.WriteStartObject();
+            writer.WriteNumber("schemaVersion", ThemeJsonLoader.SupportedSchemaVersion);
+            writer.WriteString("slug", theme.Slug);
+            writer.WriteString("name", theme.Name);
+            writer.WriteString("author", theme.Author);
+            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, "statusSuccess", theme.Colors.StatusSuccess);
+            WriteColor(writer, "statusDanger", theme.Colors.StatusDanger);
+            WriteColor(writer, "statusWarning", theme.Colors.StatusWarning);
+            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("scrollbarRounding", theme.Layout.ScrollbarRounding);
+            writer.WriteNumber("windowBorderSize", theme.Layout.WindowBorderSize);
+            writer.WriteNumber("frameBorderSize", theme.Layout.FrameBorderSize);
+            writer.WriteEndObject();
+
+            if (theme.ChatColors is { Channels.Count: > 0 } cc)
+            {
+                writer.WriteStartObject("chatChannels");
+                foreach (var kvp in cc.Channels)
+                    writer.WriteString(kvp.Key.ToString(), $"#{kvp.Value:X8}");
+                writer.WriteEndObject();
+            }
+
+            writer.WriteEndObject();
+        }
+
+        return System.Text.Encoding.UTF8.GetString(ms.ToArray());
+    }
+
+    private static void WriteColor(Utf8JsonWriter writer, string key, uint rgba)
+    {
+        writer.WriteString(key, $"#{rgba:X8}");
+    }
+}

HellionChat/Themes/ThemeLayout.cs

@@ -0,0 +1,14 @@
+namespace HellionChat.Themes;
+
+// Layout values mirror the ImGuiStyleVar slots pushed by HellionStyle.
+public sealed record ThemeLayout(
+    float WindowRounding,
+    float ChildRounding,
+    float PopupRounding,
+    float FrameRounding,
+    float GrabRounding,
+    float TabRounding,
+    float ScrollbarRounding,
+    float WindowBorderSize,
+    float FrameBorderSize
+);

HellionChat/Themes/ThemeRegistry.cs

@@ -0,0 +1,133 @@
+using HellionChat.Themes.Builtin;
+
+namespace HellionChat.Themes;
+
+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 string? _customThemesDir;
+    private Theme _active;
+
+    public ThemeRegistry(string? customThemesDir = null)
+    {
+        _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() },
+        };
+
+        // Centralised so Build() factories stay free of cache plumbing.
+        foreach (var theme in _builtIns.Values)
+            theme.RecomputeAbgrCache();
+
+        _active = _builtIns[DefaultSlug];
+        _customThemesDir = customThemesDir;
+    }
+
+    public Theme Active => _active;
+
+    public Theme Get(string slug)
+    {
+        if (_builtIns.TryGetValue(slug, out var b))
+            return b;
+
+        var custom = LoadCustomBySlug(slug);
+        if (custom != null)
+            return custom;
+
+        return _builtIns[DefaultSlug];
+    }
+
+    public IEnumerable<Theme> AllBuiltIns() => _builtIns.Values;
+
+    public IEnumerable<Theme> AllCustom() => RefreshCustomCache();
+
+    public void Switch(string slug)
+    {
+        var theme = Get(slug);
+        // 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 — theme is dropped instead of retried.
+    internal static bool IsRecoverableFileLock(Exception? ex)
+    {
+        if (ex is not IOException io)
+            return false;
+        var code = (uint)io.HResult;
+        return code == 0x80070020u || code == 0x80070021u;
+    }
+
+    // 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;
+
+        foreach (var theme in RefreshCustomCache())
+            if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
+                return theme;
+        return null;
+    }
+
+    private IEnumerable<Theme> RefreshCustomCache()
+    {
+        if (_customThemesDir is null || !Directory.Exists(_customThemesDir))
+            yield break;
+
+        var seenSlugs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var path in Directory.EnumerateFiles(_customThemesDir, "*.json"))
+        {
+            Theme? theme = null;
+            var stamp = File.GetLastWriteTimeUtc(path);
+            var key = path;
+            if (_customCache.TryGetValue(key, out var cached) && cached.Stamp == stamp)
+            {
+                theme = cached.Theme;
+            }
+            else
+            {
+                try
+                {
+                    theme = ThemeJsonLoader.LoadFromFile(path);
+                    theme.RecomputeAbgrCache();
+                    _customCache[key] = (theme, stamp);
+                }
+                catch (Exception ex) when (IsRecoverableFileLock(ex))
+                {
+                    // Editor mid-save: keep last known good, retry on next refresh.
+                    Plugin.Log.Debug(
+                        $"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
+                    );
+                    if (cached.Theme is not null)
+                        theme = cached.Theme;
+                }
+                catch (Exception)
+                {
+                    continue;
+                }
+            }
+
+            if (theme is not null && seenSlugs.Add(theme.Slug))
+                yield return theme;
+        }
+    }
+}

HellionChat/Themes/ThemeTypography.cs

@@ -0,0 +1,7 @@
+namespace HellionChat.Themes;
+
+// Optional per-theme; reserved as an extension point for future theme slots.
+public sealed record ThemeTypography(
+    float? OverrideGlobalFontSizePt = null,
+    float? OverrideSymbolsFontSizePt = null
+);

HellionChat/Ui/AutoTellTabTint.cs

@@ -0,0 +1,70 @@
+namespace HellionChat.Ui;
+
+// Deterministic hash-based color and icon tinting for Auto-Tell sidebar tabs.
+// Same tell partner (name+world) always produces the same color and icon across
+// sessions. Pure string logic, no Dalamud dependency — testable without game refs.
+internal static class AutoTellTabTint
+{
+    // Fallback for invalid input (empty name or world=0). White matches
+    // TextPrimary default so the sidebar stays visually consistent.
+    public const uint Fallback = 0xFFFFFFFFu;
+
+    // 12 saturated mid-bright colors from the built-in theme pool, readable
+    // on dark backgrounds. Collision risk is low at realistic 1-5 active tells.
+    // RGBA format, matching ColourUtil.RgbaToAbgr convention.
+    public static readonly IReadOnlyList<uint> Palette = new uint[]
+    {
+        0x00BED2FFu, // Arctic Cyan
+        0xF97316FFu, // Ember Orange
+        0xB585FFFFu, // Light Cosmic Purple
+        0xE374E8FFu, // Bloom Magenta
+        0x5DD39EFFu, // Mint Green
+        0xF0AD4EFFu, // Warning Yellow
+        0xE85C6AFFu, // Coral
+        0x5CB85CFFu, // Status Green
+        0x6278FFFFu, // Bloom Blue
+        0xC9982EFFu, // Warm Gold
+        0x9CCB7CFFu, // Soft Sage
+        0xE85D04FFu, // Deep Ember
+    };
+
+    public static uint For(string name, uint world)
+    {
+        if (string.IsNullOrEmpty(name) || world == 0)
+            return Fallback;
+
+        // Mask to positive range so modulo always yields a valid index.
+        var key = $"{name}@{world}";
+        var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
+        return Palette[(int)(hash % Palette.Count)];
+    }
+
+    // 7 visually distinct FA glyphs that make sense in a tell context.
+    // Excludes cog/comment/users — those read as system or group tabs.
+    public static readonly IReadOnlyList<string> IconPool = new[]
+    {
+        "envelope",
+        "star",
+        "heart",
+        "bell",
+        "bookmark",
+        "flag",
+        "fire",
+    };
+
+    // "envelope" matches the tell context better than the old hardcoded "clock".
+    public const string IconFallback = "envelope";
+
+    public static string IconFor(string name, uint world)
+    {
+        if (string.IsNullOrEmpty(name) || world == 0)
+            return IconFallback;
+
+        // Reversed key ("world@name") gives icon and color independent variation
+        // so the same tell partner doesn't always get the same color+icon pair.
+        // 7 icons x 12 colors = 84 distinct combinations.
+        var key = $"{world}@{name}";
+        var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
+        return IconPool[(int)(hash % IconPool.Count)];
+    }
+}

HellionChat/Ui/ChatInputBar.cs

@@ -1,22 +1,17 @@
 using System;
 using System.Numerics;
-using HellionChat.Code;
-using HellionChat.Util;
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility.Raii;
+using HellionChat._Helpers;
+using HellionChat.Code;
+using HellionChat.Util;
 
 namespace HellionChat.Ui;
 
-// Hellion Chat — v0.6.0 input bar component for pop-out windows.
+// Input bar component for pop-out windows. Render() is a stub — the main
-//
+// window input layer stays in ChatLogWindow to avoid a high-risk extract.
-// Pragmatischer Refactor-Scope: Render() ist ein leerer Marker-Stub für
+// RenderCompact() is the only v0.6.0 deliverable; Render() can be filled
-// das Hauptfenster — der bestehende Input-Layer in ChatLogWindow bleibt
+// in a later cycle if needed.
-// unangetastet, weil ein 400-Zeilen-Extract aus einem 1926-Zeilen-File
-// das v0.6.0-Risiko unverhältnismäßig erhöhen würde. Pop-Outs nutzen
-// ausschließlich RenderCompact(), das ist der ganze v0.6.0-Mehrwert.
-// Sollte das Hauptfenster selber später eine Compact-Variante brauchen
-// (oder das große Extract sich aus anderem Grund lohnen), kann Render()
-// in einem späteren Cycle gefüllt werden.
 public sealed class ChatInputBar
 {
     private readonly Plugin _plugin;
@@ -34,24 +29,17 @@ public sealed class ChatInputBar
     public InputState State => _state;
     public bool IsFocused { get; private set; }
 
-    // Stub. v0.6.0 belässt den Hauptfenster-Input wie er ist.
+    // Stub — main window input is handled in ChatLogWindow.
-    public void Render()
+    public void Render() { }
-    {
-    }
 
-    // Compact rendering for pop-out windows.
+    // Compact layout for pop-out windows: channel icon button left, text
+    // input right. Auto-translate is intentionally excluded — the upstream
+    // popup isn't instanciable per window without a larger refactor, and
+    // typical pop-out use cases rarely need it. Can be added later if
+    // tester feedback warrants it.
     //
-    // v0.6.0 Compact-Layout: Channel-Icon-Button links (Background-Farbe
+    // Channel switching is global via Plugin.Functions.Chat (FFXIV API).
-    // aus ChatColours), Text-Input rechts daneben. Auto-Translate-Picker
+    // Text buffer and history cursor are independent per pop-out.
-    // ist bewusst NICHT im Compact-Mode (Spec-Abweichung Layout D → A).
-    // Rechtfertigung: das Hauptfenster-Auto-Complete-Popup ist nicht ohne
-    // grossen Refactor pro Window instanzierbar; typische Pop-Out-Use-Cases
-    // (FC-Greeter, Club-Hostess) brauchen Auto-Translate selten dort.
-    // Eigene Compact-Auto-Complete-Implementation kann ein späterer
-    // Cycle nachreichen wenn Tester-Feedback das verlangt.
-    //
-    // Channel-Switch wirkt via Plugin.Functions.Chat global (FFXIV-API).
-    // Pro Pop-Out unabhängig bleiben Text-Buffer und History-Cursor.
     public void RenderCompact()
     {
         var tab = _activeTabAccessor();
@@ -65,84 +53,71 @@ public sealed class ChatInputBar
 
     private void DrawCompactInput(Tab tab)
     {
-        // Input takes the whole remaining width — no auto-translate button
-        // reserved on the right side in v0.6.0 (see RenderCompact comment).
         var inputWidth = ImGui.GetContentRegionAvail().X;
         if (inputWidth < 60f)
             inputWidth = 60f;
 
         ImGui.SetNextItemWidth(inputWidth);
 
-        // CallbackHistory wires up Up/Down navigation against the shared
+        // CallbackHistory wires Up/Down navigation to InputHistoryService.
-        // InputHistoryService. Submit is detected the same way the main
+        // Submit detected via IsItemDeactivated + Enter, not EnterReturnsTrue
-        // window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue
+        // (matches ChatLogWindow behavior).
-        // (matching v0.5.x ChatLogWindow.cs behavior).
         const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory;
-        ImGui.InputText($"##chat-compact-input-{tab.Identifier}", ref _state.Buffer, 500, flags, CompactCallback);
+        ImGui.InputText(
+            $"##chat-compact-input-{tab.Identifier}",
+            ref _state.Buffer,
+            500,
+            flags,
+            CompactCallback
+        );
 
         IsFocused = ImGui.IsItemActive();
 
-        if (ImGui.IsItemDeactivated()
+        if (
-            && (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter)))
+            ImGui.IsItemDeactivated()
+            && (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter))
+        )
         {
             SubmitCompact(tab);
         }
     }
 
-    private void SubmitCompact(Tab tab)
+    // TEST-MIRROR: ../_Helpers/CompactInputSubmitter.cs
-    {
+    private void SubmitCompact(Tab tab) =>
-        if (string.IsNullOrWhiteSpace(_state.Buffer))
+        CompactInputSubmitter.TrySubmit(_state, tab, _host.SendChatBoxFromExternal);
-            return;
 
-        var text = _state.Buffer;
+    // History navigation callback. Cursor math delegated to
-        _state.Buffer = string.Empty;
+    // CompactInputHistoryNavigator; ImGui buffer splice stays here.
-        _state.HistoryCursor = -1;
+    // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
-        _host.SendChatBoxFromExternal(tab, text);
+    private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
-    }
-
-    // History-navigation callback for the compact input. Mirrors the main
-    // window's logic but operates on _state.HistoryCursor and the shared
-    // InputHistoryService. Index semantics match v0.5.x InputBacklog:
-    // 0 = oldest, Count-1 = newest.
-    private unsafe int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
     {
         if (data.EventFlag != ImGuiInputTextFlags.CallbackHistory)
             return 0;
 
-        var prev = _state.HistoryCursor;
+        var direction = data.EventKey switch
-        switch (data.EventKey)
         {
-            case ImGuiKey.UpArrow:
+            ImGuiKey.UpArrow => CompactInputHistoryNavigator.Direction.Up,
-                switch (_state.HistoryCursor)
+            ImGuiKey.DownArrow => CompactInputHistoryNavigator.Direction.Down,
-                {
+            _ => (CompactInputHistoryNavigator.Direction?)null,
-                    case -1:
+        };
-                        var offset = 0;
+        if (direction is null)
-                        if (!string.IsNullOrWhiteSpace(_state.Buffer))
-                        {
-                            InputHistoryService.Push(_state.Buffer);
-                            offset = 1;
-                        }
-                        _state.HistoryCursor = InputHistoryService.Count - 1 - offset;
-                        break;
-                    case > 0:
-                        _state.HistoryCursor--;
-                        break;
-                }
-                break;
-            case ImGuiKey.DownArrow:
-                if (_state.HistoryCursor != -1)
-                    if (++_state.HistoryCursor >= InputHistoryService.Count)
-                        _state.HistoryCursor = -1;
-                break;
-        }
-
-        if (prev == _state.HistoryCursor)
             return 0;
 
-        var historyStr = InputHistoryService.GetByCursor(_state.HistoryCursor) ?? string.Empty;
+        var (cursor, replacement) = CompactInputHistoryNavigator.Navigate(
-        data.DeleteChars(0, data.BufTextLen);
+            direction.Value,
-        data.InsertChars(0, historyStr);
+            _state.HistoryCursor,
+            _state.Buffer,
+            () => InputHistoryService.Count,
+            InputHistoryService.Push,
+            InputHistoryService.GetByCursor
+        );
 
+        _state.HistoryCursor = cursor;
+        if (replacement is null)
+            return 0;
+
+        data.DeleteChars(0, data.BufTextLen);
+        data.InsertChars(0, replacement);
         return 0;
     }
 
@@ -158,7 +133,7 @@ public sealed class ChatInputBar
         var v3 = ColourUtil.RgbaToVector3(rgba);
         var bg = new Vector4(v3.X, v3.Y, v3.Z, 1f);
 
-        // Compute readable foreground — black on bright, white on dark
+        // Black foreground on bright backgrounds, white on dark.
         var luminance = 0.2126f * v3.X + 0.7152f * v3.Y + 0.0722f * v3.Z;
         var fg = luminance > 0.55f ? new Vector4(0f, 0f, 0f, 1f) : new Vector4(1f, 1f, 1f, 1f);
 
@@ -170,21 +145,19 @@ public sealed class ChatInputBar
         using (ImRaii.PushColor(ImGuiCol.ButtonActive, bg))
         using (ImRaii.PushColor(ImGuiCol.Text, fg))
         {
-            // Single-letter glyph derived from the channel — quick visual cue
+            // Single-letter glyph as a quick visual cue until a proper icon font lands.
-            // until we have a proper icon font available in the compact bar.
             var label = ChannelGlyph(inputType);
-            if (ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize)) && tab.Channel is null)
+            if (
+                ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize))
+                && tab.Channel is null
+            )
                 ImGui.OpenPopup(popupId);
         }
 
         if (tab.Channel is not null && ImGui.IsItemHovered())
-        {
             ImGui.SetTooltip(Resources.Language.ChatLog_SwitcherDisabled);
-        }
         else if (ImGui.IsItemHovered())
-        {
             ImGui.SetTooltip(inputType.Name());
-        }
 
         using (var popup = ImRaii.Popup(popupId))
         {
@@ -198,7 +171,8 @@ public sealed class ChatInputBar
         }
     }
 
-    private static string ChannelGlyph(ChatType type) => type switch
+    private static string ChannelGlyph(ChatType type) =>
+        type switch
         {
             ChatType.Say => "S",
             ChatType.Yell => "Y",
@@ -227,17 +201,12 @@ public sealed class ChatInputBar
             _ => "?",
         };
 
-    // Forwards a tab-cycle keybind delta to the host so all windows
+    // Forwards a tab-cycle keybind delta to the host (single source of truth).
-    // navigate the same active-tab pointer (single source of truth).
+    public void HandleKeybindForward(int delta) => _host.ChangeTabDelta(delta);
-    public void HandleKeybindForward(int delta)
-    {
-        _host.ChangeTabDelta(delta);
-    }
 }
 
-// Per-window input state. Each ChatInputBar instance owns one of these
+// Per-window input state. Each ChatInputBar owns one so pop-outs and the
-// so pop-outs and the main window keep independent buffers and channels
+// main window keep independent buffers and history cursors.
-// (State-Sync-Entscheidung A in the v0.6.0 spec).
 public sealed class InputState
 {
     public string Buffer = string.Empty;

HellionChat/Ui/CommandHelpWindow.cs

@@ -1,23 +1,30 @@
 using System.Numerics;
-using HellionChat.Util;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Util;
 using Lumina.Text.ReadOnly;
 
 namespace HellionChat.Ui;
 
-public class CommandHelpWindow : Window {
+public class CommandHelpWindow : Window
+{
     private ChatLogWindow LogWindow { get; }
     private ReadOnlySeString? CommandDescription { get; set; }
 
-    internal CommandHelpWindow(ChatLogWindow logWindow) : base("command help##chat2-commandhelp")
+    internal CommandHelpWindow(ChatLogWindow logWindow)
+        : base("command help##chat2-commandhelp")
     {
         LogWindow = logWindow;
 
-        Flags = ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove |
+        Flags =
-                ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.AlwaysAutoResize;
+            ImGuiWindowFlags.NoSavedSettings
+            | ImGuiWindowFlags.NoTitleBar
+            | ImGuiWindowFlags.NoMove
+            | ImGuiWindowFlags.NoResize
+            | ImGuiWindowFlags.NoFocusOnAppearing
+            | ImGuiWindowFlags.AlwaysAutoResize;
 
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
@@ -31,7 +38,8 @@ public class CommandHelpWindow : Window {
         var width = 350;
         var scaledWidth = width * ImGuiHelpers.GlobalScale;
         var pos = LogWindow.LastWindowPos;
-        switch (Plugin.Config.CommandHelpSide) {
+        switch (Plugin.Config.CommandHelpSide)
+        {
             case CommandHelpSide.Right:
                 pos.X += LogWindow.LastWindowSize.X;
                 break;
@@ -47,8 +55,11 @@ public class CommandHelpWindow : Window {
         Position = pos;
         SizeConstraints = new WindowSizeConstraints
         {
-            MinimumSize = new Vector2(width, 0),
+            // Use scaledWidth here so the size constraints stay in the same
-            MaximumSize = LogWindow.LastWindowSize with { X = width }
+            // coordinate space as Position above; otherwise the help window
+            // ends up the wrong width at non-100% DPI.
+            MinimumSize = new Vector2(scaledWidth, 0),
+            MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth },
         };
 
         IsOpen = true;
@@ -59,6 +70,10 @@ public class CommandHelpWindow : Window {
         if (CommandDescription == null)
             return;
 
-        LogWindow.DrawChunks(ChunkUtil.ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null).ToList());
+        LogWindow.DrawChunks(
+            ChunkUtil
+                .ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null)
+                .ToList()
+        );
     }
 }

HellionChat/Ui/DbViewer.cs

@@ -2,18 +2,18 @@
 using System.Globalization;
 using System.Numerics;
 using System.Text;
-using HellionChat.Code;
+using Dalamud.Bindings.ImGui;
-using HellionChat.Resources;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
-using HellionChat.Util;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
-using Dalamud.Bindings.ImGui;
+using HellionChat.Code;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
+using HellionChat.Resources;
-using Dalamud.Interface.Components;
+using HellionChat.Util;
-using Dalamud.Interface.ImGuiNotification;
 using Lumina.Data.Files;
 using Lumina.Text.ReadOnly;
 using MoreLinq;
@@ -56,7 +56,8 @@ public class DbViewer : Window
 
     private bool NeedsScrollReset;
 
-    public DbViewer(Plugin plugin) : base("DBViewer###chat2-dbviewer")
+    public DbViewer(Plugin plugin)
+        : base("DBViewer###chat2-dbviewer")
     {
         Plugin = plugin;
         SelectedChannels = TabsUtil.MostlyPlayer;
@@ -64,24 +65,42 @@ public class DbViewer : Window
         DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
         DateTimeFormat = "ddd, dd MMM yyy HH:mm:ss";
 
-        LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count);
+        LastProcessed = (
+            AfterDate,
+            BeforeDate,
+            CurrentPage,
+            OnlyCurrentCharacter,
+            SelectedChannels.Count
+        );
         DateReset();
 
         SizeConstraints = new WindowSizeConstraints
         {
             MinimumSize = new Vector2(475, 600),
-            MaximumSize = new Vector2(float.MaxValue, float.MaxValue)
+            MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
         };
 
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
 
-        Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute += Toggle;
+        Plugin
+            .Commands.Register(
+                "/hellionView",
+                "Get access to your message history, with simple filter options.",
+                true
+            )
+            .Execute += Toggle;
     }
 
     public void Dispose()
     {
-        Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute -= Toggle;
+        Plugin
+            .Commands.Register(
+                "/hellionView",
+                "Get access to your message history, with simple filter options.",
+                true
+            )
+            .Execute -= Toggle;
     }
 
     private void Toggle(string _, string __) => Toggle();
@@ -102,8 +121,21 @@ public class DbViewer : Window
         ImGui.SameLine();
 
         var spacing = 3.0f * ImGuiHelpers.GlobalScale;
-        DateWidget.DatePickerWithInput("##FromDate", 1, ref MinDateString, ref AfterDate, DateFormat);
+        DateWidget.DatePickerWithInput(
-        DateWidget.DatePickerWithInput("##ToDate", 2, ref MaxDateString, ref BeforeDate, DateFormat, true);
+            "##FromDate",
+            1,
+            ref MinDateString,
+            ref AfterDate,
+            DateFormat
+        );
+        DateWidget.DatePickerWithInput(
+            "##ToDate",
+            2,
+            ref MaxDateString,
+            ref BeforeDate,
+            DateFormat,
+            true
+        );
 
         ImGui.SameLine(0, spacing);
 
@@ -118,7 +150,11 @@ public class DbViewer : Window
         ChannelSelection();
 
         var skipText = Language.DbViewer_CharacterOption;
-        var textLength = ImGui.GetTextLineHeight() + ImGui.CalcTextSize(skipText).X + ImGui.GetStyle().ItemInnerSpacing.X + ImGui.GetStyle().FramePadding.X * 2;
+        var textLength =
+            ImGui.GetTextLineHeight()
+            + ImGui.CalcTextSize(skipText).X
+            + ImGui.GetStyle().ItemInnerSpacing.X
+            + ImGui.GetStyle().FramePadding.X * 2;
         ImGui.SameLine(ImGui.GetContentRegionMax().X - textLength);
         ImGui.Checkbox(skipText, ref OnlyCurrentCharacter);
 
@@ -139,7 +175,16 @@ public class DbViewer : Window
         using (var innerPopup = ImRaii.Popup("InputPathDialog"))
         {
             if (innerPopup.Success)
-                Plugin.FileDialogManager.OpenFolderDialog(Language.Folder_Selection_Header, (b, s) => { if (b) InputPath = s; }, null, true);
+                Plugin.FileDialogManager.OpenFolderDialog(
+                    Language.Folder_Selection_Header,
+                    (b, s) =>
+                    {
+                        if (b)
+                            InputPath = s;
+                    },
+                    null,
+                    true
+                );
         }
 
         ImGui.SameLine(0, spacing);
@@ -157,7 +202,8 @@ public class DbViewer : Window
                         UserDismissable = false,
                         InitialDuration = TimeSpan.FromSeconds(10000),
                         Progress = 0.0f,
-                    });
+                    }
+                );
                 CreateTxtBackup();
             }
         }
@@ -165,23 +211,38 @@ public class DbViewer : Window
         if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
             ImGui.SetTooltip(Language.Export_Txt_Tooltip);
 
-        // Hellion Chat: the JSON export button used to dump the database in
-        // the upstream webinterface's wire format. With the webinterface
-        // removed there is no consumer for that format any more, so the
-        // button is dropped. The Privacy tab's MessageExporter covers the
-        // same ground (Markdown / JSON / CSV) with channel and date filters
-        // and is the supported way to get history out of the plugin.
-
         var width = 350 * ImGuiHelpers.GlobalScale;
         var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64;
 
         ImGui.AlignTextToFramePadding();
-        ImGui.TextUnformatted(string.Format(Language.DbViewer_Page, CurrentPage, totalPages, Count, loadingIndicator ? Language.DbViewer_LoadingIndicator : ""));
+        ImGui.TextUnformatted(
-        ImGuiUtil.DrawArrows(ref CurrentPage, 1, totalPages, spacing, tooltipLeft: Language.Page_ArrowLeft_Tooltip, tooltipRight: Language.Page_ArrowRight_Tooltip);
+            string.Format(
+                Language.DbViewer_Page,
+                CurrentPage,
+                totalPages,
+                Count,
+                loadingIndicator ? Language.DbViewer_LoadingIndicator : ""
+            )
+        );
+        ImGuiUtil.DrawArrows(
+            ref CurrentPage,
+            1,
+            totalPages,
+            spacing,
+            tooltipLeft: Language.Page_ArrowLeft_Tooltip,
+            tooltipRight: Language.Page_ArrowRight_Tooltip
+        );
 
         ImGui.SameLine(ImGui.GetContentRegionMax().X - width);
         ImGui.SetNextItemWidth(width);
-        if (ImGui.InputTextWithHint("##searchbar", Language.DbViewer_SearcHint, ref SimpleSearchTerm, 30))
+        if (
+            ImGui.InputTextWithHint(
+                "##searchbar",
+                Language.DbViewer_SearcHint,
+                ref SimpleSearchTerm,
+                30
+            )
+        )
             Filtered = Filter(Messages);
 
         // Third row
@@ -189,7 +250,17 @@ public class DbViewer : Window
         if (DateWidget.Validate(MinimalDate, ref AfterDate, ref BeforeDate))
             DateRefresh();
 
-        if (!IsProcessing && LastProcessed != (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count))
+        if (
+            !IsProcessing
+            && LastProcessed
+                != (
+                    AfterDate,
+                    BeforeDate,
+                    CurrentPage,
+                    OnlyCurrentCharacter,
+                    SelectedChannels.Count
+                )
+        )
         {
             // Page hasn't changed, so we reset it back to 1
             if (LastProcessed.Page == CurrentPage)
@@ -198,7 +269,13 @@ public class DbViewer : Window
             AdjustDates();
             IsProcessing = true;
             ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second
-            LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count);
+            LastProcessed = (
+                AfterDate,
+                BeforeDate,
+                CurrentPage,
+                OnlyCurrentCharacter,
+                SelectedChannels.Count
+            );
             Task.Run(() =>
             {
                 try
@@ -208,9 +285,21 @@ public class DbViewer : Window
 
                     // We only want to fetch count if this is the first page
                     if (CurrentPage == 1)
-                        Count = Plugin.MessageManager.Store.CountDateRange(AfterDate, BeforeDate, channels, character);
+                        Count = Plugin.MessageManager.Store.CountDateRange(
+                            AfterDate,
+                            BeforeDate,
+                            channels,
+                            character
+                        );
 
-                    using var rangeMessageEnumerator = Plugin.MessageManager.Store.GetPagedDateRange(AfterDate, BeforeDate, channels, character, CurrentPage - 1);
+                    using var rangeMessageEnumerator =
+                        Plugin.MessageManager.Store.GetPagedDateRange(
+                            AfterDate,
+                            BeforeDate,
+                            channels,
+                            character,
+                            CurrentPage - 1
+                        );
                     Messages = rangeMessageEnumerator.ToArray();
 
                     Filtered = Filter(Messages);
@@ -231,7 +320,11 @@ public class DbViewer : Window
 
         if (Filtered.IsEmpty)
         {
-            ImGui.TextUnformatted(SimpleSearchTerm == "" ? Language.DbViewer_Status_NothingFound : Language.DbViewer_Status_NoSearchResult);
+            ImGui.TextUnformatted(
+                SimpleSearchTerm == ""
+                    ? Language.DbViewer_Status_NothingFound
+                    : Language.DbViewer_Status_NoSearchResult
+            );
             return;
         }
 
@@ -245,13 +338,24 @@ public class DbViewer : Window
             ImGui.SetScrollY(0.0f);
         }
 
-        using var table = ImRaii.Table("##messageHistory", 4, ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable);
+        using var table = ImRaii.Table(
+            "##messageHistory",
+            4,
+            ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable
+        );
         if (!table.Success)
             return;
 
         var columnWidth = ImGui.CalcTextSize(Language.DbViewer_TableField_Type);
-        ImGui.TableSetupColumn(Language.DbViewer_TableField_Date, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize);
+        ImGui.TableSetupColumn(
-        ImGui.TableSetupColumn(Language.DbViewer_TableField_Type, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize, columnWidth.X);
+            Language.DbViewer_TableField_Date,
+            ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize
+        );
+        ImGui.TableSetupColumn(
+            Language.DbViewer_TableField_Type,
+            ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize,
+            columnWidth.X
+        );
         ImGui.TableSetupColumn(Language.DbViewer_TableField_Sender);
         ImGui.TableSetupColumn(Language.DbViewer_TableField_Content);
 
@@ -349,10 +453,18 @@ public class DbViewer : Window
             return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date));
 
         return new ConcurrentStack<Message>(
-            messages.Reverse().Where(m =>
+            messages
-                ChunkUtil.ToRawString(m.Sender).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase) ||
+                .Reverse()
-                ChunkUtil.ToRawString(m.Content).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
+                .Where(m =>
-                ).OrderByDescending(m => m.Date));
+                    ChunkUtil
+                        .ToRawString(m.Sender)
+                        .Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
+                    || ChunkUtil
+                        .ToRawString(m.Content)
+                        .Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
+                )
+                .OrderByDescending(m => m.Date)
+        );
     }
 
     private void DateRefresh()
@@ -386,7 +498,12 @@ public class DbViewer : Window
                 ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null;
                 var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray();
 
-                var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(AfterDate, BeforeDate, channels, character);
+                var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(
+                    AfterDate,
+                    BeforeDate,
+                    channels,
+                    character
+                );
                 var messageHistory = rangeMessageEnumerator.ToArray();
                 await rangeMessageEnumerator.DisposeAsync();
 
@@ -397,28 +514,46 @@ public class DbViewer : Window
                 var totalCount = filteredHistory.Count;
 
                 var sb = new StringBuilder();
-                await using var stream = new StreamWriter(Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt"));
+                await using var stream = new StreamWriter(
+                    Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt")
+                );
 
                 var batch = 0;
                 foreach (var messages in filteredHistory.Batch(5000))
                 {
-                    await Plugin.Framework.RunOnTick(() =>
+                    await Plugin.Framework.RunOnTick(
+                        () =>
                         {
                             foreach (var message in messages)
                             {
-                            if (!Sheets.LogKindSheet.TryGetRow((uint)message.Code.Type, out var logKind))
+                                if (
+                                    !Sheets.LogKindSheet.TryGetRow(
+                                        (uint)message.Code.Type,
+                                        out var logKind
+                                    )
+                                )
                                     logKind = Sheets.LogKindSheet.GetRow(10); // default to say
 
-                            var rossSender = new ReadOnlySeString(message.SenderSource.Encode());
+                                var rossSender = new ReadOnlySeString(
-                            var rossMessage = new ReadOnlySeString(message.ContentSource.Encode());
+                                    message.SenderSource.Encode()
+                                );
+                                var rossMessage = new ReadOnlySeString(
+                                    message.ContentSource.Encode()
+                                );
 
                                 var timestamp = message.Date.ToLocalTime().ToString(DateTimeFormat);
-                            var text = Plugin.Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage]).ToString();
+                                var text = Plugin
-                            sb.AppendLine($"[{timestamp}][{message.Code.Type.Name()}]   {text}");
+                                    .Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage])
+                                    .ToString();
+                                sb.AppendLine(
+                                    $"[{timestamp}][{message.Code.Type.Name()}]   {text}"
+                                );
 
                                 batch++;
                             }
-                    }, delayTicks: 5);
+                        },
+                        delayTicks: 5
+                    );
 
                     Notification.Progress = (float)batch / totalCount;
                     Notification.Content = $"Exported {batch} of {totalCount} messages";
@@ -447,5 +582,4 @@ public class DbViewer : Window
             }
         });
     }
-
 }