Merge feature/v1.4.5 — UX and Robustness

Whitespace and line-reflow drift from the markdown linter on the four
files touched by the versions-bump commit (forge-post, README,
CHANGELOG, ROADMAP). No content changes.

.gitea/workflows/build.yml

@@ -32,10 +32,10 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v6
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
             - name: Setup .NET 10
-              uses: actions/setup-dotnet@v5
+              uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
               with:
                   dotnet-version: 10.0.x
 

.gitea/workflows/forge-announce.yml

@@ -101,16 +101,16 @@ jobs:
                   if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
                   $afterMarker = $raw.Substring($idx + $marker.Length)
                   $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-                      if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
                   }) -join "`n"
 
-                  $header = "**Hellion Chat $version"
+                  $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**Hellion Chat ", 1)
+                  $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()

.gitea/workflows/release.yml

@@ -20,16 +20,12 @@ 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.
+    # 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:
-        inputs:
-            tag:
-                description: "Existing tag to (re)release, e.g. v0.6.1"
-                required: true
-                type: string
 
 permissions:
     contents: write
@@ -41,17 +37,24 @@ jobs:
         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.
+            # 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@v6
-              with:
-                  ref: ${{ github.event.inputs.tag || github.ref }}
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
             - name: Setup .NET 10
-              uses: actions/setup-dotnet@v5
+              uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
               with:
                   dotnet-version: 10.0.x
 
@@ -89,12 +92,11 @@ jobs:
             - 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 }}
+                  # 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+$') {
@@ -111,20 +113,22 @@ jobs:
 
                   # 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.
+                  # 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(2) } else { $_ }
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
                   }) -join "`n"
 
-                  $header = "**Hellion Chat $version"
+                  # 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**Hellion Chat ", 1)
+                  $nextHdr = $rest.IndexOf("`n`n**v", 1)
                   $trailer = $rest.IndexOf("`n`n---")
 
                   if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
@@ -152,19 +156,28 @@ jobs:
                   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. body_path provides the
-            # generated release body, files attaches latest.zip. The auto-injected
-            # GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient
-            # for release write.
+            # 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:
-                  # 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
+                  body: ${{ steps.body.outputs.content }}
                   api_key: ${{ secrets.GITHUB_TOKEN }}

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

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

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

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

.gitignore

@@ -384,3 +384,7 @@ ChatTwo.Tests
 TestResults
 *.db-shm
 *.db-wal
+
+# Claude Code projekt-spezifisches Setup (lokal, nicht committed)
+/.claude/
+/CLAUDE.md

HellionChat/AutoTellTabsService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using HellionChat.Code;
@@ -10,14 +11,8 @@ using HellionChat.Util;
 
 namespace HellionChat;
 
-// Hellion Chat — Auto-Tell-Tabs.
-//
-// Spawns a session-only tab per /tell partner so a club greeter can track
-// multiple parallel conversations without losing context. Subscribes to
-// MessageManager.MessageProcessed for live tells and to ClientState.Logout
-// for the cleanup pass; everything else hangs off these two entry points.
-//
-// See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian vault).
+// Auto-Tell-Tabs: spawns session-only tabs per /tell partner.
+// Subscribes to MessageManager.MessageProcessed and ClientState.Logout.
 internal sealed class AutoTellTabsService : IDisposable
 {
     private readonly Plugin _plugin;
@@ -25,6 +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
-    {
-        get
-        {
-            lock (_tempTabsLock)
-            {
-                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
-            }
-        }
-    }
+    internal int ActiveTempTabCount => Volatile.Read(ref _activeTempTabCount);
 
     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)
@@ -87,10 +95,7 @@ internal sealed class AutoTellTabsService : IDisposable
         var partner = ExtractTellPartner(message);
         if (partner == null)
         {
-            // Real message without a player payload — e.g. GM tells, which
-            // we deliberately skip. The diagnostics make future regressions
-            // (FFXIV changing tell payload shape, new edge cases) findable
-            // without having to crank up debug logging at the source.
+            // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
             Plugin.Log.Warning(
                 $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
                     + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
@@ -105,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
-                // message via the MessageManager pipeline (see Task 2 sender
-                // filter).
+                // Already routed via MessageManager pipeline
                 return;
             }
 
@@ -124,10 +127,7 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         if (message.Code.Type == ChatType.TellIncoming)
         {
-            // Incoming tell: the sender is the conversation partner. The
-            // PlayerPayload normally rides on a chunk's Link slot, but for
-            // some tell types FFXIV only puts it in the raw SeString —
-            // fall back to that before giving up.
+            // Sender is the partner; check chunks first, then raw SeString as fallback
             var fromSender =
                 ChunkUtil.TryGetPlayerPayload(message.Sender)
                 ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
@@ -138,10 +138,7 @@ internal sealed class AutoTellTabsService : IDisposable
             return null;
         }
 
-        // Outgoing tell: the local player is the sender, the partner shows
-        // up either as a payload in the content (for tells typed via the
-        // Chat 2 input bar) or as the channel's tracked tell target (set by
-        // the SetContextTellTarget game hook). Same SeString fallback.
+        // Outgoing tell: check content first, then channels's TellTarget as fallback
         var fromContent =
             ChunkUtil.TryGetPlayerPayload(message.Content)
             ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
@@ -175,10 +172,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
     private void DropOldestTempTab()
     {
-        // Greeted tabs are dropped before un-greeted ones (the user said
-        // "I'm done with that conversation"), and within each bucket we
-        // pick the oldest LastActivity. This protects active conversations
-        // and unfinished greetings while still freeing up a slot.
+        // Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity
         var victim = Plugin
             .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
             .Where(t => t.Tab.IsTempTab)
@@ -191,12 +185,7 @@ internal sealed class AutoTellTabsService : IDisposable
             return;
         }
 
-        // v0.6.1 — if the victim is currently popped out, tear down the
-        // matching Popout window first. Otherwise the window stays in
-        // PopOutWindows + WindowSystem and renders empty / re-spawns on the
-        // next AddPopOutsToDraw tick. Latent since pop-outs were introduced;
-        // becomes visible with AutoTellTabsOpenAsPopout where dropping a
-        // popped tab is now a routine code path.
+        // Clean up pop-out window if tab is popped out
         if (victim.Tab.PopOut)
         {
             var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
@@ -209,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
-        // a different conversation when their tab gets dropped or shifted.
+        // Re-anchor active tab to avoid silent switch when tab is dropped
         if (victim.Index <= _plugin.LastTab)
         {
             _plugin.WantedTab = 0;
@@ -222,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
-        // the current message — and so a slow DB query never causes a
-        // visible "empty tab, then history pops in" effect on screen.
-        // The current message is already persisted in the store by the
-        // time MessageProcessed fires (see MessageManager.cs: UpsertMessage
-        // runs before the event), so we have to exclude it explicitly to
-        // avoid the separator landing below the live tell.
+        // Preload history: chronological order with current message already persisted
         PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id);
 
         tab.AddMessage(currentMessage, unread: true);
 
-        // Hellion Chat v0.6.1 — opt-in: open new /tell tabs directly as a
-        // pop-out window. Set BEFORE Tabs.Add so the next render-tick's
-        // AddPopOutsToDraw() sees PopOut=true and spawns the Popout window
-        // alongside the tab going into the list. No SaveConfig() because
-        // auto-tell tabs are IsTempTab (session-only, never persisted).
+        // Open as pop-out if configured (set before Tabs.Add for next render-tick)
         if (Plugin.Config.AutoTellTabsOpenAsPopout)
         {
             tab.PopOut = true;
         }
 
         Plugin.Config.Tabs.Add(tab);
+        Interlocked.Increment(ref _activeTempTabCount);
     }
 
     private static Tab BuildTempTab(string playerName, uint worldRowId)
@@ -272,9 +252,7 @@ internal sealed class AutoTellTabsService : IDisposable
         {
             return $"{playerName}@{worldRow.Name}";
         }
-        // World sheet lookup miss is rare (only for FFXIV worlds Dalamud has
-        // not yet seen). Fall back to the raw RowId so the user still has a
-        // unique, readable label.
+        // Fallback if world lookup misses (rare; only for unseen worlds)
         return $"{playerName}@World{worldRowId}";
     }
 
@@ -288,9 +266,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
         try
         {
-            // Pull one extra row because the live tell that triggered this
-            // spawn is already in the store and would otherwise eat one of
-            // the user's preload-budget slots.
+            // Pull one extra row: current message is already in store and would eat a preload slot
             var history = _store.GetTellHistoryWithSender(
                 _messageManager.CurrentContentId,
                 senderName,
@@ -305,23 +281,17 @@ internal sealed class AutoTellTabsService : IDisposable
 
             if (historicMessages.Count == 0)
             {
-                // No prior tells with this player — leave the tab to start
-                // empty so the user does not see a "history loaded" marker
-                // sitting alone above the very first message.
+                // No prior tells; leave tab empty to avoid orphaned "history loaded" marker
                 return;
             }
 
-            // The history list is already oldest-first, so a plain AddPrune
-            // loop produces the chronological order the user expects to see
-            // when the tab opens.
+            // History is oldest-first; add in order for chronological display
             foreach (var message in historicMessages)
             {
                 tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit);
             }
 
-            // Visible separator between the loaded history and the live
-            // tell that triggered this spawn. Goes in last so it sorts
-            // after the historical messages but before the current one.
+            // Separator between history and live tell (sorts after history but before current)
             tab.Messages.AddPrune(
                 MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
                 MessageManager.MessageDisplayLimit
@@ -329,9 +299,7 @@ internal sealed class AutoTellTabsService : IDisposable
         }
         catch (Exception ex)
         {
-            // Non-fatal: the tab still spawns, but the user gets a visible
-            // notice instead of silently missing history. The error logs
-            // once with full stack trace for diagnosis.
+            // Non-fatal: tab still spawns with visible error notice instead of silent history loss
             Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
             tab.Messages.AddPrune(
                 MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
@@ -372,9 +340,7 @@ internal sealed class AutoTellTabsService : IDisposable
 
         lock (_tempTabsLock)
         {
-            // Frame-race guard (E5): the sidebar might still render a tab
-            // that has already been removed by LRU drop or logout cleanup.
-            // Silently skip the toggle so we don't mutate stale state.
+            // Guard against frame-race: sidebar might render a tab already removed by LRU or logout
             if (!Plugin.Config.Tabs.Contains(tab))
             {
                 return;
@@ -388,18 +354,12 @@ internal sealed class AutoTellTabsService : IDisposable
     {
         lock (_tempTabsLock)
         {
-            // Snapshot whether the active tab is about to be removed, BEFORE
-            // we mutate the list — index lookups would lie to us afterwards.
+            // Snapshot active tab index before mutating list
             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
-            // popped-out temp tab windows before removing the tabs themselves,
-            // otherwise PopOutWindows + WindowSystem keep ghost entries until
-            // the next plugin reload. Especially relevant once Auto-Pop-Out is
-            // enabled — every logout would otherwise leak as many ghosts as
-            // there were active /tell pop-outs.
+            // Clean up pop-out windows before removing temp tabs
             var poppedTempTabIds = Plugin
                 .Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
                 .Select(t => t.Identifier)
@@ -417,11 +377,10 @@ internal sealed class AutoTellTabsService : IDisposable
                 }
             }
 
-            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
-            // if drops before the active index pushed LastTab out of range.
-            // Otherwise the user keeps their current persistent tab.
+            // Force switch to tab 0 if active tab was temp or index is now out of range
             var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
             if (currentWasTempTab || !stillValid)
             {

HellionChat/Branding/BrandingLinks.cs

@@ -1,11 +1,12 @@
-// HellionChat/Branding/BrandingLinks.cs
 namespace HellionChat.Branding;
 
-// Centralised so a future invite rotation only touches one file. The same
-// link is currently hard-coded in repo.json, README.md, SUPPORT.md,
-// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
-// this constant in a separate housekeeping sweep
+// 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/Chunk.cs

@@ -34,9 +34,7 @@ public abstract class Chunk
             _ => null,
         };
 
-    /// <summary>
-    /// Get some basic text for use in generating hashes.
-    /// </summary>
+    // Returns basic text for hashing (content for TextChunk, icon name for IconChunk)
     internal string StringValue()
     {
         return this switch
@@ -108,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)
@@ -122,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)

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/Configuration.cs

@@ -38,34 +38,37 @@ public class Configuration : IPluginConfiguration
 
     public int Version { get; set; } = LatestVersion;
 
-    // v1.1.0 — Theme-Engine. Slug-basiert; ThemeRegistry liefert das Objekt.
+    // Slug-based; ThemeRegistry resolves the object at runtime.
     public string Theme = "hellion-arctic";
 
-    // v1.1.0 — Globale Window-Opacity, theme-übergreifend. Migration aus
-    // HellionThemeWindowOpacity beim Bump v13 → v14.
+    // Global window opacity, applied across all themes.
     public float WindowOpacity = 0.85f;
 
-    // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
-    // vorab angelegt, damit später keine Migration nötig ist.
+    // Reserved for future UI toggles; pre-declared to avoid a migration later.
     public bool ReduceMotion;
 
-    // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
-    // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
-    // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
-    // false werden durch die v15→v16-Migration auf den neuen Default
-    // gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
-    // neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
+    // v1.2.1: default flipped false → true. Compact single-line layout is
+    // more readable than the card-rows layout introduced in v1.2.0.
     public bool UseCompactDensity = true;
 
-    // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
-    // Master-switch defaults to true; set false to restore upstream behavior.
+    // Privacy by Default master switch. Set false to restore upstream behaviour.
     public bool PrivacyFilterEnabled = true;
 
     // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
     public HashSet<ChatType> PrivacyPersistChannels = [];
 
-    // Failsafe for ChatTypes added by future FFXIV patches we don't know about.
-    public bool PrivacyPersistUnknownChannels;
+    // Failsafe for ChatTypes added by future FFXIV patches. New configs default
+    // to the failsafe via PrivacyDefaults; existing configs keep their saved
+    // choice because the deserializer overrides this initializer.
+    public bool PrivacyPersistUnknownChannels = Privacy
+        .PrivacyDefaults
+        .DefaultPersistUnknownChannels;
+
+    // F3.2: dedup unknown-ChatType warnings so a chatty filter doesn't spam
+    // the log every frame. NonSerialized so the warning fires once per
+    // runtime, not once-ever-per-install.
+    [NonSerialized]
+    private readonly HashSet<ChatType> _warnedUnknownChannels = new();
 
     public bool IsAllowedForStorage(ChatType type)
     {
@@ -73,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).
-    // Master switch defaults to false; the plugin will not delete history
-    // until the user explicitly opts in.
+    // Retention master switch defaults to false — plugin will not delete
+    // history until the user explicitly opts in.
     public bool RetentionEnabled;
     public int RetentionDefaultDays = 30;
     public Dictionary<ChatType, int> RetentionPerChannelDays = [];
     public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
-
-    // Hellion Chat first-run wizard — opens once on a fresh install. Existing
-    // ChatTwo users skip it because the v6→v7 migration sets the flag.
     public bool FirstRunCompleted;
-
-    // Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
-    // instead of whatever GlobalFontV2.FontId points at. Default ON so a
-    // fresh install gets the Hellion typography out-of-the-box; flip OFF
-    // to fall back to the user's chosen system or Dalamud font.
     public bool UseHellionFont = true;
-
-    // Cycle 1 of the plugin-integration roadmap. When Honorific is installed
-    // and reports a custom title, render it in the chat header above the
-    // message log. Auto-hides regardless when Honorific is missing or the
-    // active title is original/empty, so leaving this on is safe even for
-    // users who don't run Honorific.
     public bool ShowHonorificTitleInHeader = true;
-
-    // Hellion Chat — Auto-Tell-Tabs. When enabled, an incoming or outgoing
-    // /tell spawns a session-only tab dedicated to that conversation
-    // partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
     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)
@@ -167,10 +128,7 @@ public class Configuration : IPluginConfiguration
     public bool HideInLoadingScreens;
     public bool HideInBattle;
 
-    // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
-    // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
-    // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
-    // Sequenzen.
+    // v1.2.1: default flipped false → true for consistency with other hide defaults.
     public bool HideInNewGamePlusMenu = true;
     public bool HideWhenInactive;
     public int InactivityHideTimeout = 10;
@@ -186,18 +144,8 @@ public class Configuration : IPluginConfiguration
     public bool NativeItemTooltips = true;
     public bool PrettierTimestamps = true;
     public bool MoreCompactPretty;
-
-    // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
-    // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
-    // Timestamp pro Minute reicht aus um die Konversation zu verorten.
     public bool HideSameTimestamps = true;
     public bool ShowNoviceNetwork;
-
-    // Hellion Chat — vertical sidebar tab layout reads better than the
-    // horizontal tab strip in the company of Auto-Tell-Tabs (a club
-    // greeter typically tracks 5–15 simultaneous conversations). Bestand
-    // users keep their saved value untouched — only fresh installs pick
-    // up the new default.
     public bool SidebarTabView = true;
     public bool PrintChangelog = true;
     public bool OnlyPreviewIf;
@@ -218,22 +166,10 @@ public class Configuration : IPluginConfiguration
     public bool CollapseKeepUniqueLinks;
     public bool PlaySounds = true;
     public bool KeepInputFocus = true;
-
-    // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
-    // Hardware bei langen Sessions spürbar langsamer (Card-Layout
-    // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
-    // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
     public int MaxLinesToRender = 2_500; // 1-10000
-
-    // Default ON to match a German / European 24h locale. The
-    // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
-    // CultureInfo.InvariantCulture so the result is consistent across
-    // host locales.
     public bool Use24HourClock = true;
-
     public bool ShowEmotes = true;
     public HashSet<string> BlockedEmotes = [];
-
     public bool FontsEnabled = true;
     public ExtraGlyphRanges ExtraGlyphRanges = 0;
     public float FontSizeV2 = 12.75f;
@@ -258,12 +194,6 @@ public class Configuration : IPluginConfiguration
 
     public float TooltipOffset;
 
-    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
-    // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
-    // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
-    // Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
-    // leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
-    // Preset gehoben; User die bereits Custom-Farben haben, bleiben.
     public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();
 
     private static Dictionary<ChatType, uint> BuildDefaultChatColours()
@@ -333,9 +263,7 @@ public class Configuration : IPluginConfiguration
         MaxLinesToRender = other.MaxLinesToRender;
         Use24HourClock = other.Use24HourClock;
         ShowEmotes = other.ShowEmotes;
-        // Deep-copy the set so the live and mutable Configuration instances don't share state
-        // — a HashSet reference assignment would cause edits in the settings window to leak
-        // into the live config before the user clicks Save.
+        // Deep-copy so settings window edits don't leak into live config before Save.
         BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
         FontsEnabled = other.FontsEnabled;
         ItalicEnabled = other.ItalicEnabled;
@@ -349,22 +277,11 @@ public class Configuration : IPluginConfiguration
         ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
         ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
 
-        // Hellion Chat — Auto-Tell-Tabs are session-only and therefore
-        // never present in a disk-loaded copy. Keep the live temp tabs of
-        // *this* configuration alive across an UpdateFrom so a settings
-        // save (or sidebar-mode toggle) does not silently destroy the
-        // user's open tell conversations.
-        //
-        // For persistent tabs we go through Tab.Clone() which intentionally
-        // does NOT copy the NonSerialized Messages list (avoids shared
-        // mutable state on disk-load). On a settings save that means the
-        // chat history for every persistent tab would be wiped — bug
-        // reported by Flo 2026-05-05. We work around it by capturing the
-        // live MessageList (and LastSendUnread counter) by Identifier
-        // before the replace, then restoring it onto the freshly cloned
-        // tabs whose Identifier survives Tab.Clone(). New tabs added in
-        // settings get a fresh empty MessageList; deleted tabs lose their
-        // history (intended).
+        // Keep live temp tabs alive across UpdateFrom — a settings save must
+        // not destroy open tell conversations. For persistent tabs, capture
+        // the live MessageList and LastSendUnread by Identifier before the
+        // replace and restore them onto the freshly cloned tabs; new tabs
+        // get an empty MessageList, deleted tabs lose their history (intended).
         var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
         var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
             .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
@@ -456,9 +373,7 @@ public class Tab
 {
     public string Name = Language.Tab_DefaultName;
 
-    // v1.2.0 — optionaler FontAwesome-Glyph-Name. Null bedeutet:
-    // Default-Mapping aus TabIconMapping greift (basiert auf Tab-Name).
-    // User können hier per Settings → Tabs einen eigenen Glyph setzen.
+    // Optional FontAwesome glyph name; null falls back to TabIconMapping default.
     public string? Icon = null;
 
     [Obsolete("Removed in favor of SelectedChannels")]
@@ -510,15 +425,12 @@ public class Tab
     [NonSerialized]
     public Guid Identifier = Guid.NewGuid();
 
-    // Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the
-    // sidebar to mark a tell partner as already greeted in the current
-    // session. NonSerialized because the temp tab itself is session-only.
+    // Session-only greeted flag for club-greeter workflows.
     [NonSerialized]
     public bool IsGreeted;
 
-    // v1.4.2 — TabTintCache uses separate validation keys per cache so a
-    // TellTarget change picked up by GetTint can't strand GetIcon (or vice
-    // versa) with a stale entry that looks fresh on the shared key.
+    // 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;
 
@@ -540,17 +452,12 @@ public class Tab
     public bool Matches(Message message)
     {
         if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
-        {
             return false;
-        }
 
-        // Auto-tell temp tabs are bound to a single conversation partner;
-        // every other tell that matches the channel filter must NOT land
-        // here, otherwise all temp tabs would mirror "Tell Exclusive".
+        // Temp tabs are bound to a single conversation partner — other tells
+        // matching the channel filter must not land here.
         if (IsTempTab && TellTarget?.IsSet() == true)
-        {
             return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
-        }
 
         return true;
     }
@@ -610,10 +517,7 @@ public class Tab
         };
     }
 
-    /// <summary>
-    /// MessageList provides an ordered list of messages with duplicate ID
-    /// tracking, sorting and mutex protection.
-    /// </summary>
+    /// Ordered message list with duplicate ID tracking, sorting and mutex protection.
     public class MessageList
     {
         private readonly SemaphoreSlim LockSlim = new(1, 1);
@@ -701,10 +605,7 @@ public class Tab
             }
         }
 
-        /// <summary>
-        /// Aktuelle Anzahl der gespeicherten Messages. Lock-acquire pro Read
-        /// ist OK für 1×/sec Status-Bar-Polling (v1.2.0).
-        /// </summary>
+        /// Current message count. Lock-per-read is acceptable for 1×/sec status bar polling.
         public int Count
         {
             get
@@ -721,9 +622,7 @@ public class Tab
             }
         }
 
-        /// <summary>
-        /// Returns an array copy of the message list for usage outside of main thread
-        /// </summary>
+        /// Returns an array copy of the message list for usage outside of main thread.
         public async Task<Message[]> GetCopy(int millisecondsTimeout = -1)
         {
             await LockSlim.WaitAsync(millisecondsTimeout);
@@ -737,10 +636,7 @@ public class Tab
             }
         }
 
-        /// <summary>
-        /// GetReadOnly returns a read-only list of messages while holding a
-        /// reader lock. The list should be used with a using statement.
-        /// </summary>
+        /// Returns a read-only list while holding a reader lock. Use with a using statement.
         public RLockedMessageList GetReadOnly(int millisecondsTimeout = -1)
         {
             LockSlim.Wait(millisecondsTimeout);

HellionChat/EmoteCache.cs

@@ -79,7 +79,7 @@ public static class EmoteCache
         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();
@@ -87,15 +87,11 @@ public static class EmoteCache
 
     public static string[] SortedCodeArray = [];
 
-    // Plugin-scoped cancellation source for in-flight emote loads. Dispose
-    // cancels every running download/texture-create so the workers don't
-    // touch a torn-down TextureProvider on plugin reload. Replaced with a
-    // fresh source on the next LoadData() call so a re-enable still works.
+    // Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
     private static CancellationTokenSource Cts = new();
     internal static CancellationToken Token => Cts.Token;
 
-    // Drain target for in-flight loads on Dispose; without this an orphan
-    // continuation could still write to a torn-down Texture/Frames field.
+    // Tracks in-flight loads so Dispose can drain them before teardown.
     private static readonly ConcurrentBag<Task> PendingLoads = new();
 
     internal static void TrackLoad(Task loadTask, string emoteCode)
@@ -117,8 +113,7 @@ public static class EmoteCache
         if (State is not LoadingState.Unloaded)
             return;
 
-        // Refresh the CTS in case Dispose was called and we're being re-enabled
-        // in the same process (Dalamud /xlplugins toggle).
+        // Reset CTS if Dispose was called and the plugin is being re-enabled.
         if (Cts.IsCancellationRequested)
             Cts = new CancellationTokenSource();
 
@@ -140,11 +135,8 @@ public static class EmoteCache
                 var topList = await top.Content.ReadAsStringAsync(ct);
 
                 var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
-                // BetterTTV occasionally returns entries with a null Code; the
-                // upstream code passed those straight into Dictionary.TryAdd
-                // and tripped ArgumentNullException, killing the whole emote
-                // load. Skip them defensively so a single bad row no longer
-                // breaks the cache for everyone else.
+                // BetterTTV occasionally returns entries with a null Code;
+                // skip them so a single bad row doesn't break the whole cache.
                 foreach (var emote in jsonList)
                     if (
                         !string.IsNullOrEmpty(emote.Emote.Code)
@@ -160,16 +152,11 @@ public static class EmoteCache
         }
         catch (OperationCanceledException)
         {
-            // Plugin disposed while the cache was loading; leave State on
-            // Loading so a subsequent re-enable can re-issue LoadData with
-            // a fresh CTS (handled above).
+            // Plugin disposed mid-load; State stays on Loading so re-enable can retry.
         }
         catch (Exception ex)
         {
-            // Reset to Unloaded so a later trigger (e.g. the user reopening
-            // the Emotes tab after the network recovers) can retry. Without
-            // this the State stays on Loading and the early-out at the top
-            // of LoadData blocks every further attempt until plugin reload.
+            // Reset to Unloaded so a later trigger can retry without a plugin reload.
             State = LoadingState.Unloaded;
             Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
         }
@@ -248,11 +235,8 @@ public static class EmoteCache
 
         internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
         {
-            // BetterTTV-supplied Id and ImageType are interpolated straight
-            // into the filename. HTTPS protects the wire, but a compromised
-            // upstream could still hand us "../foo" and write into the
-            // pluginConfigs root (or worse). Resolve the candidate path and
-            // refuse anything that escapes the cache directory.
+            // Path-traversal guard: resolve and verify the candidate path stays
+            // inside the cache directory before reading or writing.
             var dir = Path.GetFullPath(
                 Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
             );
@@ -397,7 +381,7 @@ public static class EmoteCache
 
                     var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;
 
-                    // Follows the same pattern as browsers, anything under 0.02s delay will be rounded up to 0.1s
+                    // Match browser behaviour: anything under 20ms rounds up to 100ms.
                     if (delay < 0.02f)
                         delay = 0.1f;
 
@@ -416,8 +400,7 @@ public static class EmoteCache
             }
             catch (OperationCanceledException)
             {
-                // Plugin disposed mid-load; partial frames are released by
-                // InnerDispose on the next dispose pass.
+                // Plugin disposed mid-load; release any partial frames.
                 foreach (var f in Frames)
                     f.Texture.Dispose();
                 Frames = [];

HellionChat/Export/MessageExporter.cs

@@ -32,12 +32,8 @@ internal static class ExportFormatExt
         };
 }
 
-/// <summary>
-/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
-/// expected to filter the input enumerable; this class only handles
-/// formatting and writes to the supplied path. Sender substring filtering
-/// happens here because it requires deserialized SeString.TextValue.
-/// </summary>
+// Serializes message snapshots to Markdown, JSON, or CSV.
+// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
 internal static class MessageExporter
 {
     internal record FilterDescription(
@@ -100,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
@@ -132,8 +129,7 @@ internal static class MessageExporter
         FilterDescription filter
     )
     {
-        // Manual JSON to avoid pulling in System.Text.Json policy choices.
-        // Output is a single object with metadata and an array of messages.
+        // Manual JSON to avoid System.Text.Json policy coupling.
         w.Write("{\n  \"exported_at\": \"");
         w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
         w.Write("\",\n  \"plugin\": \"Hellion Chat\",\n");
@@ -194,7 +190,7 @@ internal static class MessageExporter
         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)

HellionChat/FontManager.cs

@@ -41,24 +41,29 @@ public class FontManager
         90f,
     ];
 
-    /// <summary>
-    /// Backing bytes for the bundled Hellion font (Exo 2, OFL-1.1). Lazily
-    /// extracted from the assembly's manifest resources on first use; the
-    /// load happens inside the font atlas build callback so we keep the
-    /// allocation off the plugin constructor's hot path.
-    /// </summary>
+    // Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
     private static byte[]? HellionFontBytes;
 
-    private static byte[] GetHellionFontBytes()
+    // Returns null when the embedded font resource is missing. Should never
+    // happen on a signed release build, but a broken csproj or hand-rolled
+    // dev build can land here. Caller falls back to the system font path so
+    // the plugin still loads instead of crashing the whole UiBuilder.
+    private static byte[]? TryGetHellionFontBytes()
     {
         if (HellionFontBytes is not null)
             return HellionFontBytes;
 
-        using var stream =
-            typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
-            ?? throw new FileNotFoundException(
-                "Hellion font resource not embedded in the assembly"
+        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
+            "HellionFont.ttf"
         );
+        if (stream is null)
+        {
+            Plugin.Log.Warning(
+                "Hellion font resource missing — falling back to system default font."
+            );
+            return null;
+        }
+
         using var ms = new MemoryStream();
         stream.CopyTo(ms);
         HellionFontBytes = ms.ToArray();
@@ -70,11 +75,9 @@ public class FontManager
         ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
         {
             var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
-            // text
             foreach (var range in ranges)
                 builder.AddRanges((ushort*)range);
 
-            // chars
             if (chars != null)
             {
                 for (var i = 0; i < chars.Count; i += 2)
@@ -116,13 +119,7 @@ public class FontManager
         JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
     }
 
-    /// <summary>
-    /// Async wrapper around <see cref="BuildFonts"/> for the Phase-1 LoadAsync
-    /// path. The font-atlas build is CPU-bound, so we offload via Task.Run and
-    /// honour the cancellation token at the scheduling boundary; this lets the
-    /// font build run in parallel with the theme init without blocking the
-    /// loader. Settings-driven manual rebuilds keep using the sync entry point.
-    /// </summary>
+    // CPU-bound build offloaded to Task.Run; runs parallel with theme init
     public async Task BuildFontsAsync(CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
@@ -154,18 +151,16 @@ public class FontManager
         RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
             e.OnPreBuild(tk =>
             {
-                // v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
-                // wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
-                // Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
-                // Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
-                // UseHellionFont=true wirkungslos, was 4K-User mit größerer
-                // Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
+                // 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")
+                // F10.2: if the embedded font is missing, drop to the system font
+                // path rather than letting the UiBuilder throw.
+                var hellionBytes = Plugin.Config.UseHellionFont ? TryGetHellionFontBytes() : null;
+                config.MergeFont = hellionBytes is not null
+                    ? tk.AddFontFromMemory(hellionBytes, config, "Hellion-Exo2")
                     : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
 
                 config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
@@ -218,13 +213,7 @@ public class FontManager
         }
     }
 
-    /// <summary>
-    /// Try to add a user-configured font to the build toolkit, falling back to
-    /// the bundled NotoSansCjkRegular asset if the configured font isn't
-    /// available on the system. Without this guard a stale SystemFontId
-    /// pointing at a font the user uninstalled or that never existed on
-    /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
-    /// </summary>
+    // Add font with fallback to NotoSansCjkRegular if unavailable
     private static ImFontPtr AddFontWithFallback(
         IFontAtlasBuildToolkitPreBuild tk,
         IFontId fontId,

HellionChat/GameFunctions/Chat.cs

@@ -174,8 +174,7 @@ internal sealed unsafe class Chat : IDisposable
     internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
         UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));
 
-    // This function looks up a channel's user-defined color.
-    // If this function ever returns 0, it returns null instead.
+    // Look up a channel's user-defined color, returns null if 0
     internal uint? GetChannelColor(ChatType type)
     {
         var parent = type.Parent();
@@ -215,8 +214,7 @@ internal sealed unsafe class Chat : IDisposable
 
         if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
         {
-            // FIXME: this whole system sucks
-            // FIXME v2: I hate everything about this, but it works
+            // Capture the just-typed character input
             Plugin.Framework.RunOnTick(() =>
             {
                 string? input = null;
@@ -255,13 +253,9 @@ internal sealed unsafe class Chat : IDisposable
 
         try
         {
-            // We already called this function once, so we skip the duplicated call
-            // Also return the original value here so that vanilla chat receives all information
+            // Prevent duplicate calls
             if (Plugin.ChatLogWindow.TellSpecial)
-            {
-                Plugin.Log.Information("Return early to prevent duplicated call...");
                 return ChatLogRefreshHook!.Original(log, eventId, value);
-            }
 
             Plugin.ChatLogWindow.Activated(
                 new ChatActivatedArgs(new ChannelSwitchInfo(null))
@@ -275,8 +269,7 @@ internal sealed unsafe class Chat : IDisposable
             Plugin.Log.Error(ex, "Error in chat Activated event");
         }
 
-        // prevent the game from focusing the chat log
-        return 1;
+        return 1; // Prevent vanilla chat log from gaining focus
     }
 
     private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -430,10 +423,7 @@ internal sealed unsafe class Chat : IDisposable
         );
     }
 
-    /// <summary>
-    /// Returns true if the channel is any non-linkshell channel, or if the
-    /// linkshell actually exists.
-    /// </summary>
+    // Check if channel is valid (non-linkshell or existing linkshell)
     internal static bool ValidAnyLinkshell(InputChannel channel)
     {
         var idx = channel.LinkshellIndex();
@@ -477,8 +467,7 @@ internal sealed unsafe class Chat : IDisposable
             _ => 1,
         };
 
-        // Iterate up to 8 times to find a valid linkshell.
-        for (var i = 0; i < 8; i++)
+        for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
         {
             currentIndex = (uint)((8 + currentIndex + delta) % 8);
             if (validFn(currentIndex))
@@ -524,7 +513,7 @@ internal sealed unsafe class Chat : IDisposable
                 );
                 // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
                 // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
-                return idx is null ? null : channel + idx.Value;
+                return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
             }
             default:
                 return channel;
@@ -533,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
-        // call the ChangeChatChannel function with them.
-        //
-        // Callers should call ChatLogWindow.SetChannel() which handles
-        // ExtraChat channels
+        // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
         if (channel.IsExtraChatLinkshell())
             return;
 
@@ -565,9 +550,6 @@ internal sealed unsafe class Chat : IDisposable
         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;
 
@@ -742,10 +724,7 @@ internal sealed unsafe class Chat : IDisposable
 
     internal bool CheckHideFlags()
     {
-        // Only hide the chat in a cutscene when the vanilla chat would've
-        // also been hidden. This prevents Chat 2 from hiding for a split
-        // second before the cutscene actually starts, because the game sets
-        // the cutscene conditions before processing the skip.
+        // Only hide chat in cutscene when vanilla chat would also be hidden
         var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
         return raptureAtkUnitManager == null
             || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);

HellionChat/GameFunctions/ChatBox.cs

@@ -15,17 +15,10 @@ public unsafe class ChatBox
         mes->Dtor(true);
     }
 
-    public static void SendMessage(string message)
-    {
-        var bytes = ValidateMessage(message);
-        SendMessageUnsafe(bytes);
-    }
+    public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));
 
-    // Validation split out so the deterministic checks (UTF-8 length, sanitise
-    // round-trip) can run in xUnit without ClientStructs game memory. The
-    // sanitiser is injectable so tests can pin throw behaviour without invoking
-    // Utf8String->SanitizeString, which only resolves in-process. Returns the
-    // already-encoded bytes so SendMessage doesn't pay GetBytes twice.
+    // 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,
@@ -49,11 +42,9 @@ public unsafe class ChatBox
     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/GameFunctions.cs

@@ -47,7 +47,6 @@ internal unsafe class GameFunctions : IDisposable
         Chat = new Chat(Plugin);
 
         Plugin.GameInteropProvider.InitializeFromAttributes(this);
-
         ResolveTextCommandPlaceholderHook?.Enable();
     }
 
@@ -55,36 +54,24 @@ internal unsafe class GameFunctions : IDisposable
     {
         Chat.Dispose();
         KeybindManager.Dispose();
-
         ResolveTextCommandPlaceholderHook?.Dispose();
-
         Marshal.FreeHGlobal(PlaceholderNamePtr);
     }
 
-    internal void SendFriendRequest(string name, ushort world)
-    {
+    internal void SendFriendRequest(string name, ushort world) =>
         ListCommand(name, world, "friendlist");
-    }
 
-    internal void AddToBlacklist(string name, ushort world)
-    {
-        ListCommand(name, world, "blist");
-    }
+    internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");
 
-    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId)
-    {
+    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
         AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
-    }
 
-    internal void AddToTermsList(SeString content)
-    {
+    internal void AddToTermsList(SeString content) =>
         AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
-    }
 
     private void ListCommand(string name, ushort world, string commandName)
     {
         var worldRow = Sheets.WorldSheet.GetRow(world);
-
         ReplacementName = $"{name}@{worldRow.Name.ToString()}";
         ChatBox.SendMessage($"/{commandName} add {Placeholder}");
     }
@@ -108,7 +95,6 @@ internal unsafe class GameFunctions : IDisposable
     {
         for (var i = 0; i < 4; i++)
             SetAddonInteractable($"ChatLogPanel_{i}", interactable);
-
         SetAddonInteractable("ChatLog", interactable);
     }
 
@@ -124,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;
 
@@ -133,23 +118,19 @@ internal unsafe class GameFunctions : IDisposable
         agent->Index = 0;
         agent->Flag1 &= 0xEF;
         agent->ItemId = id;
-        // agent->Flag2 = 1;
-        // agent->Flag3 = 0;
-        // TODO: Revert whenever CS is merged
+
+        // TODO: Revert when CS offset lands in a release build.
         *(byte*)((nint)agent + 0x21A) = 1;
         *(byte*)((nint)agent + 0x21E) = 0;
 
-        // This just probably needs to be set
         agent->AddonId = addon->Id;
-
-        // Skips early return
         atkStage->TooltipManager.TooltipType |= 2;
         addon->Show(false, 15);
     }
 
     internal static void CloseItemTooltip()
     {
-        // hide addon first to prevent the "addon close" sound
+        // Hide addon first to suppress the "addon close" sound.
         var addon = GetAddon<AtkUnitBase>("ItemDetail");
         if (addon != null)
             addon->Hide(true, false, 0);
@@ -167,7 +148,7 @@ 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())
         {
@@ -188,15 +169,10 @@ internal unsafe class GameFunctions : IDisposable
         }
     }
 
-    internal static bool IsMentor()
-    {
-        return PlayerState.Instance()->IsMentor();
-    }
+    internal static bool IsMentor() => PlayerState.Instance()->IsMentor();
 
-    internal static InfoProxyCommonList.CharacterData[] GetFriends()
-    {
-        return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
-    }
+    internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
+        InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
 
     internal static void OpenQuestLog(RowRef<Quest> quest)
     {
@@ -223,20 +199,12 @@ internal unsafe class GameFunctions : IDisposable
         AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
     }
 
-    internal static void OpenPartyFinder(uint id)
-    {
+    internal static void OpenPartyFinder(uint id) =>
         AgentLookingForGroup.Instance()->OpenListing(id);
-    }
 
-    internal static void OpenAchievement(uint id)
-    {
-        AgentAchievement.Instance()->OpenById(id);
-    }
+    internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);
 
-    internal static bool IsInInstance()
-    {
-        return Plugin.Condition[ConditionFlag.BoundByDuty56];
-    }
+    internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];
 
     internal static bool TryOpenAdventurerPlate(ulong playerId)
     {
@@ -255,8 +223,7 @@ internal unsafe class GameFunctions : IDisposable
     internal static void ClickNoviceNetworkButton()
     {
         var agent = AgentChatLog.Instance();
-        // case 3
-        var value = new AtkValue { Type = ValueType.Int, Int = 3 };
+        var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
         var result = 0;
         var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
             agent->VirtualTable;
@@ -275,9 +242,8 @@ internal unsafe class GameFunctions : IDisposable
         byte a4
     )
     {
-        // The detour is only invoked through the hook, so the hook should
-        // never be null here, but the nullable field declaration forces us
-        // to handle the theoretical race during teardown.
+        // Hook field is nullable due to the Signature attribute, but will never
+        // be null during normal execution; guard covers the teardown race only.
         if (ResolveTextCommandPlaceholderHook is null)
             return nint.Zero;
 
@@ -285,9 +251,7 @@ internal unsafe class GameFunctions : IDisposable
         if (ReplacementName == null || placeholder != Placeholder)
             return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
 
-        // The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit.
-        // FFXIV player names plus an @World suffix should never approach this
-        // limit, but a malformed ReplacementName must not overflow the buffer.
+        // Guard against a malformed ReplacementName overflowing the 128-byte buffer.
         var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
         if (byteCount >= PlaceholderBufferSize)
         {
@@ -300,7 +264,6 @@ internal unsafe class GameFunctions : IDisposable
 
         MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
         ReplacementName = null;
-
         return PlaceholderNamePtr;
     }
 }

HellionChat/HellionChat.csproj

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

HellionChat/HellionChat.yaml

@@ -1,77 +1,26 @@
 name: Hellion Chat
-author: JonKazama-Hellion
-punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
+author: Jon Kazama (Hellion Forge)
+punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
 description: |-
-    Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
-    based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
-    removed (the optional webinterface) and a stack of privacy controls is
-    added on top. Tabs, channel filters, RGB colours, emotes, screenshot
-    mode, IPC integration and the chat replacement window itself work the
-    same. The webinterface is intentionally not part of Hellion Chat because
-    it serves a different use case from the smaller default footprint this
-    plugin is built around.
+    Chat replacement for FINAL FANTASY XIV with privacy controls built around
+    EU, US and JP data-protection rules.
 
-    On top of that, Hellion Chat adds privacy and data-handling controls
-    designed to align with the modern data protection rules that apply
-    across the EU, the United States and Japan. By default only your own
-    conversations are stored; messages from strangers, NPCs and system
-    spam stay out of the database. Retention windows are configurable per
-    channel, history can be wiped retroactively, and stored data can be
-    exported on demand.
-
-    Key privacy and data-handling features:
+    By default only your own conversations are stored. Public chat, NPC
+    dialogue and system messages stay out of the database unless you opt in.
+    Retention windows are configurable per channel, history can be wiped
+    retroactively, and everything can be exported on demand.
 
+    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,
-      Full History)
-    - Bilingual UI (English and German) with live language switching
-    - Independent plugin state — own config file and database directory,
-      so Hellion Chat does not share state with upstream Chat 2
+    - First-run wizard with three preset profiles
+    - Bilingual UI (EN/DE) with live language switching
+    - Own config and database — no shared state with other plugins
 
-    v1.3.0 First plugin integration cycle. Honorific custom titles
-    are shown in the chat header above the message log, with auto-detect
-    and silent fallback when Honorific is not installed.
-
-    v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown
-    are cleaner: SQLite no longer leans on GC pressure to release
-    its file, worker threads are explicitly background, deferred
-    config saves no longer get lost mid-disable, and pre-v13 config
-    backups carry the user's custom theme opacity into the v14 schema
-    instead of falling back to the default.
-
-    v1.4.1 — Theme Engine Performance plus a tenth built-in.
-    HellionStyle.PushGlobal reads pre-computed ABGR values from a
-    per-theme cache instead of converting RGBA per slot per frame
-    (~13 % render-time recovery in typical scenes). Custom-theme
-    hot-reload survives transient file locks (editor mid-save
-    keeps the last-known-good snapshot). Synthwave Sunset joins
-    as the tenth built-in theme — Hot Magenta + Cyan on midnight
-    violet, 80s neon-grid vibes.
-
-    v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
-    patterns gone from the chat-log render path: card-mode borders
-    hoist invariants out of the per-message loop, auto-tell tab
-    tint and icon get a per-tab cache, and the status bar gates
-    its tab aggregation behind the same one-second cache it uses
-    for the format strings.
-
-    v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin
-    migrated to Dalamud's IAsyncDalamudPlugin so the heavy work
-    (migrations, service allocations, window construction, hook
-    subscription) runs in LoadAsync without blocking Dalamud's
-    UI. Schema-gate replaces the v9 → v16 migration chain;
-    configs on schema v16+ load directly. Custom-repo URL moves
-    to gitea.hellion-forge.cloud, the GitHub repo stays as a
-    frozen v1.4.2 snapshot.
-
-    Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
-
-    Modding & support: join the Hellion Forge Discord at
-    https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
-    other Hellion Online Media plugins/tools.
+    Based on Chat 2 by Infi and Anna (EUPL-1.2).
+    Support: https://discord.gg/X9V7Kcv5gR
 repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
 accepts_feedback: true
 icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
@@ -86,136 +35,73 @@ tags:
     - Replacement
     - Privacy
 changelog: |-
-    **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
+    **v1.4.5 — UX and Robustness (2026-05-12)**
 
-    Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
-    API. The constructor now does only the bootstrap-essentials
-    (config load, language init, conflict detection); migrations,
-    service allocations, window construction and hook subscription
-    move to LoadAsync. Dalamud can keep its UI responsive while the
-    heavy work runs.
+    Sixth sub-patch of the v1.4.x polish-sweep series. Chat-log draw
+    failures surface as a notification, the first-run wizard has an
+    explicit "Later" option, the input history clears on plugin reload,
+    and the status bar version slot stops clipping in narrow windows.
 
-    - IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
-      in DisposeAsync (mirrors LightlessSync's pattern); idempotency
-      guard protects against reload races
-    - Schema-gate replaces the v9 → v16 migration chain. Configs
-      on schema v16+ load directly; older configs trigger an
-      "install v1.4.2 first" error so the historic migration
-      path stays intact
-    - AutoTranslate.PreloadCache moved off the load path. First
-      use may have a sub-second hitch instead of every-load; the
-      upstream chose differently, we accept first-use latency
-    - FontManager.BuildFonts is called sync at the start of
-      LoadAsync; Dalamud rebuilds the font atlas on its own
-      pipeline so the custom Hellion-Exo2 font appears with a
-      brief font-pop after load (matches ChatTwo's behaviour)
-    - Custom-repo URL moved to gitea.hellion-forge.cloud/
-      JonKazama-Hellion/HellionChat. GitHub repo stays as a
-      frozen v1.4.2 snapshot; new releases ship from Gitea.
-      Existing testers need to update the custom-repo URL once
-    - Plugin-load time in this release sits at ~3.7 s median
-      (5 reloads), comparable to v1.4.2. Async migration is
-      foundational for v1.4.4 Lazy-Init optimisations rather
-      than an immediate user-perceived win
-
-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-
-    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-    **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
-
-    Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
-    allocations from the chat-log render path eliminated.
-
-    - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
-      borderColorAbgr out of the per-message loop. About 500
-      redundant calls per frame at 100 visible messages, multiplied
-      by every pop-out window
-    - Auto-tell tab tint and icon use a per-tab cache. Hash
-      computation and string allocation only happen when the tell
-      target name or world drifts. AutoTellTabTint stays a pure
-      hash helper; cache lives in a thin TabTintCache wrapper
-    - Status bar gates its tab aggregation behind the same
-      one-second cache it already used for the format strings.
-      LINQ Sum and Count replaced with a single foreach pass
-      that runs on roughly 1% of frames
-
-    Realistic frame-time recovery: 2-5% in typical scenes, more
-    on pop-out-heavy setups because the card-border hoist scales
-    per window.
-
-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-
-    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-    **Hellion Chat 1.4.1 — Theme Engine Performance**
-
-    Second sub-patch of the v1.4.x Polish Sweep series. Heap
-    pressure from the theme engine's per-frame render path
-    removed, plus a tenth built-in theme and hardening for
-    the custom-theme hot-reload.
-
-    - Theme records carry a pre-computed ABGR-packed cache
-      for every color slot; cache is filled when the theme
-      is registered and refreshed defensively on every
-      Switch()
-    - HellionStyle.PushGlobal reads ABGR values from the
-      cache instead of calling ColourUtil.RgbaToAbgr per
-      slot per frame; ~13 % render-time recovery measured
-      in typical scenes (plan estimate was 2–6 %, real
-      ~10–15 %)
-    - ThemeRegistry custom-theme reload distinguishes a
-      recoverable file lock (editor mid-save) from a
-      permanent IO failure; locked themes keep their
-      last-known-good snapshot and retry on the next
-      lookup instead of dropping out of the picker
-    - New built-in: Synthwave Sunset — Hot Magenta + Cyan
-      on midnight violet, 80s neon-grid vibes; tenth theme
-      in the picker
-    - Author credits refreshed: brand themes are credited
-      as "Hellion Forge"; Mint Grove and Forge Merchantman
-      now credited to Carla Beleandis as a community thanks
-
-    No schema bump, no user-visible behaviour change other
-    than smoother frames on GC-sensitive setups and one
-    additional colour option.
-
-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-
-    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
-
-    **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
-
-    First sub-patch of the v1.4.x Polish Sweep series. Seven
-    known lifecycle and race bugs eliminated before any
-    performance refactor sits on top.
-
-    - MessageStore disposal no longer triggers GC.Collect
-      globally; Pooling=false on the SQLite connection means
-      there's nothing left to clean up by hand
-    - PendingMessage and RetentionSweep worker threads are
-      explicitly marked IsBackground=true so the plugin domain
-      can unload during XIVLauncher reload without waiting
-      for them
-    - EmoteCache image and gif loaders moved from async-void
-      to async Task with a shared task tracker, draining
-      on Dispose so an in-flight load can no longer write
-      to a disposed EmoteImages entry
-    - DisposeAsync 10s timeout now warns loudly instead of
-      silently leaving the worker behind
-    - Plugin.Dispose flushes any pending DeferredSaveFrames
-      before tearing services down, so settings changes
-      made in the last few frames before disable are no
-      longer lost
-    - The v13→v14 config migration now reads the pre-v13
-      backup and carries HellionThemeWindowOpacity into the
-      new WindowOpacity field instead of falling back to
-      the default 0.85
-
-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-
-    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    - Chat window draw errors now show a one-shot notification instead
+      of failing silently — stack trace stays in /xllog
+    - First-run wizard: explicit "Later — keep defaults" button.
+      Closing the X no longer silently accepts the defaults; the wizard
+      reopens on the next plugin load if nothing was picked
+    - InputHistoryService clears on plugin dispose so the previous
+      session's typed commands don't bleed into the next load
+    - Status bar hides the version slot when the chat window is too
+      narrow to fit all five slots without overlap
+    - Internal: explicit session-only Auto-Tell-Tab invariant in
+      Plugin.cs plus a pinning test in the Build-Suite
+    - Internal: FontManager falls back to the system font if the
+      embedded Hellion font resource is missing — logs a Warning
 
     ---
 
-    Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+    **v1.4.4 — Threading and IPC safety polish (2026-05-12)**
+
+    Fifth sub-patch of the v1.4.x polish-sweep series. Threading
+    assumptions are documented per-method, a hot-path lock falls
+    away, and the privacy filter speaks up when an unknown ChatType
+    shows up.
+
+    - AutoTellTabs hot-path getter uses an Interlocked counter
+      instead of taking the lock on every read
+    - Honorific integration: per-method threading banners, plus
+      Warning-level log on unsubscribe failure
+    - AutoTranslate warmup thread marked IsBackground so plugin
+      unload doesn't wait for it
+    - PrivacyFilter logs once per unknown ChatType so a future
+      patch's added channel doesn't drop off the radar
+    - New installs persist unknown channels by default; existing
+      configs keep their explicit choice
+
+    ---
+
+    **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,9 @@ using System.Collections.Generic;
 
 namespace HellionChat;
 
-// Hellion Chat — v0.6.0 shared input history. Replaces the embedded
-// ChatLogWindow.InputBacklog so that pop-out windows with their own
-// ChatInputBar can navigate the same Up/Down history as the main window.
-// Index semantics are kept identical to the v0.5.x InputBacklog:
-//   index 0          = oldest entry
-//   index Count - 1  = newest entry
-// Push performs move-to-newest deduplication: existing entries are
-// removed before the new one is appended at the end.
+// Shared input history for all ChatInputBars (main and pop-out windows).
+// Push deduplicates: existing entries are moved to the end when re-added.
+// TEST-MIRROR: ../../Hellion Build test/Util/InputHistoryServiceTests.cs
 public static class InputHistoryService
 {
     private const int MaxSize = 30;
@@ -26,8 +21,7 @@ public static class InputHistoryService
 
         var trimmed = entry.Trim();
 
-        // Move-to-newest: existing entries are removed before the append
-        // so the same line typed twice does not occupy two history slots.
+        // Move-to-newest: remove existing entry before adding at the end
         for (var i = 0; i < _entries.Count; i++)
         {
             if (_entries[i] == trimmed)
@@ -48,4 +42,12 @@ public static class InputHistoryService
             return null;
         return _entries[cursor];
     }
+
+    // Plugin reload doesn't reset static state automatically. Plugin.DisposeAsync
+    // calls this so the next load starts with an empty history instead of
+    // inheriting the previous session's entries.
+    public static void Reset()
+    {
+        _entries.Clear();
+    }
 }

HellionChat/Integrations/HonorificService.cs

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

HellionChat/Integrations/HonorificTitleData.cs

@@ -2,13 +2,9 @@ using System.Numerics;
 
 namespace HellionChat.Integrations;
 
-// Local DTO mirroring Honorific's TitleData shape. We replicate the structure
-// instead of referencing Honorific.dll because a hard build-time dependency
-// would couple the two assemblies and break HellionChat at load time when
-// Honorific is missing. Glow, Color3, GradientColourSet and GradientAnimationStyle
-// are intentionally omitted — Cycle 1 renders text in the primary Color only;
-// the "Honorific Full Fidelity" backlog item adds them later as a pure
-// extension that won't break this DTO's existing consumers.
+// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
+// so HellionChat loads cleanly when Honorific is absent.
+// Glow/gradient fields omitted; Cycle 1 renders primary Color only.
 internal sealed record HonorificTitleData(
     string? Title,
     bool IsPrefix,

HellionChat/Integrations/IntegrationLinks.cs

@@ -1,10 +1,6 @@
 namespace HellionChat.Integrations;
 
-// External URLs for the third-party plugins HellionChat integrates with.
-// Kept separate from BrandingLinks (which is for Hellion-owned URLs) so
-// future cycles can extend this file with maintainer attribution links
-// for Moodles, NotificationMaster, ExtraChat, etc. without polluting the
-// brand-links class.
+// Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
 internal static class IntegrationLinks
 {
     public const string HonorificRepo = "https://github.com/Caraxi/Honorific";

HellionChat/Ipc/ExtraChat.cs

@@ -26,10 +26,9 @@ public sealed class ExtraChat : IDisposable
 
     internal (string, uint)? ChannelOverride { get; set; }
 
-    // Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a
-    // Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections.
-    // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
-    // the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
+    // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
+    // Reference assignment is atomic on x64, but the barrier ensures visibility
+    // across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
     private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
     internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
         ChannelCommandColoursInternal;
@@ -54,6 +53,7 @@ public sealed class ExtraChat : IDisposable
         OverrideChannelGate.Subscribe(OnOverrideChannel);
         ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
         ChannelNamesGate.Subscribe(OnChannelNames);
+
         try
         {
             ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
@@ -61,7 +61,7 @@ public sealed class ExtraChat : IDisposable
         }
         catch (Exception ex)
         {
-            // ExtraChat is optional; missing IPC peer is normal when the plugin isn't loaded.
+            // 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?)");
         }
     }
@@ -75,22 +75,11 @@ public sealed class ExtraChat : IDisposable
 
     private void OnOverrideChannel(OverrideInfo info)
     {
-        if (info.Channel == null)
-        {
-            ChannelOverride = null;
-            return;
+        ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
     }
 
-        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)
-    {
-        ChannelNamesInternal = obj;
-    }
+    private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
 }

HellionChat/MessageManager.cs

@@ -27,16 +27,7 @@ internal class MessageManager : IAsyncDisposable
     private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
     private ulong LastContentId { get; set; }
 
-    // Messages go into the PendingSync queue first, which will be consumed one
-    // at a time in the main thread. This is to delay the async processing until
-    // after we've received the content ID from the ContentIdResolver hook.
-    //
-    // After that, the message is enqueued in the PendingAsync queue, which will
-    // be consumed in a separate thread and perform more processing (emotes,
-    // URLs) as well as inserting the message into the database.
-    // LinkedList instead of Queue: ContentIdResolver hits PendingSync.Last
-    // every hook call. Queue<T>.Last() is the LINQ extension and walks the
-    // whole queue (O(n)); LinkedList<T>.Last is an O(1) node reference.
+    // PendingSync (main thread) → PendingAsync (worker thread); LinkedList for O(1) Last access
     private LinkedList<PendingMessage> PendingSync { get; } = [];
     private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
     private readonly Thread PendingMessageThread;
@@ -53,11 +44,8 @@ internal class MessageManager : IAsyncDisposable
         }
     }
 
-    // Hellion Chat — Auto-Tell-Tabs hook. Fires after a fully processed
-    // message has been routed to all matching persistent tabs and stored
-    // in the database. The AutoTellTabsService subscribes to spawn or
-    // refresh temp tabs without having to wedge itself into ProcessMessage
-    // directly.
+    // Auto-Tell-Tabs hook: fires after a message is processed and stored, allowing
+    // AutoTellTabsService to spawn or refresh temp tabs without coupling.
     public event Action<Message>? MessageProcessed;
 
     internal unsafe MessageManager(Plugin plugin)
@@ -66,8 +54,6 @@ internal class MessageManager : IAsyncDisposable
 
         Store = new MessageStore(DatabasePath());
 
-        // IsBackground so a stuck worker never blocks plugin unload.
-        // Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
         PendingMessageThread = new Thread(() =>
             ProcessPendingMessages(PendingThreadCancellationToken.Token)
         )
@@ -107,12 +93,9 @@ internal class MessageManager : IAsyncDisposable
         if (PendingMessageThread.IsAlive)
             Plugin.Log.Warning(
                 "PendingMessageThread did not observe cancellation within 10s. "
-                    + "Worker remains on a background thread; next plugin reload releases it. "
-                    + "If this recurs, file a bug with /xllog after the previous reload."
+                    + "Worker remains on background thread; next plugin reload releases it."
             );
 
-        // CTS owns an unmanaged WaitHandle; dispose even if the worker is
-        // alive — it checks IsCancellationRequested via the linked token.
         PendingThreadCancellationToken.Dispose();
 
         Store.Dispose();
@@ -166,12 +149,7 @@ internal class MessageManager : IAsyncDisposable
 
     internal void ClearAllTabs()
     {
-        // Hellion Chat — TempTabs haben keine DB-Persistenz (session-only,
-        // direkt vom AutoTellTabsService befüllt). Ein Clear+Refilter würde
-        // sie leer hinterlassen weil FilterAllTabs nichts aus der DB
-        // findet — Tells sind oft durch Privacy-Filter blockiert oder
-        // schlicht session-flüchtig. TempTabs vom Clear-Pfad ausschließen
-        // damit Settings-Save den Tell-Verlauf nicht zerstört.
+        // TempTabs are session-only (not persisted); exclude them to preserve Tell history
         foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
             tab.Clear();
     }
@@ -184,12 +162,7 @@ internal class MessageManager : IAsyncDisposable
 
         using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
 
-        // We store the pending messages to be added to the chat log in a
-        // temporary list, and apply them all at once after filtering.
-        // TempTabs werden ausgeschlossen — sie bleiben live-state aus dem
-        // AutoTellTabsService, ein DB-Refilter würde sie nur partial
-        // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
-        // Privacy-Filter sie blockiert hat.
+        // TempTabs are excluded; they maintain live state from AutoTellTabsService
         var pendingTabs = Plugin
             .Config.Tabs.Where(t => !t.IsTempTab)
             .Select(tab => (tab, new List<Message>()))
@@ -198,7 +171,7 @@ internal class MessageManager : IAsyncDisposable
         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);
 
@@ -207,8 +180,7 @@ internal class MessageManager : IAsyncDisposable
 
         WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error);
 
-        // Mark the failed messages as deleted so we don't try to load them
-        // again.
+        // Mark failed messages as deleted to prevent retry attempts
         var failedIds = messages.FailedMessageIds();
         Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
         foreach (var msgId in messages.FailedMessageIds())
@@ -256,16 +228,10 @@ internal class MessageManager : IAsyncDisposable
         // Update colour codes.
         GlobalParametersCache.Refresh();
 
-        // We delay messages to be handed off to the async processing thread
-        // in the next tick, otherwise we can't get the content ID from the hook
-        // below.
+        // Delay to next tick to get content ID from ContentIdResolver hook
         PendingSync.AddLast(pendingMessage);
     }
 
-    // This hook is called immediately after receiving a message with the
-    // message's content ID. If multiple messages are received in the same tick,
-    // this will be called for each message immediately after ChatMessage is
-    // called for each message.
     private unsafe void ContentIdResolver(
         RaptureLogModule* agent,
         ulong contentId,
@@ -408,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

@@ -127,7 +127,6 @@ internal class MessageStore : IDisposable
     private const int MessageQueryLimit = 10_000;
 
     private string DbPath { get; }
-
     private SqliteConnection Connection { get; set; }
 
     internal static readonly MessagePackSerializerOptions MsgPackOptions =
@@ -147,10 +146,8 @@ internal class MessageStore : IDisposable
 
     public void Dispose()
     {
-        // Pooling=false (set in Connect) avoids ClearAllPools, which is
-        // provider-wide and would touch other plugins' SQLite connections.
-        // GC.Collect was here as a defensive flush; removed because explicit
-        // Close already releases everything we hold.
+        // Pooling=false avoids ClearAllPools which is provider-wide and
+        // would touch other plugins' SQLite connections.
         Connection.Close();
         Connection.Dispose();
     }
@@ -176,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());
@@ -186,9 +182,7 @@ internal class MessageStore : IDisposable
         {
             case <= 0:
                 migrationsToDo.Add(Migrate0);
-
-                // Migration support was only added in version 1. Migrate 0 is
-                // idempotent.
+                // Migration support was only added in version 1. Migrate0 is idempotent.
                 migrationsToDo.Add(Migrate1);
                 migrationsToDo.Add(Migrate2);
                 migrationsToDo.Add(Migrate3);
@@ -238,7 +232,6 @@ internal class MessageStore : IDisposable
         Plugin.Log.Information("Running migration 1: Adding Deleted column");
         Connection.Execute(
             @"
-            -- Migration 1: Add Deleted column
             ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
         "
         );
@@ -251,7 +244,6 @@ internal class MessageStore : IDisposable
         Plugin.Log.Information("Running migration 2: Adding Channel generated column");
         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);
         "
@@ -262,9 +254,8 @@ internal class MessageStore : IDisposable
 
     private bool ColumnExists(string table, string column)
     {
-        // PRAGMA does not accept SQLite parameter bindings. The table name is
-        // a compile-time constant fed in from internal call sites, so the
-        // interpolation cannot be reached from any user-controlled path.
+        // PRAGMA does not accept SQLite parameter bindings. Table name is a
+        // compile-time constant from internal call sites only.
         using var cmd = Connection.CreateCommand();
         cmd.CommandText = $"PRAGMA table_info({table});";
         using var reader = cmd.ExecuteReader();
@@ -280,9 +271,8 @@ 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
-        // in its target shape (new columns exist, old Code column gone) but
-        // user_version was never bumped, just record the version and exit.
+        // Recovery for partially-applied Migrate3: schema already in target
+        // shape but user_version was never bumped -- just record and exit.
         if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
         {
             Plugin.Log.Information(
@@ -294,15 +284,6 @@ internal class MessageStore : IDisposable
 
         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;
@@ -328,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_ function variant that can set the version either. The
-        // version is a compile-time int from the migration sequence, never
-        // user input.
+        // PRAGMA does not accept SQLite parameter bindings; version is a
+        // compile-time int from the migration sequence, never user input.
         cmd.CommandText = $"PRAGMA user_version = {version};";
         cmd.ExecuteNonQuery();
     }
@@ -342,11 +321,8 @@ internal class MessageStore : IDisposable
         PerformMaintenance();
     }
 
-    /// <summary>
-    /// Returns a (ChatType, count) snapshot over non-deleted messages.
-    /// Used by the Privacy tab to preview the impact of a retroactive
-    /// cleanup before the user confirms.
-    /// </summary>
+    // Returns a (ChatType, count) snapshot over non-deleted messages.
+    // Used by the Privacy tab to preview retroactive cleanup impact.
     internal Dictionary<int, long> GetMessageCountsByChatType()
     {
         var result = new Dictionary<int, long>();
@@ -364,12 +340,9 @@ internal class MessageStore : IDisposable
         return result;
     }
 
-    /// <summary>
-    /// Deletes messages older than the per-channel retention window, with a
-    /// global default for channels not listed explicitly. Cutoffs are
-    /// computed from "now" at call time. Runs VACUUM only if anything was
-    /// removed. Returns the number of rows deleted.
-    /// </summary>
+    // Deletes messages older than the per-channel retention window, with a global
+    // default for unmapped channels. Runs VACUUM only if rows were removed.
+    // Returns the number of rows deleted.
     internal long DeleteByRetentionPolicy(
         IReadOnlyDictionary<int, int> chatTypeDaysMap,
         int defaultDays
@@ -408,10 +381,7 @@ internal class MessageStore : IDisposable
                 index++;
             }
 
-            // Catch-all for channels without an explicit override. "0" is
-            // treated as "do not delete by default" — without an explicit
-            // user override, unmapped channels stay forever instead of
-            // getting wiped immediately.
+            // defaultDays=0 means "keep forever" for unmapped channels.
             if (defaultDays > 0)
             {
                 var defaultCutoff = nowMs - defaultDays * 86400000L;
@@ -439,21 +409,14 @@ internal class MessageStore : IDisposable
         return deleted;
     }
 
-    /// <summary>
-    /// Hard-deletes every message whose ChatType is not in the supplied
-    /// allowlist, then VACUUMs the database to reclaim disk space.
-    /// Returns the number of rows deleted.
-    /// </summary>
+    // Hard-deletes every message whose ChatType is not in the allowlist,
+    // then VACUUMs. Returns the number of rows deleted.
     internal long CleanupRetainOnly(IReadOnlyCollection<int> allowedTypes)
     {
         if (allowedTypes.Count == 0)
-        {
-            // Defensive: refuse a "delete everything" disguised as a filter.
-            // Use ClearMessages() if a full wipe is actually intended.
             throw new InvalidOperationException(
                 "CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
             );
-        }
 
         long deleted;
         using (var cmd = Connection.CreateCommand())
@@ -493,14 +456,9 @@ internal class MessageStore : IDisposable
 
     internal void UpsertMessage(Message message)
     {
-        // Hellion Chat privacy filter — drop disallowed ChatTypes before
-        // they reach the storage layer (single source of truth, also
-        // covers any future write paths e.g. webinterface backfill).
+        // Privacy filter -- drop disallowed ChatTypes before they reach storage.
         if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
         {
-            // Verbose-only: this fires for every dropped message, which is
-            // the common case for users with a tight privacy whitelist. Keep
-            // it for diagnostics but stay out of the default xllog stream.
             Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
             return;
         }
@@ -509,33 +467,11 @@ internal class MessageStore : IDisposable
         cmd.CommandText =
             @"
             INSERT INTO messages (
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel,
-                Deleted
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel, Deleted
             ) VALUES (
-                $Id,
-                $Receiver,
-                $ContentId,
-                $Date,
-                $ChatType,
-                $SourceKind,
-                $TargetKind,
-                $Sender,
-                $Content,
-                $SenderSource,
-                $ContentSource,
-                $ExtraChatChannel,
-                false
+                $Id, $Receiver, $ContentId, $Date, $ChatType, $SourceKind, $TargetKind,
+                $Sender, $Content, $SenderSource, $ContentSource, $ExtraChatChannel, false
             )
             ON CONFLICT (id) DO UPDATE SET
                 Receiver = excluded.Receiver,
@@ -580,13 +516,9 @@ internal class MessageStore : IDisposable
         cmd.ExecuteNonQuery();
     }
 
-    /// <summary>
-    /// Streams messages for export. Optional filters:
-    /// - <paramref name="chatTypes"/>: limit to these ChatTypes
-    /// - <paramref name="from"/> / <paramref name="to"/>: inclusive date range
-    /// Result is sorted ascending by Date and excludes soft-deleted rows.
-    /// Caller is responsible for disposing the enumerator.
-    /// </summary>
+    // Streams messages for export, sorted ascending by Date, excluding soft-deleted rows.
+    // Optional filters: chatTypes, from/to inclusive date range.
+    // Caller is responsible for disposing the enumerator.
     internal MessageEnumerator StreamForExport(
         IReadOnlyCollection<int>? chatTypes,
         DateTimeOffset? from,
@@ -606,18 +538,8 @@ internal class MessageStore : IDisposable
         cmd.CommandText =
             @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             WHERE "
             + string.Join(" AND ", clauses)
@@ -633,12 +555,10 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    /// <summary>
-    /// Get the most recent messages.
-    /// </summary>
-    /// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param>
-    /// <param name="since">Only show messages since this date. If null, no filtering is performed.</param>
-    /// <param name="count">The amount to return. Defaults to 10,000.</param>
+    // Returns the most recent messages, oldest-first.
+    // receiver: filter by receiver ContentId (null = no filter)
+    // since: only include messages after this date (null = no filter)
+    // count: max rows to return, defaults to 10,000
     internal MessageEnumerator GetMostRecentMessages(
         ulong? receiver = null,
         DateTimeOffset? since = null,
@@ -654,25 +574,14 @@ internal class MessageStore : IDisposable
         var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
 
         var cmd = Connection.CreateCommand();
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
+        // Select last N by date DESC, then reverse to ascending order.
         cmd.CommandText =
             @"
             SELECT *
             FROM (
                 SELECT
-                    Id,
-                    Receiver,
-                    ContentId,
-                    Date,
-                    ChatType,
-                    SourceKind,
-                    TargetKind,
-                    Sender,
-                    Content,
-                    SenderSource,
-                    ContentSource,
-                    ExtraChatChannel
+                    Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                    Sender, Content, SenderSource, ContentSource, ExtraChatChannel
                 FROM messages
                 "
             + whereClause
@@ -682,7 +591,7 @@ internal class MessageStore : IDisposable
             )
             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);
@@ -694,21 +603,10 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    /// <summary>
-    /// Hellion Chat — Auto-Tell-Tabs history preload.
-    ///
-    /// Returns up to <paramref name="limit"/> tells exchanged with the named
-    /// player, oldest-first, ready to be added to a freshly spawned auto
-    /// tell tab. The Sender column is a serialized chunk blob, so SQL on its
-    /// own cannot filter by player identity; we narrow with SQL on Receiver
-    /// + ChatType (cheap, indexed) and let the client do the final
-    /// PlayerPayload comparison on the result set.
-    ///
-    /// <paramref name="sqlScanLimit"/> caps how many recent tells we scan
-    /// before giving up. 500 covers around 10 days for an active greeter
-    /// and stays well under the 20 ms budget required to keep the spawn on
-    /// the message-processing worker thread.
-    /// </summary>
+    // Returns up to limit tells exchanged with the named player, oldest-first.
+    // SQL narrows by Receiver + ChatType (indexed); client does the final
+    // PlayerPayload comparison. sqlScanLimit caps the scan to stay within
+    // the message-processing worker thread budget.
     internal IReadOnlyList<Message> GetTellHistoryWithSender(
         ulong receiver,
         string senderName,
@@ -718,26 +616,14 @@ internal class MessageStore : IDisposable
     )
     {
         if (limit <= 0)
-        {
             return [];
-        }
 
         using var cmd = Connection.CreateCommand();
         cmd.CommandText =
             @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             WHERE deleted = false
               AND Receiver = $Receiver
@@ -756,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
-        // recent matching tells. Reverse to oldest-first for chronological
-        // display in the tab.
+        // SQL was DESC (newest-first); reverse to oldest-first for tab display.
         collected.Reverse();
         return collected;
     }
 
-    /// <summary>
-    /// Marks a message as deleted so it won't get returned in queries.
-    /// </summary>
+    // Soft-deletes a message so it won't appear in queries.
     internal void DeleteMessage(Guid id)
     {
         using var cmd = Connection.CreateCommand();
@@ -803,8 +681,6 @@ internal class MessageStore : IDisposable
 
         var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
 
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
         cmd.CommandText =
             @"
             SELECT COUNT(*)
@@ -816,7 +692,7 @@ 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()!;
     }
@@ -839,26 +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
-        // them in ascending order.
         cmd.CommandText =
             @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             " + whereClause;
-        cmd.CommandTimeout = 120; // this could take a while on slow computers
+        cmd.CommandTimeout = 120;
 
         if (receiver != null)
             cmd.Parameters.AddWithValue("$Receiver", receiver);
@@ -888,23 +752,11 @@ internal class MessageStore : IDisposable
 
         var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
 
-        // Select last N messages by date DESC, but reverse the order to get
-        // them in ascending order.
         cmd.CommandText =
             @"
             SELECT
-                Id,
-                Receiver,
-                ContentId,
-                Date,
-                ChatType,
-                SourceKind,
-                TargetKind,
-                Sender,
-                Content,
-                SenderSource,
-                ContentSource,
-                ExtraChatChannel
+                Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
+                Sender, Content, SenderSource, ContentSource, ExtraChatChannel
             FROM messages
             "
             + whereClause
@@ -912,7 +764,7 @@ internal class MessageStore : IDisposable
             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);
@@ -925,10 +777,8 @@ internal class MessageStore : IDisposable
         return new MessageEnumerator(cmd.ExecuteReader());
     }
 
-    // Build "$prefix0,$prefix1,..." placeholder list and bind values to
-    // the command. SQLite has no native array parameter, so we generate
-    // the list at runtime and bind each entry under its own name. Used
-    // for IN-clauses and similar dynamic-arity SQL fragments.
+    // Builds a "$prefix0,$prefix1,..." placeholder list and binds values to the command.
+    // SQLite has no native array parameter, so placeholders are generated per entry.
     private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values)
     {
         var names = new List<string>();
@@ -951,8 +801,6 @@ internal class MessageEnumerator(DbDataReader reader)
 {
     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;

HellionChat/Plugin.cs

@@ -90,10 +90,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
     public readonly WindowSystem WindowSystem = new(PluginName);
 
-    // v1.4.3: properties moved from { get; } to { get; private set; } = null!;
-    // because LoadAsync now owns construction of the Phase-2 services.
-    // Phase-1 services use the same shape for consistency, even though
-    // they're still allocated in the ctor.
+    // Phase-2 services are constructed in LoadAsync; null! shape is kept
+    // consistent across all properties for clarity.
     public SettingsWindow SettingsWindow { get; private set; } = null!;
     public ChatLogWindow ChatLogWindow { get; private set; } = null!;
     public DbViewer DbViewer { get; private set; } = null!;
@@ -115,27 +113,20 @@ public sealed class Plugin : IAsyncDalamudPlugin
     internal Ui.StatusBar StatusBar { get; private set; } = null!;
     internal Integrations.HonorificService HonorificService { get; private set; } = null!;
 
-    // (B3) Lightless idempotency guard — Dalamud may fire DisposeAsync twice
-    // in a reload race; second call short-circuits.
+    // 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
-    // the manual button in the Privacy tab both run on background threads;
-    // without this gate, hitting the manual button moments after a fresh
-    // 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.
+    // Serialises retention sweeps so a manual trigger and the 24h auto-sweep
+    // can't run in parallel. Volatile because the ImGui thread reads it outside
+    // the lock to gate the manual button.
     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
@@ -149,52 +140,39 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
     public Plugin()
     {
-        // Phase-1 ctor stays minimal: bootstrap-essentials only (conflict
-        // gate, config load, language + ImGui init, WindowSystem skeleton).
-        // Schema migrations and every service / window allocation moved to
-        // LoadAsync so the sync ctor returns fast. On failure here nothing
-        // is initialized yet, so just throw — there is nothing to clean up.
+        // Phase-1 ctor: bootstrap-essentials only (conflict gate, config load,
+        // language + ImGui init). All service/window allocation lives in LoadAsync.
 
-        // Refuse to start if upstream Chat 2 is loaded — prevents IPC
-        // channel collisions and double-replacement of the in-game chat
-        // 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);
 
         GameStarted = Process.GetCurrentProcess().StartTime.ToUniversalTime();
 
-        // Hellion Chat: take over config + database from upstream ChatTwo
-        // before Dalamud loads our plugin config. Idempotent: only acts on
-        // the first start where the legacy paths exist and ours don't.
+        // Migrate config + database from upstream ChatTwo on first start.
         MigrateFromChatTwoLayout();
 
         Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
 
-        // Schema-gate: v1.4.3 only supports config schema v16. Older configs
-        // went through their migrations in v1.2.1 (v15→v16) and earlier; users
-        // who skipped past those releases need to install v1.4.2 first to run
-        // the migration chain, then upgrade to v1.4.3.
+        // Schema gate: v1.4.x requires config v16. Users on older schemas
+        // must install v1.4.2 first to run the migration chain.
         if (Config.Version < 16)
         {
             throw new InvalidOperationException(
-                $"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. "
-                    + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3."
+                $"HellionChat v1.4.5 requires config schema v16, got v{Config.Version}. "
+                    + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.5."
             );
         }
 
-        // Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig
-        // already strips temp tabs before persistence, but a previous
-        // crash or external write could have left them in the JSON.
-        // Drop them on load to guarantee the session-only invariant.
+        // Session-only tabs are stripped on every load; AutoTellTabsService.Initialize
+        // then re-pegs TempTabCounter from the stripped list, not the pre-strip snapshot.
+        // TEST-MIRROR: ../../Hellion Build test/_Helpers/TempTabCounterTests.cs
         Config.Tabs.RemoveAll(t => t.IsTempTab);
 
         LanguageChanged(Interface.UiLanguage);
         ImGuiUtil.Initialize(this);
 
         DeferredSaveFrames = -1;
-
-        // WindowSystem skeleton is initialised by the readonly field above —
-        // no AddWindow yet; window construction lives in LoadAsync.
     }
 
     public async Task LoadAsync(CancellationToken cancellationToken)
@@ -203,14 +181,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
         try
         {
-            // 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.
+            // Default tab layout on fresh install. Tells are handled by
+            // Auto-Tell-Tabs; Novice Network has no preset tab by design.
             if (Config.Tabs.Count == 0)
             {
                 Config.Tabs.Add(TabsUtil.VanillaGeneral);
@@ -222,19 +194,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            // Sync allocation + handle registration. BuildFonts() registers
-            // IFontHandles with Dalamud's UiBuilder.FontAtlas — registration
-            // itself is non-blocking (handles stored, lambdas queued). Dalamud
-            // rebuilds the atlas on its own pipeline a few frames later; first
-            // frames render with the default font until the rebuild lands and
-            // ImGui switches to Hellion-Exo2 / NotoSans (visible "font-pop").
-            // Mirrors ChatTwo Plugin.cs:152.
+            // 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();
 
-            // Theme init stays sync on the LoadAsync continuation — cheap,
-            // and Active is read every Draw frame, so the registry must be
-            // wired before the first hook fires.
+            // ThemeRegistry must be wired before the first Draw tick.
             var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
             Directory.CreateDirectory(customThemesDir);
             SeedExampleThemeIfEmpty(customThemesDir);
@@ -243,11 +208,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            // Service allocations: order encodes dependencies. Commands is
-            // alloc-only here; Initialise() runs after windows exist so the
-            // slash-commands can toggle their visibility. HonorificService
-            // registers IPC subscribers up-front so Ready/Disposing events
-            // are caught from the very first frame.
+            // 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);
@@ -258,9 +221,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
             StatusBar = new Ui.StatusBar();
             MessageManager = new MessageManager(this);
 
-            // Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for
-            // live tells and to ClientState.Logout for cleanup; needs the live
-            // store handed in at construction.
             AutoTellTabsService = new AutoTellTabsService(
                 this,
                 MessageManager,
@@ -268,7 +228,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
             );
             AutoTellTabsService.Initialize();
 
-            // SelfTest steps poll Active per frame and need the registry wired.
             SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);
 
             ChatLogWindow = new ChatLogWindow(this);
@@ -289,22 +248,19 @@ public sealed class Plugin : IAsyncDalamudPlugin
             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;
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            // let all the other components register, then initialize commands
             Commands.Initialise();
 
-            // Daily retention sweep, fire-and-forget. Skips itself when
-            // disabled or when it already ran within the past 24 hours.
+            // Daily retention sweep — fire-and-forget, skips when disabled
+            // or already ran within the past 24 hours.
             RunRetentionSweepIfDue();
 
             if (Config.ShowEmotes)
-                _ = EmoteCache.LoadData(); // Fire-and-forget, exceptions caught inside
+                _ = EmoteCache.LoadData();
 
             if (Interface.Reason is not PluginLoadReason.Boot)
                 MessageManager.FilterAllTabsAsync();
@@ -313,33 +269,22 @@ public sealed class Plugin : IAsyncDalamudPlugin
             Interface.UiBuilder.DisableGposeUiHide = true;
 
 #if !DEBUG
-            // Fire-and-forget on a worker thread. The first auto-translate use of
-            // a session may have a sub-second hitch if the cache hasn't filled yet,
-            // but that's preferable to making every user wait ~300 ms during
-            // plugin load for a cache they may never touch. ChatTwo (upstream)
-            // does this sync; we trade load-time for first-use latency.
+            // 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();
 
-            // (B1) Hooks last: every service and window must be live before
-            // Dalamud fires our first Draw / FrameworkUpdate tick. Anything
-            // earlier risks rendering against null FontManager / ThemeRegistry.
+            // 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;
         }
         catch
         {
-            // Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync
-            // so partially-built services are torn down. Swallow the cleanup
-            // exception so the original load failure stays the visible cause.
             try
             {
                 await DisposeAsync().ConfigureAwait(false);
@@ -351,28 +296,22 @@ public sealed class Plugin : IAsyncDalamudPlugin
         }
     }
 
-    // Suppressing this warning because DisposeAsync may run after a partial
-    // LoadAsync, so some properties may not be initialized.
     [SuppressMessage("ReSharper", "ConditionalAccessQualifierIsNonNullableAccordingToAPIContract")]
     public async ValueTask DisposeAsync()
     {
-        // (B3) Idempotency guard — Dalamud may reload-race us; second
-        // call short-circuits so we don't double-dispose services.
+        // Idempotency guard — second call short-circuits on reload race.
         if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
             return;
 
         Exception? failure = null;
 
-        // Hooks unsubscribe FIRST so no Draw / FrameworkUpdate / LanguageChanged
-        // tick can fire while we're tearing services down. Mirrors the
-        // hooks-last subscribe order in LoadAsync.
+        // Unsubscribe hooks first — mirrors the hooks-last subscribe order in LoadAsync.
         failure = CaptureFailure(failure, () => Interface.UiBuilder.OpenMainUi -= OpenMainUi);
         failure = CaptureFailure(failure, () => Interface.LanguageChanged -= LanguageChanged);
         failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw);
         failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate);
 
-        // v1.4.0 F5.3 — flush a pending DeferredSave before service teardown,
-        // since FrameworkUpdate just got unsubscribed and won't fire it.
+        // Flush a pending DeferredSave — FrameworkUpdate won't fire it anymore.
         failure = CaptureFailure(
             failure,
             () =>
@@ -385,13 +324,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
             }
         );
 
-        // Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager
-        // goes away. Pure-memory cleanup, no framework-thread requirement.
+        // Unsubscribe AutoTellTabs before MessageManager goes away.
         failure = CaptureFailure(failure, () => AutoTellTabsService?.Dispose());
 
-        // v1.4.0 F6.2 — MessageManager has its own async dispose path
-        // (DB flush, pending-message thread shutdown). Run it before the
-        // framework-block so the worker threads are quiesced first.
+        // MessageManager has its own async dispose path (DB flush, thread shutdown).
         if (MessageManager is not null)
         {
             failure = await CaptureFailureAsync(
@@ -401,36 +337,24 @@ public sealed class Plugin : IAsyncDalamudPlugin
                 .ConfigureAwait(false);
         }
 
-        // (B4) Game-Function / IPC / UI-Window cleanup MUST run on the
-        // framework thread. WindowSystem mutations and IPC subscriber
-        // disposes touch Dalamud state that's only safe from the framework.
-        // Worker-thread DisposeAsync would race the next Draw tick.
-        // Per-line CaptureFailure so a single throw can't strand the lines
-        // behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync.
+        // Game-function / IPC / window cleanup must run on the framework thread.
         try
         {
             await Framework
                 .RunOnFrameworkThread(() =>
                 {
-                    // Game-Functions first — other services may still query
-                    // chat-interactable state during their Dispose.
                     failure = CaptureFailure(
                         failure,
                         () => GameFunctions.GameFunctions.SetChatInteractable(true)
                     );
 
-                    // IPC subscribers — dispose before windows so any final
-                    // event firing from the IPC source can't reach a half-torn
-                    // ChatLogWindow.
+                    // 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());
 
-                    // Windows — RemoveAllWindows first, then per-window Dispose.
-                    // Order matches the pre-v1.4.3 Dispose body byte-for-byte.
-                    // CommandHelpWindow and FirstRunWizard don't implement
-                    // IDisposable; their resources are reclaimed via WindowSystem.
                     failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows());
                     failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose());
                     failure = CaptureFailure(failure, () => DbViewer?.Dispose());
@@ -446,19 +370,19 @@ public sealed class Plugin : IAsyncDalamudPlugin
             failure ??= ex;
         }
 
-        // Pure-memory cleanups — no Framework / UI / IPC touch, so they
-        // run on whatever thread DisposeAsync resumes on.
+        // Pure-memory cleanups — no Framework / UI / IPC touch.
         failure = CaptureFailure(failure, () => Functions?.Dispose());
         failure = CaptureFailure(failure, () => Commands?.Dispose());
         failure = CaptureFailure(failure, () => EmoteCache.Dispose());
+        // Static input history would otherwise survive the plugin reload.
+        failure = CaptureFailure(failure, InputHistoryService.Reset);
 
         if (failure is not null)
             ExceptionDispatchInfo.Capture(failure).Throw();
     }
 
-    // Lightless-pattern capture helpers: run cleanup, remember the FIRST
-    // exception, keep going. Without these one mid-teardown failure would
-    // skip every cleanup behind it and leave services half-torn.
+    // Run cleanup actions individually so a single failure doesn't strand
+    // the remaining teardown steps.
     private static Exception? CaptureFailure(Exception? failure, Action action)
     {
         try
@@ -499,9 +423,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
         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
@@ -523,13 +444,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
             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;
 
@@ -537,6 +451,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
         {
             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));
@@ -590,9 +506,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
         if (lockedBlocker)
         {
-            // Surface the most common cause to the user as a notification
-            // so they don't think Hellion Chat lost their history when in
-            // fact upstream Chat 2 was still holding the database file.
             Notification.AddNotification(
                 new Dalamud.Interface.ImGuiNotification.Notification
                 {
@@ -610,10 +523,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
     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;
     }
 
@@ -624,8 +533,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
         if (DateTimeOffset.UtcNow - Config.RetentionLastRunAt < TimeSpan.FromHours(24))
             return;
 
-        // Snapshot the policy so the user can edit settings while we run.
-        // Spec defaults form the baseline; explicit user overrides win.
+        // Snapshot the policy so the user can edit settings while the sweep runs.
         var policy = new Dictionary<int, int>();
         foreach (var (type, days) in Privacy.PrivacyDefaults.DefaultRetentionDays)
             policy[(int)(ushort)type] = days;
@@ -633,16 +541,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
             policy[(int)(ushort)type] = days;
         var defaultDays = Config.RetentionDefaultDays;
 
-        // IsBackground = true for the same reason as PendingMessageThread:
-        // a stuck sweep must never block plugin unload. RunRetentionSweepIfDue
-        // guards the run-frequency, and the sweep itself uses the framework's
-        // cooperative cancellation pattern. The background flag is the safety
-        // net if the sweep ever takes longer than expected.
+        // IsBackground = true so a stuck sweep never blocks plugin unload.
         new Thread(() =>
         {
-            // Bail out cheaply if a manual sweep is already in flight; the
-            // lock around the actual work would queue us up otherwise and
-            // we would just re-do whatever the manual run already did.
+            // Bail early if a manual sweep is already in flight.
             lock (RetentionSweepLock)
             {
                 if (RetentionSweepRunning)
@@ -659,11 +561,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
                 if (deleted > 0)
                 {
                     Log.Information($"Retention sweep deleted {deleted} expired messages.");
-                    // Run the clear+refilter synchronously on the framework thread.
-                    // Earlier this called FilterAllTabsAsync(), which is fire-and-forget
-                    // — the .Wait() here would return as soon as the inner Task.Run was
-                    // dispatched, racing the next sweep cycle against the still-running
-                    // filter pass. See AUDIT-2026-05-05 [QUAL-02].
+                    // Run clear+refilter on the framework thread — FilterAllTabsAsync
+                    // is fire-and-forget and would race the next sweep cycle.
                     Framework
                         .Run(() =>
                         {
@@ -694,9 +593,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
     private void Draw()
     {
-        // Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes
-        // Theme statt einem deaktivierten Hellion-Theme. Active wird einmal
-        // pro Frame aus der Registry gelesen.
+        // Theme engine is always active; Classic is a theme, not a disabled state.
         using IDisposable _style = HellionStyle.PushGlobal(
             ThemeRegistry.Active,
             Config.WindowOpacity
@@ -711,9 +608,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
             return;
         }
 
-        // v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is
-        // open. Hides every plugin window in one shot (chat log, pop-outs,
-        // settings, db viewer, etc.), matching the LoadingScreens pattern.
+        // Hide all plugin windows while the New Game+ menu is open.
         if (
             Config.HideInNewGamePlusMenu
             && GameFunctions.GameFunctions.IsAddonInteractable(
@@ -742,10 +637,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
     internal void SaveConfig()
     {
-        // Hellion Chat — Auto-Tell-Tabs are session-only. Strip them out
-        // 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.
+        // Strip session-only Auto-Tell-Tabs before serialization; restore after.
         var snapshot = Config.Tabs.ToList();
         Config.Tabs.RemoveAll(t => t.IsTempTab);
 
@@ -753,6 +645,11 @@ public sealed class Plugin : IAsyncDalamudPlugin
 
         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)
@@ -794,9 +691,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
         Condition[ConditionFlag.OccupiedInCutSceneEvent]
         || Condition[ConditionFlag.WatchingCutscene78];
 
-    // v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded
-    // example-theme.json als Vorlage rein. Bestehende User-Customs werden
-    // nicht angefasst (existing JSONs lassen den Block überspringen).
+    // 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())

HellionChat/Privacy/PrivacyDefaults.cs

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

HellionChat/Resources/ChatColourPresets.cs

@@ -4,11 +4,8 @@ using HellionChat.Util;
 
 namespace HellionChat.Resources;
 
-// Hellion Chat — v0.6.0 built-in colour presets for the ChatColours
-// settings section. Read-only static data; users apply a preset via the
-// settings UI which overwrites Configuration.ChatColours immediately.
-// Battle-channel types are intentionally NOT covered by the stylistic
-// presets so that combat-log tuning the user has done stays intact.
+// Built-in colour presets applied via Settings UI → ChatColours.
+// Battle-channel types are intentionally excluded to preserve combat-log tuning.
 public sealed record ChatColourPreset(
     string DisplayName,
     string LocalizationKey,
@@ -69,9 +66,7 @@ public static class ChatColourPresets
         };
     }
 
-    // The Default preset spiegelt 1:1 die Werte aus ChatTypeExt.DefaultColor.
-    // Channels ohne Default-Wert (return null) werden ausgelassen — wer sie
-    // anwenden will, behält seine aktuelle Farbe.
+    // Mirrors ChatTypeExt.DefaultColor; channels without a default are skipped.
     private static IReadOnlyDictionary<ChatType, uint> BuildDefault()
     {
         var dict = new Dictionary<ChatType, uint>();
@@ -183,33 +178,22 @@ public static class ChatColourPresets
         };
     }
 
-    // Hellion brand preset — Arctic Cyan + Ember Orange palette aus
-    // /mnt/ssd-fast/Projekte/hellion-media/hellion-media-website/BRANDING.md
-    // (Schema-Stand 2026-04-16). Channels sind über das ganze Brand-Spektrum
-    // verteilt damit jede Zeile auf einen Glance unterscheidbar ist:
-    // Cyan-Familie für Standard/Tell, Ember + Warning für laute Channels,
-    // Status-Farben (Success, Danger) für Linkshells. CrossLinkshells
-    // nutzen die dunkleren/sattersten Varianten derselben Hue-Familien.
+    // Hellion brand preset — Arctic Cyan + Ember Orange palette.
+    // Cyan family for Standard/Tell, Ember/Warning for loud channels,
+    // Status colours for Linkshells, darker variants for CrossLinkshells.
     private static IReadOnlyDictionary<ChatType, uint> BuildHellion()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Cyan-Familie (Brand-Primary)
             [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8
             [ChatType.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
@@ -218,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
@@ -231,31 +213,20 @@ public static class ChatColourPresets
         };
     }
 
-    // Bonus preset — Night Blue, KAZAMA-Stimmungs-Theme aus
-    // /mnt/HDD-Data1/Obsidian/Vault/Systeme/KAZAMA/Theming/Night Blue + Indigo Violet Themes.md
-    // Klassisch, kühl, technisch — Marineblau-Tiefe ohne Lila-Anteil.
-    // Bewusst NICHT als Brand-Preset markiert (Vault-Boundary): die KAZAMA-Themes
-    // sind persönliche Stimmungs-Themes, nicht Teil des Hellion-Brand-Systems.
+    // Night Blue — cool nautical theme, deep navy without purple.
     private static IReadOnlyDictionary<ChatType, uint> BuildNightBlue()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Royal Blue Akzent-Familie
             [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary
             [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot
             [ChatType.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),
@@ -264,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),
@@ -277,30 +246,20 @@ public static class ChatColourPresets
         };
     }
 
-    // Bonus preset — Indigo Violet, KAZAMA-Stimmungs-Theme aus demselben
-    // Vault-Doc. Warm-mystisch, "Galaxy/Glitter/Nordlicht" — tiefes Indigo
-    // mit kräftigem Violet-Akzent. Persönlicher Favorit (siehe Vault).
-    // Auch nicht als Brand-Preset (siehe NightBlue-Note oben).
+    // Indigo Violet — warm-mystic theme, deep indigo with violet accent.
     private static IReadOnlyDictionary<ChatType, uint> BuildIndigoViolet()
     {
         return new Dictionary<ChatType, uint>
         {
-            // Standard / Tell — Royal Violet Akzent-Familie
-            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary (light lavender)
+            [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary
             [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot
             [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
-
-            // Laute Channels — geteilt mit Night Blue (Status-Farben)
             [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),
             [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),
-
-            // Gruppen
             [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),
             [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),
             [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
             [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim
-
-            // Linkshells 1-8
             [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
             [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
             [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -309,8 +268,6 @@ public static class ChatColourPresets
             [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(139, 77, 222),
             [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(130, 90, 200),
             [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(168, 144, 208),
-
-            // CrossWorld-Linkshells
             [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
             [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
             [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),

HellionChat/Resources/HellionStrings.Designer.cs

@@ -114,6 +114,8 @@ internal class HellionStrings
     internal static string Wizard_Profile_FullHistory_GdprWarning => Get(nameof(Wizard_Profile_FullHistory_GdprWarning));
     internal static string Wizard_Profile_FullHistory_Apply => Get(nameof(Wizard_Profile_FullHistory_Apply));
     internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
+    internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
+    internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));
 
     internal static string Export_Heading => Get(nameof(Export_Heading));
     internal static string Export_Help => Get(nameof(Export_Help));

HellionChat/Resources/HellionStrings.de.resx

@@ -222,6 +222,12 @@
   <data name="Wizard_Reopen_Button" xml:space="preserve">
     <value>Wizard erneut zeigen</value>
   </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Später — Defaults behalten</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Schließt den Wizard ohne Profil-Auswahl. Die Plugin-Defaults bleiben aktiv und der Wizard erscheint beim nächsten Plugin-Reload erneut.</value>
+  </data>
   <data name="Export_Heading" xml:space="preserve">
     <value>Export (DSGVO Art. 15 — Auskunftsrecht)</value>
   </data>
@@ -639,7 +645,7 @@
     <value>Allgemein</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value>
+    <value>Sprache, Eingabe, Audio und Performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Erscheinungsbild</value>
@@ -657,25 +663,25 @@
     <value>Fenster</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Verhalten des Fensters — wann es da ist, ob es bewegt werden kann.</value>
+    <value>Wann das Fenster sichtbar ist und ob es sich bewegen lässt.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>Wie Nachrichten angezeigt werden — Tells, Vorschau, Verhalten, Emotes.</value>
+    <value>Tells, Vorschau, Nachrichten-Verhalten und Emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab-Verwaltung — eigene Chat-Tabs anlegen und konfigurieren.</value>
+    <value>Eigene Chat-Tabs anlegen und konfigurieren.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Datenschutz</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>Was darf gespeichert werden — Privacy-Filter pro Channel.</value>
+    <value>Privacy-Filter pro Channel und was gespeichert werden darf.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Datenbank</value>
@@ -687,7 +693,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value>
+    <value>Version, Mission, Lizenz und Changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -732,25 +738,25 @@
     <value>Theme &amp; Layout</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
-    <value>Wie das Fenster aussieht — Theme, Rahmen, Zeitstempel-Style.</value>
+    <value>Theme, Fenster-Rahmen und Zeitstempel-Style.</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
     <value>Schriften &amp; Farben</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
-    <value>Lesbarkeit — Schriftart, Schriftgröße, Chat-Farben pro Channel.</value>
+    <value>Schriftart, Schriftgröße und Chat-Farben pro Channel.</value>
   </data>
   <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
     <value>Daten-Verwaltung</value>
   </data>
   <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
-    <value>Was passiert mit gespeicherten Daten — Aufbewahrung, Aufräumen, Export, DB-Stats.</value>
+    <value>Aufbewahrung, Aufräumen, Export und Datenbank-Statistiken.</value>
   </data>
   <data name="Settings_Card_Integrations_Title" xml:space="preserve">
     <value>Integrationen</value>
   </data>
   <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
-    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Auto-detected, mit Vorschau auf kommende Integrationen.</value>
+    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Kommende Integrationen in der Vorschau.</value>
   </data>
   <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
     <value>Theme</value>

HellionChat/Resources/HellionStrings.resx

@@ -19,28 +19,28 @@
     <value>Enable privacy filter</value>
   </data>
   <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
-    <value>When enabled, only messages from whitelisted channels are persisted to the database. Disabling restores the original behavior (everything except battle messages is stored).</value>
+    <value>When enabled, only messages from allowed channels are written to the database. When disabled, the default behaviour applies — everything except battle logs is stored.</value>
   </data>
   <data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve">
-    <value>The filter only controls what is written to the local database. The chat log itself keeps showing every message live, disallowed channels just stop being saved. Use the channel hide options in your in-game chat tabs if you want to remove channels from the visible chat.</value>
+    <value>The filter only controls what is written to the local database. The chat log still shows every message live; excluded channels are simply no longer stored. If you also want to remove channels from the visible display, use the normal chat-tab filters in the game.</value>
   </data>
   <data name="Privacy_Filter_Tree_Heading" xml:space="preserve">
     <value>Privacy filter and whitelist</value>
   </data>
   <data name="Privacy_Whitelist_Help" xml:space="preserve">
-    <value>Pick which channels are stored in the local database. Privacy-First default: only your own conversations. Use the buttons below to apply a preset.</value>
+    <value>Choose which channels are saved to the local database. Default follows data minimisation: only your own conversations. Use the buttons below to apply a preset.</value>
   </data>
   <data name="Privacy_Preset_PrivacyFirst" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
   </data>
   <data name="Privacy_Preset_ClearAll" xml:space="preserve">
-    <value>Clear all</value>
+    <value>Deselect all</value>
   </data>
   <data name="Privacy_Preset_SelectAll" xml:space="preserve">
     <value>Select all</value>
   </data>
   <data name="Privacy_Group_DirectMessages" xml:space="preserve">
-    <value>Direct Messages</value>
+    <value>Direct messages</value>
   </data>
   <data name="Privacy_Group_PartyAlliance" xml:space="preserve">
     <value>Party &amp; Alliance</value>
@@ -55,52 +55,52 @@
     <value>Cross-World Linkshells</value>
   </data>
   <data name="Privacy_Group_ExtraChat" xml:space="preserve">
-    <value>ExtraChat (Encrypted)</value>
+    <value>ExtraChat (encrypted)</value>
   </data>
   <data name="Privacy_Group_PublicChat" xml:space="preserve">
-    <value>Public Chat (third-party data)</value>
+    <value>Public chat (third-party data)</value>
   </data>
   <data name="Privacy_Group_SystemLogs" xml:space="preserve">
-    <value>System &amp; Game Logs</value>
+    <value>System &amp; game logs</value>
   </data>
   <data name="Privacy_PersistUnknown_Name" xml:space="preserve">
-    <value>Persist unknown channel types</value>
+    <value>Save unknown channel types</value>
   </data>
   <data name="Privacy_PersistUnknown_Description" xml:space="preserve">
-    <value>Failsafe for ChatTypes added by future FFXIV patches that this plugin does not yet know about. Default OFF (Privacy-First). Turn ON if you want a complete log including future channels.</value>
+    <value>Safety net for ChatTypes added by future FFXIV patches that the plugin does not yet know about. Default is OFF (data minimisation). Enable if you want future channels to be fully logged as well.</value>
   </data>
   <data name="Cleanup_Heading" xml:space="preserve">
     <value>Apply filter to existing database</value>
   </data>
   <data name="Cleanup_Help_Intro" xml:space="preserve">
-    <value>The privacy filter only applies to new messages. Use the cleanup below to retroactively remove already-stored messages that don't match your saved whitelist.</value>
+    <value>The privacy filter only affects new messages. The cleanup below lets you retroactively remove already-stored messages that do not match your saved whitelist.</value>
   </data>
   <data name="Cleanup_Help_SavedNote" xml:space="preserve">
-    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved edits above. Click Save first if you want to apply your current edits.</value>
+    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved changes above. Click Save first if you want your current changes to be applied.</value>
   </data>
   <data name="Retention_Help_SavedNote" xml:space="preserve">
-    <value>The manual sweep uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current edits.</value>
+    <value>The manual run uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current changes.</value>
   </data>
   <data name="Cleanup_Preview_Stale" xml:space="preserve">
-    <value>Preview is out of date — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
+    <value>Preview is stale — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
   </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Refresh preview</value>
   </data>
   <data name="Cleanup_NoPreview" xml:space="preserve">
-    <value>No preview yet. Click Refresh to compute the impact.</value>
+    <value>No preview yet. Click Refresh to calculate the impact.</value>
   </data>
   <data name="Cleanup_TotalStored" xml:space="preserve">
     <value>Total stored messages: {0:N0}</value>
   </data>
   <data name="Cleanup_WillKeep" xml:space="preserve">
-    <value>Will keep:    {0:N0}</value>
+    <value>Keep:    {0:N0}</value>
   </data>
   <data name="Cleanup_WillDelete" xml:space="preserve">
-    <value>Will delete:  {0:N0}</value>
+    <value>Delete:  {0:N0}</value>
   </data>
   <data name="Cleanup_Breakdown" xml:space="preserve">
-    <value>Per-channel breakdown</value>
+    <value>Breakdown by channel</value>
   </data>
   <data name="Cleanup_Marker_Keep" xml:space="preserve">
     <value>[KEEP]  </value>
@@ -112,46 +112,46 @@
     <value>Apply current filter to database</value>
   </data>
   <data name="Cleanup_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: Hard-deletes {0:N0} messages, then runs VACUUM. Cannot be undone.</value>
+    <value>Ctrl+Shift: Permanently deletes {0:N0} messages and runs VACUUM afterwards. Cannot be undone.</value>
   </data>
   <data name="Cleanup_Running" xml:space="preserve">
-    <value>Cleanup running in background…</value>
+    <value>Cleanup running in the background…</value>
   </data>
   <data name="Cleanup_PreviewError" xml:space="preserve">
-    <value>Failed to compute cleanup preview, see /xllog</value>
+    <value>Preview could not be calculated, see /xllog</value>
   </data>
   <data name="Cleanup_Success" xml:space="preserve">
-    <value>Privacy cleanup complete: {0:N0} messages removed.</value>
+    <value>Cleanup complete, {0:N0} messages removed.</value>
   </data>
   <data name="Cleanup_Error" xml:space="preserve">
-    <value>Privacy cleanup failed, see /xllog</value>
+    <value>Cleanup failed, see /xllog</value>
   </data>
   <data name="Retention_Heading" xml:space="preserve">
     <value>Message retention</value>
   </data>
   <data name="Retention_Enabled_Name" xml:space="preserve">
-    <value>Auto-delete messages after a per-channel retention window</value>
+    <value>Automatically delete messages past their channel retention window</value>
   </data>
   <data name="Retention_Enabled_Description" xml:space="preserve">
-    <value>When enabled, messages older than the configured window are deleted on every plugin start (at most once per 24 hours). Off by default. The plugin never deletes history without your explicit consent.</value>
+    <value>When enabled, messages older than the configured window are deleted on each plugin start (at most once every 24 hours). Default is OFF — the plugin never deletes anything without your explicit consent.</value>
   </data>
   <data name="Retention_Default_Label" xml:space="preserve">
     <value>Default retention (days, 0 = never)</value>
   </data>
   <data name="Retention_Default_Help" xml:space="preserve">
-    <value>Applies to channels without an explicit override below.</value>
+    <value>Applies to channels that have no individual override below.</value>
   </data>
   <data name="Retention_Reset_Spec" xml:space="preserve">
     <value>Reset overrides to spec defaults</value>
   </data>
   <data name="Retention_Clear_Overrides" xml:space="preserve">
-    <value>Clear all overrides</value>
+    <value>Remove all overrides</value>
   </data>
   <data name="Retention_Tree_Heading" xml:space="preserve">
-    <value>Per-channel retention overrides</value>
+    <value>Retention per channel</value>
   </data>
   <data name="Retention_Tag_Override" xml:space="preserve">
-    <value>[override]</value>
+    <value>[custom]</value>
   </data>
   <data name="Retention_Tag_Spec" xml:space="preserve">
     <value>[spec]</value>
@@ -163,13 +163,13 @@
     <value>reset</value>
   </data>
   <data name="Retention_Apply_Label" xml:space="preserve">
-    <value>Apply retention policy now</value>
+    <value>Apply retention now</value>
   </data>
   <data name="Retention_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: runs the retention sweep immediately using the SAVED policy. Save your changes first.</value>
+    <value>Ctrl+Shift: Runs the retention cleanup immediately using the SAVED policy. Save your changes first.</value>
   </data>
   <data name="Retention_Running" xml:space="preserve">
-    <value>Retention sweep running in background…</value>
+    <value>Retention cleanup running in the background…</value>
   </data>
   <data name="Retention_LastRun_Never" xml:space="preserve">
     <value>Last run: never</value>
@@ -178,67 +178,73 @@
     <value>Last run: {0:yyyy-MM-dd HH:mm}</value>
   </data>
   <data name="Retention_Success" xml:space="preserve">
-    <value>Retention sweep complete: {0:N0} messages removed.</value>
+    <value>Retention cleanup complete, {0:N0} messages removed.</value>
   </data>
   <data name="Retention_Error" xml:space="preserve">
-    <value>Retention sweep failed, see /xllog</value>
+    <value>Retention cleanup failed, see /xllog</value>
   </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Welcome</value>
   </data>
   <data name="Wizard_Intro" xml:space="preserve">
-    <value>Pick a starting profile. You can change anything later under Settings → Privacy.</value>
+    <value>Choose a starting profile. You can adjust everything later under Settings → Privacy.</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Heading" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Description" xml:space="preserve">
-    <value>Only your own conversations are stored: Tells, Party, FC, Linkshells, Cross-World Linkshells, Alliance and ExtraChat. Public chat, NPC dialogue and system spam are dropped at the storage layer. Retention follows the spec defaults (Tells 365 days, own-conversation channels 90 days).</value>
+    <value>Only your own conversations are stored: tells, party, FC, linkshells, cross-world linkshells, alliance, and ExtraChat. Public chat, NPC dialogues, and system spam are discarded at the storage level. Retention follows spec defaults (tells 365 days, own conversation channels 90 days).</value>
   </data>
   <data name="Wizard_Profile_PrivacyFirst_Apply" xml:space="preserve">
-    <value>Use Privacy-First</value>
+    <value>Apply data minimisation</value>
   </data>
   <data name="Wizard_Profile_Casual_Heading" xml:space="preserve">
     <value>Casual</value>
   </data>
   <data name="Wizard_Profile_Casual_Description" xml:space="preserve">
-    <value>Privacy-First plus a 24-hour window for public chat (Say, Shout, Yell, both emote types, Novice Network). For RP players who want to look up the last scene without keeping public chat forever.</value>
+    <value>Data minimisation plus a 24-hour window for public chat (say, shout, yell, both emote types, novice network). For RP players who want to re-read the last scene without keeping public chat forever.</value>
   </data>
   <data name="Wizard_Profile_Casual_Apply" xml:space="preserve">
-    <value>Use Casual</value>
+    <value>Apply casual</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Heading" xml:space="preserve">
-    <value>Full History</value>
+    <value>Full history</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Description" xml:space="preserve">
-    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behavior). Retention is OFF, history grows forever.</value>
+    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behaviour). Retention is OFF, so the history grows indefinitely.</value>
   </data>
   <data name="Wizard_Profile_FullHistory_GdprWarning" xml:space="preserve">
-    <value>GDPR notice: storing third-party messages (Say/Shout/Yell of strangers, NPC dialogue with player names, etc.) for an unlimited time may exceed the personal/household exemption (Art. 2(2)(c)). Use this profile only if you have a clear reason to keep the full archive.</value>
+    <value>GDPR notice: Storing third-party messages (say/shout/yell from other players, NPC dialogues with player names, etc.) indefinitely may exceed the exemption for purely personal or household activities (Art. 2(2)(c)). Only use this profile if you have a clear reason to keep the full archive.</value>
   </data>
   <data name="Wizard_Profile_FullHistory_Apply" xml:space="preserve">
-    <value>Use Full History</value>
+    <value>Apply full history</value>
   </data>
   <data name="Wizard_Reopen_Button" xml:space="preserve">
     <value>Show wizard again</value>
   </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Later — keep defaults</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Close the wizard without selecting a profile. The plugin defaults stay active and the wizard returns on next plugin load.</value>
+  </data>
   <data name="Export_Heading" xml:space="preserve">
-    <value>Export (GDPR Art. 15 — right of access)</value>
+    <value>Export (GDPR Art. 15 — Right of access)</value>
   </data>
   <data name="Export_Help" xml:space="preserve">
-    <value>Export stored messages to Markdown, JSON or CSV. Use this to fulfil a request for access from someone whose messages you have, or to take your own history with you.</value>
+    <value>Export stored messages as Markdown, JSON, or CSV. This lets you fulfil an access request from a person whose messages you have stored, or take your own history with you.</value>
   </data>
   <data name="Export_Range_Label" xml:space="preserve">
-    <value>Last X days (0 = all time)</value>
+    <value>Last X days (0 = no time limit)</value>
   </data>
   <data name="Export_Sender_Label" xml:space="preserve">
     <value>Sender contains (optional, case-insensitive)</value>
   </data>
   <data name="Export_Channels_Heading" xml:space="preserve">
-    <value>Limit to channels</value>
+    <value>Restrict to channels</value>
   </data>
   <data name="Export_Channels_AllOff" xml:space="preserve">
-    <value>(none selected = all stored channels)</value>
+    <value>(nothing selected = all stored channels)</value>
   </data>
   <data name="Export_Format_Label" xml:space="preserve">
     <value>Format</value>
@@ -259,41 +265,41 @@
     <value>Save export</value>
   </data>
   <data name="Export_Running" xml:space="preserve">
-    <value>Export running in background…</value>
+    <value>Export running in the background…</value>
   </data>
   <data name="Export_Success" xml:space="preserve">
-    <value>Export complete: {0:N0} messages written to {1}</value>
+    <value>Export complete, {0:N0} messages written to {1}</value>
   </data>
   <data name="Export_Empty" xml:space="preserve">
-    <value>Export complete: no messages matched the filter.</value>
+    <value>Export complete, no message matched the filter.</value>
   </data>
   <data name="Export_Error" xml:space="preserve">
     <value>Export failed, see /xllog</value>
   </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
-    <value>Use the Hellion theme across all plugin windows</value>
+    <value>Use Hellion theme for all plugin windows</value>
   </data>
   <data name="Theme_Enabled_Description" xml:space="preserve">
-    <value>Hellion Online Media palette of Arctic Cyan plus Ember Orange, applied across the chat log, settings, viewers and the wizard. Disable to fall back to the default Dalamud look.</value>
+    <value>Hellion Online Media palette of Arctic Cyan and Ember Orange, applied to the chat window, settings, viewer, and wizard. Disable to use the default Dalamud appearance.</value>
   </data>
   <data name="Theme_WindowOpacity_Label" xml:space="preserve">
     <value>Window opacity</value>
   </data>
   <data name="Theme_WindowOpacity_Help" xml:space="preserve">
-    <value>How opaque the plugin panes are. Lower values let the game shine through; form fields and dialogs stay opaque on top so they remain readable.</value>
+    <value>How opaque the plugin windows are. Lower values let the game show through; form fields and dialogs stay fully opaque and readable on top.</value>
   </data>
   <data name="Theme_UseHellionFont_Name" xml:space="preserve">
-    <value>Use the bundled Hellion font (Exo 2)</value>
+    <value>Use bundled Hellion font (Exo 2)</value>
   </data>
   <data name="Theme_UseHellionFont_Description" xml:space="preserve">
-    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1) which ships with the plugin. Disable to fall back to whatever font you picked under Settings → Fonts.</value>
+    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1), which ships with the plugin. Disable to fall back to the font selected under Settings → Font.</value>
   </data>
 
   <data name="About_Maintainer_Heading" xml:space="preserve">
     <value>Maintainer</value>
   </data>
   <data name="About_Maintainer_Body" xml:space="preserve">
-    <value>I maintain Hellion Chat through Hellion Online Media. The website has the contact details for licensing, legal or business questions.</value>
+    <value>I maintain Hellion Chat through Hellion Online Media. Contact details for licensing, legal, or business inquiries are on the website.</value>
   </data>
   <data name="About_Maintainer_Website_Label" xml:space="preserve">
     <value>Website:</value>
@@ -303,76 +309,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 +389,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 +461,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 +492,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 +526,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 +537,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 +548,7 @@
     <value>Changelog</value>
   </data>
 
-  <!-- Hellion Chat — Default tab presets (channel-themed) -->
+  <!-- Hellion Chat — Default tab presets (channel-specific) -->
   <data name="Tabs_Presets_System" xml:space="preserve">
     <value>System</value>
   </data>
@@ -553,36 +559,36 @@
     <value>Party</value>
   </data>
   <data name="Tabs_Presets_Beginner" xml:space="preserve">
-    <value>Beginner</value>
+    <value>Novice</value>
   </data>
   <data name="Tabs_Presets_Linkshell" xml:space="preserve">
     <value>Linkshell</value>
   </data>
   <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
-    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for cleaner readability. Duplicate this tab and narrow the channel selection per copy.</value>
+    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for a cleaner overview. Duplicate the tab and restrict the channel selection in each copy.</value>
   </data>
 
   <!-- Hellion Chat — v1.2.0 per-tab icon override -->
   <data name="Tabs_Icon_Label" xml:space="preserve">
-    <value>Tab-Icon</value>
+    <value>Tab icon</value>
   </data>
   <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
-    <value>FontAwesome-Glyph für die Sidebar. Default greift auf Tab-Name oder Channel-Typ.</value>
+    <value>FontAwesome glyph for the sidebar. Default falls back to the tab name or channel type.</value>
   </data>
   <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
-    <value>(Default-Mapping)</value>
+    <value>(Default mapping)</value>
   </data>
   <data name="ChatColourPresets_Default" xml:space="preserve">
-    <value>Klassik (Chat 2 Default)</value>
+    <value>Classic (Chat 2 default)</value>
   </data>
   <data name="ChatColourPresets_HighContrast" xml:space="preserve">
-    <value>High-Contrast</value>
+    <value>High contrast</value>
   </data>
   <data name="ChatColourPresets_Pastell" xml:space="preserve">
-    <value>Pastell</value>
+    <value>Pastel</value>
   </data>
   <data name="ChatColourPresets_DarkModeTuned" xml:space="preserve">
-    <value>Dark-Mode-Tuned</value>
+    <value>Dark mode tuned</value>
   </data>
   <data name="ChatColourPresets_Hellion" xml:space="preserve">
     <value>Hellion</value>
@@ -594,22 +600,22 @@
     <value>Indigo Violet</value>
   </data>
   <data name="Settings_Appearance_Colours_PresetsHint" xml:space="preserve">
-    <value>Tip: presets overwrite your current channel colours immediately.</value>
+    <value>Tip: Presets overwrite your current channel colours immediately.</value>
   </data>
   <data name="Settings_Window_PopOutInputEnabled_Name" xml:space="preserve">
     <value>Enable input in pop-outs</value>
   </data>
   <data name="Settings_Window_PopOutInputEnabled_Description" xml:space="preserve">
-    <value>Master switch: lets you type and send messages directly inside every pop-out window (including auto-tell tabs). Channel changes inside a pop-out apply globally just like in the main window; the text buffer and history cursor stay independent per pop-out.</value>
+    <value>Master switch: allows typing and sending directly in any pop-out window (including auto-tell tabs). Channel switching in a pop-out acts globally like in the main window; the text buffer and history cursor are independent per pop-out.</value>
   </data>
   <data name="Settings_Window_ResetPosition_Name" xml:space="preserve">
-    <value>Reset Window Position</value>
+    <value>Reset window position</value>
   </data>
   <data name="Settings_Window_ResetPosition_Description" xml:space="preserve">
-    <value>Snaps the chat window and every active pop-out back to the primary monitor's top-left corner. Useful when a window has drifted off-screen after a display layout change (monitor disconnected, resolution changed). The plugin also runs an automatic bounds check once per session — this button is the manual backup if anything still ends up unreachable.</value>
+    <value>Moves the chat window and all active pop-outs back to the top-left corner of the primary monitor. Useful when a window has ended up outside the visible area after a display layout change (monitor disconnected, resolution changed). The plugin also performs an automatic bounds check once per session; this button is the manual escape hatch if something still ends up unreachable.</value>
   </data>
   <data name="Popout_v060_HintText" xml:space="preserve">
-    <value>New in v0.6.0: you can type directly inside pop-out windows. Toggle the master switch in the window settings to enable it.</value>
+    <value>New in v0.6.0: You can now type directly in pop-outs. Enable the master switch in the Window settings.</value>
   </data>
   <data name="Popout_v060_HintAck" xml:space="preserve">
     <value>Got it</value>
@@ -618,19 +624,19 @@
     <value>Open window settings</value>
   </data>
   <data name="Hint_v061_PopOutHeader_Body" xml:space="preserve">
-    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is enabled by default (can be turned off under Settings → Window).</value>
+    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is active by default (can be disabled under Settings → Window).</value>
   </data>
   <data name="Hint_v061_PopOutHeader_Ack" xml:space="preserve">
     <value>Got it</value>
   </data>
   <data name="Hint_v061_PopOutHeader_OpenSettings" xml:space="preserve">
-    <value>Open Settings</value>
+    <value>Open settings</value>
   </data>
   <data name="ChatTwoConflictTitle" xml:space="preserve">
     <value>Hellion Chat cannot start while Chat 2 is loaded.</value>
   </data>
   <data name="ChatTwoConflictBody" xml:space="preserve">
-    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same in-game chat window and would conflict at runtime if loaded together.</value>
+    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same chat window in the game and would conflict at runtime.</value>
   </data>
   <data name="ChatTwoConflictAction" xml:space="preserve">
     <value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value>
@@ -639,7 +645,7 @@
     <value>General</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-wide settings — language, input, audio, performance.</value>
+    <value>Language, input, audio, and performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Appearance</value>
@@ -657,25 +663,25 @@
     <value>Window</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Window behaviour — when it shows, whether it can move.</value>
+    <value>When the window is visible and whether it can be moved.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>How messages are displayed — tells, preview, behaviour, emotes.</value>
+    <value>Tells, preview, message behaviour, and emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab management — create and configure your own chat tabs.</value>
+    <value>Create and configure custom chat tabs.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Privacy</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>What's allowed to be stored — privacy filter per channel.</value>
+    <value>Privacy filter per channel and what may be stored.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Database</value>
@@ -687,7 +693,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>About the plugin — version, mission, license, changelog.</value>
+    <value>Version, mission, licence, and changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -705,16 +711,16 @@
     <value>Open themes folder</value>
   </data>
   <data name="Settings_Themes_ExportActive" xml:space="preserve">
-    <value>Export active...</value>
+    <value>Export active…</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
-    <value>This theme suggests its own chat channel colours.</value>
+    <value>This theme suggests its own channel colours.</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
     <value>Apply</value>
   </data>
   <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
-    <value>Keep current</value>
+    <value>Keep</value>
   </data>
   <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
     <value>Privacy-First</value>
@@ -723,55 +729,55 @@
     <value>Open</value>
   </data>
   <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
-    <value>Compact Density</value>
+    <value>Compact density</value>
   </data>
   <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
-    <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
+    <value>Switches the message layout from the card-row default back to single-line `[HH:mm] Sender: Text` rows.</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
     <value>Theme &amp; Layout</value>
   </data>
   <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
-    <value>How the window looks — theme, frame, timestamp style.</value>
+    <value>Theme, window frame, and timestamp style.</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
     <value>Fonts &amp; Colours</value>
   </data>
   <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
-    <value>Readability — font, font size, per-channel chat colours.</value>
+    <value>Font, font size, and chat colours per channel.</value>
   </data>
   <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
-    <value>Data Management</value>
+    <value>Data management</value>
   </data>
   <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
-    <value>What happens to stored data — retention, cleanup, export, DB stats.</value>
+    <value>Retention, cleanup, export, and database statistics.</value>
   </data>
   <data name="Settings_Card_Integrations_Title" xml:space="preserve">
     <value>Integrations</value>
   </data>
   <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
-    <value>Other Dalamud plugins HellionChat reacts to. Auto-detected, with a "coming soon" preview of upcoming integrations.</value>
+    <value>Other Dalamud plugins that HellionChat works with. Upcoming integrations in preview.</value>
   </data>
   <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
     <value>Theme</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
-    <value>Window Style</value>
+    <value>Window style</value>
   </data>
   <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
-    <value>Timestamp Style</value>
+    <value>Timestamp style</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
-    <value>Window Transparency</value>
+    <value>Window transparency</value>
   </data>
   <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
-    <value>How transparent the window background is. Lower values let the game show through more. Tip: Dalamud's per-window menu (Hamburger in the title bar) gives you per-window overrides for opacity, background blur, click-through and pinning — those override this slider for that window.</value>
+    <value>How transparent the window background is. Lower values let more of the game show through. Tip: Dalamud's per-window menu (hamburger in the title bar) offers per-window overrides for opacity, background blur, click-through, and pinning — those take precedence over this slider for the respective window.</value>
   </data>
   <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
     <value>Fonts</value>
   </data>
   <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
-    <value>Chat Colours</value>
+    <value>Chat colours</value>
   </data>
   <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
     <value>Storage</value>
@@ -786,22 +792,22 @@
     <value>Export</value>
   </data>
   <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
-    <value>Database Viewer</value>
+    <value>Database viewer</value>
   </data>
   <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
-    <value>Advanced (Shift+Click to open)</value>
+    <value>Advanced (Shift+click to open)</value>
   </data>
   <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
     <value>Behaviour</value>
   </data>
   <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
-    <value>Hellion Chat 1.2.1 reorganised the Settings menu and removed the legacy "Style override" option (made obsolete by the Themes system in 1.1.0). Your other settings are unchanged. Window opacity was migrated to Theme &amp; Layout. A backup of your previous config is at pluginConfigs/HellionChat.json.pre-v16-backup next to the live HellionChat.json.</value>
+    <value>Hellion Chat 1.2.1 has reorganised the settings menu and removed the old "Override style" option (superseded by the theme system from 1.1.0). Your remaining settings are unchanged. Window transparency has been migrated to "Theme &amp; Layout". A backup of the previous config is located at pluginConfigs/HellionChat.json.pre-v16-backup next to the active HellionChat.json.</value>
   </data>
   <data name="Settings_Tab_Integrations" xml:space="preserve">
     <value>Integrations</value>
   </data>
   <data name="Settings_Integrations_Intro" xml:space="preserve">
-    <value>Plugin integrations let HellionChat react to other installed Dalamud plugins. Each integration auto-detects its target and silently disables itself when the target plugin is not present.</value>
+    <value>Plugin integrations let HellionChat work together with other installed Dalamud plugins. Each integration automatically detects its target and silently disables itself when the target plugin is missing.</value>
   </data>
   <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
     <value>Honorific</value>
@@ -813,13 +819,13 @@
     <value>Not installed</value>
   </data>
   <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
-    <value>Incompatible API version ({0} expected, {1}.{2} detected)</value>
+    <value>Incompatible API version ({0} expected, {1}.{2} found)</value>
   </data>
   <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
     <value>Show Honorific title in chat header</value>
   </data>
   <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
-    <value>Displays your custom title from Honorific in the header above the chat log, in your chosen colour.</value>
+    <value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value>
   </data>
   <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
     <value>Honorific on GitHub</value>
@@ -831,48 +837,48 @@
     <value>Coming soon</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
-    <value>These integrations are on the roadmap. The settings for each appear automatically once the underlying plugin is wired up.</value>
+    <value>These integrations are on the roadmap. The settings will appear automatically once the respective plugin is connected.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
     <value>Context menu actions</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
-    <value>Right-click a name in chat to jump to PlayerTrack, open the Lodestone profile, or compose a DM in one click.</value>
+    <value>Right-click a name in chat: jump to PlayerTrack, open the Lodestone profile, or compose a DM with one click.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve">
     <value>Smart notifications (NotificationMaster)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve">
-    <value>Route mentions and DMs through NotificationMaster for system toasts, taskbar flash, and per-channel sounds.</value>
+    <value>Mentions and DMs via NotificationMaster: system toasts, taskbar flash, and per-channel sounds.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve">
     <value>RP status block (Moodles · LightlessClient)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve">
-    <value>Show Moodles status icons and pair-badges inline next to chat names for richer roleplay context.</value>
+    <value>Show Moodles status icons and pair badges directly next to chat names for more roleplay context.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve">
     <value>ExtraChat channels</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve">
-    <value>Host end-to-end-encrypted cross-datacenter linkshells natively in HellionChat.</value>
+    <value>Host end-to-end encrypted cross-datacenter linkshells natively in HellionChat.</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
-    <value>Quick DM button (XIVInstantMessenger)</value>
+    <value>Quick-DM button (XIVInstantMessenger)</value>
   </data>
   <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
-    <value>One-click DM compose without leaving the chat window.</value>
+    <value>Quick DM access directly from the chat window, one click.</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
     <value>Got an idea?</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
-    <value>Got an idea for a plugin integration that's not on this list? Hop on the Hellion Forge Discord and tell me. Community input drives the roadmap.</value>
+    <value>Got an idea for a plugin integration that is not on the list? Come to the Hellion Forge Discord and write to me. Community input shapes the roadmap.</value>
   </data>
   <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
     <value>Open Hellion Forge</value>
   </data>
   <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
-    <value>Honorific custom title</value>
+    <value>Custom title from Honorific</value>
   </data>
 </root>

HellionChat/SelfTests/ThemeSwitchSelfTestStep.cs

@@ -4,13 +4,9 @@ using HellionChat.Themes;
 
 namespace HellionChat.SelfTests;
 
-// Validates the runtime theme-switch contract from the user side. The
-// caller toggles the active theme via Settings -> Theme & Layout, the
-// step polls ThemeRegistry.Active per frame and only passes once the
-// slug has moved away from the initial value and back. The ABGR cache
-// is sanity-checked on every frame: a freshly switched theme must carry
-// a populated cache, otherwise Switch() forgot the recompute and the UI
-// would still draw, just with all-transparent slots.
+// 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;
@@ -73,9 +69,8 @@ internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
         this.switchedAway = false;
     }
 
-    // Any non-zero slot proves the cache was actually recomputed for the
-    // current theme. We don't compare against a reference, because custom
-    // themes can legitimately share slot values with a built-in.
+    // 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;

HellionChat/Themes/Builtin/HellionSpectrum.cs

@@ -2,12 +2,7 @@ using HellionChat.Util;
 
 namespace HellionChat.Themes.Builtin;
 
-// Hellion Spectrum: Deuteran/Protan-safe channel colours.
-// Palette derived from Bang Wong, "Points of view: Color blindness",
-// Nature Methods 8, 441 (2011). Channel identity (Tell pink, Yell yellow,
-// Shout orange, Party blue, FC green) is preserved per Channel-Identity-
-// Rule in docs/THEME-AUTHORING.md; tones are chosen so every channel
-// stays distinguishable under red-green colour-vision deficiency.
+// Deuteran/Protan-safe palette with preserved channel identity.
 internal static class HellionSpectrum
 {
     public const string Slug = "hellion-spectrum";
@@ -57,9 +52,6 @@ internal static class HellionSpectrum
             ChatColors: new ThemeChatColors(
                 new Dictionary<HellionChat.Code.ChatType, uint>
                 {
-                    // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
-                    // identity. FC pulled slightly greener than vanilla cyan-teal so
-                    // Party-blue and FC-green stay separable under deuteran sim.
                     [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
                     [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"),
                     [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"),

HellionChat/Themes/Builtin/SynthwaveSunset.cs

@@ -10,7 +10,7 @@ internal static class SynthwaveSunset
         new(
             Slug: Slug,
             Name: "Synthwave Sunset",
-            Author: "Hellion Forge",
+            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"),

HellionChat/Themes/ThemeChatColors.cs

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

HellionChat/Themes/ThemeColors.cs

@@ -1,6 +1,6 @@
 namespace HellionChat.Themes;
 
-// Color-Werte als 0xRRGGBBAA, RgbaToAbgr handled den Byte-Swap zu ImGui.
+// Colour values as 0xRRGGBBAA — RgbaToAbgr handles the byte-swap for ImGui.
 public sealed record ThemeColors(
     uint PrimaryDark,
     uint Primary,

HellionChat/Themes/ThemeJsonLoader.cs

@@ -66,10 +66,8 @@ internal static class ThemeJsonLoader
         var dict = new Dictionary<HellionChat.Code.ChatType, uint>();
         foreach (var prop in el.EnumerateObject())
         {
-            // Property-Name ist der ChatType-Name als String (z.B. "Say", "Tell"),
-            // Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names
-            // werden still übersprungen — Forward-Compat falls SE neue Channels
-            // einführt.
+            // 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,

HellionChat/Themes/ThemeLayout.cs

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

HellionChat/Themes/ThemeRegistry.cs

@@ -29,7 +29,7 @@ public sealed class ThemeRegistry
             { SynthwaveSunset.Slug, SynthwaveSunset.Build() },
         };
 
-        // Centralised so the ten .Build() factories stay free of cache plumbing.
+        // Centralised so Build() factories stay free of cache plumbing.
         foreach (var theme in _builtIns.Values)
             theme.RecomputeAbgrCache();
 
@@ -58,14 +58,13 @@ public sealed class ThemeRegistry
     public void Switch(string slug)
     {
         var theme = Get(slug);
-        // Defensive — idempotent and cheap, so any future theme source
-        // that forgets the cache fill still ends up with a populated one.
+        // Defensive — ensures any future theme source always gets a populated cache.
         theme.RecomputeAbgrCache();
         _active = theme;
     }
 
-    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION. Other
-    // IO failures are permanent and get the theme dropped instead of retried.
+    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION.
+    // Other IO failures are permanent — theme is dropped instead of retried.
     internal static bool IsRecoverableFileLock(Exception? ex)
     {
         if (ex is not IOException io)
@@ -74,9 +73,8 @@ public sealed class ThemeRegistry
         return code == 0x80070020u || code == 0x80070021u;
     }
 
-    // Custom-Themes werden lazy aus dem Verzeichnis geladen, Cache mit
-    // LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup
-    // neu eingelesen.
+    // Custom themes are loaded lazily, cached by LastWriteTime.
+    // A changed JSON is reloaded on the next lookup.
     private Theme? LoadCustomBySlug(string slug)
     {
         if (_customThemesDir is null)
@@ -115,8 +113,7 @@ public sealed class ThemeRegistry
                 }
                 catch (Exception ex) when (IsRecoverableFileLock(ex))
                 {
-                    // Editor mid-save: keep the cached snapshot, leave the stamp
-                    // alone so the next refresh retries automatically.
+                    // 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"
                     );

HellionChat/Themes/ThemeTypography.cs

@@ -1,7 +1,6 @@
 namespace HellionChat.Themes;
 
-// Optional pro Theme. v1.1.0 nutzt das nicht aktiv; ist als Erweiterungspunkt
-// für zukünftige Theme-Slots vorbereitet.
+// 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

@@ -1,34 +1,17 @@
 namespace HellionChat.Ui;
 
-/// <summary>
-/// Hash-Color-Tinting für Auto-Tell-Tabs in der Sidebar (v1.2.0).
-/// Differenziert Tells visuell ohne dass User pro Tab manuell ein
-/// Custom-Icon setzen muss. Gleicher Tell-Partner (Name+World) liefert
-/// konsistent dieselbe Farbe über Sessions hinweg.
-///
-/// Kuratierte 12-Farb-Palette aus dem Hellion-Theme-Pool: alle saturiert
-/// mid-bright, lesbar gegen Dark-Theme-Backgrounds. Bei realistischen
-/// 1-5 parallelen Tells ist Kollisions-Wahrscheinlichkeit gering.
-///
-/// Reine String-Logik (kein Dalamud-Dep) — testbar im HellionChat.Tests-
-/// Projekt das ohne Dalamud-Reference baut.
-/// </summary>
+// 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
 {
-    /// <summary>
-    /// Fallback bei ungültigem Input (leerer Name, World=0). Standard-
-    /// Text-Color (weiß) — passt mit existierendem TextPrimary-Default
-    /// zusammen, sodass die Sidebar visuell konsistent bleibt.
-    /// </summary>
+    // Fallback for invalid input (empty name or world=0). White matches
+    // TextPrimary default so the sidebar stays visually consistent.
     public const uint Fallback = 0xFFFFFFFFu;
 
-    /// <summary>
-    /// 12 saturierte mid-bright Farben aus den 5 Built-In-Themes
-    /// (Hellion-Arctic, Chat2-Klassik, Event-Horizon, Moonlit-Bloom,
-    /// Mint-Grove). Reihenfolge ist deterministisch — Hash-Index wählt
-    /// Farbe per Modulo. RGBA-Format (passt zu ColourUtil.RgbaToAbgr-
-    /// Konvention im restlichen Code).
-    /// </summary>
+    // 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
@@ -45,30 +28,19 @@ internal static class AutoTellTabTint
         0xE85D04FFu, // Deep Ember
     };
 
-    /// <summary>
-    /// Liefert eine konsistente Tint-Color für einen Tell-Partner.
-    /// Hash basiert auf "Name@World" — Cross-World-Namen kollidieren
-    /// nur bei Hash-Bucket-Kollision, nicht durch Identitäts-Annahme.
-    /// </summary>
     public static uint For(string name, uint world)
     {
         if (string.IsNullOrEmpty(name) || world == 0)
             return Fallback;
 
-        // GetHashCode kann negativ sein; Bitmaske auf positive Range
-        // damit Modulo-Division immer einen validen Index liefert.
+        // 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)];
     }
 
-    /// <summary>
-    /// Tell-spezifischer Icon-Pool. 7 visuell distinkte FontAwesome-Glyphen
-    /// die im Tell-Kontext sinnvoll wirken (envelope = Tell-Default, star/
-    /// heart/bell = personalisiert, bookmark/flag/fire = markiert/wichtig).
-    /// Bewusst kein cog/comment/users — die wären für System-/Group-Tabs
-    /// reserviert und würden im Tell-Bereich verwirrend wirken.
-    /// </summary>
+    // 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",
@@ -80,26 +52,17 @@ internal static class AutoTellTabTint
         "fire",
     };
 
-    /// <summary>
-    /// Fallback-Icon bei ungültigem Input. "envelope" passt semantisch zum
-    /// Tell-Kontext besser als das alte hardcoded "clock".
-    /// </summary>
+    // "envelope" matches the tell context better than the old hardcoded "clock".
     public const string IconFallback = "envelope";
 
-    /// <summary>
-    /// Liefert ein konsistentes Icon-Glyph für einen Tell-Partner.
-    /// Nutzt einen anderen Hash-Bias als For() (Color), damit Icon und
-    /// Color unabhängig variieren — gibt 7 × 12 = 84 distinct Combinations.
-    /// </summary>
     public static string IconFor(string name, uint world)
     {
         if (string.IsNullOrEmpty(name) || world == 0)
             return IconFallback;
 
-        // Anderer Hash-Bias als For() (verschiedene Modulo-Basis): wir
-        // nutzen "world@name" statt "name@world" damit Icon und Color
-        // nicht synchron variieren. Ohne Bias-Trennung würden alle Tells
-        // mit derselben Color auch dasselbe Icon haben.
+        // 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

@@ -8,16 +8,10 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui;
 
-// Hellion Chat — v0.6.0 input bar component for pop-out windows.
-//
-// Pragmatischer Refactor-Scope: Render() ist ein leerer Marker-Stub für
-// das Hauptfenster — der bestehende Input-Layer in ChatLogWindow bleibt
-// 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.
+// 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.
+// RenderCompact() is the only v0.6.0 deliverable; Render() can be filled
+// in a later cycle if needed.
 public sealed class ChatInputBar
 {
     private readonly Plugin _plugin;
@@ -35,22 +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() { }
 
-    // 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
-    // aus ChatColours), Text-Input rechts daneben. Auto-Translate-Picker
-    // 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.
+    // Channel switching is global via Plugin.Functions.Chat (FFXIV API).
+    // Text buffer and history cursor are independent per pop-out.
     public void RenderCompact()
     {
         var tab = _activeTabAccessor();
@@ -64,18 +53,15 @@ 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
-        // InputHistoryService. Submit is detected the same way the main
-        // window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue
-        // (matching v0.5.x ChatLogWindow.cs behavior).
+        // CallbackHistory wires Up/Down navigation to InputHistoryService.
+        // Submit detected via IsItemDeactivated + Enter, not EnterReturnsTrue
+        // (matches ChatLogWindow behavior).
         const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory;
         ImGui.InputText(
             $"##chat-compact-input-{tab.Identifier}",
@@ -100,9 +86,8 @@ public sealed class ChatInputBar
     private void SubmitCompact(Tab tab) =>
         CompactInputSubmitter.TrySubmit(_state, tab, _host.SendChatBoxFromExternal);
 
-    // History-navigation callback for the compact input. Cursor math is
-    // delegated to CompactInputHistoryNavigator; only the ImGui buffer
-    // splice stays here because it needs the live callback data.
+    // History navigation callback. Cursor math delegated to
+    // CompactInputHistoryNavigator; ImGui buffer splice stays here.
     // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
     private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
     {
@@ -148,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);
 
@@ -160,8 +145,7 @@ 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
-            // until we have a proper icon font available in the compact bar.
+            // Single-letter glyph as a quick visual cue until a proper icon font lands.
             var label = ChannelGlyph(inputType);
             if (
                 ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize))
@@ -171,13 +155,9 @@ public sealed class ChatInputBar
         }
 
         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))
         {
@@ -221,17 +201,12 @@ public sealed class ChatInputBar
             _ => "?",
         };
 
-    // Forwards a tab-cycle keybind delta to the host so all windows
-    // navigate the same active-tab pointer (single source of truth).
-    public void HandleKeybindForward(int delta)
-    {
-        _host.ChangeTabDelta(delta);
-    }
+    // Forwards a tab-cycle keybind delta to the host (single source of truth).
+    public void HandleKeybindForward(int delta) => _host.ChangeTabDelta(delta);
 }
 
-// Per-window input state. Each ChatInputBar instance owns one of these
-// so pop-outs and the main window keep independent buffers and channels
-// (State-Sync-Entscheidung A in the v0.6.0 spec).
+// Per-window input state. Each ChatInputBar owns one so pop-outs and the
+// main window keep independent buffers and history cursors.
 public sealed class InputState
 {
     public string Buffer = string.Empty;

HellionChat/Ui/ChatLogWindow.cs

@@ -52,10 +52,8 @@ public sealed class ChatLogWindow : Window
     private int ActivatePos = -1;
     internal string Chat = string.Empty;
 
-    // Hellion Chat — v0.6.0 input history was extracted into
-    // InputHistoryService so pop-out windows with their own ChatInputBar
-    // share the same Up/Down history with the main window. The cursor
-    // stays window-local because each window navigates independently.
+    // Input history extracted into InputHistoryService so pop-out windows share
+    // the same Up/Down history. Cursor stays window-local (independent navigation).
     private int InputBacklogIdx = -1;
     public bool TellSpecial;
     private readonly Stopwatch LastResize = new();
@@ -74,11 +72,8 @@ public sealed class ChatLogWindow : Window
     public Vector2 LastWindowPos { get; private set; } = Vector2.Zero;
     public Vector2 LastWindowSize { get; private set; } = Vector2.Zero;
 
-    // Window position recovery: guards against off-screen positions after a
-    // display layout change (monitor disconnected, resolution changed). On
-    // the first draw after plugin load we run a one-shot bounds check to see
-    // whether the stored position still overlaps any visible viewport area.
-    // The manual reset button in the settings forces the position regardless.
+    // Guards against off-screen positions after a display layout change.
+    // One-shot bounds check on first draw; manual reset button bypasses it.
     private bool DidOnLoadBoundsCheck;
     internal bool RequestPositionReset { get; set; }
 
@@ -95,6 +90,10 @@ public sealed class ChatLogWindow : Window
     private bool PlayedClosingSound = true;
     private bool DrewThisFrame;
 
+    // One-shot guard so a recurring draw failure doesn't spam the
+    // notification stack frame-by-frame. Resets only on next plugin reload.
+    private bool NotifiedDrawFailure;
+
     private long FrameTime; // set every frame
     internal long LastActivityTime = Environment.TickCount64;
 
@@ -112,9 +111,7 @@ public sealed class ChatLogWindow : Window
         IsOpen = true;
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
-        // AllowBackgroundBlur wird nach AddWindow zentral in Plugin.Setup
-        // für alle registrierten Windows gesetzt — keine Per-Window-Logik
-        // hier nötig.
+        // AllowBackgroundBlur is set centrally in Plugin.Setup after AddWindow.
 
         PayloadHandler = new PayloadHandler(this);
         HandlerLender = new Lender<PayloadHandler>(() => new PayloadHandler(this));
@@ -122,10 +119,8 @@ public sealed class ChatLogWindow : Window
         SetUpTextCommandChannels();
         SetUpAllCommands();
 
-        // Cache the registered wrapper instances so Dispose can detach the same
-        // event objects the constructor attached to, without going through
-        // Register() again (which would re-create the wrapper if the command
-        // happened to be missing from the dictionary).
+        // Cache wrapper instances so Dispose can detach the same event objects
+        // without going through Register() again.
         _clearHellionCommand = Plugin.Commands.Register(
             "/clearhellion",
             "Clear the Hellion Chat log"
@@ -397,11 +392,10 @@ public sealed class ChatLogWindow : Window
         }
     }
 
+    // Delegates to InputHistoryService so pop-out ChatInputBar instances share
+    // history. Deduplication lives inside the service.
     private void AddBacklog(string message)
     {
-        // v0.6.0 — delegates to the shared InputHistoryService so pop-out
-        // ChatInputBar instances see the same history. Move-to-newest
-        // deduplication lives inside the service.
         InputHistoryService.Push(message);
     }
 
@@ -417,15 +411,12 @@ public sealed class ChatLogWindow : Window
         if (Plugin.Config.PreviewPosition is PreviewPosition.Inside)
             height -= Plugin.InputPreview.PreviewHeight;
 
-        // Hellion Chat v0.6.1 — Header-Toolbar rendert auf Window-Ebene über
-        // einem horizontalen Layout-Pfad und wird von GetContentRegionAvail
-        // hier drin NICHT automatisch berücksichtigt, daher expliziter Abzug.
-        // Banner dagegen rendert in DrawChatLog VOR diesem ganzen Block und
-        // ImGui zieht seine Höhe automatisch von GetContentRegionAvail ab,
-        // weil der Cursor schon weiter unten steht — kein eigener Abzug.
+        // Header toolbar height is not subtracted by GetContentRegionAvail automatically
+        // (it renders outside the normal layout path), so we subtract it explicitly.
+        // The hint banner renders before this block so ImGui already accounts for it.
         height -= ImGui.GetFrameHeightWithSpacing();
 
-        // v1.2.0 — Status-Bar am Window-Boden reserviert 22 px + 2 px Spacing.
+        // Status bar at the window bottom reserves 22px + 2px spacing.
         height -= StatusBar.Height + 2;
 
         return height;
@@ -640,6 +631,19 @@ public sealed class ChatLogWindow : Window
         catch (Exception ex)
         {
             Plugin.Log.Error(ex, "Error drawing Chat Log window");
+            if (!NotifiedDrawFailure)
+            {
+                Plugin.Notification.AddNotification(
+                    new Dalamud.Interface.ImGuiNotification.Notification
+                    {
+                        Title = "Hellion Chat",
+                        Content = "A drawing error occurred. Check /xllog for details.",
+                        Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning,
+                        InitialDuration = TimeSpan.FromSeconds(20),
+                    }
+                );
+                NotifiedDrawFailure = true;
+            }
             // Prevent recurring draw failures from constantly trying to grab
             // input focus, which breaks every other ImGui window.
             Activate = false;
@@ -659,10 +663,8 @@ public sealed class ChatLogWindow : Window
         LastWindowSize = currentSize;
         LastWindowPos = ImGui.GetWindowPos();
 
-        // Window position recovery. Manual reset takes precedence and snaps
-        // the window to the safe default unconditionally; the one-shot
-        // on-load check only fires when the persisted position has no
-        // overlap with any visible viewport area.
+        // Manual reset snaps unconditionally; on-load check only fires when the
+        // stored position has no overlap with any visible viewport.
         if (RequestPositionReset)
         {
             RequestPositionReset = false;
@@ -684,11 +686,8 @@ public sealed class ChatLogWindow : Window
         if (IsChatMode && Plugin.InputPreview.IsDrawable)
             Plugin.InputPreview.CalculatePreview();
 
-        // Hellion Chat v0.6.1 — render the one-time hint banner first so it
-        // sits above the tab area / sidebar in full window width. ImGui's
-        // GetContentRegionAvail subtracts its height automatically because the
-        // cursor advances past it before the message log calls
-        // GetRemainingHeightForMessageLog, so we don't track the height here.
+        // Render the hint banner first so it sits above the tab area at full
+        // window width. ImGui accounts for its height automatically.
         DrawV061HintBannerIfNeeded();
 
         if (Plugin.Config.SidebarTabView)
@@ -713,8 +712,7 @@ public sealed class ChatLogWindow : Window
             DrawChannelName(activeTab);
         }
 
-        // v1.0.2 — compute inputColour up front so the channel selector button
-        // can also tint with it (existing input-text push remains below).
+        // inputColour computed up front so the channel selector button can share it.
         var inputType = activeTab.CurrentChannel.UseTempChannel
             ? activeTab.CurrentChannel.TempChannel.ToChatType()
             : activeTab.CurrentChannel.Channel.ToChatType();
@@ -1032,11 +1030,8 @@ public sealed class ChatLogWindow : Window
             }
             else
             {
-                // We cannot lookup ExtraChat channel names from index over
-                // IPC so we just don't show the name if it's the tabs channel.
-                //
-                // We don't call channel.ToChatType().Name() as it has the
-                // long name as used in the settings window.
+                // ExtraChat channel names aren't available over IPC by index,
+                // so we skip the name lookup and show the short form instead.
                 channelNameChunks =
                 [
                     new TextChunk(
@@ -1122,8 +1117,8 @@ public sealed class ChatLogWindow : Window
             Plugin.CurrentTab.CurrentChannel.TempTellTarget = null;
         }
 
-        // Instead of calling SetChannel(), we ask the ExtraChat plugin to set a
-        // channel override by just calling the command directly.
+        // ExtraChat linkshell channel switch: call the prefix command through the
+        // game chat because ExtraChat only registers stub handlers in Dalamud.
         if (channel.Value.IsExtraChatLinkshell())
         {
             // Check that the command is registered in Dalamud so the game code
@@ -1169,10 +1164,8 @@ public sealed class ChatLogWindow : Window
         ];
     }
 
-    // v0.6.0 — pop-out windows route submission through this wrapper.
-    // The main-window Chat buffer is briefly used as a vehicle for
-    // SendChatBox (which reads it directly) and restored afterwards so
-    // the main window does not visibly lose any half-typed input.
+    // Pop-out windows route submission here. The main Chat buffer is briefly
+    // used as a vehicle for SendChatBox and restored afterwards.
     internal void SendChatBoxFromExternal(Tab tab, string text)
     {
         var saved = Chat;
@@ -1217,7 +1210,7 @@ public sealed class ChatLogWindow : Window
                         ?? activeTab.CurrentChannel.TellTarget;
                 if (target != null)
                 {
-                    // ContentId 0 is a case where we can't directly send messages, so we send a /tell formatted message and let the game handle it
+                    // ContentId 0: can't send directly, so format as /tell and let the game handle it.
                     if (target.ContentId == 0)
                     {
                         trimmed = $"/tell {target.ToTargetString()} {trimmed}";
@@ -1383,8 +1376,8 @@ public sealed class ChatLogWindow : Window
             var maxLines = Plugin.Config.MaxLinesToRender;
             var startLine = messages.Count > maxLines ? messages.Count - maxLines : 0;
 
-            // Card-mode pre-loop hoist: theme/drawList/winLeft/winRight/border
-            // are invariant per DrawMessages call; only cursorY moves per row.
+            // Card-mode pre-loop: theme/drawList/winLeft/winRight/border are invariant
+            // per DrawMessages call; only cursorY moves per row.
             var theme = Plugin.ThemeRegistry.Active;
             var drawList = ImGui.GetWindowDrawList();
             var winLeft = ImGui.GetWindowPos().X;
@@ -1541,11 +1534,9 @@ public sealed class ChatLogWindow : Window
 
                 var lineWidth = ImGui.GetContentRegionAvail().X;
 
-                // v1.2.0 — Card-Rows als Default, Compact-Density als Opt-Out.
-                // Card-Mode: Sender-Header in Channel-Color auf eigener Zeile,
-                // dann Body, dann subtile Border-Bottom als Card-Trenner.
-                // Compact-Mode: bisheriges Verhalten — Sender + Space + Content
-                // auf einer Zeile via SameLine.
+                // v1.2.0 card mode: sender on its own line in channel color, then body,
+                // then a subtle border as a card separator.
+                // Compact mode: sender + space + content on one line via SameLine.
                 var useCard = !Plugin.Config.UseCompactDensity;
                 if (useCard)
                 {
@@ -1558,7 +1549,7 @@ public sealed class ChatLogWindow : Window
                         {
                             DrawChunks(message.Sender, true, handler, lineWidth);
                         }
-                        // KEIN SameLine — Body landet auf eigener Zeile.
+                        // No SameLine — body renders on its own line.
                     }
 
                     // We need to draw something otherwise the item visibility check below won't work.
@@ -1572,8 +1563,7 @@ public sealed class ChatLogWindow : Window
                     else
                         DrawChunks(message.Content, true, handler, lineWidth);
 
-                    // Subtile Border-Bottom als Card-Trenner. Border-Farbe mit
-                    // reduzierter Alpha (RGBA → 0x33) für dezente Trennung.
+                    // Border bottom as card separator. Alpha reduced to 0x33 for subtlety.
                     {
                         var rowEndY = ImGui.GetCursorScreenPos().Y;
                         drawList.AddLine(
@@ -1646,9 +1636,8 @@ public sealed class ChatLogWindow : Window
             if (!tabItem.Success)
                 continue;
 
-            // v1.2.0 — Active-Tab-Underline-Pill (2 px Akzent statt Background-Fill).
-            // Bewusst direkt nach TabItem-Setup; GetItemRectMin/Max referenziert noch
-            // das Tab. ImGui hat keine native Underline-API, daher direkter DrawList-Pass.
+            // Active-tab underline pill (2px accent). No native ImGui underline API,
+            // so we use a direct DrawList pass.
             {
                 var theme = Plugin.ThemeRegistry.Active;
                 var min = ImGui.GetItemRectMin();
@@ -1680,7 +1669,7 @@ public sealed class ChatLogWindow : Window
     private void DrawTabSidebar()
     {
         var currentTab = -1;
-        // v1.2.0 — Sidebar fix 44 px, kein Resize. Mehr Platz fürs Chat-Log.
+        // Sidebar fixed at 44px, no resize.
         using var tabTable = ImRaii.Table(
             "tabs-table",
             2,
@@ -1696,28 +1685,19 @@ public sealed class ChatLogWindow : Window
 
         var hasTabSwitched = false;
         var childHeight = GetRemainingHeightForMessageLog();
-        // v1.2.0 — Sidebar-Child ohne Theme-ChildBg, sonst füllt das
-        // bläuliche Frame-Rect auch den oberen HeaderToolbar-Padding-Bereich
-        // aus (sieht aus wie ein angeschnittener Block oberhalb der Buttons).
-        // Vertikale Trennung zur Message-Spalte bleibt durch BordersInnerV
-        // der Tab-Table erhalten.
+        // Sidebar child without ChildBg tint to avoid a colored block above the
+        // header toolbar area. Vertical separation is handled by BordersInnerV.
         using (ImRaii.PushColor(ImGuiCol.ChildBg, 0u))
         using (var child = ImRaii.Child("##chat2-tab-sidebar", new Vector2(-1, childHeight)))
         {
             if (child)
             {
-                // v1.2.0 — Top-Padding spiegelt die HeaderToolbar-Höhe der
-                // rechten Spalte (DrawChatHeaderToolbar wird dort als erstes
-                // gerendert, eine Frame-Zeile + ItemSpacing). Ohne diesen
-                // Padding würden die Sidebar-Buttons oben am Window-Top
-                // kleben, während die Messages erst unter der Toolbar
-                // beginnen — vertikales Mismatch.
+                // Top padding mirrors the HeaderToolbar height so sidebar buttons
+                // align with the message log start.
                 ImGui.Dummy(new Vector2(0, ImGui.GetFrameHeightWithSpacing()));
 
                 var previousTab = Plugin.CurrentTab;
-                // Hellion Chat — auto-tell-tabs section divider rendered
-                // exactly once before the first temp tab, with a live unit
-                // counter pulled directly from the tab list.
+                // Divider rendered once before the first temp tab with a live unit counter.
                 var tempTabHeaderRendered = false;
                 var tempTabCount = Plugin.Config.Tabs.Count(t => t.IsTempTab);
 
@@ -1752,11 +1732,8 @@ public sealed class ChatLogWindow : Window
 
                     if (showGreetedAffordance)
                     {
-                        // Greeted toggle sits left of the selectable so the
-                        // click areas stay separate. The icon also doubles
-                        // as the visual "I'm done with this person" cue.
-                        // Compact frame padding keeps the icon dezent next
-                        // to the tab name instead of a chunky button block.
+                        // Greeted toggle left of the selectable to keep click areas separate.
+                        // Compact padding keeps the icon next to the tab name.
                         var greetedIcon = tab.IsGreeted
                             ? FontAwesomeIcon.CheckCircle
                             : FontAwesomeIcon.Check;
@@ -1784,10 +1761,8 @@ public sealed class ChatLogWindow : Window
                         ImGui.SameLine();
                     }
 
-                    // v1.2.0 — Icon-only Sidebar mit Tooltip beim Hover.
-                    // Active-Tab kriegt Akzent-Color am Icon, Greeted-Tabs
-                    // werden auf TextDim gedimmt (löst den alten Header-
-                    // Dim-Trick ab, da wir keine Selectable mehr nutzen).
+                    // Icon-only sidebar with tooltip on hover. Active tab gets accent color;
+                    // greeted tabs are dimmed; tell tabs get a hash-based tint.
                     var theme = Plugin.ThemeRegistry.Active;
                     var icon = TabIconMapping.Resolve(tab);
                     uint iconColor;
@@ -1801,8 +1776,8 @@ public sealed class ChatLogWindow : Window
                     }
                     else if (tab.IsTempTab && tab.TellTarget != null && tab.TellTarget.IsSet())
                     {
-                        // v1.2.0 — Hash-Color-Tint differenziert parallele Auto-Tell-Tabs
-                        // visuell ohne dass User pro Tab manuell ein Custom-Icon setzen muss.
+                        // Hash-based color tint differentiates parallel Auto-Tell tabs
+                        // without requiring manual icon assignment per tab.
                         iconColor = TabTintCache.GetTint(tab);
                     }
                     else
@@ -1835,9 +1810,8 @@ public sealed class ChatLogWindow : Window
 
                     if (isCurrentTab)
                     {
-                        // v1.2.0 — Vertikale Akzent-Pill an der linken Window-Kante.
-                        // 3 px breit, halbe Tab-Höhe, vertikal zentriert. ImGui hat keine
-                        // native Pill-API, daher direkter DrawList-Pass.
+                        // Vertical accent pill on the left window edge, 3px wide, half tab height,
+                        // vertically centered. Direct DrawList pass, no native ImGui API for this.
                         var min = ImGui.GetItemRectMin();
                         var max = ImGui.GetItemRectMax();
                         const float pillWidth = 3f;
@@ -1853,10 +1827,8 @@ public sealed class ChatLogWindow : Window
                             ); // leichter Rounding
                     }
 
-                    // v1.2.0 — Unread-Dot oben rechts am Icon. Sichtbar ohne Hover, damit
-                    // User Tabs mit ungelesenen Messages sofort erkennt. Aktive Tabs haben
-                    // per Konvention Unread = 0 (LastTab-Branch in ChatLogWindow), daher
-                    // kollidiert der Dot nicht mit der Active-Pill.
+                    // Unread dot top-right of the icon. Active tabs have Unread=0 by convention
+                    // so the dot never conflicts with the active pill.
                     if (!isCurrentTab && tab.UnreadMode != UnreadMode.None && tab.Unread > 0)
                     {
                         var min = ImGui.GetItemRectMin();
@@ -1868,10 +1840,7 @@ public sealed class ChatLogWindow : Window
                             min.Y + dotRadius + dotPadding
                         );
 
-                        // v1.2.0 — Sanfter Pulse-Effekt: Alpha schwankt zwischen 60% und
-                        // 100% mit ~2-Sekunden-Cycle (subtil, nicht hektisch).
-                        // Plugin.Config.ReduceMotion (Field seit v1.1.0) skipt den Pulse
-                        // und rendert statisch — Default ist Animation an.
+                        // Sin-based 2s pulse: alpha oscillates 60-100%. Skipped when ReduceMotion is on.
                         var dotColor = theme.Colors.StatusDanger;
                         if (!Plugin.Config.ReduceMotion)
                         {
@@ -1941,14 +1910,8 @@ public sealed class ChatLogWindow : Window
         Plugin.WantedTab = null;
     }
 
-    // Hellion Chat v0.6.1 — visible pop-out trigger right above the message
-    // log so users discover the feature without having to right-click the tab.
-    // Renders only for the active tab in the main ChatLogWindow; pop-out
-    // windows have their own render path and skip this toolbar.
-    //
-    // Hellion Chat v1.3.0 also renders the optional Honorific title slot
-    // left of the pop-out button, when HonorificService reports an active
-    // custom title and the user has ShowHonorificTitleInHeader enabled.
+    // DrawChatHeaderToolbar: renders the pop-out button for the active tab.
+    // v1.3.0 also renders the optional Honorific title slot left of it.
     private void DrawChatHeaderToolbar(Tab tab)
     {
         DrawHonorificTitleSlot();
@@ -1973,16 +1936,9 @@ public sealed class ChatLogWindow : Window
         }
     }
 
-    // Renders the Honorific custom title to the left of the pop-out button,
-    // wrapped in guillemets to match how the game itself displays titles.
-    // We lay out the title first, then DrawPopOutButton uses
-    // GetContentRegionAvail to anchor itself flush right, which is why the
-    // call order in DrawChatHeaderToolbar matters: title first, button second.
-    //
-    // The slot stays on the same line as the pop-out button so the chat
-    // log doesn't lose vertical space; we use ImGui.SameLine after our
-    // text so the cursor X is still on the toolbar row when the pop-out
-    // button takes over.
+    // Title rendered first so DrawPopOutButton can anchor flush right via
+    // GetContentRegionAvail. Call order in DrawChatHeaderToolbar matters.
+    // SameLine keeps both on the same toolbar row.
     private void DrawHonorificTitleSlot()
     {
         var service = Plugin.HonorificService;
@@ -2028,8 +1984,7 @@ public sealed class ChatLogWindow : Window
 
         var theme = Plugin.ThemeRegistry.Active;
 
-        // Group so the tooltip's IsItemHovered check fires for hover anywhere
-        // on the crown-plus-title pair, not just one of the two.
+        // Group so IsItemHovered covers both the crown icon and the title text.
         ImGui.BeginGroup();
         using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
         using (Plugin.FontManager.FontAwesome.Push())
@@ -2051,11 +2006,7 @@ public sealed class ChatLogWindow : Window
         ImGui.SameLine();
     }
 
-    // Hellion Chat v0.6.1 — One-Time-Hint-Banner introducing the chat header
-    // pop-out toolbar button and the right-click pathway. Reuses the visual
-    // pattern from Popout.cs DrawHintBannerIfNeeded so users see a familiar
-    // dismiss-affordance. Returns the vertical space the banner consumed
-    // (0 when not shown) so the message log can shrink accordingly.
+    // One-time hint banner for the pop-out header button and right-click pathway.
     private float DrawV061HintBannerIfNeeded()
     {
         if (Plugin.Config.SeenPopOutHeaderHint)
@@ -2070,10 +2021,7 @@ public sealed class ChatLogWindow : Window
         var bg = new System.Numerics.Vector4(0.16f, 0.20f, 0.28f, 1f);
         var dismiss = false;
         var openSettings = false;
-        // RAII for the style stack so an early return in this block
-        // (or a later refactor that introduces one) can never leave the
-        // ImGui style stack unbalanced. Matches the convention used
-        // elsewhere in this file.
+        // RAII style stack so an early return can never leave ImGui unbalanced.
         using (ImRaii.PushColor(ImGuiCol.ChildBg, bg))
         using (ImRaii.PushStyle(ImGuiStyleVar.FrameBorderSize, 1f))
         using (
@@ -2176,10 +2124,8 @@ public sealed class ChatLogWindow : Window
     internal readonly List<bool> PopOutDocked = [];
     internal readonly HashSet<Guid> PopOutWindows = [];
 
-    // v0.6.0 — live enumeration of all active Popout windows so the
-    // KeybindManager can find a focused ChatInputBar to forward tab-cycle
-    // keybinds to. Filter on IsOpen prevents touching closed-but-still-
-    // registered popouts.
+    // Live enumeration of active Popout windows for KeybindManager tab-cycle forwarding.
+    // Filters on IsOpen to skip closed-but-registered popouts.
     internal IEnumerable<Popout> ActivePopouts =>
         Plugin.WindowSystem.Windows.OfType<Popout>().Where(p => p.IsOpen);
 
@@ -2352,8 +2298,7 @@ public sealed class ChatLogWindow : Window
         }
         finally
         {
-            // ImGuiListClipperPtr wraps an unmanaged ImGuiListClipper allocated above.
-            // Without Destroy() the unmanaged block leaks per autocomplete render.
+            // Destroy frees the unmanaged ImGuiListClipper allocated above; without it the block leaks per render.
             clipper.Destroy();
         }
     }
@@ -2687,9 +2632,8 @@ public sealed class ChatLogWindow : Window
         return $"Player {hashCode:X8}";
     }
 
-    // Snap threshold in pixels: at least this much of the window must overlap
-    // a visible viewport so the user can still grab the first tab header.
-    // Below the threshold the window is considered off-screen.
+    // Snap threshold: minimum window overlap with a visible viewport before
+    // we consider it off-screen.
     private const int OnScreenMinOverlapX = 100;
     private const int OnScreenMinOverlapY = 40;
 
@@ -2725,9 +2669,7 @@ public sealed class ChatLogWindow : Window
             $"[Window-Recovery] {source}: snapping main window from {LastWindowPos} (size {LastWindowSize}) to {safePos}."
         );
 
-        // Pop-outs are intentionally non-persistent (cleared on plugin reload),
-        // so an off-screen pop-out can never survive a session boundary. The
-        // main window above is the only persistence target that needs an
-        // explicit recovery path.
+        // Pop-outs don't persist across sessions so they can never end up off-screen
+        // after a reload. Only the main window needs explicit recovery.
     }
 }

HellionChat/Ui/DbViewer.cs

@@ -211,13 +211,6 @@ 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;
 

HellionChat/Ui/FirstRunWizard.cs

@@ -30,14 +30,10 @@ public sealed class FirstRunWizard : Window
 
     public override void OnClose()
     {
-        // Closing the wizard without picking anything = the user accepts
-        // whatever defaults are already in place. Mark as complete so we
-        // don't pester them again on the next launch.
-        if (!Plugin.Config.FirstRunCompleted)
-        {
-            Plugin.Config.FirstRunCompleted = true;
-            Plugin.SaveConfig();
-        }
+        // OnClose fires on explicit X-click and on plugin dispose. We never
+        // implicitly accept the defaults here — the explicit "Later" button
+        // does that. If the user hasn't picked a profile yet, the wizard
+        // reopens on the next plugin load.
     }
 
     public override void Draw()
@@ -49,7 +45,12 @@ public sealed class FirstRunWizard : Window
 
         var avail = ImGui.GetContentRegionAvail();
         var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f;
-        var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing();
+        // Reserve room for the footer separator + cancel button below the cards.
+        var footerReserve =
+            ImGui.GetStyle().ItemSpacing.Y * 3
+            + ImGui.GetTextLineHeight()
+            + ImGui.GetFrameHeightWithSpacing();
+        var cardHeight = avail.Y - footerReserve;
 
         DrawCard(
             "privacy-first",
@@ -87,6 +88,20 @@ public sealed class FirstRunWizard : Window
             HellionStrings.Wizard_Profile_FullHistory_Apply,
             ApplyFullHistory
         );
+
+        ImGui.Spacing();
+        ImGui.Separator();
+        ImGui.Spacing();
+
+        if (ImGui.Button(HellionStrings.Wizard_Cancel_Label))
+        {
+            Plugin.Config.FirstRunCompleted = true;
+            Plugin.SaveConfig();
+            IsOpen = false;
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGuiUtil.Tooltip(HellionStrings.Wizard_Cancel_Tooltip);
     }
 
     private void DrawCard(

HellionChat/Ui/HellionStyle.cs

@@ -5,18 +5,12 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui;
 
-/// <summary>
-/// ImGui style override for Hellion Chat. v1.1.0 ist die Engine
-/// theme-getrieben: PushGlobal nimmt eine Theme-Instance + Window-
-/// Opacity, die gesamten Color- und Style-Slots werden aus dem Theme
-/// gelesen statt aus einer fixen Konstanten-Tabelle.
-/// </summary>
+// Theme-driven ImGui style override. PushGlobal is pushed once per frame
+// in Plugin.Draw and drives every Hellion-rendered window.
 internal static class HellionStyle
 {
-    /// <summary>
-    /// Local color stack auf Basis des aktiven Themes. Cheap. Use inside a
-    /// `using var _ = HellionStyle.Push(theme);` block.
-    /// </summary>
+    // Local color stack for the active theme. Use inside a
+    // `using var _ = HellionStyle.Push(theme);` block.
     internal static IDisposable Push(Theme theme)
     {
         var a = theme.AbgrCache;
@@ -37,13 +31,8 @@ internal static class HellionStyle
         return stack;
     }
 
-    /// <summary>
-    /// Global color and style-variable stack pushed once per frame in
-    /// Plugin.Draw. Drives every Hellion-rendered window from the active
-    /// theme's palette and layout values.
-    /// </summary>
-    /// <param name="theme">Active theme from ThemeRegistry.</param>
-    /// <param name="windowOpacity">Window background alpha (0.5–1.0).</param>
+    // Global color and style stack pushed once per frame.
+    // windowOpacity: window background alpha (0.5-1.0).
     internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f)
     {
         var c = theme.Colors;
@@ -54,15 +43,11 @@ internal static class HellionStyle
         var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
         var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;
 
-        // ChildBg-Alpha: Sub-Bereiche (Tab-Sidebar, Message-Area, Input-Bar)
-        // werden im ChatLog-Window als BeginChild gezeichnet. Würde der ChildBg
-        // mit dem gleichen Alpha wie WindowBg gerendert, multiplizieren sich
-        // die Layer (1 - (1-α)² Deckung), und 50 % WindowOpacity kommt mit
-        // 75 % Deckung im Child-Bereich an — das Fenster wirkt solider als der
-        // Slider verspricht. Bei voller Opacity bleibt der Theme-Akzent
-        // erhalten (Theme-eigene Alpha-Komponente, i.d.R. FF); sobald der User
-        // Transparenz zieht, wird ChildBg vollständig durchsichtig damit nur
-        // der WindowBg-Layer die finale Deckung bestimmt.
+        // ChildBg alpha: child areas rendered inside ChatLogWindow would
+        // multiply their alpha with WindowBg, making 50% opacity appear
+        // ~75% solid. At full opacity the theme's alpha is preserved; below
+        // it ChildBg goes fully transparent so only WindowBg sets the final
+        // coverage.
         var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
         var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
 
@@ -77,8 +62,8 @@ internal static class HellionStyle
         stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, l.WindowBorderSize);
         stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, l.FrameBorderSize);
 
-        // Surfaces — WindowBg/ChildBg use the per-push opacity-modulated value,
-        // so they go through the RGBA path; everything else reads from cache.
+        // Surfaces — WindowBg/ChildBg use opacity-modulated values (RGBA path);
+        // everything else reads from the pre-computed ABGR cache.
         stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha);
         stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha);
         stack.PushColorAbgr(ImGuiCol.PopupBg, a.ChildBg);

HellionChat/Ui/Popout.cs

@@ -12,19 +12,15 @@ internal class Popout : Window
     private readonly Tab Tab;
     private readonly int Idx;
 
-    private long FrameTime; // set every frame
+    private long FrameTime;
     private long LastActivityTime = Environment.TickCount64;
 
-    // v0.6.0 — optional input bar inside the pop-out window. Lazy-allocated
-    // when the user enables Tab.PopOutInputEnabled and torn down when the
-    // toggle is turned off (independent text buffer is intentionally
-    // discarded — see v0.6.0 spec edge-case P1).
+    // Optional input bar inside the pop-out. Lazy-allocated when enabled,
+    // torn down on toggle-off (buffer discarded intentionally).
     public ChatInputBar? InputBar { get; private set; }
     public bool HasFocusedInputBar => InputBar?.IsFocused ?? false;
 
-    // Hellion Chat — v0.6.1 expose just the tab identifier (not the whole Tab
-    // reference) so AutoTellTabsService.DropOldestTempTab can locate the
-    // matching pop-out window when an LRU temp tab gets evicted.
+    // Exposed so AutoTellTabsService can locate this window during LRU eviction.
     internal Guid TabIdentifier => Tab.Identifier;
 
     public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx)
@@ -40,12 +36,9 @@ internal class Popout : Window
         IsOpen = true;
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
-        // v1.2.1 — KEIN AllowBackgroundBlur. Pop-Outs werden vom User häufig
-        // im Dalamud-Tab-Container mit anderen Plugin-Windows kombiniert; in
-        // dem Render-Pfad blurt Dalamud den gesamten Container, nicht nur
-        // das Pop-Out — würde die Tab-Bar oben und benachbarte Plugins
-        // mitziehen. Wer Blur in Pop-Outs will, kann ihn via Dalamud-
-        // Hamburger-Menü pro Window selbst aktivieren.
+        // AllowBackgroundBlur is intentionally off: Dalamud blurs the entire
+        // tab container, not just this window, which would affect adjacent plugins.
+        // Users can enable blur per-window via the Dalamud hamburger menu.
     }
 
     public override void PreOpenCheck()
@@ -70,7 +63,6 @@ internal class Popout : Window
             return true;
         }
 
-        // Activity in the tab, this popout window, or the main chat log window.
         var lastActivityTime = Math.Max(Tab.LastActivity, LastActivityTime);
         lastActivityTime = Math.Max(lastActivityTime, ChatLogWindow.LastActivityTime);
         return FrameTime - lastActivityTime <= 1000 * Plugin.Config.InactivityHideTimeout;
@@ -78,10 +70,8 @@ internal class Popout : Window
 
     public override void PreDraw()
     {
-        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
-        // zusätzlicher Dalamud-StyleModel-Override mehr pro Window. Plugin.Draw
-        // pusht das aktive Hellion-Theme global; Pop-Out zeichnet sich damit
-        // konsistent zum Haupt-Chat-Window.
+        // Theme engine pushes the active theme globally in Plugin.Draw;
+        // pop-outs draw consistently without per-window overrides.
         Flags = ImGuiWindowFlags.None;
         if (!Plugin.Config.ShowPopOutTitleBar)
             Flags |= ImGuiWindowFlags.NoTitleBar;
@@ -92,19 +82,10 @@ internal class Popout : Window
         if (!Tab.CanResize)
             Flags |= ImGuiWindowFlags.NoResize;
 
-        // Idx may point past the end if PopOutDocked was resized (e.g., a tab
-        // dropped) between the AddPopOutsToDraw() snapshot and this frame.
-        // Guard the read so we don't index into stale state.
+        // Guard against Idx pointing past the end if PopOutDocked was resized mid-frame.
         if (Idx >= 0 && Idx < ChatLogWindow.PopOutDocked.Count && !ChatLogWindow.PopOutDocked[Idx])
         {
-            if (Tab.IndependentOpacity)
-            {
-                BgAlpha = Tab.Opacity / 100f;
-            }
-            else
-            {
-                BgAlpha = Plugin.Config.WindowOpacity;
-            }
+            BgAlpha = Tab.IndependentOpacity ? Tab.Opacity / 100f : Plugin.Config.WindowOpacity;
         }
     }
 
@@ -118,24 +99,15 @@ internal class Popout : Window
             ImGui.Separator();
         }
 
-        // v0.6.0 — one-time hint banner explaining the new pop-out input
-        // feature. Shown once per user; "Got it" or "Open settings"
-        // dismisses it and persists the flag.
         var hintBannerHeight = DrawHintBannerIfNeeded();
 
-        // v0.6.0 — pop-out optional input bar. Reserve height first so the
-        // message log draws into the right region; only shown when the
-        // global master switch is on. Toggle-OFF resets InputBar so the
-        // next toggle-ON gives a fresh buffer (no stale text persists).
+        // Toggle-OFF resets InputBar so the next toggle-ON starts with a fresh buffer.
         var inputEnabled = Plugin.Config.PopOutInputEnabled;
         if (!inputEnabled && InputBar != null)
-        {
             InputBar = null;
-        }
+
         if (inputEnabled)
-        {
             InputBar ??= new ChatInputBar(ChatLogWindow.Plugin, ChatLogWindow, () => Tab);
-        }
 
         var inputBarHeight = inputEnabled
             ? ImGui.GetFrameHeightWithSpacing() + ImGui.GetStyle().ItemSpacing.Y
@@ -155,8 +127,7 @@ internal class Popout : Window
             LastActivityTime = FrameTime;
     }
 
-    // Returns the vertical space the banner consumed (0 when not shown)
-    // so the message log can shrink accordingly.
+    // Returns the vertical space consumed by the banner (0 when not shown).
     private float DrawHintBannerIfNeeded()
     {
         if (Plugin.Config.SeenPopOutInputHint)
@@ -240,21 +211,18 @@ internal class Popout : Window
 
     private bool HideStateCheck()
     {
-        // if the chat has no hide state set, and the player has entered battle, we hide chat if they have configured it
         if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
         {
             CurrentHideState = HideState.Battle;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None → Battle");
+            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Battle");
         }
 
-        // If the chat is hidden because of battle, we reset it here
         if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
         {
             CurrentHideState = HideState.None;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle → None");
+            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle -> None");
         }
 
-        // if the chat has no hide state and in a cutscene, set the hide state to cutscene
         if (
             Tab.HideDuringCutscenes
             && CurrentHideState == HideState.None
@@ -264,11 +232,10 @@ internal class Popout : Window
             if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
             {
                 CurrentHideState = HideState.Cutscene;
-                Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None → Cutscene");
+                Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Cutscene");
             }
         }
 
-        // if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none
         if (
             CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride
             && !Plugin.CutsceneActive
@@ -276,25 +243,23 @@ internal class Popout : Window
         )
         {
             Plugin.Log.Verbose(
-                $"Popout HideState [{Tab.Name}]: {CurrentHideState} → None (cutscene/gpose ended)"
+                $"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)"
             );
             CurrentHideState = HideState.None;
         }
 
-        // if the chat is hidden because of a cutscene and the chat has been activated, show chat
         if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
         {
             CurrentHideState = HideState.CutsceneOverride;
             Plugin.Log.Verbose(
-                $"Popout HideState [{Tab.Name}]: Cutscene → CutsceneOverride (user activate)"
+                $"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)"
             );
         }
 
-        // if the user hid the chat and is now activating chat, reset the hide state
         if (CurrentHideState == HideState.User && ChatLogWindow.Activate)
         {
             CurrentHideState = HideState.None;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User → None (activate)");
+            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User -> None (activate)");
         }
 
         return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle

HellionChat/Ui/Settings.cs

@@ -92,10 +92,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
             View = SettingsView.Overview;
         }
 
-        // ESC im Detail-View kehrt zur Overview zurück. Window-Focus-Check ist
-        // Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster
-        // fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe
-        // Util/SearchSelector.cs:37).
+        // ESC in Detail view returns to Overview. Window focus check is
+        // required so ESC doesn't fire when the user targets a different window.
         if (
             View == SettingsView.Detail
             && ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows)
@@ -128,13 +126,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
 
     private void DrawDetail()
     {
-        // Breadcrumb-Header — Akzent-Cyan, klickbar, führt zurück zur Overview
+        // Breadcrumb header -- accent cyan, clickable, returns to Overview.
         using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00BED2u))
         using (ImRaii.PushColor(ImGuiCol.Button, 0u))
         using (ImRaii.PushColor(ImGuiCol.ButtonHovered, 0x33FFFFFFu))
         using (ImRaii.PushColor(ImGuiCol.ButtonActive, 0x55FFFFFFu))
         {
-            if (ImGui.SmallButton("← Settings"))
+            if (ImGui.SmallButton("<- Settings"))
             {
                 View = SettingsView.Overview;
                 return;
@@ -149,11 +147,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
         ImGui.Separator();
         ImGui.Spacing();
 
-        // Section-Content in voller Breite. Die Tab-Liste links ist überholt:
-        // der User ist bereits über die Card-Übersicht navigiert, eine zweite
-        // Tab-Liste daneben würde nur den Vanilla-Look zurückbringen. Falls
-        // der User in eine andere Section will, geht er zurück zur Overview
-        // (Breadcrumb / ESC).
+        // Section content fills full width. Navigation back to another
+        // section goes via the breadcrumb or ESC.
         var style = ImGui.GetStyle();
         var height =
             ImGui.GetContentRegionAvail().Y
@@ -182,9 +177,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
         ImGui.SameLine();
 
         if (ImGui.Button(Language.Settings_Discard))
-        {
             IsOpen = false;
-        }
 
         const string buttonLabel = "Anna's Ko-fi";
         const string buttonLabel2 = "Infi's Ko-fi";
@@ -217,7 +210,6 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
         if (!save)
             return;
 
-        // calculate all conditions before updating config
         var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat;
         var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride;
         var fontChanged =
@@ -230,18 +222,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
             Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001
             || Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001;
         var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled;
-        // v1.2.0 — Refilter only if a filter-relevant setting actually
-        // changed. The Clear+Refilter cycle reloads messages from the DB,
-        // which silently wipes any in-session message that wasn't
-        // persisted (Privacy-First config blocks most channels from DB).
-        // Cosmetic changes (theme, tab icons, layout flags) trigger no
-        // refilter — chat history stays intact.
+
+        // Only refilter when filter-relevant settings changed. Clear+Refilter
+        // reloads from the DB and silently drops in-session messages that
+        // weren't persisted (Privacy-First blocks most channels). Cosmetic
+        // changes (theme, icons, layout) skip the cycle.
         var filtersChanged = HasFilterRelevantChanges();
 
         Plugin.Config.UpdateFrom(Mutable, true);
 
-        // save after 60 frames have passed, which should hopefully not
-        // commit any changes that cause a crash
+        // Defer save by 60 frames to avoid committing changes that cause a crash.
         Plugin.DeferredSaveFrames = 60;
         if (filtersChanged)
         {
@@ -259,24 +249,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
             GameFunctions.GameFunctions.SetChatInteractable(true);
 
         if (Plugin.Config.ShowEmotes)
-            _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
+            _ = EmoteCache.LoadData();
 
         Initialise();
     }
 
-    /// <summary>
-    /// v1.2.0 — Detects whether any setting that influences message
-    /// filtering changed between Plugin.Config and the Mutable working
-    /// copy. Used to gate the heavy ClearAllTabs+FilterAllTabsAsync cycle
-    /// in Save: cosmetic changes (theme, tab icons, layout flags) do not
-    /// touch the chat log, only filter-relevant changes do. Without this
-    /// gate, every settings save wipes the chat history of any channel
-    /// the Privacy filter blocks from being persisted to the DB —
-    /// reported by Flo from in-game testing 2026-05-05/06.
-    /// </summary>
+    // Returns true if any filter-relevant setting changed between Plugin.Config
+    // and the Mutable copy. Gates Clear+Refilter on Save so cosmetic changes
+    // don't wipe in-session chat history.
     private bool HasFilterRelevantChanges()
     {
-        // Top-level privacy controls.
         if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled)
             return true;
         if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels)
@@ -285,27 +267,23 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
             return true;
 
         // FilterIncludePreviousSessions changes the GetMostRecentMessages
-        // window in MessageManager.FilterAllTabs and is therefore filter-
-        // relevant even though it lives outside the Privacy block.
+        // window and is filter-relevant even outside the Privacy block.
         if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions)
             return true;
 
-        // Per-tab channel selection. Compare persistent tabs only —
-        // TempTabs are session-only and never refiltered anyway.
+        // Compare persistent tabs only -- TempTabs are never refiltered.
         var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
         var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList();
 
         if (origPersistent.Count != newPersistent.Count)
-            return true; // add or delete
+            return true;
 
         for (var i = 0; i < origPersistent.Count; i++)
         {
             var orig = origPersistent[i];
             var neu = newPersistent[i];
 
-            // Identifier mismatch at the same index means reorder or
-            // a slot got swapped — treat as filter-relevant so the new
-            // channel-selection layout actually applies.
+            // Identifier mismatch means reorder or slot swap -- treat as filter-relevant.
             if (orig.Identifier != neu.Identifier)
                 return true;
 
@@ -314,8 +292,6 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
             if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels))
                 return true;
 
-            // SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)>
-            // — value-tuple equality already does the right thing per-pair.
             if (orig.SelectedChannels.Count != neu.SelectedChannels.Count)
                 return true;
             foreach (var pair in orig.SelectedChannels)

HellionChat/Ui/SettingsOverview.cs

@@ -11,46 +11,58 @@ internal sealed class SettingsOverview
 {
     private readonly SettingsWindow _window;
 
-    // Card-Reihenfolge entspricht 1:1 dem Tabs-Index in SettingsWindow.
-    // v1.2.1: Cards thematisch re-sortiert. Theme & Layout vereint Theme-
-    // Picker + Frame-Style + Timestamps; Fonts & Colours vereint Schriften
-    // + Chat-Farben; Data Management vereint Storage + Retention + Cleanup
-    // + Export + DB-Viewer + Advanced.
-    private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs =
+    // Card order matches the Tabs index in SettingsWindow 1:1.
+    private static (FontAwesomeIcon Icon, string Title, string Subtext)[] BuildCardDefs() =>
         [
-        (FontAwesomeIcon.SlidersH, "Settings_Card_General_Title", "Settings_Card_General_Subtext"),
+            (
+                FontAwesomeIcon.SlidersH,
+                HellionStrings.Settings_Card_General_Title,
+                HellionStrings.Settings_Card_General_Subtext
+            ),
             (
                 FontAwesomeIcon.Palette,
-            "Settings_Card_ThemeAndLayout_Title",
-            "Settings_Card_ThemeAndLayout_Subtext"
+                HellionStrings.Settings_Card_ThemeAndLayout_Title,
+                HellionStrings.Settings_Card_ThemeAndLayout_Subtext
             ),
             (
                 FontAwesomeIcon.Font,
-            "Settings_Card_FontsAndColours_Title",
-            "Settings_Card_FontsAndColours_Subtext"
+                HellionStrings.Settings_Card_FontsAndColours_Title,
+                HellionStrings.Settings_Card_FontsAndColours_Subtext
             ),
             (
                 FontAwesomeIcon.WindowMaximize,
-            "Settings_Card_Window_Title",
-            "Settings_Card_Window_Subtext"
+                HellionStrings.Settings_Card_Window_Title,
+                HellionStrings.Settings_Card_Window_Subtext
+            ),
+            (
+                FontAwesomeIcon.Comments,
+                HellionStrings.Settings_Card_Chat_Title,
+                HellionStrings.Settings_Card_Chat_Subtext
+            ),
+            (
+                FontAwesomeIcon.FolderTree,
+                HellionStrings.Settings_Card_Tabs_Title,
+                HellionStrings.Settings_Card_Tabs_Subtext
+            ),
+            (
+                FontAwesomeIcon.ShieldAlt,
+                HellionStrings.Settings_Card_Privacy_Title,
+                HellionStrings.Settings_Card_Privacy_Subtext
             ),
-        (FontAwesomeIcon.Comments, "Settings_Card_Chat_Title", "Settings_Card_Chat_Subtext"),
-        (FontAwesomeIcon.FolderTree, "Settings_Card_Tabs_Title", "Settings_Card_Tabs_Subtext"),
-        (FontAwesomeIcon.ShieldAlt, "Settings_Card_Privacy_Title", "Settings_Card_Privacy_Subtext"),
             (
                 FontAwesomeIcon.Database,
-            "Settings_Card_DataManagement_Title",
-            "Settings_Card_DataManagement_Subtext"
+                HellionStrings.Settings_Card_DataManagement_Title,
+                HellionStrings.Settings_Card_DataManagement_Subtext
             ),
             (
                 FontAwesomeIcon.Plug,
-            "Settings_Card_Integrations_Title",
-            "Settings_Card_Integrations_Subtext"
+                HellionStrings.Settings_Card_Integrations_Title,
+                HellionStrings.Settings_Card_Integrations_Subtext
             ),
             (
                 FontAwesomeIcon.InfoCircle,
-            "Settings_Card_Information_Title",
-            "Settings_Card_Information_Subtext"
+                HellionStrings.Settings_Card_Information_Title,
+                HellionStrings.Settings_Card_Information_Subtext
             ),
         ];
 
@@ -64,19 +76,16 @@ internal sealed class SettingsOverview
         var avail = ImGui.GetContentRegionAvail();
         var columns = avail.X >= 700f ? 3 : 2;
         var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
-        // v1.2.1 — Subtexte wrappen jetzt auf zwei Zeilen, daher 110f statt der
-        // v1.1.0-Höhe 96f. Wrap-Breite + Y-Position der Subtext-Zeile sind in
-        // DrawCard auf den Card-Innenrand abgestimmt.
+        // 110f accommodates two-line subtexts; wrap width is matched in DrawCard.
         var cardHeight = 110f;
 
-        for (var i = 0; i < CardDefs.Length; i++)
+        var cardDefs = BuildCardDefs();
+        for (var i = 0; i < cardDefs.Length; i++)
         {
-            var (icon, titleKey, subtextKey) = CardDefs[i];
-            var title = HellionStrings.ResourceManager.GetString(titleKey) ?? titleKey;
-            var subtext = HellionStrings.ResourceManager.GetString(subtextKey) ?? subtextKey;
+            var (icon, title, subtext) = cardDefs[i];
             DrawCard(i, icon, title, subtext, cardWidth, cardHeight);
 
-            if ((i + 1) % columns != 0 && i != CardDefs.Length - 1)
+            if ((i + 1) % columns != 0 && i != cardDefs.Length - 1)
                 ImGui.SameLine();
         }
     }
@@ -90,9 +99,8 @@ internal sealed class SettingsOverview
         float h
     )
     {
-        // BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item.
-        // Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die
-        // einzelnen InvisibleButton/Text-Items separat und das Wrapping bricht.
+        // BeginGroup makes the card a single layout item so SameLine works
+        // in the caller loop -- without it ImGui tracks each child separately.
         ImGui.BeginGroup();
 
         var cursorBefore = ImGui.GetCursorScreenPos();
@@ -103,9 +111,6 @@ internal sealed class SettingsOverview
         var draw = ImGui.GetWindowDrawList();
         draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
 
-        // Inhalts-Overlay: Icon + Title via DrawList (kein Wrap nötig). Subtext
-        // läuft über ImGui-Cursor + PushTextWrapPos damit der Text bei
-        // Card-Innenbreite umbricht statt rechts geclippt zu werden.
         var iconPos = cursorBefore + new Vector2(16f, 12f);
         var titlePos = cursorBefore + new Vector2(16f, 40f);
         var subtextPos = cursorBefore + new Vector2(16f, 62f);
@@ -120,10 +125,8 @@ internal sealed class SettingsOverview
 
         draw.AddText(titlePos, titleColor, title);
 
-        // Subtext mit Wrap auf Card-Innenbreite (16 px Padding links + rechts).
-        // Cursor-basiertes TextUnformatted würde die ImGui-Group-Bounds
-        // erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher
-        // bleibt der Subtext bewusst beim DrawList-Overlay-Pattern.
+        // Subtext wraps at card inner width (16px padding each side) via DrawList
+        // to avoid expanding the group bounds and breaking SameLine in the card row.
         var subtextWrapWidth = w - 32f;
         draw.AddText(
             ImGui.GetFont(),
@@ -137,8 +140,6 @@ internal sealed class SettingsOverview
         ImGui.EndGroup();
 
         if (clicked)
-        {
             _window.OpenSection(index);
     }
 }
-}

HellionChat/Ui/SettingsTabs/Chat.cs

@@ -9,10 +9,7 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui.SettingsTabs;
 
-// Chat-Tab — vier eigenständige Sektionen: Auto-Tell-Tabs, Behaviour,
-// Preview, Emotes. Der Emotes-Block ist 1:1 aus der Bestand-Datei
-// Emote.cs übernommen; die Datei wird in Plan-Task 11 (Settings UX
-// Polish v0.5.0) entfernt, sobald alle Tabs migriert sind.
+// Four sections: Auto-Tell Tabs, Behaviour, Preview, Emotes.
 internal sealed class Chat : ISettingsTab
 {
     private Plugin Plugin { get; }
@@ -22,9 +19,8 @@ internal sealed class Chat : ISettingsTab
 
     private SearchSelector.SelectorPopupOptions WordPopupOptions;
 
-    // Snapshot of EmoteCache.State for which we last built WordPopupOptions.
-    // Without this, an empty FilteredSheet (e.g., the user blocked every emote)
-    // would trigger a refill every frame the settings tab is open.
+    // Tracks which EmoteCache state WordPopupOptions was built for so we
+    // don't refill every frame when FilteredSheet is empty.
     private EmoteCache.LoadingState? WordPopupOptionsBuiltFor;
 
     internal Chat(Plugin plugin, Configuration mutable)
@@ -36,15 +32,13 @@ internal sealed class Chat : ISettingsTab
         WordPopupOptionsBuiltFor = EmoteCache.State;
     }
 
-    private SearchSelector.SelectorPopupOptions RefillSheet()
-    {
-        return new SearchSelector.SelectorPopupOptions
+    private SearchSelector.SelectorPopupOptions RefillSheet() =>
+        new SearchSelector.SelectorPopupOptions
         {
             FilteredSheet = EmoteCache
                 .SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w))
                 .ToArray(),
         };
-    }
 
     public void Draw(bool changed)
     {
@@ -61,9 +55,7 @@ internal sealed class Chat : ISettingsTab
     {
         using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_AutoTellTabs_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
@@ -76,9 +68,7 @@ internal sealed class Chat : ISettingsTab
             ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
             var limit = Mutable.AutoTellTabsLimit;
             if (ImGui.SliderInt(HellionStrings.ChatLog_AutoTellTabs_Limit_Name, ref limit, 1, 50))
-            {
                 Mutable.AutoTellTabsLimit = limit;
-            }
             ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description);
 
             ImGui.Checkbox(
@@ -119,9 +109,7 @@ internal sealed class Chat : ISettingsTab
                     100
                 )
             )
-            {
                 Mutable.AutoTellTabsHistoryPreload = preload;
-            }
             ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);
 
             ImGui.Spacing();
@@ -133,9 +121,7 @@ internal sealed class Chat : ISettingsTab
     {
         using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Behaviour_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
@@ -160,9 +146,7 @@ internal sealed class Chat : ISettingsTab
     {
         using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Preview_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
@@ -178,12 +162,10 @@ internal sealed class Chat : ISettingsTab
                     foreach (var position in Enum.GetValues<PreviewPosition>())
                     {
                         if (ImGui.Selectable(position.Name(), Mutable.PreviewPosition == position))
-                        {
                             Mutable.PreviewPosition = position;
                     }
                 }
             }
-            }
             ImGuiUtil.HelpMarker(Language.Options_Preview_Description);
 
             if (
@@ -193,9 +175,7 @@ internal sealed class Chat : ISettingsTab
                     ref Mutable.PreviewMinimum
                 )
             )
-            {
                 Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250);
-            }
 
             ImGui.Checkbox(Language.Options_PreviewOnlyIf_Name, ref Mutable.OnlyPreviewIf);
             ImGuiUtil.HelpMarker(Language.Options_PreviewOnlyIf_Description);
@@ -206,9 +186,7 @@ internal sealed class Chat : ISettingsTab
     {
         using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Emotes_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
@@ -233,17 +211,13 @@ internal sealed class Chat : ISettingsTab
             using (Plugin.FontManager.FontAwesome.Push())
                 ImGui.Button(FontAwesomeIcon.Plus.ToIconString(), new Vector2(buttonWidth, 0));
 
-            // Open the selector popup on left-click; SelectorPopup uses
-            // ImRaii.ContextPopupItem internally which only opens on right-
-            // click otherwise — without this OpenPopup the button looked
-            // active but the popup never appeared on a normal click.
+            // OpenPopup on click because SelectorPopup uses ContextPopupItem
+            // which only triggers on right-click by default.
             if (ImGui.IsItemClicked())
                 ImGui.OpenPopup("WordAddPopup");
 
             if (SearchSelector.SelectorPopup("WordAddPopup", out var newWord, WordPopupOptions))
-            {
                 Mutable.BlockedEmotes.Add(newWord);
-            }
 
             using (
                 var table = ImRaii.Table(
@@ -257,11 +231,9 @@ internal sealed class Chat : ISettingsTab
                 {
                     ImGui.TableSetupColumn(Language.Options_Emote_EmoteTable);
                     ImGui.TableSetupColumn("##Del", ImGuiTableColumnFlags.WidthStretch, 0.07f);
-
                     ImGui.TableHeadersRow();
 
-                    var copiedList = Mutable.BlockedEmotes.ToArray();
-                    foreach (var word in copiedList)
+                    foreach (var word in Mutable.BlockedEmotes.ToArray())
                     {
                         ImGui.TableNextColumn();
                         ImGui.TextUnformatted(word);
@@ -274,12 +246,10 @@ internal sealed class Chat : ISettingsTab
                                 !ImGui.GetIO().KeyCtrl
                             )
                         )
-                        {
                             Mutable.BlockedEmotes.Remove(word);
                     }
                 }
             }
-            }
 
             ImGui.Spacing();
             ImGui.Separator();
@@ -289,17 +259,14 @@ internal sealed class Chat : ISettingsTab
             ImGui.Spacing();
 
             if (EmoteCache.State is EmoteCache.LoadingState.Done)
-            {
                 ImGui.TextColored(ImGuiColors.HealerGreen, Language.Options_Emote_Ready);
-            }
             else
-            {
                 ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady);
-            }
 
             ImGui.TextUnformatted(
                 $"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"
             );
+
             using (
                 var emoteTable = ImRaii.Table(
                     "##LoadedEmotes",

HellionChat/Ui/SettingsTabs/Information.cs

@@ -8,9 +8,7 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui.SettingsTabs;
 
-// Information-Tab vereint die früheren About- und Changelog-Tabs in
-// drei kollabierbaren Sektionen. Der About-Inhalt ist 1:1 aus About.cs
-// übernommen, die Changelog-Render-Logik aus Changelog.cs.
+// Combines the former About and Changelog tabs into three collapsible sections.
 internal sealed class Information : ISettingsTab
 {
     private Configuration Mutable { get; }

HellionChat/Ui/SettingsTabs/Integrations.cs

@@ -8,9 +8,8 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui.SettingsTabs;
 
-// First settings tab introduced in v1.3.0 (Plugin Integrations Cycle 1).
-// Designed to grow organically: each future cycle adds a new section above
-// the "Coming soon" block and removes the corresponding stub item.
+// Added in v1.3.0. Each future integration cycle adds a section above
+// the "Coming soon" block and removes its stub item.
 internal sealed class Integrations : ISettingsTab
 {
     private Plugin Plugin { get; }
@@ -48,11 +47,9 @@ internal sealed class Integrations : ISettingsTab
         DrawHonorificStatus();
         ImGui.Spacing();
 
-        // The toggle is enabled regardless of detection state — leaving it
-        // on means "render when available, hide otherwise". Disabling the
-        // toggle when Honorific is missing would force the user to retoggle
-        // it every time Honorific is reloaded, which is worse UX than the
-        // silent auto-hide.
+        // Toggle works regardless of detection state: "show when available,
+        // hide otherwise". Disabling it when Honorific is missing would force
+        // the user to retoggle on every reload.
         if (
             ImGui.Checkbox(
                 HellionStrings.Settings_Integrations_Honorific_Toggle,
@@ -76,11 +73,9 @@ internal sealed class Integrations : ISettingsTab
             }
         }
 
-        // Maintainer attribution. Honorific has no LICENSE in its repo so we
-        // can't bundle its assets, but linking to the upstream and the
-        // author's profile is the polite minimum. Plain ImGui buttons keep
-        // the visual weight modest, the FontAwesome Brands subset is not
-        // guaranteed in Dalamud's font set so we use text labels.
+        // Honorific has no LICENSE in its repo so we link upstream and author
+        // instead of bundling assets. Text labels because FA Brands isn't
+        // guaranteed in Dalamud's font set.
         ImGui.Spacing();
         if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkRepo))
         {
@@ -147,9 +142,7 @@ internal sealed class Integrations : ISettingsTab
         ImGui.TextWrapped(HellionStrings.Settings_Integrations_ComingSoon_Intro);
         ImGui.Spacing();
 
-        // Static list maintained in code (not Configuration). Each cycle
-        // that lands a real integration removes its stub here and adds a
-        // full section above the Coming Soon block.
+        // Each integration cycle removes its stub here and adds a full section above.
         DrawComingSoonItem(
             HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title,
             HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description

HellionChat/Ui/SettingsTabs/Privacy.cs

@@ -20,8 +20,7 @@ internal sealed class Privacy : ISettingsTab
         Mutable = mutable;
     }
 
-    // (HeadingKey lookup, ChatType list). Heading is resolved per-frame so
-    // a runtime LanguageChanged call updates the labels immediately.
+    // (HeadingKey, ChatType list). Heading resolved per-frame for live language switching.
     private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
     [
         (

HellionChat/Ui/SettingsTabs/Tabs.cs

@@ -123,7 +123,7 @@ internal sealed class Tabs : ISettingsTab
                 ImGuiInputTextFlags.EnterReturnsTrue
             );
 
-            // v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt.
+            // Per-tab icon override added in v1.2.0. Falls back to default mapping if unset.
             ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label);
             ImGui.SameLine();
             ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker);
@@ -135,7 +135,7 @@ internal sealed class Tabs : ISettingsTab
             {
                 if (combo.Success)
                 {
-                    // Erste Option: Default (löscht Icon, lässt Mapping greifen).
+                    // First option clears the icon and lets the default mapping take over.
                     if (
                         ImGui.Selectable(
                             HellionStrings.Tabs_Icon_DefaultOption,
@@ -148,7 +148,7 @@ internal sealed class Tabs : ISettingsTab
 
                     ImGui.Separator();
 
-                    // Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth).
+                    // Options sourced from TabIconGlyphResolver.PickerOptions (single source of truth).
                     foreach (var option in TabIconGlyphResolver.PickerOptions)
                     {
                         var isSelected = string.Equals(
@@ -305,10 +305,8 @@ internal sealed class Tabs : ISettingsTab
 
                         ImGui.SameLine();
 
-                        // Guard against an empty worlds list — can happen briefly
-                        // when switching characters or if the datacenter sheet
-                        // has not yet populated. Without the guard the indexed
-                        // access into worlds[selectedWorld] would crash.
+                        // Guard against an empty worlds list (character switch or sheet not yet populated)
+                        // to avoid an out-of-bounds crash on worlds[selectedWorld].
                         if (worlds.Count == 0)
                         {
                             ImGui.TextDisabled("(no worlds available)");

HellionChat/Ui/SettingsTabs/ThemeAndLayout.cs

@@ -43,9 +43,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
             var registry = Plugin.ThemeRegistry;
             var active = registry.Get(Mutable.Theme);
 
-            var activeLabelTemplate =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
-            ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
+            ImGui.TextUnformatted(
+                string.Format(HellionStrings.Settings_Themes_Active, active.Name)
+            );
             using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
                 ImGui.TextUnformatted(active.Author);
 
@@ -55,10 +55,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
             ImGui.Separator();
             ImGui.Spacing();
 
-            var builtInsLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns")
-                ?? "Built-in themes";
-            ImGui.TextUnformatted(builtInsLabel);
+            ImGui.TextUnformatted(HellionStrings.Settings_Themes_BuiltIns);
             ImGui.Spacing();
             DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
 
@@ -68,10 +65,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
                 ImGui.Spacing();
                 ImGui.Separator();
                 ImGui.Spacing();
-                var customLabel =
-                    HellionStrings.ResourceManager.GetString("Settings_Themes_Custom")
-                    ?? "Custom themes";
-                ImGui.TextUnformatted(customLabel);
+                ImGui.TextUnformatted(HellionStrings.Settings_Themes_Custom);
                 ImGui.Spacing();
                 DrawThemeGrid(customs, active.Slug);
             }
@@ -80,10 +74,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
             ImGui.Separator();
             ImGui.Spacing();
 
-            var openFolderLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder")
-                ?? "Open themes folder";
-            if (ImGui.Button(openFolderLabel))
+            if (ImGui.Button(HellionStrings.Settings_Themes_OpenFolder))
             {
                 var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
                 Directory.CreateDirectory(dir);
@@ -91,10 +82,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
             }
 
             ImGui.SameLine();
-            var exportLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive")
-                ?? "Export active...";
-            if (ImGui.Button(exportLabel))
+            if (ImGui.Button(HellionStrings.Settings_Themes_ExportActive))
             {
                 var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
                 Directory.CreateDirectory(dir);
@@ -206,25 +194,19 @@ internal sealed class ThemeAndLayout : ISettingsTab
         draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
         draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
 
-        var hint =
-            HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
-            ?? "This theme suggests its own chat channel colours.";
-        var applyLabel =
-            HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
-            ?? "Apply";
-        var keepLabel =
-            HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
-            ?? "Keep current";
-
         var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
-        draw.AddText(origin + new Vector2(12f, 10f), textColor, hint);
+        draw.AddText(
+            origin + new Vector2(12f, 10f),
+            textColor,
+            HellionStrings.Settings_Themes_ApplyChatColors_Hint
+        );
 
         using (ImRaii.PushColor(ImGuiCol.Button, active.Colors.Primary))
         using (ImRaii.PushColor(ImGuiCol.ButtonHovered, active.Colors.PrimaryLight))
         using (ImRaii.PushColor(ImGuiCol.ButtonActive, active.Colors.PrimaryDark))
         {
             ImGui.SetCursorScreenPos(origin + new Vector2(12f, 32f));
-            if (ImGui.Button(applyLabel))
+            if (ImGui.Button(HellionStrings.Settings_Themes_ApplyChatColors_Apply))
             {
                 foreach (var kvp in themeChatColors.Channels)
                     Mutable.ChatColours[kvp.Key] = kvp.Value;
@@ -233,7 +215,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
         }
 
         ImGui.SameLine();
-        if (ImGui.Button(keepLabel))
+        if (ImGui.Button(HellionStrings.Settings_Themes_ApplyChatColors_Keep))
         {
             _applyDismissedFor = active.Slug;
         }
@@ -272,9 +254,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
             ImGui.Separator();
             ImGui.Spacing();
 
-            // Slider 50–100 % UX-Range; intern 0.5–1.0 als WindowOpacity-Float.
-            // Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden
-            // des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0).
+            // Slider range 50-100% maps to 0.5-1.0 internally. Floor at 50% prevents
+            // accidentally hiding the chat background (v1.2.0 bug at WindowAlpha=0).
             var opacityPercent = Mutable.WindowOpacity * 100f;
             if (
                 ImGuiUtil.DragFloatVertical(

HellionChat/Ui/SettingsTabs/ThemeMockup.cs

@@ -7,15 +7,14 @@ namespace HellionChat.Ui.SettingsTabs;
 
 internal static class ThemeMockup
 {
-    // Zeichnet ein Mini-Chat-Window-Mockup mit den Theme-Werten direkt
-    // ins WindowDrawList. Keine Texture, keine Allocation pro Frame —
-    // alles via DrawList.AddRectFilled / AddText.
+    // Mini chat window mockup drawn directly into the WindowDrawList.
+    // No textures, no per-frame allocations — pure AddRectFilled/AddText.
     public static void Draw(Vector2 origin, Vector2 size, Theme theme)
     {
         var draw = ImGui.GetWindowDrawList();
         var c = theme.Colors;
 
-        // Window-Bg
+        // Window background
         draw.AddRectFilled(
             origin,
             origin + size,
@@ -23,7 +22,7 @@ internal static class ThemeMockup
             theme.Layout.WindowRounding
         );
 
-        // Title-Bar
+        // Title bar
         var titleHeight = 14f;
         draw.AddRectFilled(
             origin,
@@ -32,7 +31,7 @@ internal static class ThemeMockup
             theme.Layout.WindowRounding
         );
 
-        // Tab-Bar — 3 Mini-Tabs
+        // Tab bar (3 tabs)
         var tabY = origin.Y + titleHeight + 4f;
         var tabHeight = 12f;
         for (var i = 0; i < 3; i++)
@@ -46,7 +45,7 @@ internal static class ThemeMockup
                 theme.Layout.TabRounding
             );
 
-            if (i == 0) // Active-Pill
+            if (i == 0) // active pill
             {
                 draw.AddRectFilled(
                     new Vector2(tabX, tabY + tabHeight - 2f),
@@ -56,7 +55,7 @@ internal static class ThemeMockup
             }
         }
 
-        // Card-Row mit Mock-Sender + Text
+        // Message card row
         var rowY = tabY + tabHeight + 6f;
         var rowHeight = 18f;
         draw.AddRectFilled(
@@ -66,7 +65,7 @@ internal static class ThemeMockup
             2f
         );
 
-        // Akzent-Button rechts unten
+        // Accent button (bottom right)
         var btnW = 28f;
         var btnH = 10f;
         var btnX = origin.X + size.X - btnW - 6f;
@@ -78,7 +77,7 @@ internal static class ThemeMockup
             theme.Layout.FrameRounding
         );
 
-        // Border um das gesamte Mockup
+        // Mockup border
         draw.AddRect(
             origin,
             origin + size,

HellionChat/Ui/SettingsTabs/Window.cs

@@ -107,7 +107,7 @@ internal sealed class Window : ISettingsTab
                 1,
                 10
             );
-            // Untergrenze von 2 Sekunden gegen Selbst-Soft-Lock.
+            // Floor at 2 seconds to prevent self-soft-lock.
             Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout);
 
             using (ImRaii.Disabled(Mutable.HideInBattle))
@@ -177,7 +177,6 @@ internal sealed class Window : ISettingsTab
             ImGui.Checkbox(Language.Options_CanMove_Name, ref Mutable.CanMove);
             ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);
 
-            // v0.6.0 — global master switch for the pop-out input bar.
             ImGui.Checkbox(
                 HellionStrings.Settings_Window_PopOutInputEnabled_Name,
                 ref Mutable.PopOutInputEnabled
@@ -186,9 +185,7 @@ internal sealed class Window : ISettingsTab
 
             ImGui.Spacing();
 
-            // Manual escape hatch for off-screen windows. The plugin already
-            // runs an automatic bounds check once per session, but a button
-            // is the user-friendly fallback after a display layout change.
+            // Fallback for off-screen windows after a display layout change.
             if (ImGui.Button(HellionStrings.Settings_Window_ResetPosition_Name))
                 Plugin.ChatLogWindow.RequestPositionReset = true;
             ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_ResetPosition_Description);

HellionChat/Ui/StatusBar.cs

@@ -9,32 +9,23 @@ using HellionChat.Util;
 
 namespace HellionChat.Ui;
 
-/// <summary>
-/// Bottom-Status-Bar (v1.2.0). Fix 22 px hoch, BorderTop als Trenner.
-/// Slots links → rechts: Channel-Indicator (Color-Dot + Channel-Name),
-/// Privacy-Badge (Lock-Icon + Privacy-Label), Counts (Tabs + Msgs),
-/// Tells (Auto-Tell-Counter, hidden bei 0), Version (rechtsbündig, muted).
-///
-/// Update-Frequenz: 1×/Sekunde. Format-Strings werden zwischen Updates
-/// gecached, damit kein Per-Frame-Format-Allocation entsteht.
-/// </summary>
+// Bottom status bar, 22px tall. Slots left to right: channel indicator,
+// privacy badge, counts, tells (hidden at 0), version (right-aligned).
+// Updates at 1Hz; format strings are cached between updates.
 internal sealed class StatusBar
 {
     public const float Height = 22f;
     private const long UpdateIntervalMs = 1000;
 
-    // Cache-State — initial outdated, damit der erste Frame frisch berechnet.
+    // Initially outdated so the first frame always computes fresh.
     private long _lastUpdateMs = -UpdateIntervalMs;
     private string _cachedCountsText = string.Empty;
     private string _cachedTellsText = string.Empty;
 
-    /// <summary>
-    /// Reine String-Logik — testbar ohne ImGui-Init.
-    /// </summary>
+    // Pure string logic, testable without ImGui init.
     public static string FormatCounts(int tabs, int messages)
     {
-        // InvariantCulture: User-System-Locale darf das Format nicht
-        // verändern (de_DE würde sonst "1,2k" statt "1.2k" liefern).
+        // InvariantCulture so locale doesn't affect the format (e.g. de_DE "1,2k").
         var msgPart =
             messages >= 1000
                 ? string.Format(CultureInfo.InvariantCulture, "{0:0.0}k msg", messages / 1000.0)
@@ -43,10 +34,7 @@ internal sealed class StatusBar
         return $"{tabsPart} · {msgPart}";
     }
 
-    /// <summary>
-    /// Reine String-Logik — testbar ohne ImGui-Init.
-    /// 0 Tells → Leerstring (Slot wird ausgeblendet).
-    /// </summary>
+    // Pure string logic, testable without ImGui init. Returns empty string at 0 tells.
     public static string FormatTells(int count)
     {
         if (count <= 0)
@@ -54,8 +42,7 @@ internal sealed class StatusBar
         return $"{count} {(count == 1 ? "tell" : "tells")}";
     }
 
-    // Single-pass replacement for the LINQ Sum+Count pair in Draw. Pure
-    // helper so a future LINQ regression gets pinned by xUnit.
+    // Single-pass replacement for a LINQ Sum+Count pair. Pure helper for unit testing.
     internal static (int messages, int tells) AggregateForStatusBar(IList<Tab> tabs)
     {
         int messages = 0,
@@ -69,10 +56,7 @@ internal sealed class StatusBar
         return (messages, tells);
     }
 
-    /// <summary>
-    /// Test-Hook: Cache-Logic ohne reale Time-Source verifizieren.
-    /// Nicht für Production-Render.
-    /// </summary>
+    // Test hook to verify cache logic without a real time source.
     internal (string counts, string tells) SnapshotForTest(
         long now,
         int tabs,
@@ -93,24 +77,18 @@ internal sealed class StatusBar
         _lastUpdateMs = now;
     }
 
-    /// <summary>
-    /// Render-Pfad. Aufrufer pusht bereits den HellionStyle/Theme;
-    /// wir lesen nur die aktiven Theme-Farben und zeichnen.
-    /// </summary>
     public void Draw(Plugin plugin)
     {
         var theme = plugin.ThemeRegistry.Active;
         var now = Environment.TickCount64;
 
-        // Outer gate keeps the foreach out of the hot path 99% of frames.
-        // UpdateCacheIfDue runs the same check internally — idempotent.
         if (now - _lastUpdateMs >= UpdateIntervalMs)
         {
             var (messages, tells) = AggregateForStatusBar(Plugin.Config.Tabs);
             UpdateCacheIfDue(now, Plugin.Config.Tabs.Count, messages, tells);
         }
 
-        // BorderTop als Trenner — DrawList-Line, ImGui-Separator hat zu viel Padding.
+        // Border top via DrawList -- ImGui.Separator has too much padding.
         var cursorY = ImGui.GetCursorScreenPos().Y;
         var winLeft = ImGui.GetWindowPos().X;
         var winRight = winLeft + ImGui.GetWindowSize().X;
@@ -123,9 +101,9 @@ internal sealed class StatusBar
                 1f
             );
 
-        ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing
+        ImGui.Dummy(new Vector2(0, 2));
 
-        // Slot 1: Active-Channel-Indicator
+        // Slot 1: active channel indicator
         var inputCh = plugin.CurrentTab?.CurrentChannel?.Channel ?? InputChannel.Invalid;
         var hasChannel = inputCh != InputChannel.Invalid;
         var chatType = inputCh.ToChatType();
@@ -137,7 +115,7 @@ internal sealed class StatusBar
         ImGui.SameLine();
         ImGui.TextUnformatted(channelName);
 
-        // Slot 2: Privacy-Badge — abgeleitet aus PrivacyFilterEnabled.
+        // Slot 2: privacy badge
         ImGui.SameLine();
         DrawSeparator();
         ImGui.SameLine();
@@ -151,13 +129,13 @@ internal sealed class StatusBar
             : HellionStrings.StatusBar_Privacy_Open;
         ImGui.TextUnformatted(privacyLabel);
 
-        // Slot 3: Counts
+        // Slot 3: counts
         ImGui.SameLine();
         DrawSeparator();
         ImGui.SameLine();
         ImGui.TextUnformatted(_cachedCountsText);
 
-        // Slot 4: Tells (nur wenn > 0)
+        // Slot 4: tells (hidden at 0)
         if (!string.IsNullOrEmpty(_cachedTellsText))
         {
             ImGui.SameLine();
@@ -166,16 +144,22 @@ internal sealed class StatusBar
             ImGui.TextUnformatted(_cachedTellsText);
         }
 
-        // Slot 5: Version (rechtsbündig, muted)
+        // Slot 5: version, right-aligned, muted. Hidden when the window is
+        // too narrow to fit all five slots — the other four need ~200 px
+        // before the version text starts clipping into them.
         var versionText = $"v{Plugin.Interface.Manifest.AssemblyVersion} · Hellion";
         var versionWidth = ImGui.CalcTextSize(versionText).X;
         var contentRegionMax = ImGui.GetContentRegionMax().X;
+        const float MinOtherSlotsWidth = 200f;
+        if (contentRegionMax - versionWidth > MinOtherSlotsWidth)
+        {
             ImGui.SameLine(contentRegionMax - versionWidth);
             using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
             {
                 ImGui.TextUnformatted(versionText);
             }
         }
+    }
 
     private static void DrawDot(uint rgba)
     {

HellionChat/Ui/TabIconGlyphResolver.cs

@@ -1,22 +1,11 @@
 namespace HellionChat.Ui;
 
-/// <summary>
-/// Reine String-Resolver-Logik ohne Dalamud-Dependency. Bewusst in
-/// eigener Datei (Dependency-Boundary auf File-Level sichtbar), damit
-/// Tests (HellionChat.Tests, Microsoft.NET.Sdk ohne Dalamud-Reference)
-/// sie aufrufen können, ohne dass die JIT beim Methodenaufruf die
-/// Dalamud-Assembly laden muss.
-///
-/// Wird im Settings-UI (T7) für die Glyph-Picker-Combobox und im
-/// Render-Code indirekt über <see cref="TabIconMapping.Resolve(Tab)"/>
-/// verwendet.
-/// </summary>
+// Pure string resolver logic with no Dalamud dependency, kept in its own
+// file so tests (HellionChat.Tests, no Dalamud reference) can call it directly.
+// Used in the settings UI glyph picker and indirectly via TabIconMapping.Resolve.
 internal static class TabIconGlyphResolver
 {
-    /// <summary>
-    /// Picker-Options-Pool — Single Source of Truth für das Glyph-Set.
-    /// Reihenfolge ist die UI-Reihenfolge im Settings-Tab Icon-Combobox.
-    /// </summary>
+    // Single source of truth for the glyph set; order matches the settings combobox.
     public static readonly IReadOnlyList<string> PickerOptions =
     [
         "comment",
@@ -36,20 +25,13 @@ internal static class TabIconGlyphResolver
         "fire",
     ];
 
-    /// <summary>
-    /// Glyph-Set, das überhaupt als Override akzeptiert wird. Aus
-    /// <see cref="PickerOptions"/> abgeleitet — KnownGlyphs nie
-    /// manuell pflegen.
-    /// </summary>
+    // Derived from PickerOptions -- never maintain this manually.
     private static readonly HashSet<string> KnownGlyphs = new(
         PickerOptions,
         StringComparer.OrdinalIgnoreCase
     );
 
-    /// <summary>
-    /// Tab-Name → Default-Glyph-Name. Tab.Name wird per Lokalisierung
-    /// gesetzt; wir matchen daher gegen einen Pool aus DE/EN-Synonymen.
-    /// </summary>
+    // Tab.Name is localised, so we match against a pool of DE/EN synonyms.
     private static readonly Dictionary<string, string> NameDefaults = new(
         StringComparer.OrdinalIgnoreCase
     )
@@ -69,18 +51,11 @@ internal static class TabIconGlyphResolver
         ["tell"] = "envelope",
     };
 
-    /// <summary>
-    /// Test-Surface: Glyph-Name-Resolver ohne Dalamud-Dependency.
-    /// Reihenfolge:
-    /// 1. Tab.Icon-Override (falls gesetzt und nicht nur Whitespace):
-    ///    a) bekannter Glyph → diesen Glyph
-    ///    b) unbekannter Glyph → harter Fallback "hashtag" (User hat
-    ///       bewusst etwas gesetzt, also überstimmt das die Defaults)
-    /// 2. Auto-Tell-Tab → <paramref name="autoTellGlyph"/> falls
-    ///    übergeben, sonst "clock".
-    /// 3. Tab-Name-Default (<see cref="NameDefaults"/>-Lookup)
-    /// 4. Fallback "hashtag"
-    /// </summary>
+    // Resolves the glyph name for a tab. Priority order:
+    // 1. Tab.Icon override (if set): known glyph -> use it, unknown -> "hashtag"
+    // 2. Auto-tell tab -> autoTellGlyph if provided, else "clock"
+    // 3. Name default lookup
+    // 4. Fallback "hashtag"
     public static string ResolveGlyphName(Tab tab, string? autoTellGlyph = null)
     {
         if (!string.IsNullOrWhiteSpace(tab.Icon))

HellionChat/Ui/TabIconMapping.cs

@@ -2,31 +2,14 @@ using Dalamud.Interface;
 
 namespace HellionChat.Ui;
 
-/// <summary>
-/// Default-Icon-Mapping für Tabs. v1.2.0 Layout-Refresh nutzt das
-/// in Top-Tabs (Icon-Prefix) und Sidebar (Icon-only mit Tooltip).
-/// User können in Settings → Tabs per Tab.Icon-Override eigene
-/// FontAwesome-Glyphen setzen.
-///
-/// Diese Klasse ist Dalamud-abhängig (FontAwesomeIcon-Enum). Die
-/// reine String-Resolver-Logik liegt bewusst in
-/// <see cref="TabIconGlyphResolver"/> (eigene Datei, ohne
-/// Dalamud-Imports), damit Tests sie ohne Dalamud-Reference aufrufen
-/// können.
-/// </summary>
+// Default icon mapping for tabs, used in top-tabs (icon prefix) and sidebar (icon-only with tooltip).
+// Users can override per tab via Settings -> Tabs -> Tab.Icon.
+// Pure string resolver logic lives in TabIconGlyphResolver (no Dalamud dependency) for testability.
 internal static class TabIconMapping
 {
-    /// <summary>
-    /// FontAwesome-Glyph-Name → Icon-Enum-Lookup. Wird für die
-    /// Production-Resolve-API benötigt.
-    ///
-    /// INVARIANTE: Jeder Key in <see cref="GlyphLookup"/> muss auch in
-    /// <see cref="TabIconGlyphResolver.PickerOptions"/> stehen. Wird
-    /// ein Glyph zu PickerOptions hinzugefügt, aber nicht hier, fällt
-    /// die Override-Auflösung still auf <see cref="FontAwesomeIcon.Hashtag"/>
-    /// zurück (degraded, kein Crash). Build-Time-Enforcement ist nicht
-    /// möglich, weil PickerOptions ohne Dalamud-Reference auskommt.
-    /// </summary>
+    // Glyph name -> FontAwesomeIcon lookup for production resolve.
+    // Every key must also exist in TabIconGlyphResolver.PickerOptions.
+    // A missing key silently falls back to FontAwesomeIcon.Hashtag (degraded, no crash).
     private static readonly Dictionary<string, FontAwesomeIcon> GlyphLookup = new(
         StringComparer.OrdinalIgnoreCase
     )
@@ -48,23 +31,13 @@ internal static class TabIconMapping
         ["fire"] = FontAwesomeIcon.Fire,
     };
 
-    /// <summary>
-    /// Production-Surface: liefert das Icon für einen Tab. Wrapper um
-    /// <see cref="TabIconGlyphResolver.ResolveGlyphName(Tab)"/> plus
-    /// Enum-Lookup. Wird von Render-Code (T3, T5) verwendet.
-    /// </summary>
+    // Resolves the icon for a tab. Auto-tell tabs get a per-partner hashed icon
+    // from the tell pool so parallel tells differ by glyph shape, not just colour.
     public static FontAwesomeIcon Resolve(Tab tab)
     {
-        // v1.2.0 — Auto-Tell-Tabs bekommen ein per-Partner gehashtes
-        // Icon aus dem Tell-Pool. Damit unterscheiden sich parallele
-        // Tells nicht nur über die Color (For), sondern auch über die
-        // Glyph-Form. Berechnung bleibt hier (Dalamud-bound), weil
-        // TellTarget Dalamud-Imports hat.
         string? autoTellGlyph = null;
         if (tab.IsTempTab && tab.TellTarget != null && tab.TellTarget.IsSet())
-        {
             autoTellGlyph = TabTintCache.GetIcon(tab);
-        }
 
         var glyph = TabIconGlyphResolver.ResolveGlyphName(tab, autoTellGlyph);
         return GlyphLookup.TryGetValue(glyph, out var icon) ? icon : FontAwesomeIcon.Hashtag;

HellionChat/Util/AutoTranslate.cs

@@ -17,10 +17,9 @@ internal static class AutoTranslate
     private static readonly Dictionary<ClientLanguage, List<AutoTranslateEntry>> Entries = new();
     private static readonly HashSet<(uint, uint)> ValidEntries = [];
 
-    // Serializes all reads and writes against Entries / ValidEntries.
-    // PreloadCache spawns a worker thread that fills both, while the main
-    // thread reads them via Matching / ReplaceWithPayload / StartsWithCommand
-    // — without this lock the HashSet/Dictionary access is undefined.
+    // Serialises all reads/writes against Entries and ValidEntries.
+    // PreloadCache fills both from a worker thread while the main thread
+    // reads via Matching/ReplaceWithPayload/StartsWithCommand.
     private static readonly object EntriesLock = new();
 
     private static Parser<char, (string name, Maybe<IEnumerable<ISelectorPart>> selector)> Parser()
@@ -54,21 +53,22 @@ internal static class AutoTranslate
         return Map((name, sel) => (name, sel), sheetName, selector.Optional());
     }
 
-    /// <summary>
-    /// Preloads auto-translate entries into the cache for the current game
-    /// language. Without this, the first message will take a long time to send
-    /// (which causes a hitch in the main thread).
-    ///
-    /// This spawns a new thread.
-    /// </summary>
+    // Warms the auto-translate cache on a background thread so the first
+    // message send doesn't hitch the main thread. IsBackground keeps plugin
+    // unload non-blocking even if the warmup is still in flight.
     internal static void PreloadCache()
     {
-        new Thread(() =>
+        var thread = new Thread(() =>
         {
             var sw = Stopwatch.StartNew();
             AllEntries();
             Plugin.Log.Debug($"Warming up auto-translate took {sw.ElapsedMilliseconds}ms");
-        }).Start();
+        })
+        {
+            IsBackground = true,
+            Name = "HellionChat-AutoTranslate-Warmup",
+        };
+        thread.Start();
     }
 
     private static List<AutoTranslateEntry> AllEntries()
@@ -104,7 +104,7 @@ internal static class AutoTranslate
             {
                 if (lookup is not ("" or "@"))
                 {
-                    // SE added whitespace to the newest additions, but ParseOrThrow doesn't see them as valid
+                    // SE added whitespace to newer entries; strip it before parsing.
                     lookup = lookup.Replace(" ", "");
 
                     var (sheetName, selector) = parser.ParseOrThrow(lookup);
@@ -144,19 +144,13 @@ internal static class AutoTranslate
                         columns.Add(0);
 
                     if (rows.Count == 0)
-                        // We can't use an "index from end" (like `^0`) here because
-                        // we're iterating over integers, not an array directly.
-                        // Previously, we were setting `0..^0` which caused these
-                        // sheets to be completely skipped due to this bug.
-                        // See below.
+                        // Can't use index-from-end here because we iterate over integers,
+                        // not an array directly. `0..^0` would silently skip the sheet.
                         rows.Add(..Index.FromStart((int)sheet.GetRowAt(sheet.Count - 1).RowId + 1));
 
                     foreach (var range in rows)
                     {
-                        // We iterate over the range by numerical values here, so
-                        // we can't use an "index from end" otherwise nothing will
-                        // happen.
-                        // See above.
+                        // Integer iteration -- can't use index-from-end (see above).
                         for (var i = range.Start.Value; i < range.End.Value; i++)
                         {
                             if (!sheet.TryGetRow((uint)i, out var rowParser))
@@ -261,7 +255,6 @@ internal static class AutoTranslate
         if (bytes.Length <= search.Length)
             return;
 
-        // populate the list of valid entries
         bool needBuild;
         lock (EntriesLock)
             needBuild = ValidEntries.Count == 0;
@@ -308,9 +301,8 @@ internal static class AutoTranslate
                 start = -1;
             }
 
-            // Pure managed comparison via Span avoids the msvcrt.dll P/Invoke,
-            // which is fragile under Wine and triggered an extra managed-to-
-            // unmanaged copy per check.
+            // Span comparison avoids the msvcrt.dll P/Invoke which is fragile
+            // under Wine and caused an extra managed-to-unmanaged copy per check.
             if (
                 i + search.Length < bytes.Length
                 && bytes.AsSpan(i, search.Length).SequenceEqual(search)
@@ -325,7 +317,6 @@ internal static class AutoTranslate
         if (bytes.Length <= search.Length)
             return false;
 
-        // populate the list of valid entries
         bool needBuild;
         lock (EntriesLock)
             needBuild = ValidEntries.Count == 0;

HellionChat/Util/GlobalParametersCache.cs

@@ -10,9 +10,8 @@ public static class GlobalParametersCache
 
     public static int GetValue(int index)
     {
-        // Capture the array reference once so the bounds check and the
-        // indexed read operate on the same instance, even if Refresh
-        // reassigns Cache between the two operations.
+        // Capture the array reference once so bounds check and read operate
+        // on the same instance if Refresh reassigns Cache between the two.
         var cache = Cache;
         if (index < 0 || index >= cache.Length)
             return 0;
@@ -20,12 +19,7 @@ public static class GlobalParametersCache
         return cache[index];
     }
 
-    /// <summary>
-    /// Refresh the cache of global parameters from RaptureTextModule.
-    /// </summary>
-    /// <remarks>
-    /// This should be called in the main thread when updates are necessary.
-    /// </remarks>
+    // Refreshes the cache from RaptureTextModule. Must be called on the main thread.
     public static unsafe void Refresh()
     {
         if (!ThreadSafety.IsMainThread)

HellionChat/Util/IconUtil.cs

@@ -11,8 +11,7 @@ public readonly unsafe ref struct GfdFileView
     private readonly ReadOnlySpan<byte> Span;
     private readonly bool DirectLookup;
 
-    /// <summary>Initializes a new instance of the <see cref="GfdFileView"/> struct.</summary>
-    /// <param name="span">The data.</param>
+    // span: raw .gfd file bytes
     public GfdFileView(ReadOnlySpan<byte> span)
     {
         Span = span;
@@ -27,18 +26,13 @@ public readonly unsafe ref struct GfdFileView
             DirectLookup &= i + 1 == entries[i].Id;
     }
 
-    /// <summary>Gets the header.</summary>
     private ref readonly GfdHeader Header => ref MemoryMarshal.AsRef<GfdHeader>(Span);
 
-    /// <summary>Gets the entries.</summary>
     private ReadOnlySpan<GfdEntry> Entries =>
         MemoryMarshal.Cast<byte, GfdEntry>(Span[sizeof(GfdHeader)..]);
 
-    /// <summary>Attempts to get an entry.</summary>
-    /// <param name="iconId">The icon ID.</param>
-    /// <param name="entry">The entry.</param>
-    /// <param name="followRedirect">Whether to follow redirects.</param>
-    /// <returns><c>true</c> if found.</returns>
+    // Returns true if the entry was found.
+    // followRedirect: whether to chase redirect chains.
     public bool TryGetEntry(uint iconId, out GfdEntry entry, bool followRedirect = true)
     {
         if (iconId == 0)
@@ -50,9 +44,8 @@ public readonly unsafe ref struct GfdFileView
         var entries = Entries;
         if (DirectLookup)
         {
-            // Resolve redirects on the direct-lookup path too — the binary-search
-            // path follows them, and skipping them here was inconsistent for
-            // contiguous ID sets.
+            // Follow redirects on the direct-lookup path for consistency with
+            // the binary-search path.
             var visited = 0;
             while (iconId <= entries.Length)
             {
@@ -107,49 +100,28 @@ public readonly unsafe ref struct GfdFileView
         return false;
     }
 
-    /// <summary>Header of a .gfd file.</summary>
+    // .gfd file header
     [StructLayout(LayoutKind.Sequential)]
     public struct GfdHeader
     {
-        /// <summary>Signature: "gftd0100".</summary>
-        public fixed byte Signature[8];
-
-        /// <summary>Number of entries.</summary>
+        public fixed byte Signature[8]; // "gftd0100"
         public int Count;
-
-        /// <summary>Unused/unknown.</summary>
         public fixed byte Padding[4];
     }
 
-    /// <summary>An entry of a .gfd file.</summary>
+    // .gfd file entry -- one icon slot
     [StructLayout(LayoutKind.Sequential, Size = 0x10)]
     public struct GfdEntry
     {
-        /// <summary>ID of the entry.</summary>
         public ushort Id;
-
-        /// <summary>The left offset of the entry.</summary>
         public ushort Left;
-
-        /// <summary>The top offset of the entry.</summary>
         public ushort Top;
-
-        /// <summary>The width of the entry.</summary>
         public ushort Width;
-
-        /// <summary>The height of the entry.</summary>
         public ushort Height;
-
-        /// <summary>Unknown/unused.</summary>
         public ushort Unk0A;
-
-        /// <summary>The redirected entry, maybe.</summary>
-        public ushort Redirect;
-
-        /// <summary>Unknown/unused.</summary>
+        public ushort Redirect; // non-zero = redirects to another entry
         public ushort Unk0E;
 
-        /// <summary>Gets a value indicating whether this entry is effectively empty.</summary>
         public bool IsEmpty => Width == 0 || Height == 0;
     }
 }

HellionChat/Util/MathUtil.cs

@@ -31,18 +31,10 @@ public static class MathUtil
         public override string ToString() => $"X: {X} Y: {Y} Width: {Width} Height: {Height}";
     }
 
-    /// <summary>
-    /// Checks if two rectangles overlap at any point.
-    /// </summary>
-    /// <param name="a"></param>
-    /// <param name="b"></param>
-    /// <returns>True if overlapping</returns>
+    // Standard AABB overlap test. Inclusive on both axes to catch shared
+    // edges and identical rectangles (previous ValueInRange approach missed these).
     public static bool HasOverlap(this Rectangle a, Rectangle b)
     {
-        // Standard AABB overlap test: two rectangles overlap iff they
-        // overlap on both axes. The previous nested ValueInRange approach
-        // used strict inequalities at both ends, which dropped identical
-        // rectangles and shared-edge cases as false negatives.
         return a.X < b.X + b.Width
             && a.X + a.Width > b.X
             && a.Y < b.Y + b.Height

HellionChat/Util/Payloads.cs

@@ -13,16 +13,11 @@ internal class PartyFinderPayload : Payload
         Id = id;
     }
 
-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 
-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
         throw new NotImplementedException();
 }
-}
 
 internal class AchievementPayload : Payload
 {
@@ -35,16 +30,11 @@ internal class AchievementPayload : Payload
         Id = id;
     }
 
-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 
-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
         throw new NotImplementedException();
 }
-}
 
 internal class UriPayload(Uri uri) : Payload
 {
@@ -55,20 +45,14 @@ internal class UriPayload(Uri uri) : Payload
     private const string DefaultScheme = "https";
     private static readonly string[] ExpectedSchemes = ["http", "https"];
 
-    /// <summary>
-    /// Create a URIPayload from a raw URI string. If the URI does not have a
-    /// scheme, it will default to https://.
-    /// </summary>
-    /// <exception cref="UriFormatException">
-    /// If the URI is invalid, or if the scheme is not supported.
-    /// </exception>
+    // Parses a raw URI string. Defaults to https:// if no scheme is present.
+    // Throws UriFormatException for empty input or unsupported schemes.
     public static UriPayload ResolveUri(string rawUri)
     {
         ArgumentNullException.ThrowIfNull(rawUri);
         if (string.IsNullOrWhiteSpace(rawUri))
             throw new UriFormatException("URI cannot be empty or whitespace.");
 
-        // Check for an expected scheme '://', if not add 'https://'
         if (ExpectedSchemes.Any(scheme => rawUri.StartsWith($"{scheme}://")))
             return new UriPayload(new Uri(rawUri));
 
@@ -78,15 +62,10 @@ internal class UriPayload(Uri uri) : Payload
         return new UriPayload(new Uri($"{DefaultScheme}://{rawUri}"));
     }
 
-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
         throw new NotImplementedException();
-    }
 
-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 }
 
 internal class EmotePayload : Payload
@@ -95,18 +74,10 @@ internal class EmotePayload : Payload
 
     public string Code = string.Empty;
 
-    public static EmotePayload ResolveEmote(string code)
-    {
-        return new EmotePayload { Code = code };
-    }
+    public static EmotePayload ResolveEmote(string code) => new EmotePayload { Code = code };
 
-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
         throw new NotImplementedException();
-    }
 
-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 }

HellionChat/Util/TabsUtil.cs

@@ -14,12 +14,8 @@ public static class TabsUtil
         return channels;
     }
 
-    // Hellion-tuned General preset (v1.0.0 — sharpened defaults).
-    // Public-chat-only, the bare three channels you encounter in open
-    // world. Group/FC/Linkshell traffic moves to dedicated tabs, gameplay
-    // events (loot, crafting, gathering, NPC dialogue, PF pings) move to
-    // the System tab where they belong — keeps the General view focused
-    // on actual conversation in the immediate surroundings.
+    // Public-chat-only: Say, Yell, Shout. Group/FC/Linkshell and gameplay
+    // events live in their own tabs to keep General focused on open-world chat.
     public static Tab VanillaGeneral =>
         new()
         {
@@ -55,11 +51,8 @@ public static class TabsUtil
             AllSenderMessages = true,
         };
 
-    // Hellion default-tab presets used by the v10 wipe migration. Names are
-    // kept in HellionStrings (EN+DE) instead of Language.* so the upstream
-    // resource files stay untouched. Channel selections cover the channels
-    // a typical Eorzea raider uses without forcing the user to hand-tick
-    // each box on first start.
+    // Hellion tab presets. Names live in HellionStrings (EN+DE) so upstream
+    // resource files stay untouched.
     public static Tab HellionFreeCompany =>
         new()
         {
@@ -88,10 +81,8 @@ public static class TabsUtil
                 [ChatType.LootNotice] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.LootRoll] = (ChatSourceExt.All, ChatSourceExt.All),
             },
-            // No automatic input-channel switch; the Gruppe tab is a read
-            // surface that pulls in Party, CrossParty, Alliance and PvpTeam
-            // together. Auto-routing /party into this tab would surprise the
-            // user when they actually wanted /alliance or /pvpteam.
+            // No input-channel switch: Party pulls in multiple channel types
+            // and auto-routing /party would surprise users wanting /alliance or /pvpteam.
         };
 
     public static Tab HellionBeginner =>
@@ -112,7 +103,7 @@ public static class TabsUtil
             Name = HellionStrings.Tabs_Presets_System,
             SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
             {
-                // Plain system noise
+                // System noise
                 [ChatType.Debug] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.Urgent] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.Notice] = (ChatSourceExt.All, ChatSourceExt.All),
@@ -130,7 +121,7 @@ public static class TabsUtil
                 [ChatType.PvpTeamLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.RetainerSale] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.PeriodicRecruitmentNotification] = (ChatSourceExt.All, ChatSourceExt.All),
-                // Gameplay-event streams (moved out of General in v1.0.0)
+                // Gameplay event streams
                 [ChatType.NpcDialogue] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.LootNotice] = (ChatSourceExt.All, ChatSourceExt.All),
                 [ChatType.LootRoll] = (ChatSourceExt.All, ChatSourceExt.All),

HellionChat/Util/Tokenizer.cs

@@ -135,18 +135,8 @@ public static class Tokenizer
         public int Precedence { get; set; }
     }
 
-    /// <summary>
-    /// URLRegex returns a regex object that matches URLs like:
-    /// - https://example.com
-    /// - http://example.com
-    /// - www.example.com
-    /// - https://sub.example.com
-    /// - example.com
-    /// - sub.example.com
-    ///
-    /// It matches URLs with www. or https:// prefix, and also matches URLs
-    /// without a prefix on specific TLDs.
-    /// </summary>
+    // Matches URLs with http(s):// or www. prefix, and bare domains on known TLDs.
+    // Examples: https://example.com, www.sub.example.com, example.com
     private static readonly Regex UrlRegex = new(
         @"(?<URL>((https?:\/\/|www\.)[a-z0-9-]+(\.[a-z0-9-]+)*|([a-z0-9-]+(\.[a-z0-9-]+)*\.(com|net|org|co|io|app)))(:[\d]{1,5})?(\/[^\s]*)?)",
         RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture

HellionChat/_Helpers/CompactInputHistoryNavigator.cs

@@ -2,16 +2,17 @@ using System;
 
 namespace HellionChat._Helpers;
 
-// Pure-helper mirror of the compact pop-out history-navigation cursor
-// math. The original CompactCallback was tangled with ImGuiInputTextCallbackData
-// (DeleteChars/InsertChars), which can't be exercised in xUnit. The
-// ImGui buffer mutation stays at the call site; only the deterministic
-// cursor-and-replacement decision lives here.
+// Extracted history-navigation cursor math from CompactCallback to allow unit
+// testing without ImGuiInputTextCallbackData (DeleteChars/InsertChars).
+// Buffer mutation stays at the call site; only the cursor/replacement decision lives here.
 //
 // Index semantics match InputHistoryService:
 //   index 0        = oldest entry
 //   index Count-1  = newest entry
-//   cursor == -1     = "not browsing history"
+//   cursor == -1   = not browsing history
+//
+// replacement == null: caller must NOT touch the buffer (cursor unchanged).
+// replacement != null: write it to the buffer (including "" to clear it).
 //
 // TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputHistoryNavigatorTests.cs
 public static class CompactInputHistoryNavigator
@@ -22,9 +23,6 @@ public static class CompactInputHistoryNavigator
         Down,
     }
 
-    // replacement == null means: caller must NOT touch the buffer. This
-    // distinguishes "cursor unchanged, leave the user's typing alone"
-    // from "cursor moved to an empty slot, clear the buffer".
     public static (int cursor, string? replacement) Navigate(
         Direction direction,
         int currentCursor,
@@ -38,7 +36,6 @@ public static class CompactInputHistoryNavigator
         ArgumentNullException.ThrowIfNull(push);
         ArgumentNullException.ThrowIfNull(getByCursor);
 
-        var prev = currentCursor;
         var next = currentCursor;
 
         switch (direction)
@@ -46,8 +43,7 @@ public static class CompactInputHistoryNavigator
             case Direction.Up:
                 if (currentCursor == -1)
                 {
-                    // First Up press from a fresh buffer: stash whatever
-                    // the user typed so they can recover it after browsing.
+                    // Stash current input so the user can recover it after browsing.
                     var offset = 0;
                     if (!string.IsNullOrWhiteSpace(currentBuffer))
                     {
@@ -57,10 +53,9 @@ public static class CompactInputHistoryNavigator
                     next = getCount() - 1 - offset;
                 }
                 else if (currentCursor > 0)
-                {
                     next--;
-                }
                 break;
+
             case Direction.Down:
                 if (currentCursor != -1)
                 {
@@ -71,10 +66,9 @@ public static class CompactInputHistoryNavigator
                 break;
         }
 
-        if (prev == next)
+        if (next == currentCursor)
             return (next, null);
 
-        var replacement = getByCursor(next) ?? string.Empty;
-        return (next, replacement);
+        return (next, getByCursor(next) ?? string.Empty);
     }
 }

HellionChat/_Helpers/CompactInputSubmitter.cs

@@ -3,11 +3,8 @@ using HellionChat.Ui;
 
 namespace HellionChat._Helpers;
 
-// Pure-helper mirror of the compact pop-out submit flow. ChatInputBar's
-// SubmitCompact used to inline this against a sealed ChatLogWindow, which
-// blocks Moq-based isolation. Lifting the deterministic part into a POCO
-// keeps the production call site a one-liner while letting xUnit assert
-// the buffer/cursor reset and the sender contract directly.
+// Extracted submit logic from ChatInputBar.SubmitCompact to allow unit testing
+// without a sealed ChatLogWindow dependency.
 // TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputSubmitterTests.cs
 public static class CompactInputSubmitter
 {

README.md

@@ -2,7 +2,7 @@
 
 [![Build](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml/badge.svg?branch=main)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml)
 [![License: EUPL-1.2](https://img.shields.io/badge/License-EUPL--1.2-blue.svg)](LICENSE)
-[![Latest release](https://img.shields.io/badge/release-v1.4.3-brightgreen)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/latest)
+[![Latest release](https://img.shields.io/badge/release-v1.4.5-brightgreen)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/latest)
 [![Dalamud API](https://img.shields.io/badge/Dalamud-API_15-purple)](https://github.com/goatcorp/Dalamud)
 [![.NET](https://img.shields.io/badge/.NET-10.0-512BD4)](https://dotnet.microsoft.com/)
 [![FFXIV](https://img.shields.io/badge/FFXIV-Dawntrail-c3a37f)](https://www.finalfantasyxiv.com/)
@@ -11,7 +11,7 @@
   <img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" />
 </p>
 
-**Version 1.4.3** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on
+**Version 1.4.5** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on
 [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
 
 Hellion Chat is a privacy-first plugin built on the Chat 2 foundation. The majority of the engine comes from Chat 2
@@ -286,14 +286,18 @@ An optional submission to the Dalamud main plugin repo (in addition to the custo
 
 ## Project Status
 
-**Version 1.4.3** — Plugin-load async init plus repo cutover: the plugin has been migrated to Dalamud's
-`IAsyncDalamudPlugin` API. The constructor now handles only bootstrap essentials (config load, language init, conflict
-detection); migrations, service allocations, window construction, and hook subscriptions move into `LoadAsync`, allowing
-Dalamud to keep the UI responsive during heavy lifting. A schema gate replaces the v9 → v16 migration chain; configs at
-schema v16+ load directly, older configs trigger an "install v1.4.2 first" error message. Custom repo URL migrated to
-`gitea.hellion-forge.cloud`; the GitHub repo remains as a frozen v1.4.2 snapshot. Plugin load time is ~3.7 s median (5
-reloads), comparable to v1.4.2 — the async migration is the foundation for v1.4.4 lazy-init optimizations, not a direct
-user-facing win. Fourth sub-patch of the v1.4.x polish sweep series (as of 2026-05-08).
+**Version 1.4.5** — User-visible robustness polish on top of the v1.4.4 threading work. The chat log no longer fails
+silently: a draw-path exception now triggers a one-shot warning notification that points users at `/xllog`, while the
+stack trace itself keeps going through `Plugin.Log.Error` as before. The first-run wizard splits accept from close —
+`OnClose` no longer silently sets `FirstRunCompleted`, so closing the X leaves the wizard pending and it reopens on the
+next plugin load; a new footer "Later — keep defaults" button is the explicit path to dismiss without picking a profile.
+`InputHistoryService` clears on plugin dispose alongside the existing pure-memory cleanups, so the previous session's
+typed commands don't bleed into the next load. `FontManager.GetHellionFontBytes` becomes a `Try`-variant that falls back
+to the system-font path when the embedded resource is missing (broken csproj / dev build) instead of throwing through
+the UiBuilder. The status bar drops the right-aligned version slot when the chat window is below the threshold needed to
+fit all five slots without overlap. Internal: explicit session-only Auto-Tell-Tab invariant comment with a
+`TempTabCounter.InitFromList` pin in the Build-Suite. No schema bump, no migration. Sixth sub-patch of the v1.4.x polish
+sweep series (as of 2026-05-12).
 
 Hellion Chat is a standalone plugin, no longer a fork in the repository sense. Fully completed:
 

docs/AI_DISCLOSURE.md

@@ -57,7 +57,7 @@ Both are good projects. Use what fits you best.
 ## Tooling
 
 | Tool                                                  | Purpose                                                             |
-| ----------------------------------------------------- | ------------------------------------------------------------- |
+| ----------------------------------------------------- | ------------------------------------------------------------------- |
 | [Claude](https://claude.ai) (Anthropic)               | Pair-level AI assistance via Claude Code CLI                        |
 | [VS Code](https://code.visualstudio.com) + C# Dev Kit | Primary IDE                                                         |
 | Dedicated Windows 11 VM                               | Build and in-game test environment (Dalamud requires Windows)       |
@@ -65,6 +65,9 @@ Both are good projects. Use what fits you best.
 | [Microsoft Learn](https://learn.microsoft.com)        | .NET and C# documentation                                           |
 | [Context7](https://context7.com)                      | Up-to-date library docs for Claude context                          |
 | [Stack Overflow](https://stackoverflow.com)           | General C# and .NET problem-solving                                 |
+| Custom build test suite                               | Pattern-based integration tests written from scratch, drawing on    |
+|                                                       | conventions from Lightless, Umbra and other standard FFXIV plugins. |
+|                                                       | Not publicly available. Yet.                                        |
 
 ## Contact
 

docs/CHANGELOG.md

@@ -1,13 +1,73 @@
 # Changelog — Hellion Chat
 
-Alle nutzersichtbaren Änderungen an Hellion Chat. Das Format orientiert sich an
-[Keep a Changelog](https://keepachangelog.com/de/1.0.0/), die Version-Nummern folgen
-[Semantischer Versionierung](https://semver.org/lang/de/).
+All user-facing changes to Hellion Chat. Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+version numbers follow [Semantic Versioning](https://semver.org/).
 
-Detaillierte Release-Notes pro Version stehen direkt am
-[Gitea-Release](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases) und im Plugin-Changelog-Block
-(`HellionChat/HellionChat.yaml` → `changelog:`). Diese Datei fasst die Releases als Überblick zusammen und verlinkt für
-Details auf die Release-Pages.
+Detailed release notes per version are available directly on the
+[Gitea Release page](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases) and in the plugin
+changelog block (`HellionChat/HellionChat.yaml` → `changelog:`). This file summarises releases as an overview and links
+to the release pages for details.
+
+---
+
+## Hellion Chat 1.4.5 — UX and Robustness (2026-05-12)
+
+Sixth sub-patch of the v1.4.x polish-sweep series. User-visible robustness fixes plus two doc/test polish items from the
+audit backlog. No schema bump, no migration.
+
+- `ChatLogWindow.Draw` now surfaces a one-shot warning notification when the draw path throws. The stack trace still
+  goes to `/xllog` via `Plugin.Log.Error`; the notification is suppressed for the rest of the plugin session so a
+  recurring failure can't spam the notification stack frame-by-frame. Pattern-match to the existing `Plugin.cs:505-516`
+  migration-blocker notification
+- `FirstRunWizard` splits accept from close. `OnClose` no longer silently sets `FirstRunCompleted`, so closing the X
+  leaves the wizard pending and it reopens on the next plugin load. A new footer "Later — keep defaults" button is the
+  explicit path to dismiss without picking a profile. Bilingual strings (EN + DE) plus a tooltip
+- `InputHistoryService.Reset` is wired into `Plugin.DisposeAsync` alongside the existing pure-memory cleanups. Static
+  state used to survive a plugin reload — the next load now starts with an empty history
+- `FontManager.GetHellionFontBytes` becomes `TryGetHellionFontBytes` with a nullable return. On miss (broken csproj,
+  hand-rolled dev build) the caller falls back to the system-font path that `UseHellionFont=false` already uses, plus a
+  `Plugin.Log.Warning`. The whole UiBuilder no longer throws if the embedded font resource is absent
+- `Plugin.cs:167-168` gets a 4-line reasoning comment around the session-only `RemoveAll(IsTempTab)`: tells are usually
+  privacy-filtered, resurrecting an empty crashed-session tab would trigger DB reconstruction on the next load.
+  `TempTabCounter.InitFromList` mirrors the post-strip semantic in the Build-Suite with a pinning test
+- `StatusBar.cs` drops the version slot when the chat window's content width minus the version text is below 200 px. The
+  right-aligned version used to clip into the four left-side slots in narrow windows
+
+Modding & support: join Hellion Forge — <https://discord.gg/X9V7Kcv5gR>
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+---
+
+## Hellion Chat 1.4.4 — Threading and IPC Safety Polish (2026-05-12)
+
+Fifth sub-patch of the v1.4.x polish-sweep series. Threading assumptions are documented per-method, a hot-path lock
+falls away in `AutoTellTabsService`, IPC-cleanup failures become visible, and the privacy filter now speaks up when an
+unknown ChatType shows up.
+
+- `AutoTellTabsService.ActiveTempTabCount` switches from a lock-protected LINQ `Count` to an `Interlocked` counter kept
+  in sync with `Config.Tabs` from inside the existing mutation paths. `Initialize()` seeds the counter from the
+  persisted Tabs list, and `SaveConfig`'s snapshot-restore path calls a new `ResyncTempTabCounter()` so the mid-step
+  `RemoveAll` doesn't leave the counter drifting. Pure-helper test mirror lives in the Build-Suite repo
+- `HonorificService` per-method threading banners replace the block comment at the bottom of the file. Each IPC callback
+  (`TryInitialPull`, `OnTitleChanged`, `OnReady`, `OnDisposing`, `TryUnsubscribe`) and the `CurrentTitle` field carry a
+  one-line `// Thread:` annotation so the framework-thread invariant is visible at the call site
+- `TryUnsubscribe` log-level upgraded from `Debug` to `Warning`. A silent unsubscribe failure leaks a live subscription
+  across plugin reloads, which is exactly the kind of issue that should not be at Debug
+- `AutoTranslate.PreloadCache` thread now has `IsBackground = true` and a thread name. Without `IsBackground` the warmup
+  blocks plugin unload (typically 100-300 ms). Pattern-match to `MessageManager` (F6.1) and `Plugin.RetentionSweep`
+  (F9.3), both since v1.4.0
+- `Configuration.IsAllowedForStorage` adds a one-line `Plugin.Log.Warning` for the first occurrence of any ChatType that
+  isn't in `PrivacyPersistChannels`. Dedup via a `NonSerialized` `HashSet<ChatType>`, so the warning fires once per
+  runtime — not once per frame, not once per install. Failsafe routing through `PrivacyPersistUnknownChannels` is
+  unchanged
+- `PrivacyPersistUnknownChannels` field default flipped from `false` to `true` for new installs via a constant in
+  `PrivacyDefaults`. Existing configs keep their explicit choice — the deserializer overrides the initializer. No schema
+  bump, no migration, no first-run banner
+
+Modding & support: join Hellion Forge — <https://discord.gg/X9V7Kcv5gR>
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
 ---
 
@@ -40,8 +100,8 @@ Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
 Third sub-patch of the v1.4.x Polish Sweep series. Per-frame allocations from the chat-log render path eliminated.
 
-- `DrawMessages` card-mode hoists `theme`/`drawList`/`winLeft`/ `winRight`/`borderColorAbgr` out of the per-message
-  loop. About 500 redundant calls per frame at 100 visible messages, multiplied by every pop-out window
+- `DrawMessages` card-mode hoists `theme`/`drawList`/`winLeft`/`winRight`/`borderColorAbgr` out of the per-message loop.
+  About 500 redundant calls per frame at 100 visible messages, multiplied by every pop-out window
 - Auto-tell tab tint and icon use a per-tab cache. Hash computation and string allocation only happen when the tell
   target name or world drifts. `AutoTellTabTint` stays a pure hash helper; cache lives in a thin `TabTintCache` wrapper
 - Status bar gates its tab aggregation behind the same one-second cache it already used for the format strings. LINQ
@@ -105,7 +165,7 @@ Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
 ---
 
-## Hellion Chat 1.3.0 - Plugin Integrations: Honorific
+## Hellion Chat 1.3.0 — Plugin Integrations: Honorific
 
 First step on the plugin-integration roadmap. HellionChat now listens to Honorific and shows your custom title in the
 chat header. The slot auto-hides when Honorific is not installed, when no custom title is active, or when you are using
@@ -118,7 +178,7 @@ the original FFXIV title.
 - Maintainer attribution buttons for Honorific repo and Caraxi
 - New service-class pattern under HellionChat/Integrations/
 
-Modding and support: join Hellion Forge - <https://discord.gg/X9V7Kcv5gR>
+Modding & support: join Hellion Forge — <https://discord.gg/X9V7Kcv5gR>
 
 Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
@@ -177,7 +237,7 @@ Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
 ## v1.2.0 — Layout Refresh (2026-05-05)
 
-### 1.2.0 Added
+### Added
 
 - Sidebar tab modernization: icon-only at fixed 44 px, tooltip on hover, vertical accent pill for active tab
 - Top tabs: accent underline pill replaces background fill on active tab
@@ -190,12 +250,12 @@ Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 - Unread indicator: pulsing red dot in the top-right corner of any sidebar tab icon with unread messages, 2-second
   sine-wave pulse, respects `Configuration.ReduceMotion`
 
-### 1.2.0 Changed
+### Changed
 
 - Migration v14 → v15: deprecated Configuration fields `HellionThemeEnabled` and `HellionThemeWindowOpacity` removed
 - Appearance settings cleaned: legacy theme-engine bindings replaced by Themes tab (introduced in v1.1.0)
 
-### 1.2.0 Fixed
+### Fixed
 
 - Settings save no longer wipes chat history by default — the heavy `ClearAllTabs + FilterAllTabsAsync` cycle now only
   runs when a filter-relevant setting actually changed (Privacy filter, persisted channels, per-tab channel selection).
@@ -206,75 +266,78 @@ Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 - Sidebar child window no longer paints the top padding area with its frame background
 - Status bar version slot (`vX.Y.Z · Hellion`) no longer clips its rightmost character
 
-### 1.2.0 Notes
+### Notes
 
 - Polish phase (animations, theme crossfade, header quick-picker) follows in v1.3.0
 - Top-Tab icon prefixes were considered but dropped: Dalamud's default font atlas does not include FontAwesome
   codepoints, so mixed-font in a single TabItem label renders as tofu. Underline pill alone is the v1.2.0 visual
   treatment for top tabs. Resolution would require Font-Atlas merge at FontManager level — out of scope.
 
+---
+
 ## [1.1.0] — 2026-05-05 — Theme Foundation
 
-Erster großer UI-Cycle nach v1.0.0. Theme-Engine, fünf Built-In-Themes, Custom-Themes via JSON, Settings-Card-Grid.
+First major UI cycle after v1.0.0. Theme engine, five built-in themes, custom themes via JSON, settings card grid.
 
-### Hinzugefügt
+### Added
 
-- **Theme-Engine** mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom,
+- **Theme engine** with five built-in themes: Hellion Arctic (default), Chat 2 Classic, Event Horizon, Moonlit Bloom,
   Mint Grove.
-- **Settings → Themes** mit Mini-Mockup-Preview pro Theme. Klick auf eine Card switcht sofort das ganze Plugin (Chat,
-  Settings, Pop-Out).
-- **Custom-Themes via JSON** in `pluginConfigs/HellionChat/themes/`. Beim ersten Start wird `example-theme.json` als
-  Vorlage abgelegt.
-- **Optional Theme-Chat-Channel-Colors**: Themes können eigene Channel-Farben mitliefern. Beim Switch erscheint ein
-  Banner mit _Übernehmen / Behalten_ — nie automatisch.
-- **Settings-Card-Grid**: neue Übersicht beim Öffnen, Card-Klick führt in die Detail-Ansicht der Section. Breadcrumb +
-  ESC führen zurück.
-- **`docs/THEME-AUTHORING.md`** als Anleitung zum Schreiben eigener Themes, mit Hellion-Forge-Branding.
+- **Settings → Themes** with mini mockup preview per theme. Clicking a card instantly switches the entire plugin (chat,
+  settings, pop-outs).
+- **Custom themes via JSON** in `pluginConfigs/HellionChat/themes/`. On first start, `example-theme.json` is placed
+  there as a template.
+- **Optional theme chat channel colours**: themes can ship their own channel colours. On switch, a banner appears with
+  _Apply / Keep current_ — never applied automatically.
+- **Settings card grid**: new overview on open, clicking a card navigates into the section's detail view. Breadcrumb +
+  ESC navigate back.
+- **`docs/THEME-AUTHORING.md`** as a guide for writing custom themes, with Hellion Forge branding.
 
-### Geändert
+### Changed
 
-- **Plugin-Icon** auf Hellion Forge Hammer (vorher ChatTwo-Derivat).
-- **Settings-Detail-View** verwendet die volle Breite — die zweite Tab-Liste links ist weg, weil die Card-Übersicht den
-  Wechsel übernimmt.
-- **`HellionStyle.PushGlobal`** ist jetzt theme-driven (`PushGlobal(theme, opacity)`) statt const-palette-driven.
-- **Configuration v13 → v14**: alle User landen auf `hellion-arctic`. Wer den Upstream-Look will, wählt `chat2-classic`
-  in Settings → Themes.
+- **Plugin icon** updated to Hellion Forge hammer (previously a ChatTwo derivative).
+- **Settings detail view** uses the full width — the second tab list on the left is gone because the card overview
+  handles navigation.
+- **`HellionStyle.PushGlobal`** is now theme-driven (`PushGlobal(theme, opacity)`) instead of const-palette-driven.
+- **Configuration v13 → v14**: all users land on `hellion-arctic`. Those who prefer the upstream look can select
+  `chat2-classic` in Settings → Themes.
 
-### Veraltet
+### Deprecated
 
-- `Configuration.HellionThemeEnabled` und `HellionThemeWindowOpacity` bleiben für ein Release lesbar als Safety-Net,
-  werden aber nicht mehr ausgewertet. Entfernung geplant in v1.2.0.
+- `Configuration.HellionThemeEnabled` and `HellionThemeWindowOpacity` remain readable for one release as a safety net
+  but are no longer evaluated. Removal planned for v1.2.0.
 
-### Sicherheit
+### Security
 
-- Custom-Theme-JSON-Loader prüft `schemaVersion`, Pflichtfelder und Hex-Format. Ungültige Themes werden mit Warning
-  übersprungen, das Plugin lädt mit Built-Ins weiter.
+- Custom theme JSON loader validates `schemaVersion`, required fields and hex format. Invalid themes are skipped with a
+  warning; the plugin continues loading with built-ins.
 
-### Intern
+### Internal
 
-- 51 lokale Unit-Tests (Theme-Records, Registry, JSON-Round-Trip, Sanity pro Built-In-Theme). Tests sind gitignored.
+- 51 local unit tests (theme records, registry, JSON round-trip, sanity per built-in theme). Tests are gitignored.
 
 ---
 
-## [1.0.3] — 2026-05-04 — Polish patch
+## [1.0.3] — 2026-05-04 — Polish Patch
 
-Vier kleine Polish-Items aus dem Backlog gebündelt:
+Four small polish items from the backlog bundled together:
 
-- **Hide bei New Game+ Menü**: Optionaler globaler Toggle der Hellion Chat (und alle weiteren Plugin-Fenster wie
-  Settings, DB-Viewer, Pop-Outs) ausblendet, solange das NG+-Menü offen ist. Settings → Fenster → Rahmen, Default aus.
-  Skipt analog zum bestehenden LoadingScreens-Pattern den gesamten `WindowSystem.Draw()`-Pfad.
-- **Channel-Selector-Färbung**: Optionales Tinting des Channel-Auswahl-Knopfs (Comment-Icon) neben dem Eingabefeld in
-  der aktuellen Channel-Farbe. Settings → Aussehen → Chat-Farben, Default an. Konsistent zur bestehenden
-  Eingabetext-Färbung, ExtraChat-Override wird übernommen.
-- **(De)Buff-Icon Aspect-Ratio-Fix**: `PayloadHandler.InlineIcon` quetschte alle Hover-Icons auf 32×32. Status-Icons mit
-  nicht-quadratischen Dimensionen (Debuffs mit Pfeil-Indikator) sind jetzt aspekt-erhaltend geshrinkt. Eigenständige
-  Float-Math-Implementierung mit Zero-Size-Guard statt Cherry-Pick aus dem offenen ChatTwo PR #157 (der hatte eine
-  int-Division-Falle).
-- **HideState-Logging-Sweep**: Alle HideState-Transitions (Battle/Cutscene/User/Override plus die Pop-Out-Spiegelung)
-  loggen sich auf Verbose-Level. Aus by default, Aktivierung via `/xllog set HellionChat verbose` für
-  Bug-Report-Diagnose.
+- **Hide on New Game+ menu**: optional global toggle that hides Hellion Chat (and all other plugin windows such as
+  Settings, DB Viewer, pop-outs) while the NG+ menu is open. Settings → Window → Frame, default off. Skips the entire
+  `WindowSystem.Draw()` path analogous to the existing LoadingScreens pattern.
+- **Channel selector colouring**: optional tinting of the channel-select button (comment icon) next to the input field
+  in the current channel colour. Settings → Appearance → Chat Colours, default on. Consistent with the existing input
+  text colouring; ExtraChat override is carried over.
+- **(De)buff icon aspect-ratio fix**: `PayloadHandler.InlineIcon` was squashing all hover icons to 32×32. Status icons
+  with non-square dimensions (debuffs with an arrow indicator) are now shrunk aspect-preserving. Standalone float-math
+  implementation with zero-size guard instead of a cherry-pick from the open ChatTwo PR #157 (which had an int-division
+  trap).
+- **HideState logging sweep**: all HideState transitions (Battle/Cutscene/User/Override plus pop-out mirroring) log at
+  verbose level. Off by default; enable via `/xllog set HellionChat verbose` for bug-report diagnostics.
 
-[Release-Notes 1.0.3](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.3)
+[Release Notes 1.0.3](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.3)
+
+---
 
 ## [1.0.1] — 2026-05-04 — Window Position Recovery
 
@@ -287,61 +350,71 @@ Bundled housekeeping since v1.0.0: documentation restructured into `docs/`, stal
 cleaned up, Pidgin parser library bumped from 3.3.0 to 3.5.1, GitHub Actions bumps for `actions/setup-dotnet` (4 → 5)
 and `github/codeql-action` (3 → 4).
 
-[Release-Notes 1.0.1](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.1)
+[Release Notes 1.0.1](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.1)
+
+---
 
 ## [1.0.0] — 2026-05-03 — Standalone Major Release
 
-Erste vollständig eigenständige Version. Code-Namespace, IPC-Kanäle und Source-Tree-Struktur wurden auf `HellionChat.*`
-konsolidiert. Plugin verweigert den Start bei aktivem Upstream Chat 2 (bilinguale Konflikt-Meldung). SQLite-Native auf
-3.50.3 gepinnt (CVE-2025-6965, CVE-2025-7709). Tab-Layout-Default für neue Installationen und für User auf
-Config-Version 12 oder älter neu strukturiert (5 thematische Tabs statt 6+ kitchen-sink). Sweep aus Critical- und
-Major-Findings aus dem Codebase-Audit eingearbeitet.
+First fully independent release. Code namespace, IPC channels and source tree structure consolidated under
+`HellionChat.*`. Plugin refuses to start alongside an active upstream Chat 2 (bilingual conflict message). SQLite native
+pinned to 3.50.3 (CVE-2025-6965, CVE-2025-7709). Tab layout default for new installs and users on config version 12 or
+older restructured (5 thematic tabs instead of 6+ kitchen-sink). Sweep of critical and major findings from the codebase
+audit incorporated.
 
-[Release-Notes 1.0.0](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.0)
+[Release Notes 1.0.0](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v1.0.0)
+
+---
 
 ## [0.6.1] — 2026-05-03 — Pop-Out Discoverability & /tell Auto-Pop-Out
 
-Pop-Out-Button im Chat-Header sichtbar, einmaliger Hint-Banner für die Pop-Out-Funktionalität. Neue Einstellung "Neue
-/tell-Tabs direkt als Pop-Out öffnen". Pop-Out-Input ist jetzt standardmäßig aktiv. Bugfixes: Ghost-Windows bei LRU-Drop
-/ Logout, Dead-Zone unter dem Input-Bar bei aktivem Hint-Banner.
+Pop-out button visible in the chat header, one-time hint banner for the pop-out feature. New setting "Open new /tell
+tabs directly as pop-out". Pop-out input is now active by default. Bug fixes: ghost windows on LRU-drop / logout, dead
+zone below the input bar when the hint banner is active.
 
-[Release-Notes 0.6.1](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.6.1)
+[Release Notes 0.6.1](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.6.1)
+
+---
 
 ## [0.6.0] — 2026-05-03 — UX Polish: Pop-Out Input + Colour Presets
 
-Zwei opt-in UX-Features. Pop-Out-Fenster bekommen optional eine kompakte Eingabe-Bar mit channel-farbigem Icon-Button
-und unabhängigem Text-Buffer pro Pop-Out. Sieben Built-in-Color-Presets (Klassik, High-Contrast, Pastell,
-Dark-Mode-Tuned, Hellion, Night Blue, Indigo Violet) zum One-Click-Apply. Konfigurations-Migration v10 → v11.
+Two opt-in UX features. Pop-out windows optionally get a compact input bar with a channel-coloured icon button and an
+independent text buffer per pop-out. Seven built-in colour presets (Classic, High Contrast, Pastel, Dark Mode Tuned,
+Hellion, Night Blue, Indigo Violet) for one-click apply. Configuration migration v10 → v11.
 
-[Release-Notes 0.6.0](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.6.0)
+[Release Notes 0.6.0](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.6.0)
+
+---
 
 ## [0.5.4] — 2026-05-02 — WrapText Hardening
 
-`ImGuiUtil.WrapText` von Pointer-Arithmetik auf Span- und Index-basierten Control-Flow umgestellt. Schließt das
-wiederkehrende CodeQL-Critical-Alert "unvalidated local pointer arithmetic" dauerhaft. Keine nutzersichtbare
-Verhaltensänderung — Word-Wrap-Output ist byte-identisch zu 0.5.3.
+`ImGuiUtil.WrapText` rewritten from pointer arithmetic to Span- and index-based control flow. Permanently closes the
+recurring CodeQL critical alert "unvalidated local pointer arithmetic". No user-visible behaviour change — word-wrap
+output is byte-identical to 0.5.3.
 
-[Release-Notes 0.5.4](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.5.4)
+[Release Notes 0.5.4](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.5.4)
+
+---
 
 ## [0.5.3] — 2026-05-02 — Pointer Arithmetic Hardening
 
-Erster Anlauf zur Schließung des CodeQL-Critical-Alerts in `ImGuiUtil.WrapText`. Encoded-Byte-Buffer-Length wird vor der
-Pointer-Arithmetik via `GetByteCount` validiert.
+First attempt at closing the CodeQL critical alert in `ImGuiUtil.WrapText`. Encoded byte buffer length is validated via
+`GetByteCount` before pointer arithmetic.
 
-[Release-Notes 0.5.3](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.5.3)
+[Release Notes 0.5.3](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/v0.5.3)
 
 ---
 
-## Frühere Versionen
+## Earlier Versions
 
-Releases vor 0.5.3 (Bootstrap-Phase 0.1.0 bis 0.5.2) sind direkt am GitHub-Release-Stream einsehbar:
+Releases before 0.5.3 (bootstrap phase 0.1.0 to 0.5.2) are available directly on the Gitea release stream:
 
-[Alle Releases](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases)
+[All Releases](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases)
 
 ---
 
-## Pflege-Hinweis
+## Maintenance Note
 
-Die Source-of-Truth für den nutzersichtbaren Changelog ist der `changelog:`-Block in `HellionChat/HellionChat.yaml`.
-`repo.json` und der GitHub-Release-Body werden daraus gespeist. Diese Datei (`docs/CHANGELOG.md`) ist eine kuratierte
-Zusammenfassung mit Verweis auf die Release-Pages und wird beim Versions-Bump manuell ergänzt.
+The source of truth for the user-facing changelog is the `changelog:` block in `HellionChat/HellionChat.yaml`.
+`repo.json` and the GitHub release body are fed from there. This file (`docs/CHANGELOG.md`) is a curated summary with
+links to the release pages and is updated manually on each version bump.

docs/CONTRIBUTORS.md

@@ -1,87 +1,83 @@
 # Contributors — Hellion Chat
 
-Hellion Chat ist von der Code-Seite ein Ein-Personen-Projekt. Aber ohne die Leute auf dieser Seite gäbe es weder die
-Bug-Fixes noch die UX-Verbesserungen, die seit den frühen Versionen reingelaufen sind. Jeder Eintrag hier hat das Plugin
-konkret besser gemacht.
+Hellion Chat is a one-person project on the code side. But without the people on this page, the bug fixes and UX
+improvements that have landed since the early versions would not exist. Every entry here has made the plugin concretely
+better.
 
-Die Anerkennung an die Upstream-Autoren von Chat 2 (Infi und Anna) liegt bewusst in [`../NOTICE.md`](../NOTICE.md),
-nicht hier. Diese Datei deckt explizit Beiträge zur Hellion-Chat-Seite ab.
+Attribution for the upstream Chat 2 authors (Infi and Anna) is intentionally in [`../NOTICE.md`](../NOTICE.md), not
+here. This file covers contributions to the Hellion Chat side specifically.
 
 ---
 
-## Entwicklung
+## Development
 
 ### JonKazama (Florian Wathling) — Maintainer
 
-Hellion Chat ist mein erstes FFXIV-Plugin und mein erstes größeres C#-/Dalamud-Projekt. Mein beruflicher Hintergrund ist
-Webentwicklung (Next.js, React, TypeScript, Prisma). Plugin-Entwicklung in einer fremden Codebase, ImGui,
-FFXIV-Game-Hooks und der gesamte Dalamud-Stack waren Neuland.
+Hellion Chat is my first FFXIV plugin and my first larger C#/Dalamud project. My professional background is web
+development (Next.js, React, TypeScript, Prisma). Plugin development in an unfamiliar codebase, ImGui, FFXIV game hooks
+and the entire Dalamud stack were new territory.
 
-Privacy-First-Defaults, Per-Channel-Retention, Auto-Tell-Tabs, Pop-Out-Input, ChatColours-Presets, Hellion-Theme plus
-Exo-2-Font und der v1.0.0-Standalone-Cut sind die Hellion-spezifischen Surface-Areas, die ich auf das Chat-2-Fundament
-aufgebaut habe. Die Lern-Geschichte dahinter steht in [`LEARNING-JOURNEY.md`](LEARNING-JOURNEY.md).
+Privacy-first defaults, per-channel retention, Auto-Tell-Tabs, pop-out input, ChatColours presets, the Hellion theme
+plus Exo 2 font, and the v1.0.0 standalone cut are the Hellion-specific surface areas I built on top of the Chat 2
+foundation. The learning story behind that is in [`LEARNING-JOURNEY.md`](LEARNING-JOURNEY.md).
 
-Hellion Chat ist Teil von [Hellion Online Media](https://hellion-media.de).
+Hellion Chat is part of [Hellion Online Media](https://hellion-media.de).
 
 ---
 
-## Tester
+## Testers
 
-Eine kurze Notiz vorneweg: Ich teste das Plugin nicht allein. Die Leute hier haben mir Bugs gemeldet, bevor sie bei mehr
-Nutzern aufgeschlagen wären. Sie haben UX-Probleme angesprochen, die ich blind nicht mehr gesehen habe. Und sie haben
-Feature-Wünsche eingebracht, die das Plugin in Richtungen geschoben haben, in die ich von alleine nicht gegangen wäre.
-Das ist nicht selbstverständlich. Externe Tester sind ihre Zeit wert.
+A quick note: I do not test this plugin alone. The people listed here reported bugs before they hit more users, raised
+UX problems I had gone blind to, and brought in feature requests that pushed the plugin in directions I would not have
+gone on my own. That is not a given. External testers are worth their time.
 
-### Carl Beleandis (Carla) — Beta-Tester
+### Carl Beleandis (Carla) — Beta Tester
 
-Carl testet seit der Bootstrap-Phase und hat sowohl die Pop-Out-Mechanik als auch die Theme-Richtung geprägt. Sein
-Feedback kommt direkt und ohne Umschweife und das ist genau, was ich beim Testen brauche.
+Carl has been testing since the bootstrap phase and has shaped both the pop-out mechanics and the theme direction.
+Feedback comes direct and without detours, which is exactly what I need when testing.
 
-Konkrete Beiträge:
+Concrete contributions:
 
-- **Pop-Out-Discoverability** — der Hinweis, dass Pop-Outs nur per Rechtsklick erreichbar waren, hat den Header-Button
-  und den einmaligen Hint-Banner in v0.6.1 ausgelöst. Ich kannte den Rechtsklick-Pfad blind, deshalb hatte ich nicht
-  mehr gesehen, dass neue Nutzer die Funktion gar nicht finden.
-- **/tell-Pop-Out-Mode** — der Wunsch, /tell-Tabs direkt als Pop-Out zu öffnen statt über den Tab-Umweg, ist in v0.6.1
-  als opt-in Settings-Toggle gelandet. Bonus: Bei der Implementation ist ein alter Ghost-Window-Bug aufgefallen
-  (LRU-Drop ließ Pop-Out-Fenster als Geister stehen), der gleich mit gefixt wurde.
-- **Theme-Varianten mit Helligkeits-Abstufungen** — der Wunsch nach einer Grün-Familie hat mein Verständnis von "ein
-  Theme = eine Farbe" auf "Theme-Familien mit Stimmungs-Varianten" verschoben. Steht in der [Roadmap](ROADMAP.md) für
-  einen späteren Cycle.
+- **Pop-out discoverability** — pointing out that pop-outs were only reachable via right-click triggered the header
+  button and the one-time hint banner in v0.6.1. I knew the right-click path by heart and had stopped seeing that new
+  users could not find the feature at all.
+- **/tell pop-out mode** — the request to open /tell tabs directly as a pop-out instead of going through the tab sidebar
+  landed in v0.6.1 as an opt-in settings toggle. Bonus: during implementation an old ghost-window bug surfaced (LRU drop
+  left pop-out windows as ghosts), which got fixed at the same time.
+- **Theme variants with brightness gradations** — the request for a green family shifted my thinking from "one theme =
+  one colour" to "theme families with mood variants". On the [roadmap](ROADMAP.md) for a later cycle.
 
-### Jin (Jingliu) — Alpha-Tester
+### Jin (Jingliu) — Alpha Tester
 
-Jin ist der aktive Tester der ersten Stunde und hat den Pop-Out-Workflow architektonisch in eine andere Richtung
-geschoben.
+Jin is the active tester from day one and pushed the pop-out workflow architecture in a different direction.
 
-Konkrete Beiträge:
+Concrete contributions:
 
-- **Pop-Out-Tab mit Input-Feld** — der Vorschlag, in einem Pop-Out auch tippen zu können (statt nur lesen), hat die
-  v0.6.0 Pop-Out-Input-Bar ausgelöst. Das war ein größerer Refactor: Der Input-Layer aus `ChatLogWindow` musste so
-  geöffnet werden, dass er auch in `Popout.cs` lebt, mit unabhängigem Text-Buffer und History-Cursor pro Pop-Out. Hat
-  den Cycle dominiert, weil das Design erst sauber sein musste, bevor Code passieren konnte.
-- **TempTell Persistence** — der Wunsch, /tell-Tabs per Pin-Toggle einen Relog überleben zu lassen, steht in der
-  [Roadmap](ROADMAP.md) für einen späteren Cycle. Berührt das Tab-System architektonisch und braucht eigenes Design.
+- **Pop-out tab with input bar** — the suggestion to be able to type in a pop-out (instead of just reading) triggered
+  the v0.6.0 pop-out input bar. That was a larger refactor: the input layer from `ChatLogWindow` had to be opened up so
+  it could also live in `Popout.cs`, with an independent text buffer and history cursor per pop-out. It dominated the
+  cycle because the design had to be clean before any code could happen.
+- **TempTell persistence** — the request for /tell tabs to survive a relog via a pin toggle is on the
+  [roadmap](ROADMAP.md) for a later cycle. It touches the tab system architecturally and needs its own design work.
 
 ---
 
-## Übersetzungen
+## Translations
 
-Hellion-eigene UI-Strings werden in `HellionChat/Resources/HellionStrings.<lang>.resx` gepflegt.
+Hellion-specific UI strings are maintained in `HellionChat/Resources/HellionStrings.<lang>.resx`.
 
-- **Deutsch (DE):** JonKazama (Native Speaker, Hauptsprache des Projekts)
+- **German (DE):** JonKazama (native speaker, primary project language)
 
-Die Upstream-Sprach-Dateien (`Language.<lang>.resx`) sind nicht Teil dieser Datei. Sie werden über das
-[Chat-2-Crowdin-Projekt](https://github.com/Infiziert90/ChatTwo) gepflegt; Crowdin-Übersetzer findest du in den
-Plugin-Settings unter **Info → "Chat 2 community translators"**.
+Upstream language files (`Language.<lang>.resx`) are not covered here. They are maintained via the
+[Chat 2 Crowdin project](https://github.com/Infiziert90/ChatTwo); Crowdin translators are listed in the plugin settings
+under **Info → "Chat 2 community translators"**.
 
 ---
 
-## Wie du beitragen kannst
+## How to Contribute
 
-Bug-Reports, Feature-Wünsche und Pull-Requests laufen über
-[Gitea Issues](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues). Workflow und Erwartungen stehen
-in [`../CONTRIBUTING.md`](../CONTRIBUTING.md), Code of Conduct in [`../CODE_OF_CONDUCT.md`](../CODE_OF_CONDUCT.md).
+Bug reports, feature requests and feedback are welcome — the best place to reach me is the Hellion Forge Discord:
+[discord.gg/X9V7Kcv5gR](https://discord.gg/X9V7Kcv5gR). Join and ping me in the Hellion Chat channel.
 
-Tester-Pool für neue Versionen läuft über den Hellion-Forge-Discord:
-[discord.gg/X9V7Kcv5gR](https://discord.gg/X9V7Kcv5gR). Wer in den Tester-Channel rein will, einfach im Forge melden.
+For pull requests and contribution guidelines see [`../CONTRIBUTING.md`](../CONTRIBUTING.md), Code of Conduct in
+[`../CODE_OF_CONDUCT.md`](../CODE_OF_CONDUCT.md).

docs/LEARNING-JOURNEY.md

@@ -1,336 +1,331 @@
-# Entwicklungsgeschichte und Lernprozess
+# Development History and Learning Process
 
-## Hintergrund
+## Background
 
-Ich bin Autodidakt. Hellion Chat ist mein erstes FFXIV-Plugin und mein erstes größeres C#-Projekt. Mein beruflicher
-Hintergrund ist Webentwicklung (Next.js, React, TypeScript, Prisma, MySQL), also Browser-Welt mit JavaScript-Toolchain.
-C# kannte ich vor diesem Projekt nur oberflächlich, ImGui gar nicht, Dalamud nur als Endnutzer über andere Plugins.
+I am self-taught. Hellion Chat is my first FFXIV plugin and my first larger C# project. My professional background is
+web development (Next.js, React, TypeScript, Prisma, MySQL) — browser world with a JavaScript toolchain. I knew C# only
+superficially before this project, ImGui not at all, and Dalamud only as an end user through other plugins.
 
-Wenn ich an einer Stelle nicht weiterkomme, nutze ich AI-Tools wie Claude Code als Pair-Hilfsmittel. Wie das genau
-aussieht und welche Klassifikation ich verwende, steht transparent in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md).
+When I get stuck somewhere, I use AI tools like Claude Code as a pair assistant. What that looks like exactly and which
+classification I use is documented transparently in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md).
 
 ---
 
-## Warum überhaupt ein Chat-Plugin?
+## Why a chat plugin at all?
 
-Hellion Chat soll Chat 2 nicht ersetzen. Chat 2 liefert ein vollständiges Chat-Erlebnis mit kompletter Historie,
-Filtern, Suche und Replay. Für die meisten Nutzer ist genau das richtig.
+Hellion Chat is not meant to replace Chat 2. Chat 2 delivers a complete chat experience with full history, filters,
+search and replay. For most users that is exactly the right thing.
 
-### Zwei Millionen Nachrichten in zwei Jahren
+### Two million messages in two years
 
-Mein Wunsch nach einem engeren Default war ehrlich gesagt erstmal persönlich. Nach zwei Jahren mit Chat 2 lag meine
-Datenbank bei über zwei Millionen Nachrichten, der Großteil davon /say, /shout und /yell von wildfremden Leuten in
-Limsa. Genau diese Daten machen Chat 2's Voll-Historie nützlich, und die meisten Nutzer behalten sie auch gerne. Mein
-eigener Geschmack wollte einen kleineren Default. Also habe ich diesen Fork gebaut.
+My desire for a tighter default was honestly personal at first. After two years with Chat 2 my database had grown to
+over two million messages, the majority of them /say, /shout and /yell from complete strangers in Limsa. That is exactly
+what makes Chat 2's full history useful, and most users are happy to keep it. My own preference wanted a smaller
+default. So I built this fork.
 
-### Greeter in mehreren Clubs
+### Greeter in several clubs
 
-Dazu kam ein zweiter Use-Case: Ich bin in mehreren FFXIV-Clubs als Greeter aktiv. Für die Greeter-Arbeit reicht die
-Vanilla-Chat-Oberfläche nicht. Parallel laufende /tell-Gespräche schreiben in einem einzigen Tab durcheinander, und ich
-verliere ständig den Faden, wer mir gerade was geschrieben hat. Auto-Tell-Tabs (eines der frühen Hellion-Chat-Features)
-ist genau für diesen Workflow entstanden: ein Tab pro Gesprächspartner, automatisch gespawnt, mit manuellem
-Greeted-Status. Dass das auch der Privacy-Hygiene gut tut, war ein netter Bonus, nicht der Auslöser.
+There was a second use case: I am active as a greeter in several FFXIV clubs. The vanilla chat interface is not enough
+for greeter work. Parallel /tell conversations write into a single tab at the same time, and I constantly lose track of
+who wrote what. Auto-Tell-Tabs (one of the early Hellion Chat features) came directly from this workflow: one tab per
+conversation partner, automatically spawned, with a manual greeted status. The privacy hygiene benefit was a nice bonus,
+not the trigger.
 
 ### Hellion Online Media
 
-Die Privacy-Defaults sind außerdem eine Position aus meinem Hauptberuf. Hellion Online Media ist mein Einzelunternehmen,
-und Datenschutz gegenüber Kunden ist da kein Marketing-Slogan, sondern operativ relevant. Dieser Fork ist die
-Plugin-Form derselben Haltung.
+The privacy defaults also reflect a position from my main work. Hellion Online Media is my sole proprietorship, and data
+protection toward clients is not a marketing slogan there but operationally relevant. This fork is the plugin form of
+the same stance.
 
 ---
 
-## Warum nicht beim Original mitarbeiten?
+## Why not contribute to the original?
 
-Drei Gründe, in absteigender Wichtigkeit.
+Three reasons, in descending order of importance.
 
-### Defaults sind nicht verhandelbar, auch nicht meine
+### Defaults are not negotiable, including mine
 
-Privacy-First als Standard ist eine Minderheits-Position. Chat 2 bedient zu Recht die breite Masse mit Voll-Historie als
-Default. Diese Defaults im Upstream zu ändern wäre falsch gewesen. Ich hätte den Standard für eine große Nutzerbasis
-umgekippt, die ihn so wollte, wie er ist. Saubere Trennung über einen eigenen Plugin-Slot war der respektvollere Weg.
+Privacy-first as a default is a minority position. Chat 2 rightly serves the broad majority with full history as the
+default. Changing those defaults upstream would have been wrong. I would have flipped the standard for a large user base
+that wanted it as it was. A clean separation through a dedicated plugin slot was the more respectful path.
 
-### Das Webinterface musste weg
+### The web interface had to go
 
-Das ist ein zentrales Chat-2-Feature für Remote-Zugriff vom Zweitgerät. Ein PR der das entfernt, hat in einem gepflegten
-Upstream-Projekt keine Chance, und das ist auch richtig so. Aber genau das Webinterface kollidiert mit der
-Privacy-First-These dieses Forks: Ein Chat-Plugin das einen lokalen HTTP-Server startet, ist für mein Threat-Model eine
-zu große Angriffsfläche. Also raus damit.
+It is a central Chat 2 feature for remote access from a second device. A PR removing it has no chance in a
+well-maintained upstream project, and that is correct. But exactly that web interface conflicts with the privacy-first
+premise of this fork: a chat plugin that starts a local HTTP server is too large an attack surface for my threat model.
+So out it went.
 
-### Tempo
+### Velocity
 
-Ein Solo-Maintainer-Projekt mit kleinem Tester-Pool kann schneller iterieren als ein etabliertes Plugin mit großer
-Nutzerbasis. Das ist kein Vorwurf an Upstream, sondern eine andere Optimierung. Ich brauche keine Roadmap-Abstimmung,
-keine Reviewer-Verfügbarkeit, und kann Audit-Konsequenzen wie das Webinterface-Removal in einer einzigen Version
-durchziehen statt über mehrere Releases.
+A solo-maintainer project with a small tester pool can iterate faster than an established plugin with a large user base.
+That is not a criticism of upstream but a different optimization. I do not need roadmap alignment, reviewer
+availability, or to spread audit consequences like the web interface removal across multiple releases.
 
-EUPL-1.2 erlaubt das alles ausdrücklich, mit klarer Attribution. Der Code liegt offen unter derselben Lizenz wie Chat 2.
-Infi, Anna oder sonst jemand dürfen reinschauen, Ideen mitnehmen, Fragen stellen oder den Fork einfach ignorieren. Alles
-drei ist für mich okay.
+EUPL-1.2 explicitly allows all of this with clear attribution. The code is open under the same license as Chat 2. Infi,
+Anna, or anyone else can look in, take ideas, ask questions, or simply ignore the fork. All three are fine with me.
 
 ---
 
-## Wie ich so schnell release
+## How I release this fast
 
-Wer auf den Repo schaut, sieht in kurzer Zeit viele Releases und sehr viele Commits. Beides wird von außen gerne als
-Red-Flag gelesen: KI-Slop, Salami-Taktik, Code-Spam. Bei Hellion Chat ist beides eine bewusste Entscheidung, und ich
-erkläre lieber einmal warum, als mich später dafür zu rechtfertigen.
+Anyone looking at the repo sees a lot of releases and a high commit count in a short time. Both tend to read as red
+flags from the outside: AI slop, salami tactics, code spam. In Hellion Chat both are deliberate decisions, and I would
+rather explain them once than justify them later.
 
-### Vorarbeit, lange bevor der Fork existierte
+### Groundwork, long before the fork existed
 
-Bevor ich die erste Zeile in `HellionChat/` getippt habe, war ich wochenlang nur Leser. Chat 2 ingame nutzen und damit
-rumspielen. Issues im Upstream-Tracker durchgehen, vor allem die geschlossenen, weil dort steht, wie Infi und Anna Bugs
-einkreisen. Commits lesen, gerne auch ältere, um zu verstehen, warum eine Architektur-Entscheidung getroffen wurde,
-nicht nur, dass sie getroffen wurde. Wenn ich heute weiß, wo im Code was liegt, dann nicht, weil ich besonders schnell
-durch eine Codebase navigiere, sondern weil ich den Code vorher gelesen habe.
+Before I typed the first line into `HellionChat/`, I spent weeks as a reader. Using Chat 2 in-game and playing around
+with it. Going through issues in the upstream tracker, especially the closed ones, because that is where you see how
+Infi and Anna narrow down bugs. Reading commits, including older ones, to understand _why_ an architecture decision was
+made, not just _that_ it was made. If I know today where things live in the codebase, it is not because I navigate
+codebases particularly fast but because I read the code beforehand.
 
-Klingt nach Selbstverständlichkeit, ist es aber nicht. Die übliche Reihenfolge bei Solo-Forks heißt erst forken, dann
-verstehen. Ich habe es andersrum gemacht.
+That sounds obvious. It is not. The usual order for solo forks is fork first, understand later. I did it the other way
+around.
 
-### Die Codebase von Infi und Anna
+One thing I noticed reading the codebase closely: some patterns felt familiar in ways I had not expected, structural
+choices and comment styles that show up across a lot of modern plugin and tooling code regardless of how it was written.
+Nothing worth reading into. Coding workflows have changed a lot in the last few years across the board, and the traces
+of that show up everywhere. It did make me less self-conscious about my own workflow.
 
-Hellion Chat baut auf einem Boden auf, der schon flach ist. Chat 2 ist sauber strukturiert, die Naming-Konventionen sind
-konsistent, die Trennung zwischen Layern (Storage, UI, Game-Hooks, IPC) ist klar gezogen. Das ist in
-Open-Source-Plugin-Welten nicht selbstverständlich, und es ist der Hauptgrund, warum sich Hellion-spezifische Features
-oft "fast nativ" einbauen lassen. Ich muss nicht erst Spaghetti entwirren bevor ich was Eigenes danebenstellen kann.
+### Infi and Anna's codebase
 
-Side-Fact: Selbst beim ersten Codebase-Walkthrough mit Claude kam mehrfach der Hinweis, dass die Architektur
-ungewöhnlich gut aufgeräumt ist und mehrere Erweiterungspunkte vorbereitet. Das hat Gewicht, weil es von außen kommt,
-aber den eigentlichen Kredit kriegen Infi und Anna, nicht Claude.
+Hellion Chat builds on a foundation that is already flat. Chat 2 is cleanly structured, naming conventions are
+consistent, and the separation between layers (storage, UI, game hooks, IPC) is clearly drawn. That is not a given in
+open-source plugin land, and it is the main reason Hellion-specific features often slot in "almost natively". I do not
+have to untangle spaghetti before I can put something of my own next to it.
 
-### Atomar arbeiten, kleine Commits
+Side note: even during the first codebase walkthrough with Claude, the comment came up several times that the
+architecture is unusually tidy and has several extension points prepared. That carries weight because it comes from
+outside, but the actual credit goes to Infi and Anna, not Claude.
 
-Ein Commit, eine logische Änderung. Wenn ich einen Bug fixe, parallel eine Variable umbenenne und nebenbei einen
-Kommentar einbaue, sind das drei Commits, nicht einer. Klingt nach Mikro-Management, ist es aber nicht. Wenn in sechs
-Monaten ein Bug auftaucht und ich `git bisect` brauche, finde ich die kaputte Änderung in zwei Minuten statt in zwei
-Stunden. Bei einem 4000-Zeilen-Mega-Commit darf ich raten, welche der hundert Änderungen die kaputte ist.
+### Atomic work, small commits
 
-Den Stil habe ich bewusst auch deshalb beibehalten, weil Infi im Upstream häufig genauso arbeitet. Manchmal ein
-Sechs-Zeilen-Commit, manchmal nur ein Typo-Fix. Das ist keine Schwäche, das ist eine Entscheidung für lesbare
-Git-History. Den Stil im Fork beizubehalten ist ein Respekt-Move: Wer die beiden Repos vergleicht, soll den gleichen
-Lese-Rhythmus haben.
+One commit, one logical change. If I fix a bug, rename a variable and add a comment at the same time, that is three
+commits, not one. Sounds like micro-management, it is not. If a bug surfaces in six months and I need `git bisect`, I
+find the broken change in two minutes instead of two hours. With a 4000-line mega-commit I get to guess which of the
+hundred changes is the broken one.
 
-Bonus für mich persönlich: Kleine Commits zwingen mich, jeden Schritt einzeln zu durchdenken und zu benennen. Wenn ich
-nicht in zwei Sätzen erklären kann, was ein Commit macht, ist die Änderung wahrscheinlich noch nicht klar genug. Auf
-Beginner-Niveau ist das ein eingebauter Sanity-Check, den ich bei einem Big-Bang-Commit nicht hätte.
+I kept this style deliberately also because Infi works the same way upstream. Sometimes a six-line commit, sometimes
+just a typo fix. That is not a weakness, it is a decision for readable Git history. Keeping the style in the fork is a
+respect move: anyone comparing both repos should have the same reading rhythm.
 
-### AI als Beschleuniger, ehrlich
+Personal bonus: small commits force me to think through and name each step individually. If I cannot explain what a
+commit does in two sentences, the change is probably not clear enough yet. At beginner level that is a built-in sanity
+check I would not have with a big-bang commit.
 
-Ja, AI hilft beim Tempo, und nicht zu knapp. Ohne CodeRabbit hätte ich Critical-Bugs der Klasse
-`Equals/GetHashCode`-Anti-Pattern, Hook-Subscription-Leaks und TOCTOU-Races nicht gefunden. Ich bin schlicht zu
-unerfahren für diese Klasse von Findings, das schreibe ich genau so hin.
+### AI as an accelerator, honestly
 
-Was ich aber nicht mache: blind Code übernehmen, weil ein Tool ihn als Fix markiert hat. Bei mehreren
-CodeRabbit-Findings stand in den Original-Commits von Infi oder Anna sogar ein Stackoverflow-Link mit Begründung dabei,
-warum eine bestimmte Stelle so aussieht wie sie aussieht. Die habe ich gelesen, bevor ich was geändert habe. Erst
-verstehen, dann anfassen, dann committen. Das ist der Unterschied zwischen "AI gibt mir Code, ich pushe" und "AI zeigt
-mir wo's klemmt, ich entscheide".
+Yes, AI helps with velocity, and not a little. Without CodeRabbit I would not have found critical bugs like
+`Equals/GetHashCode` anti-patterns, hook subscription leaks and TOCTOU races. I am simply too inexperienced for that
+class of findings, and I write that exactly as it is.
 
-Klassifikation und konkrete Beispiele zur AI-Nutzung stehen in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md). Hier in dieser
-Sektion ging es nur um den Tempo-Aspekt: Recherche plus saubere Codebase plus atomare Commits plus AI-gestütztes
-Review-Sparring sind die vier Faktoren zusammen. Kein einzelner davon erklärt das Tempo allein.
+What I do not do: blindly take code because a tool marked it as a fix. On several CodeRabbit findings, the original
+commits from Infi or Anna even included a Stack Overflow link explaining why a particular spot looks the way it does. I
+read those before touching anything. Understand first, then change, then commit. That is the difference between "AI
+gives me code, I push" and "AI shows me where it breaks, I decide".
+
+Classification and concrete examples of AI usage are in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md). This section was only
+about the velocity aspect: research plus a clean codebase plus atomic commits plus AI-assisted review sparring are the
+four factors together. No single one explains the pace on its own.
 
 ---
 
-## Vom Web-Stack zu C# / Dalamud
+## From the web stack to C# / Dalamud
 
-### Type-System? Weniger Schock als erwartet
+### Type system? Less of a shock than expected
 
-C# nach TypeScript war angenehmer als gedacht. Properties statt getter/setter sind sauber, nullable reference types
-fühlen sich an wie `strict: true` in TypeScript. Ungewohnt war Wert-Typen vs. Referenz-Typen explizit denken zu müssen
-(`struct` vs. `class` mit echten Verhaltens-Konsequenzen), und Generics mit Constraints sind syntaktisch anders genug,
-dass ich beim Lesen kurz stocke. `async`/`await` ist semantisch ähnlich, aber Threading-Modelle sind in C# expliziter:
-`Task.Run`, `ConfigureAwait`, Synchronization-Contexts. Das hat mich mehrere Bugs gekostet, bevor ich verstanden hatte,
-wann der Main-Thread (in Plugin-Welt: der Framework-Tick) wirklich kritisch ist.
+C# after TypeScript was more comfortable than expected. Properties instead of getters/setters are clean, nullable
+reference types feel like `strict: true` in TypeScript. What was unfamiliar was having to think explicitly about value
+types versus reference types (`struct` vs. `class` with real behavioural consequences), and generics with constraints
+are syntactically different enough that I stumble on them while reading. `async`/`await` is semantically similar, but
+threading models are more explicit in C#: `Task.Run`, `ConfigureAwait`, synchronization contexts. That cost me several
+bugs before I understood when the main thread (in plugin land: the framework tick) is actually critical.
 
-### Build-Toolchain: ähnlich, aber anders
+### Build toolchain: similar, but different
 
-`dotnet` CLI, csproj-XML, NuGet sind funktional nicht weit weg von npm und tsconfig. Aber das XML-Format der csproj ist
-eine andere Sprache als JSON-Configs. Die Lock-Datei (`packages.lock.json`) musste ich erst aktiv aktivieren
-(`RestorePackagesWithLockFile=true`); das ist nicht Default. Im Web-Stack ist Lock-File-First Standard, im .NET-Stack
-offenbar nicht. Das war eine echte Überraschung.
+`dotnet` CLI, csproj XML, NuGet are functionally not far from npm and tsconfig. But the XML format of csproj is a
+different language than JSON configs. The lock file (`packages.lock.json`) had to be actively enabled
+(`RestorePackagesWithLockFile=true`); that is not the default. In the web stack, lock-file-first is standard, in the
+.NET stack apparently not. That was a real surprise.
 
-### ImGui ist eine andere Welt
+### ImGui is a different world
 
-Immediate-Mode-Rendering hat mit React-Component-Trees nichts gemein. Es gibt keine virtuelle DOM, keine Reconciliation,
-keinen "State der Komponente". Pro Frame zeichnet der Code die UI komplett neu, und der State lebt entweder in lokalen
-Variablen, die ich selbst verwalten muss, oder in der ImGui-eigenen ID-Stack-Logik.
+Immediate-mode rendering has nothing in common with React component trees. There is no virtual DOM, no reconciliation,
+no "component state". Every frame the code redraws the UI from scratch, and state lives either in local variables I
+manage myself or in ImGui's own ID stack logic.
 
-Was in React zwei Zeilen `useState` sind, ist in ImGui ein Member-Field plus manuelle ID-Stempel auf den Widgets, sonst
-kollidieren zwei Selectables in derselben Loop, weil sie auf die gleiche ID zurückfallen. Die ID-Stack-Kollision in
-`SearchSelector` (gefixt in v1.0.0) war genau dieses Symptom: Alle Selectables fielen auf dieselbe ambiguous ID zurück,
-bis ich den Row-Index in den Push-ID gemixt habe. Klassischer "warum klickt der falsche Eintrag"-Bug, den man nur
-findet, wenn man verstanden hat, wie ImGui IDs intern handhabt.
+What is two lines of `useState` in React is a member field plus manual ID stamps on widgets in ImGui, otherwise two
+selectables in the same loop collide because they fall back to the same ID. The ID stack collision in `SearchSelector`
+(fixed in v1.0.0) was exactly that symptom: all selectables fell back to the same ambiguous ID until I mixed the row
+index into the PushID. Classic "why is the wrong entry getting clicked" bug that you only find once you understand how
+ImGui handles IDs internally.
 
-### Dalamud-Spezifika
+### Dalamud specifics
 
-Plugin-Lifecycle, IPC-Subscriber-Pattern, Hook-System für Game-Functions, Game-Object-Threading. Viel davon war nur
-durch Lesen der Upstream-Codebase und durch [dalamud.dev](https://dalamud.dev) zu verstehen. Meine Trainings- und
-Such-Ergebnisse für "Dalamud" liefern oft veraltete API-Beispiele aus alten Versionen. dalamud.dev ist die zuverlässige
-Quelle. Wenn jemand neu anfängt: dort hin, nicht zu Stack Overflow.
+Plugin lifecycle, IPC subscriber pattern, hook system for game functions, game object threading. Much of that was only
+understandable through reading the upstream codebase and through [dalamud.dev](https://dalamud.dev). Search results for
+"Dalamud" often turn up outdated API examples from old versions. dalamud.dev is the reliable source. If someone is just
+starting out: go there, not to Stack Overflow.
 
-### Der Tag, an dem mich der DalamudPackager einen Tag gekostet hat
+### The day DalamudPackager cost me a day
 
-Dalamud SDK 15 liefert seinen eigenen Default-Packager mit, der Icons und Image-URLs ins Manifest einträgt. Ich hatte
-aus dem Upstream-Repo eine eigene `DalamudPackager.targets`-Datei mit `HandleImages`-Override übernommen, und die hat
-den SDK-Default überschrieben. Resultat: Das Manifest hatte keinen `IconUrl` mehr, und das Plugin tauchte in der
-Plugin-Liste ohne Icon auf.
+Dalamud SDK 15 ships its own default packager that writes icons and image URLs into the manifest. I had carried over a
+`DalamudPackager.targets` file from the upstream repo with a `HandleImages` override, and it was overriding the SDK
+default. Result: the manifest had no `IconUrl` anymore, and the plugin appeared in the plugin list without an icon.
 
-Symptom war einfach zu sehen, Ursache hat einen Tag gekostet. Ich hatte die Override-Datei für eine Pflicht-Datei
-gehalten, war sie aber nicht. Removal in v0.5.2, seitdem läuft der SDK-Default. Lektion: Erstmal mit Defaults arbeiten,
-Overrides erst wenn der Default nachweislich nicht passt.
+The symptom was easy to spot, the cause cost a day. I had treated the override file as mandatory when it was not.
+Removed in v0.5.2, SDK default running since then. Lesson: start with defaults, add overrides only when the default
+demonstrably does not fit.
 
 ---
 
-## Was ich aus dem Fork gelernt habe
+## What I learned from the fork
 
-### Refactor in einer fremden Codebase
+### Refactoring in an unfamiliar codebase
 
-Der Standalone-Cut in v1.0.0 hat die `ChatTwo.*`-Identität komplett auf `HellionChat.*` migriert. Klingt nach
-Find-and-Replace. War es nicht.
+The standalone cut in v1.0.0 migrated the entire `ChatTwo.*` identity to `HellionChat.*`. That sounds like find and
+replace. It was not.
 
-Konkret bedeutete das: Code-Namespace über alle 80 Source-Files plus 100 using-Direktiven plus zwei FQN-Aliases plus die
-Resource-Designer-Strings. Sechs IPC-Channels umbenannt (Breaking Change für Drittplugins, keine bekannten Anbindungen).
-Repo-Ordner-Struktur (`ChatTwo/` → `HellionChat/`) inklusive csproj, sln, allen GitHub-Workflows und der dependabot.yml.
-Public-Facing-Branding in README, repo.json, yaml auf Standalone-Framing umformuliert.
+In concrete terms: code namespace across all 80 source files plus 100 using directives plus two FQN aliases plus the
+resource designer strings. Six IPC channels renamed (breaking change for third-party plugins, no known integrations).
+Repo folder structure (`ChatTwo/` -> `HellionChat/`) including csproj, sln, all GitHub workflows and dependabot.yml.
+Public-facing branding in README, repo.json and yaml reformulated to standalone framing.
 
-Das war kein Solo-Find-and-Replace, weil Unicode-String-Pfade in Workflow-YAMLs anders quotiert werden müssen als
-C#-Strings. Weil Resource-Designer-Files generierte Inhalte haben, die nicht jede Toolchain im Blick hat. Und weil die
-`ChatTwo.*`-IPC-Channel-Namen Strings in `GetIpcSubscriber`-Calls sind: kein Symbol, kein Compile-Error, wenn man einen
-vergisst. Da merkst du, was alles still bleibt.
+It was not a solo find-and-replace because Unicode string paths in workflow YAMLs need different quoting than C#
+strings. Because resource designer files have generated content that not every toolchain tracks. And because the
+`ChatTwo.*` IPC channel names are strings in `GetIpcSubscriber` calls: no symbol, no compile error if you miss one. That
+is when you find out what stays quiet.
 
-### Sicherheit ist kein abstraktes Thema mehr
+### Security is no longer abstract
 
-Vor diesem Projekt war Supply-Chain-Sicherheit für mich akademisch. Drei konkrete Lektionen haben das geändert.
+Before this project, supply chain security was academic for me. Three concrete lessons changed that.
 
-**SQLite-Native-Binary.** Ich musste auf 3.50.3 pinnen (`SQLitePCLRaw.lib.e_sqlite3` Override), weil
-`Microsoft.Data.Sqlite` die transitiv nachgezogene Lib in einer Version mitschleppte, die CVE-2025-6965
-(Memory-Corruption durch Aggregate-Term-Overflow) und CVE-2025-7709 enthielt. Der Managed-Wrapper war neu, die
-Native-Lib war es nicht. Lektion: Transitive Dependencies prüfen sich nicht von selbst, du musst hinschauen.
+**SQLite native binary.** I had to pin to 3.50.3 (`SQLitePCLRaw.lib.e_sqlite3` override) because `Microsoft.Data.Sqlite`
+was pulling in a transitively referenced library at a version containing CVE-2025-6965 (memory corruption via aggregate
+term overflow) and CVE-2025-7709. The managed wrapper was new; the native library was not. Lesson: transitive
+dependencies do not audit themselves, you have to look.
 
-**Lock-File-Drift.** `packages.lock.json` honored bei `dotnet restore` (per `RestorePackagesWithLockFile=true` in der
-csproj) verhindert, dass transitive Versionen zwischen meiner Maschine und CI silent driften. Erst nach einem
-Build-Output-Mismatch zwischen lokal und GitHub-Actions hatte ich überhaupt verstanden, warum das nicht der Default ist.
+**Lock file drift.** `packages.lock.json` honoured via `RestorePackagesWithLockFile=true` in the csproj prevents
+transitive versions from silently drifting between my machine and CI. I only understood why this is not the default
+after a build output mismatch between local and GitHub Actions.
 
-**WrapText und der CodeQL-Alarm der drei Releases gekostet hat.** CodeQL hat in `ImGuiUtil.WrapText` einen
-Critical-Alert wegen "unvalidated local pointer arithmetic" geworfen. v0.5.2 hat einen Edge-Case validiert. Alert kam
-wieder. v0.5.3 hat den Buffer-Length via `GetByteCount` vor der Pointer-Math gecheckt. Alert kam wieder. v0.5.4 hat den
-ganzen Algorithmus auf `Span` und int-Offsets umgebaut, mit einem 16-KiB-Cap auf den ArrayPool-Rent. Erst da war Ruhe.
+**WrapText and the CodeQL alert that cost three releases.** CodeQL flagged a critical alert in `ImGuiUtil.WrapText` for
+unvalidated local pointer arithmetic. v0.5.2 validated an edge case. Alert came back. v0.5.3 checked buffer length via
+`GetByteCount` before the pointer math. Alert came back. v0.5.4 rebuilt the whole algorithm on `Span` and int offsets
+with a 16 KiB cap on the ArrayPool rent. Only then did it go quiet.
 
-Lektion: Wenn ein statischer Analyzer drei Mal hintereinander meckert, ist nicht der Analyzer überempfindlich. Die
-Datenflusslogik ist es.
+Lesson: when a static analyser complains three times in a row, the analyser is not oversensitive. The data flow logic
+is.
 
-### CodeRabbit als externer Code-Reviewer
+### CodeRabbit as an external code reviewer
 
-Der v1.0.0-Sweep hat 3 Critical und 21 Major Findings hochgespült. Drei Klassen davon waren besonders lehrreich:
+The v1.0.0 sweep surfaced 3 critical and 21 major findings. Three classes were particularly instructive:
 
-- **`Equals`-Methoden die `GetHashCode()` vergleichen.** Klassisches Hash-Kollisions-Anti-Pattern. Klingt nach "ist doch
-  egal, wenn Hashes gleich sind, sind die Objekte auch gleich", ist aber genau falsch. Hashes können kollidieren,
-  Objekte sind dann nicht gleich.
-- **`Dispose`-Methoden die nur einen Teil der Subscriptions wieder abmelden.** Leak bei jedem Plugin-Reload. Im
-  Nutzer-Alltag merkst du das nicht sofort, im Long-Running-Test schon.
-- **TOCTOU-Races.** Zwischen Bounds-Check und Read kann ein anderer Thread das Array unter dir austauschen
+- **`Equals` methods comparing `GetHashCode()`.** Classic hash collision anti-pattern. Sounds like "if hashes are equal
+  the objects are equal", which is exactly backwards. Hashes can collide; the objects are not equal.
+- **`Dispose` methods that only unsubscribe part of their subscriptions.** Leak on every plugin reload. In normal use
+  you do not notice it immediately; in a long-running test you do.
+- **TOCTOU races.** Between a bounds check and a read another thread can swap out the array underneath you
   (`GlobalParametersCache`, `AutoTranslate`).
 
-Davon hatte ich vorher bestenfalls die Theorie gelesen, nicht selbst diagnostiziert. CodeRabbit war für mich der Moment,
-wo "akademisches Wissen" zu "okay, das ist mein Code, das ist mein Bug" wurde.
+I had at best read the theory on all of these before, never diagnosed them in my own code. CodeRabbit was the moment
+where "academic knowledge" became "okay, that is my code, that is my bug".
 
-### Externe Tester sind ihr Gewicht in Gold wert
+### External testers are worth their weight
 
-Carlas Feedback zur Pop-Out-Discoverability hat den Header-Button in v0.6.1 ausgelöst. Dass Pop-Outs nur per Rechtsklick
-erreichbar waren, hatte ich als Maintainer nicht mehr gesehen, ich kannte den Pfad blind. Carls Wunsch nach
-Theme-Varianten mit Helligkeits-Abstufungen hat mein Verständnis von "ein Theme = eine Farbe" auf "Theme-Familien mit
-Stimmungs-Varianten" verschoben. Jingliu hat TempTell-Persistence gefordert, was das Tab-System architektonisch in Frage
-stellt.
+Carla's feedback on pop-out discoverability triggered the header button in v0.6.1. That pop-outs were only reachable via
+right-click was something I as maintainer had stopped seeing; I knew the path by heart. Carl's request for theme
+variants with brightness gradations shifted my thinking from "one theme = one colour" to "theme families with mood
+variants". Jingliu asked for TempTell persistence, which puts the tab system architecturally into question.
 
-Solo hätte ich diese drei Dinge nicht erkannt. Punkt.
+Solo I would not have seen any of those three things. Full stop.
 
-### release.yml und die Markdown-Hölle
+### release.yml and the YAML rabbit hole
 
-Der `release.yml`-Workflow ist beim ersten v0.6.0-Tag-Push einfach nicht losgegangen. Ich habe Stunden in Permissions,
-Secret-Scopes und Tag-Trigger-Konfiguration gegraben, bevor ich verstand, was eigentlich los war: Der
-PowerShell-Heredoc-Footer im "Generate release body"-Step enthielt eine `---`-Markdown-Horizontal-Rule an Spalte 1, und
-genau das hat das YAML-Block-Scalar von `run: |` beendet. GitHub konnte die Workflow-Datei nicht parsen, also hat der
-Push-Tag-Trigger nie registriert.
+The `release.yml` workflow simply did not fire on the first v0.6.0 tag push. I dug through permissions, secret scopes
+and tag trigger configuration for hours before I understood what was actually happening: the PowerShell heredoc footer
+in the "Generate release body" step contained a `---` Markdown horizontal rule at column 1, and that terminated the YAML
+block scalar of `run: |`. GitHub could not parse the workflow file, so the push-tag trigger never registered.
 
-Fix: Footer in eine externe `.github/release-footer.md` extrahiert, Workflow liest sie via `Get-Content` ein. Lektion:
-Wenn ein Workflow nicht triggert, verifiziere als Erstes, dass GitHub die Datei überhaupt parsen kann. Das war einer der
-Bugs, bei denen ich nach dem Fix kurz gelacht habe und mich dann gefragt, wie viele andere YAML-Dateien ich noch habe,
-die so eine Falle drin haben könnten.
+Fix: extracted the footer into an external `.github/release-footer.md`, workflow reads it via `Get-Content`. Lesson: if
+a workflow does not trigger, verify first that GitHub can even parse the file. That was one of the bugs where I laughed
+briefly after the fix and then asked myself how many other YAML files I had that might have the same trap in them.
 
 ---
 
-## Was ich noch lerne
+## What I am still learning
 
-### Performance-Profiling im Game-Context
+### Performance profiling in a game context
 
-Der FPS-Drop-Bug aus Upstream Chat 2 ([#145](https://github.com/Infiziert90/ChatTwo/issues/145)) ist auch in Hellion
-Chat noch nicht reproduziert oder verifiziert. v1.0.0 hat mehrere Fixes auf den verdächtigen Pfaden (DbViewer O(N²) →
-O(N), AutoTranslate Lock-Serialisierung, EmoteCache HttpClient-Reuse), aber das systematische Vermessen unter Last fehlt
-mir. Ich muss noch lernen, wie man im Plugin-Kontext sauber misst, was wirklich das Frame-Budget frisst.
+The FPS drop bug from upstream Chat 2 ([#145](https://github.com/Infiziert90/ChatTwo/issues/145)) has not been
+reproduced or verified in Hellion Chat. v1.0.0 applied several fixes on the suspected paths (DbViewer O(N²) -> O(N),
+AutoTranslate lock serialisation, EmoteCache HttpClient reuse), but systematic measurement under load is missing. I
+still need to learn how to properly measure what is actually consuming the frame budget in a plugin context.
 
-### Native-Interop und Pointer-Math
+### Native interop and pointer math
 
-Auch nach dem WrapText-Span-Refactor in v0.5.4 ist mir Pointer-Math unsicher. ImGui zwingt einen an mehreren Stellen in
-`unsafe`-Code, und der Sicherheitsabstand zur "unbounded ArrayPool allocation"-Klasse von Bugs ist schmaler als mir lieb
-ist. Da will ich besser werden, bevor ich tieferes ImGui-Custom-Drawing anfasse.
+Even after the WrapText Span refactor in v0.5.4, pointer math makes me uneasy. ImGui forces you into `unsafe` code in
+several places, and the safety margin from the "unbounded ArrayPool allocation" class of bugs is narrower than I would
+like. I want to get better at that before touching deeper ImGui custom drawing.
 
-### Test-Disziplin für Plugin-Code
+### Test discipline for plugin code
 
-Aktuell hat das Repo kein Test-Projekt. Das ist eine bewusste Entscheidung, keine vergessene. Plugin-Code mit
-FFXIV-Hooks und Dalamud-Lifecycle sauber zu testen ist nicht trivial, und ich hatte keinen Ansatz gefunden, der ohne
-riesiges Mocking-Gerüst sinnvoll wirkte. Privacy-Filter und Configuration-Migration wären gute Testkandidaten, weil sie
-isoliert sind. Steht auf der Liste, ist aber kein Quick-Win.
+The repo currently has no test project. That is a deliberate decision, not a forgotten one. Testing plugin code with
+FFXIV hooks and Dalamud lifecycle cleanly is non-trivial, and I had not found an approach that made sense without a
+large mocking scaffold. Privacy filter and configuration migration would be good test candidates because they are
+isolated. On the list, but not a quick win.
 
-### Linux-Eigenheiten unter Wine
+### Linux quirks under Wine
 
-XDG-Compliance, libnotify-Integration, WireGuard-Network-Detection, alles in der [Roadmap](ROADMAP.md), und alles
-technisch noch nicht ganz klar. Wine und sandboxed Plugin-Code teilen nicht alle System-APIs, und ich weiß nicht, wo die
-Stolperfallen liegen, bevor ich sie gefunden habe.
+XDG compliance, libnotify integration, WireGuard network detection, all on the [roadmap](ROADMAP.md), and all
+technically still unclear. Wine and sandboxed plugin code do not share all system APIs, and I do not know where the
+pitfalls are until I have found them.
 
 ---
 
-## Einsatz von AI-Tools
+## Use of AI tools
 
-Ich verwende Claude Code als Hilfsmittel, nicht als Ersatz für eigene Arbeit.
+I use Claude Code as an assistant, not as a replacement for my own work.
 
-**Wofür ich AI einsetze:**
+**What I use AI for:**
 
-- Debugging von Problemen, bei denen ich nach längerer Eigenrecherche nicht weiterkomme
-- Mustererkennen über große Codebasen hinweg (z. B. der ChatTwo→HellionChat-Sweep über 80 Dateien)
-- Verständnisfragen zu C#- und Dalamud-Konzepten, die mir noch nicht geläufig sind
-- Code-Review-Sparring, bevor ich CodeRabbit drauflasse
+- Debugging problems where I am stuck after extended research of my own
+- Pattern recognition across large codebases (e.g. the ChatTwo -> HellionChat sweep across 80 files)
+- Understanding questions on C# and Dalamud concepts I am not yet familiar with
+- Code review sparring before I run CodeRabbit on something
 
-**Was ich selbst mache:**
+**What I do myself:**
 
-- Architektur und Designentscheidungen
-- Privacy-First-Defaults und das Threat-Model dahinter
-- Tester-Kommunikation und Roadmap-Priorisierung
-- Reviewen, Verifizieren, Pushen
+- Architecture and design decisions
+- Privacy-first defaults and the threat model behind them
+- Tester communication and roadmap prioritisation
+- Reviewing, verifying, pushing
 
-Die Klassifikation und konkrete Beispiele stehen in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md). Mir ist wichtig, dass Nutzer
-und potenzielle Beiträger verstehen, wie der Code zustande gekommen ist, gerade bei einem Plugin, das mit Nutzerdaten
-arbeitet.
+Classification and concrete examples are in [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md). It matters to me that users and
+potential contributors understand how the code came together, especially for a plugin that handles user data.
 
-Ja, AI. Ja, alleine. Beides öfter erwähnt als nötig. Willkommen im Open-Source-Plugin-Klima.
+Yes, AI. Yes, alone. Both mentioned more than strictly necessary. Welcome to the open-source plugin climate.
 
 ---
 
-## Warum diese Transparenz
+## Why this transparency
 
-Wer sich den Quellcode ansieht, soll wissen:
+Anyone reading the source code should know:
 
-- Ich bin kein professioneller C#- oder Plugin-Entwickler und lerne weiterhin dazu
-- AI-Unterstützung ist ein Werkzeug, kein Ghostwriter
-- Die Privacy-Position, die Designentscheidungen und die Roadmap sind meine
-- Ich versuche, meinen Code so sauber und sicher zu halten, wie meine aktuellen Fähigkeiten es zulassen
+- I am not a professional C# or plugin developer and am still learning
+- AI assistance is a tool, not a ghostwriter
+- The privacy position, the design decisions and the roadmap are mine
+- I try to keep my code as clean and secure as my current skills allow
 
-Hellion Chat ist auch ein Lernprojekt, und das soll man dem Repository ansehen dürfen.
+Hellion Chat is also a learning project, and that should be visible in the repository.
 
 ---
 
-## Verlinkungen
+## Links
 
-- [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md) — KI-Pair-Disclosure mit Klassifikations-Schema
-- [`CONTRIBUTORS.md`](CONTRIBUTORS.md) — wer hat dieses Plugin neben mir besser gemacht
-- [`../NOTICE.md`](../NOTICE.md) — Anerkennung an Infi und Anna für das Chat-2-Fundament
-- [`ROADMAP.md`](ROADMAP.md) — geplante Cycles und Themen
+- [`AI_DISCLOSURE.md`](AI_DISCLOSURE.md) -- AI pair disclosure with classification schema
+- [`CONTRIBUTORS.md`](CONTRIBUTORS.md) -- who has made this plugin better alongside me
+- [`../NOTICE.md`](../NOTICE.md) -- attribution to Infi and Anna for the Chat 2 foundation
+- [`ROADMAP.md`](ROADMAP.md) -- planned cycles and topics

docs/ROADMAP.md

@@ -1,174 +1,201 @@
 # Hellion Chat — Roadmap
 
-Geplante Arbeit nach dem v1.0.0 Standalone-Cut. Diese Liste ist absichtlich grob: konkrete Specs, Größenschätzungen und
-Repro-Steps liegen im internen Backlog. Tracking nach außen läuft über
-[Gitea Issues](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues) mit dem `roadmap`-Label, sobald
-ein Item für einen Cycle eingeplant ist.
+Planned work after the v1.0.0 standalone cut. This list is intentionally high-level: concrete specs, size estimates and
+repro steps live in the internal backlog. External tracking runs via
+[Gitea Issues](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues) with the `roadmap` label once an
+item is scheduled for a cycle.
 
-Reihenfolge ist Priorität, nicht Garantie. Items können sich verschieben oder ganz wegfallen wenn sie sich beim
-Brainstorm als nicht passend zur Privacy-First-Schnittmenge des Plugins erweisen.
+Order reflects priority, not a guarantee. Items may shift or be dropped entirely if they turn out to be a poor fit for
+the plugin's privacy-first scope during brainstorming.
 
 ---
 
-## Nächster Cycle (v1.4.4)
+## Next Cycle (v1.4.6)
 
-**Window-Lazy-Open + Render-Init-Cost-Optimisation** — die in v1.4.3 gelegte IAsyncDalamudPlugin-Foundation jetzt für
-die echten User- spürbaren Wins nutzen. Window-Konstruktion erst beim ersten Open, Render-Path-Init-Kosten in den ersten
-Frames runter. Konkrete Kandidaten und Größenschätzungen werden im v1.4.4-Brainstorm konsolidiert.
+**Code-Hygiene + Refactor.** Build-side pre-commit hook with csharpier-check as a hard gate so format drift can't reach
+a commit (~30 min). Plus the cycle absorbs whatever surfaces from v1.4.5 smoke that doesn't justify a hotfix. Concrete
+scope is consolidated in the v1.4.6 brainstorm.
+
+---
+
+## v1.4.5 — UX and Robustness (released 2026-05-12)
+
+Sixth sub-patch of the v1.4.x Polish Sweep series. User-visible robustness polish plus two doc/test polish items from
+the audit backlog. Chat-log draw failures now surface as a one-shot notification instead of failing silently. The
+first-run wizard splits accept from close: `OnClose` no longer silently sets `FirstRunCompleted`, and a new footer
+"Later — keep defaults" button is the explicit path to dismiss without picking a profile. `InputHistoryService` clears
+on plugin dispose so the previous session's typed commands don't bleed into the next load. `FontManager` falls back to
+the system font path if the embedded Hellion font resource is missing (broken-csproj / dev-build only). The status bar
+hides the version slot when the chat window is too narrow to fit all five slots without overlap. Plus
+`Plugin.cs:167-168` gains an explicit session-only Auto-Tell-Tab invariant comment with a `TempTabCounter.InitFromList`
+pin in the Build-Suite. No schema bump, no migration.
+
+## v1.4.4 — Threading and IPC Safety Polish (released 2026-05-12)
+
+Fifth sub-patch of the v1.4.x Polish Sweep series. `AutoTellTabsService.ActiveTempTabCount` switches from a
+lock-protected LINQ `Count` to an `Interlocked` counter kept in sync from inside the existing mutation paths;
+`Initialize()` seeds from the persisted Tabs list and `SaveConfig`'s snapshot-restore path calls a new
+`ResyncTempTabCounter()` after the mid-step `RemoveAll`. `HonorificService` carries per-method threading banners and
+`TryUnsubscribe`'s log level moves from Debug to Warning. `AutoTranslate.PreloadCache` is marked `IsBackground = true`
+so plugin unload no longer waits for it. `Configuration.IsAllowedForStorage` logs once per unknown ChatType via a
+`NonSerialized` `HashSet`, and `PrivacyPersistUnknownChannels` default flips to `true` for new installs. No schema bump,
+no migration.
 
 ## v1.4.3 — Plugin-Load Async-Init + Repo-Cutover (released 2026-05-08)
 
-Vierter und größter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin auf Dalamud's IAsyncDalamudPlugin-API migriert: der
-Konstruktor übernimmt nur noch Bootstrap-Essentials (Config-Load, Language-Init, Conflict-Detection), Migrationen,
-Service-Allokationen, Window- Konstruktion und Hook-Subscription wandern in LoadAsync. Schema- Gate ersetzt die v9 → v16
-Migrations-Kette; Configs auf Schema v16+ laden direkt, ältere Configs triggern eine "install v1.4.2
-first"-Fehlermeldung. AutoTranslate.PreloadCache vom Load-Pfad runter. FontManager.BuildFonts läuft sync am Start von
-LoadAsync, Dalamud baut den Font-Atlas auf seiner eigenen Pipeline. Custom-Repo-URL auf `gitea.hellion-forge.cloud`
-cut-over, das GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen. Plugin-Load-Zeit liegt bei ~3.7 s Median (5
-Reloads), vergleichbar mit v1.4.2: Async-Migration ist Foundation für v1.4.4 Lazy-Init- Optimierungen, kein direkter
-User-spürbarer Win.
+Fourth and largest sub-patch of the v1.4.x Polish Sweep series. Plugin migrated to Dalamud's `IAsyncDalamudPlugin` API:
+the constructor handles only bootstrap essentials (config load, language init, conflict detection); migrations, service
+allocations, window construction and hook subscription move to `LoadAsync`. Schema gate replaces the v9 → v16 migration
+chain; configs on schema v16+ load directly, older configs trigger an "install v1.4.2 first" error.
+`AutoTranslate.PreloadCache` moved off the load path. `FontManager.BuildFonts` runs sync at the start of `LoadAsync`;
+Dalamud rebuilds the font atlas on its own pipeline. Custom-repo URL cut over to `gitea.hellion-forge.cloud`; the GitHub
+repo remains as a frozen v1.4.2 snapshot. Plugin load time sits at ~3.7 s median (5 reloads), comparable to v1.4.2 — the
+async migration is a foundation for v1.4.4 lazy-init optimisations rather than an immediate user-perceived win.
 
-## v1.4.2 — ChatLog Frame-Hot-Path (released <Datum>)
+## v1.4.2 — ChatLog Frame-Hot-Path (released 2026-05-08)
 
-Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Per-Frame- Allokationen aus dem ChatLogWindow-Render-Pfad und der
-Settings-StatusBar eliminiert. Card-Mode-Border-Loop in DrawMessages hebt fünf Invarianten in einen Pre-Loop-Hoist,
-AutoTellTabTint bekommt einen Per-Tab-Cache via TabTintCache (separate Validation-Keys pro Cache, kein
-Cross-Invalidation), StatusBar zieht den Cache-Gate-Check vor die Aggregations und ersetzt LINQ Sum+Count durch eine
-Single-Pass-Foreach.
+Third sub-patch of the v1.4.x Polish Sweep series. Per-frame allocations eliminated from the ChatLogWindow render path
+and the settings status bar. Card-mode border loop in `DrawMessages` hoists five invariants into a pre-loop hoist;
+`AutoTellTabTint` gets a per-tab cache via `TabTintCache` (separate validation keys per cache, no cross-invalidation);
+status bar moves the cache-gate check before the aggregation and replaces LINQ `Sum`+`Count` with a single-pass foreach.
 
-## v1.4.1 — Theme Engine Performance (released <Datum>)
+## v1.4.1 — Theme Engine Performance (released 2026-05-08)
 
-Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. ABGR-Cache auf den Theme-Records pre-computed, HellionStyle.PushGlobal
-liest aus dem Cache statt pro Slot pro Frame zu konvertieren. **~13 % Render-Time-Recovery** im Smoke-Test
-(Plan-Erwartung 2-6 % war konservativ, real ~10-15 %). Custom-Theme-Hot-Reload überlebt transient File-Locks via
-Last-Known-Good-Snapshot. Plus: Synthwave Sunset als zehnter Built-In, Author-Credits auf Hellion Forge konsolidiert,
-Mint Grove + Forge Merchantman auf Carla Beleandis als Community-Thanks.
+Second sub-patch of the v1.4.x Polish Sweep series. ABGR cache pre-computed on theme records; `HellionStyle.PushGlobal`
+reads from the cache instead of converting per slot per frame. **~13 % render-time recovery** in smoke tests (plan
+estimate of 2–6 % was conservative; real result ~10–15 %). Custom-theme hot-reload survives transient file locks via
+last-known-good snapshot. Plus: Synthwave Sunset as the tenth built-in, author credits consolidated under Hellion Forge,
+Mint Grove + Forge Merchantman credited to Carla Beleandis as a community thanks.
 
 ## v1.4.0 — Critical Lifecycle Fixes (released 2026-05-07)
 
-Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben P0- Findings aus Audit-Pass-3 und Pass-4 abgearbeitet:
-async-void-Loads, fehlende IsBackground-Flags, GC.Collect in Dispose, DeferredSave-Race und Pre-v13-Backup-Lookup für
-WindowOpacity. Keine Schema-Bumps, keine Funktions- Änderungen für den User außer dass Reload und Shutdown spürbar
-sauberer laufen.
+First sub-patch of the v1.4.x Polish Sweep series. Seven P0 findings from audit passes 3 and 4 resolved: async-void
+loads, missing `IsBackground` flags, `GC.Collect` in Dispose, deferred-save race and pre-v13 backup lookup for
+`WindowOpacity`. No schema bumps, no user-facing behaviour changes other than reload and shutdown running noticeably
+cleaner.
 
-## v1.3.0 - Plugin Integrations: Honorific (released 2026-05-07)
+## v1.3.0 — Plugin Integrations: Honorific (released 2026-05-07)
 
-Erster Cycle der Plugin-Integrations-Roadmap. Honorific-Custom- Titles werden im Chat-Header angezeigt, mit Auto-Detect
-und silent Fallback. Neuer Integrations-Settings-Tab. Pattern- Etablierer für die fünf folgenden Cycles (Context-Menu,
-NotificationMaster, RP-Status-Block, ExtraChat, XIVIM).
+First cycle of the plugin integrations roadmap. Honorific custom titles displayed in the chat header with auto-detect
+and silent fallback. New Integrations settings tab. Pattern-setter for the five following cycles (Context Menu,
+NotificationMaster, RP Status Block, ExtraChat, XIVIM).
 
-Spec: [Plugin-Integrationen-Übersicht](../Hellion%20Chat%20Plugin-Integrationen.md)
+Spec: [Plugin Integrations Overview](../Hellion%20Chat%20Plugin-Integrationen.md)
 
 ## v1.2.3 — Theme Expansion (released 2026-05-06)
 
-Vier neue Built-In-Themes: Night Blue, Indigo Violet, Forge Merchantman, Hellion Spectrum (Deuteran/Protan-safe). Keine
-Engine-Änderungen. Siehe `docs/CHANGELOG.md`.
+Four new built-in themes: Night Blue, Indigo Violet, Forge Merchantman, Hellion Spectrum (Deuteran/Protan-safe). No
+engine changes. See `docs/CHANGELOG.md`.
 
-(v1.2.2 wurde verbrannt weil das `repo.json`-Manifest beim ersten Push nicht synchron mitgebumpt wurde — Re-Release als
-v1.2.3 mit kompletter Manifest-Synchronisation.)
+(v1.2.2 was burned because the `repo.json` manifest was not bumped in sync on the first push — re-released as v1.2.3
+with full manifest synchronisation.)
 
 ## v1.2.1 — Settings Cleanup (released 2026-05-06)
 
-Re-sortierte Settings (9 Cards thematisch), 4 tote Settings entfernt, Auto-Migration v15 → v16 ohne Daten-Verlust.
+Settings re-sorted thematically (9 cards), 4 dead settings removed, auto-migration v15 → v16 without data loss.
 
 ## v1.2.0 — Layout Refresh (released 2026-05-05)
 
-Top-Tabs-Refresh, Sidebar-Tab-Icons, Bottom-Status-Bar, Card-Rows als Default-Message-Render, Auto-Tell-Tab-Hashing.
+Top tabs refresh, sidebar tab icons, bottom status bar, card rows as default message render, auto-tell tab hashing.
 
 ## v1.1.0 — Theme Foundation (released 2026-05-05)
 
-Theme-Engine mit fünf Built-In-Themes, Settings-Card-Grid, Custom- Themes via JSON, Theme-Authoring-Doku. Plugin-Icon
-auf Hellion Forge. Siehe `docs/CHANGELOG.md` für Details.
+Theme engine with five built-in themes, settings card grid, custom themes via JSON, theme authoring docs. Plugin icon
+updated to Hellion Forge hammer. See `docs/CHANGELOG.md` for details.
 
-Aus dem ursprünglichen v1.1.0-Plan (Ad-Block / Spam-Filter, Receive- Suppressed-Tells-Toggle) wurden zugunsten der
-Theme-Engine zurück­ gestellt — beide Items leben weiter im Mittelfrist-Block.
-
-## Mittelfristig (v1.4.x+)
-
-- **Plugin-Integrations-Roadmap (Cycles 2-6)** - sechs Plugin- Integrationen geplant, Honorific (Cycle 1) ist live,
-  danach folgen Context-Menu, NotificationMaster, RP-Status-Block, ExtraChat und XIVIM in eigenen Cycles. Spec und
-  Cycle-Reihenfolge in [Plugin-Integrationen-Übersicht](../Hellion%20Chat%20Plugin-Integrationen.md).
-- **Ad-Block / Spam-Filter** — Hybrid-Konzept aus eigenem Light-Filter und optionaler `NoSoliciting`-IPC-Integration.
-  Adressiert Werbe-Spam in öffentlichen Channels und Tells. Aus dem v1.1.0-Plan zurückgestellt.
-- **Receive-Suppressed-Tells-Toggle** — Auto-Tell-Tabs greift auch wenn ein Drittplugin (z.B. XIVMessenger) die
-  /tell-Anzeige global suppressed. Gleicher Hook-Layer wie Ad-Block, deshalb gebündelt.
-- **Database-Viewer Inline-Search** — Volltext-Suche im DB-Viewer via SQLite FTS5. Aktuell gibt es nur Datums- und
-  Channel-Filter.
-- **TempTell Persistence** — Pin-Toggle auf TempTell-Tabs damit ausgewählte Tells einen Relog überleben. Tester-Wunsch
-  von Jingliu.
-- **FontManager Async-Refactor** — `LoadGameSymFontAsync` aus dem blockierenden Plugin-Constructor herausziehen.
-  Cold-Start-Hitching beim ersten Plugin-Start beheben (Severity niedrig, Plugin ist funktional).
-- **Separate Opacity Active vs. Inactive** — zweiter Slider für inaktive Fenster-Deckkraft. Upstream lehnt das ab; wir
-  können hier anders entscheiden.
-- **Failed-Tell-Notification** — sichtbare Nachricht bei /tell-Fail (offline, restricted instance, blacklisted,
-  world-mismatch) statt stillem Failure.
-- **Per-Tab Sound-Notification** — Sound-Toggle und optional eigene .wav pro Tab, mit Mute-In-Combat-Option.
-
-## Langfrist (v1.x+)
-
-### Storage-Backends (drei Stufen Bestätigung)
-
-- MySQL/MariaDB-Backend für Multi-Device-Setups
-- PostgreSQL-Backend
-- AES-256-Verschlüsselung für sensible Channels mit lokalem Key
-
-### Linux-spezifisch
-
-- WireGuard-Network-Detection als optionaler Filter-Trigger
-- libnotify-Integration für native Linux-Toasts
-- XDG-Compliance (komplex unter Wine)
-
-### UX und Tab-Management
-
-- **Regex Tab Routing** — Plugin-Output-Spam in eigene Tabs, Tells bestimmter Personen automatisch sortieren. Klar
-  abgegrenzt zum Ad-Block: Routing sortiert in Views, Block versteckt global.
-- **Auto-Detect Duties** — Tab-Switch beim Duty-Start via Condition-Flag.
-- **UX Bundle** — Vertical-Tab-Bar als Layout-Option, Shift+Mousewheel zum Tab-Header-Scrollen ohne Aktivierung,
-  globaler Hotkey zum Schließen des aktiven Tabs.
-- **Configure Tab Title** — konfigurierbares Tab-Title-Format (Name / Name + abgekürzter World / voller Name / Custom),
-  pro Tab überschreibbar.
-- **Name Display Options** — analog zu FFXIV-Vanilla (voller Name, Vorname abgekürzt, Initialen), per-Channel-Override
-  möglich.
-- **Item & Flag Linking** — Outgoing: Shift-Klick auf Item/Flag sendet ins fokussierte Plugin-Input. Incoming:
-  Item-Links und Map-Coords klickbar.
-- **Color Currently Selected Input Channel** — Channel-Selector-Button im Input-Bar mit Channel-Farbe einfärben.
-- **Plugin-Disclosure Pre-Send Filter** — konfigurierbare Wort-/Regex-Liste blockiert das Senden mit Pre-Send-Confirm.
-  Schutz vor versehentlicher Plugin-Nennung in öffentlichen Channels.
-- **Chat Clear on Name Change** — bei Charakter-Namensänderung lokalen Verlauf migrieren oder löschen, Default Wipe für
-  maximale Privacy.
-- **Hide Plugin Window on NG+ Screen** — Hide-Logik um zusätzliche Addon-Namen erweitern.
-- **Kick from Novice Network** — Mentor-Nische, Context-Menü-Eintrag mit Confirmation.
-- **Text-to-Speech für /tell** — eingehende Tells via TTS, optional pro Sender, mit Channel-Filter und Mute-In-Combat.
-  Geringe Priorität.
-
-### Distribution und Branding
-
-- Hand-gezeichnetes Hellion-Logo (aktuell Platzhalter aus dem Hellion-Online-Media-Brand-Repo)
-- GitHub Action für automatischen `repo.json`-Sync nach Tag-Push
-- Submission ans Dalamud-Main-Plugin-Repo (zusätzlich zum Custom-Repo)
+Items from the original v1.1.0 plan (ad-block / spam filter, receive-suppressed-tells toggle) were deferred in favour of
+the theme engine — both items live on in the mid-term block.
 
 ---
 
-## Bug-Verifizierungen
+## Mid-Term (v1.4.x+)
 
-Aus dem Upstream-Issue-Tracker übernommen, in Hellion Chat 1.0.0 noch nicht reproduziert oder verifiziert. Werden bei
-Gelegenheit gegen den aktuellen Stand getestet.
-
-- **Right-Click Whisper Error** in Field Ops / Special Instances (Eureka, Bozja, Occult Crescent, DRS) — Upstream
-  [#168](https://github.com/Infiziert90/ChatTwo/issues/168). Reply-Helper scheint `@World`-Suffix zu schlucken.
-- **FPS Drops with Plugin active** — Upstream [#145](https://github.com/Infiziert90/ChatTwo/issues/145). 10–20 % Drop
-  seit upstream v1.29.19.0. v1.0.0 hat mehrere Fixes auf den verdächtigen Pfaden, Repro-Test gegen aktuellen Stand
-  offen.
-- **Add Blacklist from Plugin Window** — Upstream [#140](https://github.com/Infiziert90/ChatTwo/issues/140). Right-Click
-  Add-to-Blacklist wirft "Cannot locate character with that name", via Vanilla-Chat funktioniert es.
-- **DB-Viewer Column Sort** — sortiert State-Column lexikografisch statt numerisch (10 vor 2). XIVIM
-  [#82](https://github.com/NightmareXIV/XIVInstantMessenger/issues/82), Repro in Hellion Chat offen.
+- **Plugin Integrations Roadmap (Cycles 2–6)** — six plugin integrations planned; Honorific (Cycle 1) is live, followed
+  by Context Menu, NotificationMaster, RP Status Block, ExtraChat and XIVIM in their own cycles. Spec and cycle order in
+  [Plugin Integrations Overview](../Hellion%20Chat%20Plugin-Integrationen.md).
+- **Ad-Block / Spam Filter** — hybrid concept combining a lightweight built-in filter with optional `NoSoliciting` IPC
+  integration. Addresses ad-spam in public channels and tells. Deferred from the v1.1.0 plan.
+- **Receive-Suppressed-Tells Toggle** — auto-tell tabs trigger even when a third-party plugin (e.g. XIVMessenger)
+  globally suppresses /tell display. Same hook layer as ad-block, so they are bundled.
+- **Database Viewer Inline Search** — full-text search in the DB viewer via SQLite FTS5. Currently only date and channel
+  filters are available.
+- **TempTell Persistence** — pin toggle on TempTell tabs so selected tells survive a relog. Tester request from Jingliu.
+- **FontManager Async Refactor** — move `LoadGameSymFontAsync` out of the blocking plugin constructor. Fix cold-start
+  hitching on first plugin load (low severity; plugin is functional).
+- **Separate Opacity Active vs. Inactive** — second slider for inactive window opacity. Upstream declines this; we can
+  decide differently here.
+- **Failed-Tell Notification** — visible message on /tell failure (offline, restricted instance, blacklisted,
+  world-mismatch) instead of silent failure.
+- **Per-Tab Sound Notification** — sound toggle and optionally a custom .wav per tab, with mute-in-combat option.
 
 ---
 
-## Lizenz-Boundary
+## Long-Term (v1.x+)
 
-Hellion Chat ist EUPL-1.2-lizenziert. Konzept-Imports aus AGPL-3.0-Plugins (z.B. XIV Instant Messenger) sind
-ausschließlich architektonische Inspiration, kein Code-Port. Code-Imports aus dem Upstream-Bestand sind seit v1.4.x
-abgeschlossen, weil Chat 2 in einem grundlegenden Rework ist und selektive Patches nicht mehr sauber portierbar sind.
-Stand und Begründung in [`UPSTREAM_SYNC.md`](UPSTREAM_SYNC.md).
+### Storage Backends (three-stage confirmation)
+
+- MySQL/MariaDB backend for multi-device setups
+- PostgreSQL backend
+- AES-256 encryption for sensitive channels with a local key
+
+### Linux-Specific
+
+- WireGuard network detection as an optional filter trigger
+- libnotify integration for native Linux toasts
+- XDG compliance (complex under Wine)
+
+### UX and Tab Management
+
+- **Regex Tab Routing** — route plugin output spam into dedicated tabs, auto-sort tells from specific people. Clearly
+  scoped against ad-block: routing sorts into views, blocking hides globally.
+- **Auto-Detect Duties** — tab switch on duty start via condition flag.
+- **UX Bundle** — vertical tab bar as a layout option, Shift+Mousewheel to scroll tab headers without activating them,
+  global hotkey to close the active tab.
+- **Configure Tab Title** — configurable tab title format (name / name + abbreviated world / full name / custom),
+  overridable per tab.
+- **Name Display Options** — analogous to FFXIV vanilla (full name, first name abbreviated, initials), per-channel
+  override possible.
+- **Item & Flag Linking** — outgoing: Shift-click on an item/flag sends it to the focused plugin input. Incoming: item
+  links and map coordinates are clickable.
+- **Color Currently Selected Input Channel** — tint the channel-selector button in the input bar with the current
+  channel colour.
+- **Plugin-Disclosure Pre-Send Filter** — configurable word/regex list blocks sending with a pre-send confirmation.
+  Protects against accidentally mentioning plugins in public channels.
+- **Chat Clear on Name Change** — on character name change, migrate or wipe local history; default is wipe for maximum
+  privacy.
+- **Hide Plugin Window on NG+ Screen** — extend hide logic to cover additional addon names.
+- **Kick from Novice Network** — mentor niche; context menu entry with confirmation.
+- **Text-to-Speech for /tell** — incoming tells via TTS, optionally per sender, with channel filter and mute-in-combat.
+  Low priority.
+
+### Distribution and Branding
+
+- Hand-drawn Hellion logo (currently a placeholder from the Hellion Online Media brand repo)
+- GitHub Action for automatic `repo.json` sync after tag push
+- Submission to the Dalamud main plugin repository (in addition to the custom repo)
+
+---
+
+## Bug Verifications
+
+Carried over from the upstream issue tracker; not yet reproduced or verified in Hellion Chat 1.0.0. Will be tested
+against the current state when opportunity allows.
+
+- **Right-Click Whisper Error** in Field Ops / Special Instances (Eureka, Bozja, Occult Crescent, DRS) — upstream
+  [#168](https://github.com/Infiziert90/ChatTwo/issues/168). Reply helper appears to swallow the `@World` suffix.
+- **FPS Drops with Plugin Active** — upstream [#145](https://github.com/Infiziert90/ChatTwo/issues/145). 10–20 % drop
+  since upstream v1.29.19.0. v1.0.0 includes several fixes on the suspected paths; repro test against the current state
+  is open.
+- **Add Blacklist from Plugin Window** — upstream [#140](https://github.com/Infiziert90/ChatTwo/issues/140). Right-click
+  add-to-blacklist throws "Cannot locate character with that name"; works via vanilla chat.
+- **DB Viewer Column Sort** — State column sorts lexicographically instead of numerically (10 before 2). XIVIM
+  [#82](https://github.com/NightmareXIV/XIVInstantMessenger/issues/82); repro in Hellion Chat open.
+
+---
+
+## Licence Boundary
+
+Hellion Chat is licensed under EUPL-1.2. Concept imports from AGPL-3.0 plugins (e.g. XIV Instant Messenger) are
+architectural inspiration only — no code was ported. Code imports from the upstream codebase are complete as of v1.4.x
+because Chat 2 is undergoing a fundamental rework and selective patches are no longer cleanly portable. Status and
+rationale in [`UPSTREAM_SYNC.md`](UPSTREAM_SYNC.md).

renovate.json

@@ -26,8 +26,8 @@
         },
         {
             "description": "TypeScript type definitions stay grouped with each other",
-            "matchPackagePrefixes": ["@types/"],
-            "groupName": "type definitions"
+            "groupName": "type definitions",
+            "matchPackageNames": ["@types/{/,}**"]
         },
         {
             "description": "Dev dependencies in their own group",
@@ -37,13 +37,13 @@
         {
             "description": "Pin GitHub Action versions by SHA for supply-chain hygiene",
             "matchManagers": ["github-actions"],
-            "pinDigests": true
+            "pinDigests": true,
+            "ignorePaths": [".gitea/workflows/**"]
         }
     ],
     "vulnerabilityAlerts": {
         "labels": ["security", "vulnerability"],
-        "schedule": ["at any time"],
-        "prPriority": 10
+        "schedule": ["at any time"]
     },
     "lockFileMaintenance": {
         "enabled": true,

scripts/verify-changelog-sync.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # verify-changelog-sync.sh — Block C.
 # Strips .0 suffix from repo.json AssemblyVersion to derive the 3-digit tag/version.
-# yaml.changelog is a single multi-line block with **Hellion Chat X.Y.Z** subblocks.
+# yaml.changelog is a single multi-line block with **vX.Y.Z** subblocks.
 
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
@@ -16,11 +16,11 @@ ok()   { echo "verify-changelog-sync: OK — $1"; }
 VER="$(jq -r '.[0].AssemblyVersion' "$REPO_JSON" | sed -E 's/\.0$//')"
 TAG="v$VER"
 
-grep -qE "^[[:space:]]*\*\*Hellion Chat ${VER}" "$YAML" \
-  || fail "$YAML changelog missing **Hellion Chat ${VER}** subblock. Fix: add the v${VER} block at the top of the changelog field."
+grep -qE "^[[:space:]]*\*\*v${VER}[^0-9]" "$YAML" \
+  || fail "$YAML changelog missing **v${VER}** subblock. Fix: add the v${VER} block at the top of the changelog field."
 
-jq -r '.[0].Changelog' "$REPO_JSON" | grep -qE "^[[:space:]]*\*\*Hellion Chat ${VER}" \
-  || fail "$REPO_JSON Changelog missing **Hellion Chat ${VER}** subblock. Fix: copy the yaml changelog over."
+jq -r '.[0].Changelog' "$REPO_JSON" | grep -qE "^[[:space:]]*\*\*v${VER}[^0-9]" \
+  || fail "$REPO_JSON Changelog missing **v${VER}** subblock. Fix: copy the yaml changelog over."
 
 FORGE_FILE="$FORGE_DIR/${TAG}.md"
 [ -f "$FORGE_FILE" ] || fail "$FORGE_FILE missing. Fix: create from previous tag's file as template."
@@ -39,7 +39,7 @@ FOOTER_LEN=80
 TOTAL=$((TITLE_LEN + ${#BODY} + FOOTER_LEN))
 [ "$TOTAL" -le 5500 ] || fail "Forge embed total ~${TOTAL} chars > 5500 cap."
 
-YAML_VERSIONS="$(grep -cE '^[[:space:]]*\*\*Hellion Chat' "$YAML" || true)"
+YAML_VERSIONS="$(grep -cE '^[[:space:]]*\*\*v[0-9]+\.[0-9]+\.[0-9]+' "$YAML" || true)"
 [ "$YAML_VERSIONS" -le 4 ] || fail "$YAML changelog has $YAML_VERSIONS version subblocks (max 4). Fix: move oldest to docs/CHANGELOG.md."
 
 ok "yaml/repo.json/forge-post in sync for $TAG, embed-total ~${TOTAL}/5500, $YAML_VERSIONS/4 subblocks"